Atmos pipes now deal blunt damage (#27673)

* pipe

* weak

* inhand

* IT WORKS

* inventory

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index e5b77095b0e52f8e84611d9cd428f205f33d9482..0025fc5ae1b3045e30efaa7cb49fbf99f2cefe40 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   id: GasPipeBase
   parent: BaseItem
@@ -101,6 +101,20 @@
   - type: Construction
     graph: GasPipe
     node: straight
+  - type: Item
+    size: Normal
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageStraight
+    shape:
+    - 0,0,0,2
+  - type: MeleeWeapon
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud # this NEEDS to changed to the metal pipe falling sound effect on april first every year
 
 - type: entity
   parent: GasPipeBase
@@ -120,6 +134,27 @@
   - type: Construction
     graph: GasPipe
     node: bend
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,0
+    - 1,1,1,1
+    heldPrefix: Bend
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageBend
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 6
+    soundHit:
+      collection: MetalThud
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 3 #This should be 6 but throwing damage is doubled at the moment for some reason so for now it's 3
 
 - type: entity
   parent: GasPipeBase
@@ -139,6 +174,23 @@
   - type: Construction
     graph: GasPipe
     node: tjunction
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,1
+    heldPrefix: TJunction
+    storedSprite:
+      sprite: Structures/Piping/Atmospherics/pipe.rsi
+      state: storageTJunction
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   parent: GasPipeBase
@@ -160,6 +212,20 @@
   - type: Construction
     graph: GasPipe
     node: fourway
+  - type: Item
+    size: Normal
+    shape:
+    - 1,0,1,2
+    - 0,1,2,1
+    heldPrefix: Fourway
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 0.75
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   id: GasPipeBroken

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-left.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-left.png
new file mode 100644 (file)
index 0000000..f4f60cd
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-left.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-right.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-right.png
new file mode 100644 (file)
index 0000000..dfd2452
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Bend-inhand-right.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-left.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-left.png
new file mode 100644 (file)
index 0000000..4da2f45
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-left.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-right.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-right.png
new file mode 100644 (file)
index 0000000..a59a797
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/Fourway-inhand-right.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-left.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-left.png
new file mode 100644 (file)
index 0000000..8b14c91
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-left.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-right.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-right.png
new file mode 100644 (file)
index 0000000..828920b
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/TJunction-inhand-right.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-left.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7ca777a
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-right.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6c8c55a
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
index ae4ff9b12d0d3e7c89bdd708785040a3b7cb4f4b..aecb62aee527c77b9bc4b3510d6b4f11f4690b65 100644 (file)
--- a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/meta.json
@@ -5,8 +5,40 @@
       "y":32
    },
    "license":"CC-BY-SA-3.0",
-   "copyright":"pipeTrinaryConnectors made by Menshin for SS14 based on pipeTJunction, the rest is taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "copyright":"Inhand sprites by alzore_(discord) for SS14. pipeTrinaryConnectors made by Menshin for SS14 based on pipeTJunction, the rest is taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da.",
    "states":[
+      {
+         "name": "inhand-left",
+         "directions":4
+      },
+      {
+         "name":"inhand-right",
+         "directions":4
+      },
+      {
+         "name": "Bend-inhand-left",
+         "directions":4
+      },
+      {
+         "name":"Bend-inhand-right",
+         "directions":4
+      },
+      {
+         "name": "TJunction-inhand-left",
+         "directions":4
+      },
+      {
+         "name":"TJunction-inhand-right",
+         "directions":4
+      },
+      {
+         "name": "Fourway-inhand-left",
+         "directions":4
+      },
+      {
+         "name":"Fourway-inhand-right",
+         "directions":4
+      },
       {
          "name":"pipeBroken",
          "directions":1
@@ -38,6 +70,18 @@
          {
          "name":"pipeTrinaryConnectors",
          "directions":4
+      },
+      {
+         "name":"storageStraight",
+         "directions":4
+      },
+      {
+         "name":"storageBend",
+         "directions":4
+      },
+      {
+         "name":"storageTJunction",
+         "directions":4
       }
    ]
 }

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png
index b6408718ebabf37e4eedfef7601b7378670ebcb0..cda379a65b98d8a14d23331935afd60b5f71b5b0 100644 (file)
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/pipeBend.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageBend.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageBend.png
new file mode 100644 (file)
index 0000000..39ffe21
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageBend.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageStraight.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageStraight.png
new file mode 100644 (file)
index 0000000..715aeb5
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageStraight.png differ

diff --git a/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageTJunction.png b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageTJunction.png
new file mode 100644 (file)
index 0000000..af8376a
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/pipe.rsi/storageTJunction.png differ