diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index f6ab96a6f9..708c7db44a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -1,5 +1,5 @@ - type: entity - parent: + parent: - BaseStructure id: CP14BaseWorkbench abstract: true @@ -104,6 +104,11 @@ name: sewing table description: A table with embroidery tools to create different clothing and materials. components: + - type: Sprite + snapCardinals: true + state: sewing_table + - type: Icon + state: sewing_table - type: CP14Workbench craftSound: collection: CP14Sawing #TODO diff --git a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml index be533d3a5f..c4a3f669b5 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml @@ -1,7 +1,7 @@ - type: entity id: CP14FrameWooden name: wooden wall frame - parent: + parent: - BaseStructureDynamic - CP14BaseFlammableSpreading description: Wooden frame for any wooden wall. @@ -63,7 +63,7 @@ collection: WoodDestroy - !type:SpawnEntitiesBehavior spawn: - CP14WoodenPlanks1: + CP14FrameWoodenCrushedMedium: min: 1 max: 1 @@ -99,4 +99,153 @@ - MachineMask layer: - GlassAirlockLayer - - type: InteractionOutline \ No newline at end of file + - type: InteractionOutline + +- type: entity ### Crushed Medium frame + id: CP14FrameWoodenCrushedMedium + name: wooden wall frame + parent: CP14BaseCrushed + suffix: CrushedMedium + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wall_frame.rsi + state: crushed_medium + - type: Icon + sprite: _CP14/Structures/Walls/wall_frame.rsi + state: crushed_medium + - type: Transform + anchored: true + noRot: false + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 20 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14FrameWoodenCrushedLow: + min: 1 + max: 1 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14FrameWoodenCrushedLow: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity ### Crushed Low frame + id: CP14FrameWoodenCrushedLow + name: wooden wall frame + parent: CP14BaseCrushed + suffix: CrushedLow + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wall_frame.rsi + state: crushed_low + - type: Icon + sprite: _CP14/Structures/Walls/wall_frame.rsi + state: crushed_low + - type: Transform + anchored: true + noRot: false + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity ### Crushed Medium stone + id: CP14WallStonebrickCrushedMedium + name: stone brick wall + parent: CP14BaseCrushed + suffix: CrushedMedium + components: + - type: Sprite + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: crushed_medium + - type: Icon + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: crushed_medium + - type: Transform + anchored: true + noRot: false + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14WallStonebrickCrushedLow: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity ### Crushed Low stone + id: CP14WallStonebrickCrushedLow + name: stone brick wall + parent: CP14BaseCrushed + suffix: CrushedLow + components: + - type: Sprite + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: crushed_low + - type: Icon + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: crushed_low + - type: Transform + anchored: true + noRot: false + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index e649fdb02d..2c8b9fe70f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -51,65 +51,6 @@ acts: [ "Destruction" ] - type: CP14WallpaperHolder -- type: entity ### Crushed Medium - id: CP14WallStonebrickCrushedMedium - name: stone brick wall - parent: CP14BaseCrushed - suffix: CrushedMedium - components: - - type: Sprite - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_medium - - type: Icon - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_medium - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - CP14WallStonebrickCrushedLow: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity ### Crushed Low - id: CP14WallStonebrickCrushedLow - name: stone brick wall - parent: CP14BaseCrushed - suffix: CrushedLow - components: - - type: Sprite - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_low - - type: Icon - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_low - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: entity id: CP14WallWhitebrick name: white brick wall @@ -166,6 +107,11 @@ - !type:PlaySoundBehavior sound: collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14FrameWooden: + min: 1 + max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction @@ -194,6 +140,11 @@ - !type:PlaySoundBehavior sound: collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14FrameWooden: + min: 1 + max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Construction diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json index 656a6d26a7..a8070577ac 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "cooking_table" + }, + { + "name": "sewing_table" } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/sewing_table.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/sewing_table.png new file mode 100644 index 0000000000..1289f84624 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/sewing_table.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png new file mode 100644 index 0000000000..bc08c28406 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png new file mode 100644 index 0000000000..843b1366d1 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json index 8e9f9fe09f..df0390090b 100644 --- a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json @@ -5,10 +5,16 @@ "y": 64 }, "license": "CLA", - "copyright": "Created by TheShuEd for CrystallPunk14, modified by vladimir.s", + "copyright": "Created by TheShuEd & Jaraten for CrystallPunk14, modified by vladimir.s", "states": [ { "name": "wooden" + }, + { + "name": "crushed_medium" + }, + { + "name": "crushed_low" } ] -} \ No newline at end of file +}