Important fix for table climbing (#10803)
This commit is contained in:
committed by
GitHub
parent
0e5e3b46c4
commit
84e20049b8
9
Resources/Audio/Items/attributions.yml
Normal file
9
Resources/Audio/Items/attributions.yml
Normal file
@@ -0,0 +1,9 @@
|
||||
- files: ["trayhit1.ogg"]
|
||||
license: "CC-BY-SA-3.0"
|
||||
copyright: "Time immemorial"
|
||||
source: "https://github.com/tgstation/tgstation/blob/172b533d0257fcc1f8a05406f1c9fad514c14d88/sound/items/trayhit1.ogg"
|
||||
|
||||
- files: ["trayhit2.ogg"]
|
||||
license: "CC-BY-SA-3.0"
|
||||
copyright: "Time immemorial"
|
||||
source: "https://github.com/tgstation/tgstation/blob/172b533d0257fcc1f8a05406f1c9fad514c14d88/sound/items/trayhit2.ogg"
|
||||
BIN
Resources/Audio/Items/trayhit1.ogg
Normal file
BIN
Resources/Audio/Items/trayhit1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Items/trayhit2.ogg
Normal file
BIN
Resources/Audio/Items/trayhit2.ogg
Normal file
Binary file not shown.
@@ -27,4 +27,10 @@
|
||||
key: state
|
||||
base: state_
|
||||
- type: Climbable
|
||||
bonk: true
|
||||
bonkDamage:
|
||||
types:
|
||||
Blunt: 4
|
||||
bonkSound: !type:SoundCollectionSpecifier
|
||||
collection: TrayHit
|
||||
- type: Clickable
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
- type: Construction
|
||||
graph: Table
|
||||
node: TableFrame
|
||||
|
||||
|
||||
- type: entity
|
||||
id: CounterWoodFrame
|
||||
parent: BaseStructure
|
||||
@@ -216,6 +216,12 @@
|
||||
- type: Construction
|
||||
graph: Table
|
||||
node: TableReinforced
|
||||
- type: Climbable
|
||||
# Reinforced tables are extra tough
|
||||
bonkDamage:
|
||||
types:
|
||||
Blunt: 8
|
||||
bonkTime: 3
|
||||
|
||||
- type: entity
|
||||
id: TableGlass
|
||||
@@ -490,7 +496,7 @@
|
||||
- type: Construction
|
||||
graph: Table
|
||||
node: CounterWood
|
||||
|
||||
|
||||
- type: entity
|
||||
id: TableCounterMetal
|
||||
parent: CounterMetalFrame
|
||||
|
||||
5
Resources/Prototypes/SoundCollections/tray.yml
Normal file
5
Resources/Prototypes/SoundCollections/tray.yml
Normal file
@@ -0,0 +1,5 @@
|
||||
- type: soundCollection
|
||||
id: TrayHit
|
||||
files:
|
||||
- /Audio/Items/trayhit1.ogg
|
||||
- /Audio/Items/trayhit2.ogg
|
||||
Reference in New Issue
Block a user