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 0000000000..381e09f600 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Shutters/blastdoor.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/meta.json b/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/meta.json index 130943aa80..9dd14958c7 100644 --- a/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/meta.json @@ -1 +1,97 @@ -{"name":1,"size":{"x":32,"y":32},"states":[{"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":"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":"open","directions":1},{"name":"frame","directions":1},{"name":"closed","directions":1}],"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": "frame", + "directions": 1 + }, + { + "name": "open", + "directions": 1 + }, + { + "name": "closed", + "directions": 1 + }, + { + "name": "welded", + "directions": 1 + }, + { + "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": "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/welded.png b/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/welded.png new file mode 100644 index 0000000000..5063c6ca1a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Shutters/shutters.rsi/welded.png differ 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 0000000000..5063c6ca1a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Shutters/shutters_radiation.rsi/welded.png differ 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 0000000000..5063c6ca1a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Shutters/shutters_window.rsi/welded.png differ