Atmos pipes now deal blunt damage (#27673)

* pipe

* weak

* inhand

* IT WORKS

* inventory
This commit is contained in:
Alzore
2024-05-09 01:00:47 -05:00
committed by GitHub
parent a2329889aa
commit 4d991d1554
14 changed files with 112 additions and 2 deletions

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@@ -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
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B