diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index 78b9a493ed..dffd3f0741 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -301,7 +301,7 @@ entities: parent: 100 type: Transform - uid: 12 - type: WallMetal + type: WallSolid components: - pos: -0.5,-5.5 parent: 100 @@ -391,7 +391,7 @@ entities: parent: 100 type: Transform - uid: 27 - type: WallMetal + type: WallSolid components: - pos: 0.5,-5.5 parent: 100 @@ -675,7 +675,7 @@ entities: parent: 100 type: Transform - uid: 72 - type: WallMetal + type: WallSolid components: - pos: 1.5,-5.5 parent: 100 @@ -25964,7 +25964,7 @@ entities: parent: 100 type: Transform - uid: 656 - type: WallMetal + type: WallSolid components: - pos: 13.5,11.5 parent: 100 @@ -25976,25 +25976,25 @@ entities: parent: 100 type: Transform - uid: 658 - type: WallMetal + type: WallSolid components: - pos: 12.5,16.5 parent: 100 type: Transform - uid: 659 - type: WallMetal + type: WallSolid components: - pos: 12.5,15.5 parent: 100 type: Transform - uid: 660 - type: WallMetal + type: WallSolid components: - pos: 6.5,16.5 parent: 100 type: Transform - uid: 661 - type: WallMetal + type: WallSolid components: - pos: 11.5,16.5 parent: 100 @@ -26012,13 +26012,13 @@ entities: parent: 100 type: Transform - uid: 664 - type: WallMetal + type: WallSolid components: - pos: 13.5,12.5 parent: 100 type: Transform - uid: 665 - type: WallMetal + type: WallSolid components: - pos: 14.5,12.5 parent: 100 @@ -26036,25 +26036,25 @@ entities: parent: 100 type: Transform - uid: 668 - type: WallMetal + type: WallSolid components: - pos: 14.5,15.5 parent: 100 type: Transform - uid: 669 - type: WallMetal + type: WallSolid components: - pos: 13.5,15.5 parent: 100 type: Transform - uid: 670 - type: WallMetal + type: WallSolid components: - pos: 5.5,16.5 parent: 100 type: Transform - uid: 671 - type: WallMetal + type: WallSolid components: - pos: 5.5,15.5 parent: 100 diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 3b2ad757c0..dfebe73b8c 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -241,36 +241,6 @@ key: walls base: ice -- type: entity - parent: WallBase - id: WallMetal - name: metal wall - components: - - type: Tag - tags: - - Wall - - RCDDeconstructWhitelist - - type: Sprite - sprite: Structures/Walls/metal.rsi - - type: Icon - sprite: Structures/Walls/metal.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - Girder: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: IconSmooth - key: walls - base: metal - - type: entity parent: WallBase id: WallPlasma @@ -589,6 +559,42 @@ base: solid - type: StaticPrice price: 1 # total material cost. If you change the recipe for the wall you should recalculate this. + +- type: entity + parent: WallBase + id: WallSolidRust + name: solid wall + suffix: rusted + components: + - type: Sprite + sprite: Structures/Walls/solidrust.rsi + - type: Construction + graph: Girder + node: wallrust + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:ChangeConstructionNodeBehavior + node: girder + - !type:DoActsBehavior + acts: ["Destruction"] + destroySound: + path: /Audio/Effects/metalbreak.ogg + - type: IconSmooth + key: walls + base: solidrust - type: entity parent: WallBase diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index 5db4348be1..8f58d761e0 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -143,3 +143,16 @@ data: 0 - tool: Cutting doAfter: 1 + + - node: wallrust + entity: WallSolidRust + edges: + - to: wall + completed: + - !type:SpawnPrototype + prototype: WallSolid + amount: 1 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 diff --git a/Resources/Textures/Structures/Walls/metal.rsi/full.png b/Resources/Textures/Structures/Walls/metal.rsi/full.png deleted file mode 100644 index 02ae3ff3cc..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/meta.json b/Resources/Textures/Structures/Walls/metal.rsi/meta.json deleted file mode 100644 index 04a5d9b667..0000000000 --- a/Resources/Textures/Structures/Walls/metal.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full"}, {"name": "metal0", "directions": 4}, {"name": "metal1", "directions": 4}, {"name": "metal2", "directions": 4}, {"name": "metal3", "directions": 4}, {"name": "metal4", "directions": 4}, {"name": "metal5", "directions": 4}, {"name": "metal6", "directions": 4}, {"name": "metal7", "directions": 4}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal0.png b/Resources/Textures/Structures/Walls/metal.rsi/metal0.png deleted file mode 100644 index fe570c054f..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal1.png b/Resources/Textures/Structures/Walls/metal.rsi/metal1.png deleted file mode 100644 index 4374ed1e10..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal2.png b/Resources/Textures/Structures/Walls/metal.rsi/metal2.png deleted file mode 100644 index fe570c054f..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal3.png b/Resources/Textures/Structures/Walls/metal.rsi/metal3.png deleted file mode 100644 index 4374ed1e10..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal4.png b/Resources/Textures/Structures/Walls/metal.rsi/metal4.png deleted file mode 100644 index 95e4089479..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal5.png b/Resources/Textures/Structures/Walls/metal.rsi/metal5.png deleted file mode 100644 index d4f50d419f..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal6.png b/Resources/Textures/Structures/Walls/metal.rsi/metal6.png deleted file mode 100644 index 95e4089479..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/metal.rsi/metal7.png b/Resources/Textures/Structures/Walls/metal.rsi/metal7.png deleted file mode 100644 index a880e87e0e..0000000000 Binary files a/Resources/Textures/Structures/Walls/metal.rsi/metal7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/full.png b/Resources/Textures/Structures/Walls/solidrust.rsi/full.png new file mode 100644 index 0000000000..f76449b04a Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json b/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json new file mode 100644 index 0000000000..3176ddd0cc --- /dev/null +++ b/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full"}, {"name": "solidrust0", "directions": 4}, {"name": "solidrust1", "directions": 4}, {"name": "solidrust2", "directions": 4}, {"name": "solidrust3", "directions": 4}, {"name": "solidrust4", "directions": 4}, {"name": "solidrust5", "directions": 4}, {"name": "solidrust6", "directions": 4}, {"name": "solidrust7", "directions": 4}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png new file mode 100644 index 0000000000..063c345fb7 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png new file mode 100644 index 0000000000..7cf44a388e Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png new file mode 100644 index 0000000000..063c345fb7 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png new file mode 100644 index 0000000000..7cf44a388e Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png new file mode 100644 index 0000000000..dc035c9933 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png new file mode 100644 index 0000000000..a9e64f62c3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png new file mode 100644 index 0000000000..dc035c9933 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png new file mode 100644 index 0000000000..396f37008b Binary files /dev/null and b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png differ