Cleans up Airlock content (#3575)

* Initial

* Fixed RSI timings

* Sorts RSIs

* Adds effects.rsi

* Unlits

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