From a775858486b5f0a0eb8fb787bdca6eae14239be6 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Mon, 26 May 2025 03:57:18 +1200 Subject: [PATCH] Add welded visuals to shutters and blast doors (#37807) add welded to all shutters and blast doors --- .../Structures/Doors/Shutter/blast_door.yml | 2 + .../Structures/Doors/Shutter/shutters.yml | 6 ++ .../Doors/Shutters/blastdoor.rsi/meta.json | 5 +- .../Doors/Shutters/blastdoor.rsi/welded.png | Bin 0 -> 547 bytes .../Doors/Shutters/shutters.rsi/meta.json | 98 +++++++++++++++++- .../Doors/Shutters/shutters.rsi/welded.png | Bin 0 -> 494 bytes .../Shutters/shutters_radiation.rsi/meta.json | 93 ++++++++++++++++- .../shutters_radiation.rsi/welded.png | Bin 0 -> 494 bytes .../Shutters/shutters_window.rsi/meta.json | 94 ++++++++++++++++- .../Shutters/shutters_window.rsi/welded.png | Bin 0 -> 494 bytes 10 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/welded.png create mode 100644 Resources/Textures/Structures/Doors/Shutters/shutters.rsi/welded.png create mode 100644 Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/welded.png create mode 100644 Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/welded.png diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index d61f6dd21c..4a294d8a16 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml @@ -11,6 +11,8 @@ layers: - state: closed map: ["enum.DoorVisualLayers.Base"] + - state: welded + map: ["enum.WeldableLayers.BaseWelded"] - type: Door closeTimeOne: 0.4 closeTimeTwo: 0.4 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index f322de7283..7becad94bf 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -14,6 +14,8 @@ layers: - state: closed map: ["enum.DoorVisualLayers.Base"] + - state: welded + map: ["enum.WeldableLayers.BaseWelded"] - type: AnimationPlayer - type: Physics - type: Fixtures @@ -140,6 +142,8 @@ layers: - state: closed map: ["enum.DoorVisualLayers.Base"] + - state: welded + map: ["enum.WeldableLayers.BaseWelded"] - type: Occluder - type: Construction graph: Shutters @@ -176,6 +180,8 @@ layers: - state: closed map: ["enum.DoorVisualLayers.Base"] + - state: welded + map: ["enum.WeldableLayers.BaseWelded"] - type: Construction graph: Shutters node: ShuttersWindow diff --git a/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/meta.json b/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/meta.json index 905fe8a64e..958822457c 100644 --- a/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Tgstation at 97b4295aca9f31a750456e40730d05b5837e39fc", + "copyright": "Tgstation at 97b4295aca9f31a750456e40730d05b5837e39fc, welded taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d and modified by K-Dynamic (github)", "size": { "x": 32, "y": 32 @@ -45,6 +45,9 @@ }, { "name": "closed" + }, + { + "name": "welded" } ] } diff --git a/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/welded.png b/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..381e09f600b975fadeffcdbb444bcb6692607f05 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUO{JtvO-&;rB2rRPOiWDN+}vzzYytxV!^6X6Wo3b?68DK10V(d1 zAiv=MaKPZ@&-e)_%vs`1G1NjN$~muaP8G)qe3_ZhkjQJhQ;ULGffk4#DT zU~b8})8R0aN7kaj;pq%_2BkZ`(=;zW-KA;9>~PG|vX ur1qHM%;LX)p9767D|o|MR`EX4{cil-$!ea;N4HmlTs+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^+kG#Ht|;!HrcAtMum z0FaIX;>>myuy_`b4Fdbi7#UswJr1MMEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq z5MTnD%LG;#WN86pL3J4#7=UDbG8X-mJ;(JF$c*%KaSXBWf7@%wcff#yIk(*;^WXmm zvo@5xzNR_tfP^g5YiD*1*##vHm+BcbmW9{zODjY%aCKbZ(v-N^dV_((B&|K>Tfw=d qlN(p_w@-|J;QZ5X-dsb=-+viiX{#Dq%Y70AS?KBN=d#Wzp$Pz(8F-8U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/meta.json b/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/meta.json index c97082c061..af88fb32c0 100644 --- a/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/meta.json @@ -1 +1,92 @@ -{"name":1,"size":{"x":32,"y":32},"states":[{"name":"closed","directions":1},{"name":"open","directions":1},{"name":"opening","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]},{"name":"closing","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]}],"license":"CC-BY-SA-3.0","copyright":"Tgstation at 97b0.05295aca9f31a7500.0556e0.050730d05b5837e39fc","version":1} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Tgstation at 97b0.05295aca9f31a7500.0556e0.050730d05b5837e39fc, welded taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d and modified by K-Dynamic (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open", + "directions": 1 + }, + { + "name": "closed", + "directions": 1 + }, + { + "name": "welded" + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/welded.png b/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..5063c6ca1a20282e071ec920326ac57336721a5f GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU-Q3(vOiTg;18r<s+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^+kG#Ht|;!HrcAtMum z0FaIX;>>myuy_`b4Fdbi7#UswJr1MMEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq z5MTnD%LG;#WN86pL3J4#7=UDbG8X-mJ;(JF$c*%KaSXBWf7@%wcff#yIk(*;^WXmm zvo@5xzNR_tfP^g5YiD*1*##vHm+BcbmW9{zODjY%aCKbZ(v-N^dV_((B&|K>Tfw=d qlN(p_w@-|J;QZ5X-dsb=-+viiX{#Dq%Y70AS?KBN=d#Wzp$Pz(8F-8U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/meta.json b/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/meta.json index 611cd681a8..76e841bf61 100644 --- a/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/meta.json @@ -1 +1,93 @@ -{"name":1,"size":{"x":32,"y":32},"states":[{"name":"closed","directions":1},{"name":"opening","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]},{"name":"closing","directions":1,"delays":[[0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05,0.05]]},{"name":"open","directions":1}],"license":"CC-BY-SA-3.0","copyright":"Tgstation at 97b0.05295aca9f31a7500.0556e0.050730d05b5837e39fc, Edited to rectagular window by Pancake","version":1} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Tgstation at 97b0.05295aca9f31a7500.0556e0.050730d05b5837e39fc, Edited to rectagular window by Pancake, welded taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d and modified by K-Dynamic (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open", + "directions": 1 + }, + { + "name": "closed", + "directions": 1 + }, + { + "name": "welded", + "directions": 1 + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/welded.png b/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..5063c6ca1a20282e071ec920326ac57336721a5f GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU-Q3(vOiTg;18r<s+fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^+kG#Ht|;!HrcAtMum z0FaIX;>>myuy_`b4Fdbi7#UswJr1MMEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq z5MTnD%LG;#WN86pL3J4#7=UDbG8X-mJ;(JF$c*%KaSXBWf7@%wcff#yIk(*;^WXmm zvo@5xzNR_tfP^g5YiD*1*##vHm+BcbmW9{zODjY%aCKbZ(v-N^dV_((B&|K>Tfw=d qlN(p_w@-|J;QZ5X-dsb=-+viiX{#Dq%Y70AS?KBN=d#Wzp$Pz(8F-8U literal 0 HcmV?d00001