Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Debris Actually Dangerous #353

Merged
merged 4 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/shards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
damage:
types:
Slash: 2
- type: EmbeddableProjectile
sound: /Audio/Weapons/bladeslice.ogg
- type: Tag
tags:
- Trash
Expand Down
28 changes: 18 additions & 10 deletions Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.ogg

- type: entity
name: steel dark checker tile
Expand Down Expand Up @@ -86,7 +94,7 @@

- type: entity
name: steel tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemMetalDiamond
components:
- type: Sprite
Expand Down Expand Up @@ -143,7 +151,7 @@

- type: entity
name: dark tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemDark
components:
- type: Sprite
Expand All @@ -162,7 +170,7 @@

- type: entity
name: techmaint floor
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemTechmaint
components:
- type: Sprite
Expand All @@ -178,7 +186,7 @@

- type: entity
name: reinforced tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemReinforced
components:
- type: Sprite
Expand Down Expand Up @@ -282,7 +290,7 @@

- type: entity
name: elevator shaft tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemElevatorShaft
components:
- type: Sprite
Expand Down Expand Up @@ -362,7 +370,7 @@

- type: entity
name: dark mining tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemMiningDark
components:
- type: Sprite
Expand All @@ -378,7 +386,7 @@

- type: entity
name: light mining tile
parent: FloorTileItemBase
parent: FloorTileItemSteel
id: FloorTileItemMiningLight
components:
- type: Sprite
Expand Down Expand Up @@ -1082,4 +1090,4 @@
stackType: FloorTileWoodLarge
- type: Construction
graph: TileWoodLarge
node: woodtilelarge
node: woodtilelarge
Loading