From 75c2cc46420faf7a5964f582dc4ad64801e45f32 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 30 Apr 2024 22:02:08 -0400 Subject: [PATCH 1/3] Make debris actually dangerous --- .../Entities/Objects/Materials/shards.yml | 6 ++++ .../Entities/Objects/Misc/tiles.yml | 28 ++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index f94f0a7e0eb..e3653e955c0 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -46,6 +46,12 @@ damage: types: Slash: 2 + - type: EmbeddableProjectile + sound: /Audio/Weapons/bladeslice.ogg + - type: DamageOtherOnHit + damage: + types: + Slash: 2 - type: Tag tags: - Trash diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 8e29c3c27e6..a363bca0518 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1,7 +1,7 @@ - type: entity parent: BaseItem id: FloorTileItemBase - description: These could work as a pretty decent throwing weapon. + description: The floor was meant to hold this, not you. abstract: true components: - type: Sprite @@ -12,7 +12,9 @@ - type: DamageOtherOnHit damage: types: - Blunt: 5 + Blunt: 2 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg - type: Stack count: 1 - type: Damageable @@ -59,6 +61,12 @@ - type: Construction graph: TileSteel node: steeltile + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 #Metal floor tiles deal more damage than standard + - type: EmbeddableProjectile + sound: /Audio/Weapons/block_metal1 - type: entity name: steel dark checker tile @@ -86,7 +94,7 @@ - type: entity name: steel tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemMetalDiamond components: - type: Sprite @@ -143,7 +151,7 @@ - type: entity name: dark tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemDark components: - type: Sprite @@ -162,7 +170,7 @@ - type: entity name: techmaint floor - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemTechmaint components: - type: Sprite @@ -178,7 +186,7 @@ - type: entity name: reinforced tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemReinforced components: - type: Sprite @@ -282,7 +290,7 @@ - type: entity name: elevator shaft tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemElevatorShaft components: - type: Sprite @@ -362,7 +370,7 @@ - type: entity name: dark mining tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemMiningDark components: - type: Sprite @@ -378,7 +386,7 @@ - type: entity name: light mining tile - parent: FloorTileItemBase + parent: FloorTileItemSteel id: FloorTileItemMiningLight components: - type: Sprite @@ -1082,4 +1090,4 @@ stackType: FloorTileWoodLarge - type: Construction graph: TileWoodLarge - node: woodtilelarge \ No newline at end of file + node: woodtilelarge From 6e9403ec7bd26b5e81cbfb03bbabea3dbbf94f77 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 30 Apr 2024 22:12:17 -0400 Subject: [PATCH 2/3] Update shards.yml --- Resources/Prototypes/Entities/Objects/Materials/shards.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index e3653e955c0..6a3ba22abcf 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -48,10 +48,6 @@ Slash: 2 - type: EmbeddableProjectile sound: /Audio/Weapons/bladeslice.ogg - - type: DamageOtherOnHit - damage: - types: - Slash: 2 - type: Tag tags: - Trash From 2429075559b12cfe80008db00a3870f3898b249a Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 30 Apr 2024 22:20:52 -0400 Subject: [PATCH 3/3] guh --- Resources/Prototypes/Entities/Objects/Misc/tiles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index a363bca0518..45762474a98 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -66,7 +66,7 @@ types: Blunt: 5 #Metal floor tiles deal more damage than standard - type: EmbeddableProjectile - sound: /Audio/Weapons/block_metal1 + sound: /Audio/Weapons/block_metal1.ogg - type: entity name: steel dark checker tile