Cleans up Airlock content (#3575)

* Initial

* Fixed RSI timings

* Sorts RSIs

* Adds effects.rsi

* Unlits

Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs

@@ -84,7 +84,7 @@ namespace Content.Client.GameObjects.Components.Doors
                 var flick = new AnimationTrackSpriteFlick();
                 DenyAnimation.AnimationTracks.Add(flick);
                 flick.LayerKey = DoorVisualLayers.BaseUnlit;
-                flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("deny", 0f));
+                flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("deny_unlit", 0f));
 
                 var sound = new AnimationTrackPlaySound();
                 DenyAnimation.AnimationTracks.Add(sound);
@@ -128,7 +128,7 @@ namespace Content.Client.GameObjects.Components.Doors
                 case DoorVisualState.Closed:
                     sprite.LayerSetState(DoorVisualLayers.Base, "closed");
                     sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit");
-                    sprite.LayerSetState(DoorVisualLayers.BaseBolted, "bolted");
+                    sprite.LayerSetState(DoorVisualLayers.BaseBolted, "bolted_unlit");
                     sprite.LayerSetState(WiresVisualizer.WiresVisualLayers.MaintenancePanel, "panel_open");
                     break;
                 case DoorVisualState.Opening:

Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml

@@ -9,7 +9,7 @@
   - type: Sprite
     netsync: false
     drawdepth: Mobs # They're on the same layer as mobs, perspective.
-    sprite: Constructible/Structures/Doors/airlock_basic.rsi
+    sprite: Constructible/Structures/Doors/Standard/basic.rsi
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
@@ -18,7 +18,7 @@
       map: ["enum.DoorVisualLayers.BaseUnlit"]
     - state: welded
       map: ["enum.DoorVisualLayers.BaseWelded"]
-    - state: bolted
+    - state: bolted_unlit
       shader: unshaded
       map: ["enum.DoorVisualLayers.BaseBolted"]
     - state: panel_open
@@ -73,23 +73,3 @@
     mode: NoSprite
   placement:
     mode: SnapgridCenter
-
-- type: entity
-  id: AirlockGlass
-  parent: Airlock
-  name: glass airlock
-  components:
-  - type: Door
-    occludes: false
-  - type: Occluder
-    enabled: false
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_glass.rsi
-
-- type: entity
-  parent: Airlock
-  id: AirlockMaint
-  name: maintenance hatch
-  components:
-  - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_maint.rsi

Resources/Prototypes/Entities/Constructible/Doors/airlock_types.yml

@@ -1,4 +1,5 @@
-# Airlocks
+# Standard
+
 - type: entity
   parent: Airlock
   id: AirlockExternal
@@ -8,7 +9,7 @@
   - type: Door
     bumpOpen: false
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_external.rsi
+    sprite: Constructible/Structures/Doors/Standard/external.rsi
   - type: Appearance
     visuals:
     - type: AirlockVisualizer
@@ -23,7 +24,7 @@
   suffix: Freezer
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_freezer.rsi
+    sprite: Constructible/Structures/Doors/Standard/freezer.rsi
 
 - type: entity
   parent: Airlock
@@ -31,7 +32,7 @@
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_engineering.rsi
+    sprite: Constructible/Structures/Doors/Standard/engineering.rsi
 
 - type: entity
   parent: Airlock
@@ -39,7 +40,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_cargo.rsi
+    sprite: Constructible/Structures/Doors/Standard/cargo.rsi
 
 - type: entity
   parent: Airlock
@@ -47,7 +48,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_medical.rsi
+    sprite: Constructible/Structures/Doors/Standard/medical.rsi
 
 - type: entity
   parent: Airlock
@@ -55,7 +56,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_science.rsi
+    sprite: Constructible/Structures/Doors/Standard/science.rsi
 
 - type: entity
   parent: Airlock
@@ -63,7 +64,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_command.rsi
+    sprite: Constructible/Structures/Doors/Standard/command.rsi
 
 - type: entity
   parent: Airlock
@@ -71,16 +72,37 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_security.rsi
+    sprite: Constructible/Structures/Doors/Standard/security.rsi
+
+- type: entity
+  parent: Airlock
+  id: AirlockMaint
+  name: maintenance hatch
+  components:
+  - type: Sprite
+    sprite: Constructible/Structures/Doors/Standard/maint.rsi
+
+# Glass
+
+- type: entity
+  id: AirlockGlass
+  parent: Airlock
+  name: glass airlock
+  components:
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: Constructible/Structures/Doors/Glass/glass.rsi
 
-# Glass Airlocks
 - type: entity
   parent: AirlockGlass
   id: AirlockEngineeringGlass
   suffix: Engineering
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_engineering_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/engineering.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -88,7 +110,7 @@
   suffix: Cargo
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_cargo_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/cargo.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -96,7 +118,7 @@
   suffix: Medical
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_medical_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/medical.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -104,7 +126,7 @@
   suffix: Science
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_science_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/science.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -112,7 +134,7 @@
   suffix: Command
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_command_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/command.rsi
 
 - type: entity
   parent: AirlockGlass
@@ -120,4 +142,4 @@
   suffix: Security
   components:
   - type: Sprite
-    sprite: Constructible/Structures/Doors/airlock_security_glass.rsi
+    sprite: Constructible/Structures/Doors/Glass/security.rsi

Resources/Prototypes/Entities/Constructible/Doors/firelock.yml

@@ -18,7 +18,7 @@
     - type: Sprite
       netsync: false
       drawdepth: Mobs # They're on the same layer as mobs, perspective.
-      sprite: Constructible/Structures/Doors/firelock.rsi
+      sprite: Constructible/Structures/Doors/Standard/firelock.rsi
       layers:
         - state: closed
           map: ["enum.DoorVisualLayers.Base"]
@@ -27,12 +27,11 @@
           map: ["enum.DoorVisualLayers.BaseUnlit"]
         - state: welded
           map: ["enum.DoorVisualLayers.BaseWelded"]
-        - state: bolted
+        - state: bolted_unlit
           shader: unshaded
           map: ["enum.DoorVisualLayers.BaseBolted"]
         - state: panel_open
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
-
     - type: Physics
       canCollide: false
       fixtures:
@@ -79,7 +78,6 @@
     - type: Construction
       graph: Firelock
       node: Firelock
-
   placement:
     mode: SnapgridCenter
 
@@ -93,8 +91,7 @@
     - type: Occluder
       enabled: false
     - type: Sprite
-      sprite: Constructible/Structures/Doors/firelock_glass.rsi
+      sprite: Constructible/Structures/Doors/Glass/firelock.rsi
-
 
 - type: entity
   id: FirelockEdge

Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml

@@ -4,7 +4,7 @@
   description: That is a firelock frame.
   components:
     - type: Sprite
-      sprite: Constructible/Structures/Doors/firelock.rsi
+      sprite: Constructible/Structures/Doors/Standard/firelock.rsi
       state: frame1
     - type: Construction
       graph: Firelock

Resources/Prototypes/Recipes/Construction/structures.yml

@@ -133,7 +133,7 @@
   category: Structures
   description: This is a firelock - it locks an area when a fire alarm in the area is triggered. Don't get squished!
   icon:
-    sprite: Constructible/Structures/Doors/firelock.rsi
+    sprite: Constructible/Structures/Doors/Standard/firelock.rsi
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter

Resources/Textures/Constructible/Structures/Doors/Glass/cargo.rsi/meta.json

@@ -1,35 +1,23 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/doorint.dmi",
   "states": [
     {
-      "name": "bolted",
+      "name": "assembly"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "locked",
+      "name": "bolted_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed",
+      "name": "locked"
-      "delays": [
+    },
-        [
+    {
-          1
+      "name": "closed"
-        ]
-      ]
     },
     {
       "name": "closed_unlit",
@@ -66,7 +54,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
@@ -76,12 +64,7 @@
       ]
     },
     {
-      "name": "open",
+      "name": "open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "opening",
@@ -126,12 +109,7 @@
       ]
     },
     {
-      "name": "panel_open",
+      "name": "panel_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "panel_opening",
@@ -201,12 +179,7 @@
       ]
     },
     {
-      "name": "welded",
+      "name": "welded"
-      "delays": [
-        [
-          1
-        ]
-      ]
     }
   ]
 }

Resources/Textures/Constructible/Structures/Doors/Glass/command.rsi/meta.json

@@ -1,35 +1,23 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi",
   "states": [
     {
-      "name": "bolted",
+      "name": "assembly"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "locked",
+      "name": "bolted_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed",
+      "name": "locked"
-      "delays": [
+    },
-        [
+    {
-          1
+      "name": "closed"
-        ]
-      ]
     },
     {
       "name": "closed_unlit",
@@ -66,7 +54,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
@@ -76,12 +64,7 @@
       ]
     },
     {
-      "name": "open",
+      "name": "open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "opening",
@@ -126,12 +109,7 @@
       ]
     },
     {
-      "name": "panel_open",
+      "name": "panel_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "panel_opening",
@@ -201,12 +179,7 @@
       ]
     },
     {
-      "name": "welded",
+      "name": "welded"
-      "delays": [
-        [
-          1
-        ]
-      ]
     }
   ]
 }

Resources/Textures/Constructible/Structures/Doors/Glass/engineering.rsi/meta.json

@@ -1,35 +1,23 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi",
   "states": [
     {
-      "name": "bolted",
+      "name": "assembly"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "locked",
+      "name": "bolted_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed",
+      "name": "locked"
-      "delays": [
+    },
-        [
+    {
-          1
+      "name": "closed"
-        ]
-      ]
     },
     {
       "name": "closed_unlit",
@@ -66,7 +54,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
@@ -76,12 +64,7 @@
       ]
     },
     {
-      "name": "open",
+      "name": "open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "opening",
@@ -126,12 +109,7 @@
       ]
     },
     {
-      "name": "panel_open",
+      "name": "panel_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "panel_opening",
@@ -201,12 +179,7 @@
       ]
     },
     {
-      "name": "welded",
+      "name": "welded"
-      "delays": [
-        [
-          1
-        ]
-      ]
     }
   ]
 }

Resources/Textures/Constructible/Structures/Doors/Glass/firelock.rsi/meta.json

@@ -1,35 +1,20 @@
 {
   "version": 1,
+  "license": "CC-BY-SA 3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA 3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
   "states": [
     {
-      "name": "bolted",
+      "name": "bolted_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed",
+      "name": "closed"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed_unlit",
+      "name": "closed_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "closing",
@@ -78,20 +63,10 @@
       ]
     },
     {
-      "name": "locked",
+      "name": "locked"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "open",
+      "name": "open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "opening",
@@ -134,12 +109,7 @@
       ]
     },
     {
-      "name": "panel_open",
+      "name": "panel_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "panel_opening",
@@ -156,20 +126,10 @@
       ]
     },
     {
-      "name": "welded",
+      "name": "welded"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "welded_open",
+      "name": "welded_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     }
   ]
 }

Resources/Textures/Constructible/Structures/Doors/Glass/glass.rsi/meta.json

@@ -1,35 +1,23 @@
 {
   "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0",
   "size": {
     "x": 32,
     "y": 32
   },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi",
   "states": [
     {
-      "name": "bolted",
+      "name": "assembly"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "locked",
+      "name": "bolted_unlit"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
-      "name": "closed",
+      "name": "locked"
-      "delays": [
+    },
-        [
+    {
-          1
+      "name": "closed"
-        ]
-      ]
     },
     {
       "name": "closed_unlit",
@@ -66,7 +54,7 @@
       ]
     },
     {
-      "name": "deny",
+      "name": "deny_unlit",
       "delays": [
         [
           0.1,
@@ -76,12 +64,7 @@
       ]
     },
     {
-      "name": "open",
+      "name": "open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "opening",
@@ -126,12 +109,7 @@
       ]
     },
     {
-      "name": "panel_open",
+      "name": "panel_open"
-      "delays": [
-        [
-          1
-        ]
-      ]
     },
     {
       "name": "panel_opening",
@@ -201,12 +179,7 @@
       ]
     },
     {
-      "name": "welded",
+      "name": "welded"
-      "delays": [
-        [
-          1
-        ]
-      ]
     }
   ]
 }