diff --git a/Resources/Maps/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml
similarity index 77%
rename from Resources/Maps/Shuttles/liquidator.yml
rename to Resources/Maps/_NF/Shuttles/liquidator.yml
index e1747dda66c..e3658b0988e 100644
--- a/Resources/Maps/Shuttles/liquidator.yml
+++ b/Resources/Maps/_NF/Shuttles/liquidator.yml
@@ -3,14 +3,14 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  27: FloorDark
-  60: FloorLino
-  62: FloorMetalDiamond
-  84: FloorSteel
-  92: FloorSteelMono
-  96: FloorTechMaint
-  112: Lattice
-  113: Plating
+  28: FloorDark
+  61: FloorLino
+  63: FloorMetalDiamond
+  85: FloorSteel
+  93: FloorSteelMono
+  97: FloorTechMaint
+  113: Lattice
+  114: Plating
 entities:
 - proto: ""
   entities:
@@ -24,19 +24,19 @@ entities:
     - chunks:
         0,0:
           ind: 0,0
-          tiles: GwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAVAAAAAAAVAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAVQAAAAAAVQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAPgAAAAAAcQAAAAAAPgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAYAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAPwAAAAAAcgAAAAAAPwAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAA
           version: 6
       type: MapGrid
     - type: Broadphase
@@ -62,14 +62,14 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            25: -2,-5
-            26: -4,-7
-            27: -4,-5
+            23: -2,-5
+            24: -4,-7
+            25: -4,-5
         - node:
             color: '#0096FFFF'
             id: BotRightGreyscale
           decals:
-            32: -2,-7
+            30: -2,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
@@ -90,126 +90,138 @@ entities:
             id: BrickTileDarkCornerSw
           decals:
             3: -4,0
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            4: -2,1
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            7: -3,2
+            6: -3,2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            5: -3,0
+            4: -3,0
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            6: -4,1
+            5: -4,1
         - node:
             color: '#9FED5896'
             id: BrickTileSteelLineE
           decals:
-            29: -2,-5
+            27: -2,-5
         - node:
             color: '#9FED5896'
             id: BrickTileSteelLineW
           decals:
-            28: -4,-5
+            26: -4,-5
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineE
           decals:
-            12: -2,-2
-            13: -2,-3
-            14: -2,-4
-            31: -2,-5
+            11: -2,-2
+            12: -2,-3
+            13: -2,-4
+            29: -2,-5
         - node:
             color: '#8932B8FF'
             id: BrickTileWhiteLineW
           decals:
-            18: 0,-2
-            24: 0,-3
+            17: 0,-2
+            22: 0,-3
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            9: -4,-4
-            10: -4,-3
-            11: -4,-2
-            30: -4,-5
+            8: -4,-4
+            9: -4,-3
+            10: -4,-2
+            28: -4,-5
         - node:
             color: '#F9801DFF'
             id: BrickTileWhiteLineW
           decals:
-            8: 4,-3
+            7: 4,-3
         - node:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            46: 3.0023866,-2.4370086
-            47: 1.9920118,-2.4370086
+            44: 3.0023866,-2.4370086
+            45: 1.9920118,-2.4370086
         - node:
             color: '#8932B8FF'
             id: CheckerNESW
           decals:
-            15: 1,-1
-            16: 1,0
-            17: 1,1
-            21: 2,-1
-            22: 2,0
-            23: 2,1
+            14: 1,-1
+            15: 1,0
+            16: 1,1
+            19: 2,-1
+            20: 2,0
+            21: 2,1
         - node:
             color: '#A020F0FF'
             id: CheckerNESW
           decals:
-            41: 1,-2
-            42: 2,-2
+            39: 1,-2
+            40: 2,-2
         - node:
             color: '#FFA500FF'
             id: ConcreteTrimLineW
           decals:
-            44: 4,-2
-            45: 4,-3
+            42: 4,-2
+            43: 4,-3
         - node:
             color: '#B02E26FF'
             id: Delivery
           decals:
-            19: -3,-7
+            18: -3,-7
         - node:
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            34: 2,-3
-            35: 5,-3
-            36: 4,-3
-            43: 3,-3
+            32: 2,-3
+            33: 5,-3
+            34: 4,-3
+            41: 3,-3
+        - node:
+            color: '#18A2D5FF'
+            id: DeliveryGreyscale
+          decals:
+            46: 5,2
+        - node:
+            color: '#951710FF'
+            id: DeliveryGreyscale
+          decals:
+            47: 5,1
         - node:
-            color: '#3C44AAFF'
+            color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            20: 3,-1
+            48: 5,0
         - node:
             color: '#0096FFFF'
             id: LoadingAreaGreyscale
           decals:
-            33: -2,-7
+            31: -2,-7
         - node:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            39: 1,2
-            40: 0,2
+            37: 1,2
+            38: 0,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            49: 4,2
+            50: 4,1
+            51: 4,0
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            37: 0,2
-            38: 1,2
+            35: 0,2
+            36: 1,2
       type: DecalGrid
     - version: 2
       data:
@@ -223,27 +235,29 @@ entities:
           -1,-1:
             0: 65535
           0,1:
-            0: 255
+            1: 255
           1,0:
-            0: 62837
-            1: 2
-            2: 512
+            0: 30583
+            1: 32768
           1,1:
-            0: 2303
+            1: 2303
           2,1:
-            0: 4369
+            1: 4369
           0,-2:
-            0: 65534
+            0: 65520
+            1: 14
           1,-2:
-            0: 4369
+            1: 1
+            0: 4368
           1,-1:
             0: 30583
           -2,1:
-            0: 9966
+            1: 9966
           -2,0:
-            0: 51336
+            1: 16384
+            0: 34952
           -1,1:
-            0: 255
+            1: 255
           -2,-2:
             0: 34952
           -2,-1:
@@ -270,21 +284,6 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 6666.982
           - 0
           - 0
           - 0
@@ -304,43 +303,64 @@ entities:
       type: BecomesStation
 - proto: AirAlarm
   entities:
-  - uid: 53
+  - uid: 4
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-3.5
+    - name: engine room air alarm
+      type: MetaData
+    - pos: 3.5,-3.5
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 22
-      - 173
       - 162
-      - 200
-      - 278
-      - 295
-      - 69
       - 234
       - 328
-      - 249
-      - 366
-      - 327
       type: DeviceNetwork
     - devices:
-      - 200
-      - 327
-      - 366
-      - 249
       - 328
-      - 22
-      - 173
+      - 234
       - 162
-      - 278
+      type: DeviceList
+  - uid: 396
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 1
+      type: Transform
+    - ShutdownSubscribers:
+      - 335
       - 295
       - 69
-      - 234
+      - 278
+      - 460
+      - 173
+      - 249
+      - 457
+      - 22
+      type: DeviceNetwork
+    - devices:
+      - 457
+      - 249
+      - 460
+      - 278
+      - 69
+      - 295
+      - 335
+      - 173
+      - 22
       type: DeviceList
-- proto: AirlockCaptainGlassLocked
+- proto: AirCanister
   entities:
-  - uid: 15
+  - uid: 235
+    components:
+    - anchored: True
+      pos: 5.5,0.5
+      parent: 1
+      type: Transform
+    - bodyType: Static
+      type: Physics
+- proto: AirlockCommandGlass
+  entities:
+  - uid: 8
     components:
     - rot: 3.141592653589793 rad
       pos: -3.5,-0.5
@@ -355,21 +375,23 @@ entities:
       type: Transform
 - proto: AirlockExternalGlass
   entities:
-  - uid: 146
+  - uid: 9
     components:
-    - pos: -3.5,-5.5
+    - rot: 3.141592653589793 rad
+      pos: -1.5,-5.5
       parent: 1
       type: Transform
     - links:
-      - 393
+      - 107
       type: DeviceLinkSink
-  - uid: 237
+  - uid: 11
     components:
-    - pos: -1.5,-5.5
+    - rot: 3.141592653589793 rad
+      pos: -3.5,-5.5
       parent: 1
       type: Transform
     - links:
-      - 393
+      - 107
       type: DeviceLinkSink
 - proto: AirlockGlassShuttle
   entities:
@@ -405,34 +427,40 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
-  - uid: 327
+  - uid: 328
     components:
     - rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
+      pos: 0.5,-4.5
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 4
       type: DeviceNetwork
-  - uid: 328
+  - uid: 366
     components:
     - rot: -1.5707963267948966 rad
-      pos: 0.5,-4.5
+      pos: -2.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 457
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
-  - uid: 366
+  - uid: 460
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,1.5
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
 - proto: APCBasic
   entities:
@@ -465,282 +493,473 @@ entities:
     - pos: -1.5,-7.5
       parent: 1
       type: Transform
-- proto: AtmosFixNitrogenMarker
+- proto: AtmosFixBlockerMarker
   entities:
-  - uid: 376
+  - uid: 389
     components:
-    - pos: 5.5,0.5
+    - pos: -6.5,7.5
       parent: 1
       type: Transform
-- proto: AtmosFixOxygenMarker
-  entities:
-  - uid: 368
+  - uid: 391
     components:
-    - pos: 5.5,2.5
+    - pos: -6.5,6.5
       parent: 1
       type: Transform
-- proto: BiomassReclaimer
-  entities:
-  - uid: 206
+  - uid: 392
     components:
-    - pos: 2.5,-2.5
+    - pos: -6.5,5.5
       parent: 1
       type: Transform
-- proto: BlastDoor
-  entities:
-  - uid: 186
+  - uid: 410
     components:
-    - pos: 1.5,3.5
+    - pos: -6.5,4.5
       parent: 1
       type: Transform
-    - links:
-      - 188
-      type: DeviceLinkSink
-  - uid: 326
+  - uid: 411
     components:
-    - pos: 0.5,3.5
+    - pos: -5.5,6.5
       parent: 1
       type: Transform
-    - links:
-      - 188
-      type: DeviceLinkSink
-- proto: BoxBeaker
-  entities:
-  - uid: 205
+  - uid: 412
     components:
-    - pos: 5.735236,-1.2296951
+    - pos: 7.5,6.5
       parent: 1
       type: Transform
-- proto: BoxBodyBag
-  entities:
-  - uid: 72
+  - uid: 413
     components:
-    - pos: 0.7108896,1.719961
+    - pos: 8.5,7.5
       parent: 1
       type: Transform
-- proto: BoxFolderBase
-  entities:
-  - uid: 8
+  - uid: 414
     components:
-    - pos: -1.6713722,1.8778938
+    - pos: 8.5,6.5
       parent: 1
       type: Transform
-- proto: BoxLightbulb
-  entities:
-  - uid: 183
+  - uid: 415
     components:
-    - pos: 0.3708086,1.3091961
+    - pos: 8.5,4.5
       parent: 1
       type: Transform
-- proto: BoxLighttube
-  entities:
-  - uid: 357
+  - uid: 416
     components:
-    - pos: 0.76756954,1.2525389
+    - pos: 8.5,5.5
       parent: 1
       type: Transform
-- proto: Bucket
-  entities:
-  - uid: 64
+  - uid: 417
     components:
-    - pos: 0.9776434,-0.16575927
+    - pos: 7.5,4.5
       parent: 1
       type: Transform
-  - uid: 134
+  - uid: 418
     components:
-    - pos: -1.9130454,-1.6813397
+    - pos: 7.5,5.5
       parent: 1
       type: Transform
-- proto: CableApcExtension
-  entities:
-  - uid: 10
+  - uid: 419
     components:
-    - pos: -3.5,-0.5
+    - pos: 6.5,4.5
       parent: 1
       type: Transform
-  - uid: 54
+  - uid: 420
     components:
-    - pos: 0.5,3.5
+    - pos: 6.5,5.5
       parent: 1
       type: Transform
-  - uid: 56
+  - uid: 421
     components:
-    - pos: -2.5,-1.5
+    - pos: 5.5,4.5
       parent: 1
       type: Transform
-  - uid: 96
+  - uid: 422
     components:
-    - pos: 2.5,0.5
+    - pos: 5.5,5.5
       parent: 1
       type: Transform
-  - uid: 99
+  - uid: 423
     components:
-    - pos: 0.5,4.5
+    - pos: 4.5,4.5
       parent: 1
       type: Transform
-  - uid: 107
+  - uid: 424
     components:
-    - pos: 2.5,-7.5
+    - pos: 4.5,5.5
       parent: 1
       type: Transform
-  - uid: 115
+  - uid: 425
     components:
-    - pos: 0.5,0.5
+    - pos: 3.5,4.5
       parent: 1
       type: Transform
-  - uid: 116
+  - uid: 426
     components:
-    - pos: 0.5,-1.5
+    - pos: 3.5,5.5
       parent: 1
       type: Transform
-  - uid: 117
+  - uid: 427
     components:
-    - pos: 4.5,-2.5
+    - pos: 2.5,4.5
       parent: 1
       type: Transform
-  - uid: 119
+  - uid: 428
     components:
-    - pos: 1.5,-2.5
+    - pos: 2.5,5.5
       parent: 1
       type: Transform
-  - uid: 120
+  - uid: 429
     components:
-    - pos: 4.5,-7.5
+    - pos: 1.5,4.5
       parent: 1
       type: Transform
-  - uid: 133
+  - uid: 430
     components:
-    - pos: 1.5,0.5
+    - pos: 1.5,5.5
       parent: 1
       type: Transform
-  - uid: 138
+  - uid: 431
     components:
-    - pos: -3.5,0.5
+    - pos: 0.5,4.5
       parent: 1
       type: Transform
-  - uid: 141
+  - uid: 432
     components:
-    - pos: 3.5,0.5
+    - pos: 0.5,5.5
       parent: 1
       type: Transform
-  - uid: 144
+  - uid: 433
     components:
-    - pos: -0.5,-1.5
+    - pos: -0.5,4.5
       parent: 1
       type: Transform
-  - uid: 177
+  - uid: 434
     components:
-    - pos: 3.5,-7.5
+    - pos: -0.5,5.5
       parent: 1
       type: Transform
-  - uid: 213
+  - uid: 435
     components:
-    - pos: 1.5,-4.5
+    - pos: -1.5,4.5
       parent: 1
       type: Transform
-  - uid: 256
+  - uid: 436
     components:
-    - pos: 4.5,0.5
+    - pos: -1.5,5.5
       parent: 1
       type: Transform
-  - uid: 257
+  - uid: 437
     components:
-    - pos: 0.5,2.5
+    - pos: -2.5,4.5
       parent: 1
       type: Transform
-  - uid: 259
+  - uid: 438
     components:
-    - pos: 2.5,-4.5
+    - pos: -2.5,5.5
       parent: 1
       type: Transform
-  - uid: 261
+  - uid: 439
     components:
-    - pos: 0.5,-0.5
+    - pos: -3.5,4.5
       parent: 1
       type: Transform
-  - uid: 269
+  - uid: 440
     components:
-    - pos: 0.5,-4.5
+    - pos: -3.5,5.5
       parent: 1
       type: Transform
-  - uid: 270
+  - uid: 441
     components:
-    - pos: -1.5,-1.5
+    - pos: -4.5,4.5
       parent: 1
       type: Transform
-  - uid: 285
+  - uid: 442
     components:
-    - pos: -3.5,2.5
+    - pos: -4.5,5.5
       parent: 1
       type: Transform
-  - uid: 291
+  - uid: 443
     components:
-    - pos: 3.5,-6.5
+    - pos: -5.5,4.5
       parent: 1
       type: Transform
-  - uid: 300
+  - uid: 444
     components:
-    - pos: 3.5,-5.5
+    - pos: -5.5,5.5
       parent: 1
       type: Transform
-  - uid: 301
+  - uid: 445
     components:
-    - pos: -0.5,-4.5
+    - pos: -5.5,3.5
       parent: 1
       type: Transform
-  - uid: 303
+  - uid: 446
     components:
-    - pos: 0.5,4.5
+    - pos: 7.5,3.5
       parent: 1
       type: Transform
-  - uid: 304
+  - uid: 447
     components:
-    - pos: 1.5,4.5
+    - pos: 1.5,-7.5
       parent: 1
       type: Transform
-  - uid: 305
+  - uid: 448
     components:
-    - pos: 2.5,4.5
+    - pos: 2.5,-7.5
       parent: 1
       type: Transform
-  - uid: 306
+  - uid: 449
     components:
-    - pos: 4.5,4.5
+    - pos: 3.5,-7.5
       parent: 1
       type: Transform
-  - uid: 307
+  - uid: 450
     components:
-    - pos: 3.5,4.5
+    - pos: 4.5,-7.5
       parent: 1
       type: Transform
-  - uid: 309
+- proto: BiomassReclaimer
+  entities:
+  - uid: 36
     components:
-    - pos: 0.5,1.5
+    - pos: 2.5,-2.5
       parent: 1
       type: Transform
-  - uid: 320
+- proto: BlastDoor
+  entities:
+  - uid: 186
     components:
-    - pos: -3.5,1.5
+    - pos: 1.5,3.5
       parent: 1
       type: Transform
-  - uid: 323
-    components:
-    - pos: -1.5,-5.5
-      parent: 1
+    - links:
+      - 188
+      type: DeviceLinkSink
+  - uid: 326
+    components:
+    - pos: 0.5,3.5
+      parent: 1
       type: Transform
-  - uid: 333
+    - links:
+      - 188
+      type: DeviceLinkSink
+- proto: BoxBeaker
+  entities:
+  - uid: 205
     components:
-    - pos: 5.5,4.5
+    - pos: 5.735236,-1.2296951
       parent: 1
       type: Transform
-  - uid: 334
+- proto: BoxBodyBag
+  entities:
+  - uid: 72
     components:
-    - pos: 6.5,4.5
+    - pos: 0.7108896,1.719961
       parent: 1
       type: Transform
-  - uid: 335
+- proto: BoxCardboard
+  entities:
+  - uid: 285
     components:
-    - pos: 7.5,4.5
+    - name: external light tube box
+      type: MetaData
+    - pos: 0.26414788,1.5837543
+      parent: 1
+      type: Transform
+    - storageUsed: 30
+      type: Storage
+    - containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 288
+          - 289
+          - 290
+          - 299
+          - 60
+          - 463
+      type: ContainerContainer
+- proto: BoxFolderRed
+  entities:
+  - uid: 15
+    components:
+    - pos: -1.6538084,1.929544
+      parent: 1
+      type: Transform
+- proto: BoxLightbulb
+  entities:
+  - uid: 183
+    components:
+    - pos: 0.3708086,1.3091961
+      parent: 1
+      type: Transform
+- proto: BoxLighttube
+  entities:
+  - uid: 357
+    components:
+    - pos: 0.76756954,1.2525389
+      parent: 1
+      type: Transform
+- proto: Bucket
+  entities:
+  - uid: 64
+    components:
+    - pos: 0.9776434,-0.16575927
+      parent: 1
+      type: Transform
+- proto: CableApcExtension
+  entities:
+  - uid: 10
+    components:
+    - pos: -3.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 54
+    components:
+    - pos: 0.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 56
+    components:
+    - pos: -2.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 96
+    components:
+    - pos: 2.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 99
+    components:
+    - pos: 0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 115
+    components:
+    - pos: 0.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 116
+    components:
+    - pos: 0.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 119
+    components:
+    - pos: 1.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 133
+    components:
+    - pos: 1.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 138
+    components:
+    - pos: -3.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 141
+    components:
+    - pos: 3.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 144
+    components:
+    - pos: -0.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 177
+    components:
+    - pos: 3.5,-7.5
+      parent: 1
+      type: Transform
+  - uid: 213
+    components:
+    - pos: 1.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 257
+    components:
+    - pos: 0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 259
+    components:
+    - pos: 2.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 261
+    components:
+    - pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 269
+    components:
+    - pos: 0.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 270
+    components:
+    - pos: -1.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 291
+    components:
+    - pos: 3.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 300
+    components:
+    - pos: 3.5,-5.5
+      parent: 1
+      type: Transform
+  - uid: 301
+    components:
+    - pos: -0.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 303
+    components:
+    - pos: 0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 304
+    components:
+    - pos: 1.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 305
+    components:
+    - pos: 2.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 306
+    components:
+    - pos: 4.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 307
+    components:
+    - pos: 3.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 309
+    components:
+    - pos: 0.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 320
+    components:
+    - pos: -3.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 323
+    components:
+    - pos: -1.5,-5.5
+      parent: 1
+      type: Transform
+  - uid: 333
+    components:
+    - pos: 5.5,4.5
       parent: 1
       type: Transform
   - uid: 336
@@ -763,16 +982,6 @@ entities:
     - pos: -3.5,4.5
       parent: 1
       type: Transform
-  - uid: 340
-    components:
-    - pos: -4.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 341
-    components:
-    - pos: -5.5,4.5
-      parent: 1
-      type: Transform
   - uid: 344
     components:
     - pos: 2.5,-2.5
@@ -783,11 +992,6 @@ entities:
     - pos: 3.5,-2.5
       parent: 1
       type: Transform
-  - uid: 350
-    components:
-    - pos: 5.5,-2.5
-      parent: 1
-      type: Transform
   - uid: 351
     components:
     - pos: 0.5,-2.5
@@ -1066,25 +1270,11 @@ entities:
     - pos: 5.2959647,-1.1305447
       parent: 1
       type: Transform
-- proto: ClosetJanitorFilled
-  entities:
-  - uid: 4
-    components:
-    - pos: 3.5,2.5
-      parent: 1
-      type: Transform
-- proto: ClosetL3JanitorFilled
+- proto: ClosetRadiationSuitFilled
   entities:
-  - uid: 235
-    components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
-- proto: ClothingBeltJanitorFilled
-  entities:
-  - uid: 224
+  - uid: 273
     components:
-    - pos: 0.6116991,0.51599467
+    - pos: 1.5,-2.5
       parent: 1
       type: Transform
 - proto: ClothingBeltUtilityEngineering
@@ -1108,11 +1298,11 @@ entities:
     - pos: 0.54084945,0.600981
       parent: 1
       type: Transform
-- proto: ClothingHeadHatPurplesoft
+- proto: ClothingNeckCloakJanitorFilled
   entities:
-  - uid: 193
+  - uid: 458
     components:
-    - pos: 0.55501914,0.45933747
+    - pos: -1.3020872,1.440808
       parent: 1
       type: Transform
 - proto: ClothingOuterCoatLabChem
@@ -1143,30 +1333,16 @@ entities:
     - pos: 0.4846384,0.38614094
       parent: 1
       type: Transform
-- proto: ClothingUniformJumpskirtJanitor
+- proto: ComputerTabletopShuttle
   entities:
-  - uid: 97
-    components:
-    - pos: 0.32829833,0.57265174
-      parent: 1
-      type: Transform
-- proto: ClothingUniformJumpsuitJanitor
-  entities:
-  - uid: 179
-    components:
-    - pos: 0.7108896,0.45933747
-      parent: 1
-      type: Transform
-- proto: ComputerShuttle
-  entities:
-  - uid: 26
+  - uid: 464
     components:
     - pos: -3.5,2.5
       parent: 1
       type: Transform
-- proto: ComputerStationRecords
+- proto: ComputerTabletopStationRecords
   entities:
-  - uid: 273
+  - uid: 459
     components:
     - pos: -2.5,2.5
       parent: 1
@@ -1185,6 +1361,163 @@ entities:
         bank-ATM-cashSlot: !type:ContainerSlot {}
       type: ContainerContainer
     - type: ItemSlots
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 406
+    components:
+    - pos: 5.5,-0.5
+      parent: 1
+      type: Transform
+- proto: DisposalBend
+  entities:
+  - uid: 206
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 211
+    components:
+    - pos: 3.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 376
+    components:
+    - pos: 0.5,4.5
+      parent: 1
+      type: Transform
+- proto: DisposalJunctionFlipped
+  entities:
+  - uid: 171
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+      type: Transform
+- proto: DisposalPipe
+  entities:
+  - uid: 12
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 21
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 66
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 131
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 136
+    components:
+    - pos: 0.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 145
+    components:
+    - pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 146
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 160
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -4.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 164
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -3.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 176
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -2.5,-3.5
+      parent: 1
+      type: Transform
+  - uid: 191
+    components:
+    - pos: -2.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 200
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 245
+    components:
+    - pos: 0.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 334
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 367
+    components:
+    - pos: 0.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 368
+    components:
+    - pos: 0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 403
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -5.5,4.5
+      parent: 1
+      type: Transform
+- proto: DisposalTrunk
+  entities:
+  - uid: 163
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -6.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 350
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -2.5,-4.5
+      parent: 1
+      type: Transform
+- proto: DisposalUnit
+  entities:
+  - uid: 196
+    components:
+    - pos: -2.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 332
+    components:
+    - pos: -6.5,4.5
+      parent: 1
+      type: Transform
 - proto: Dropper
   entities:
   - uid: 255
@@ -1196,14 +1529,8 @@ entities:
   entities:
   - uid: 6
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 367
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
+    - rot: 3.141592653589793 rad
+      pos: -2.5,-6.5
       parent: 1
       type: Transform
   - uid: 379
@@ -1236,11 +1563,64 @@ entities:
       pos: 3.5,4.5
       parent: 1
       type: Transform
-  - uid: 392
+- proto: ExteriorLightTube
+  entities:
+  - uid: 60
     components:
-    - pos: -2.5,-7.5
-      parent: 1
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
       type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 288
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
+      type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 289
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
+      type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 290
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
+      type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 299
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
+      type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 341
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 340
+      type: Transform
+    - canCollide: False
+      type: Physics
+  - uid: 463
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 285
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 65
@@ -1256,63 +1636,69 @@ entities:
     - pos: -1.5,2.5
       parent: 1
       type: Transform
-- proto: FloorDrain
+- proto: FirelockGlass
   entities:
-  - uid: 2
+  - uid: 451
     components:
-    - pos: 0.5,-0.5
+    - pos: -3.5,-0.5
       parent: 1
       type: Transform
-    - fixtures: {}
-      type: Fixtures
-- proto: GasMixerFlipped
-  entities:
-  - uid: 60
+  - uid: 452
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,0.5
+    - pos: -0.5,-1.5
       parent: 1
       type: Transform
-    - inletTwoConcentration: 0.78
-      inletOneConcentration: 0.22
-      type: GasMixer
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-- proto: GasOutletInjector
-  entities:
-  - uid: 397
+  - uid: 453
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,2.5
+    - pos: -0.5,-2.5
       parent: 1
       type: Transform
-    - color: '#449DFFFF'
-      type: AtmosPipeColor
-  - uid: 401
+  - uid: 454
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,0.5
+    - pos: -0.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 455
+    components:
+    - pos: -3.5,-5.5
+      parent: 1
+      type: Transform
+  - uid: 456
+    components:
+    - pos: -1.5,-5.5
+      parent: 1
+      type: Transform
+- proto: FloorDrain
+  entities:
+  - uid: 2
+    components:
+    - pos: 0.5,-0.5
       parent: 1
       type: Transform
-    - color: '#DF2C38FF'
-      type: AtmosPipeColor
-- proto: GasPassiveVent
+    - fixtures: {}
+      type: Fixtures
+- proto: GasAnalyzer
   entities:
-  - uid: 11
+  - uid: 26
     components:
-    - pos: 5.5,2.5
+    - pos: 0.35859585,0.46067148
       parent: 1
       type: Transform
-    - color: '#449DFFFF'
-      type: AtmosPipeColor
-  - uid: 109
+- proto: GasMixer
+  entities:
+  - uid: 224
     components:
     - rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
+      pos: 3.5,1.5
       parent: 1
       type: Transform
-    - color: '#DF2C38FF'
+    - inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+      type: GasMixer
+    - color: '#0000CCFF'
       type: AtmosPipeColor
+- proto: GasPassiveVent
+  entities:
   - uid: 324
     components:
     - pos: 0.5,5.5
@@ -1322,61 +1708,61 @@ entities:
       type: AtmosPipeColor
 - proto: GasPipeBend
   entities:
-  - uid: 131
+  - uid: 150
     components:
     - rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: 0.5,-1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 150
+  - uid: 254
     components:
     - rot: -1.5707963267948966 rad
-      pos: 0.5,-1.5
+      pos: 3.5,-0.5
       parent: 1
       type: Transform
-    - color: '#990000FF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 160
+  - uid: 256
     components:
     - rot: 1.5707963267948966 rad
       pos: 2.5,1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 280
+  - uid: 293
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
+    - rot: 3.141592653589793 rad
+      pos: -2.5,0.5
       parent: 1
       type: Transform
-    - color: '#DF2C38FF'
+    - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 289
+  - uid: 327
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
+    - rot: 1.5707963267948966 rad
+      pos: 3.5,0.5
       parent: 1
       type: Transform
-    - color: '#449DFFFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 293
+  - uid: 369
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,0.5
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 1
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 369
+  - uid: 409
     components:
     - rot: 1.5707963267948966 rad
-      pos: -2.5,-1.5
+      pos: 3.5,2.5
       parent: 1
       type: Transform
-    - color: '#990000FF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasPipeFourway
   entities:
@@ -1387,12 +1773,12 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 230
+  - uid: 237
     components:
-    - pos: 2.5,-2.5
+    - pos: 2.5,-0.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasPipeStraight
   entities:
@@ -1404,21 +1790,6 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 9
-    components:
-    - pos: 6.5,3.5
-      parent: 1
-      type: Transform
-    - color: '#DF2C38FF'
-      type: AtmosPipeColor
-  - uid: 12
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,1.5
-      parent: 1
-      type: Transform
-    - color: '#449DFFFF'
-      type: AtmosPipeColor
   - uid: 31
     components:
     - rot: 1.5707963267948966 rad
@@ -1435,6 +1806,14 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
+  - uid: 50
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+      type: Transform
+    - color: '#0000CCFF'
+      type: AtmosPipeColor
   - uid: 68
     components:
     - pos: -2.5,1.5
@@ -1448,7 +1827,7 @@ entities:
       pos: -1.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 124
     components:
@@ -1472,7 +1851,7 @@ entities:
       pos: 0.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 148
     components:
@@ -1480,7 +1859,7 @@ entities:
       pos: 2.5,-1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 153
     components:
@@ -1488,29 +1867,7 @@ entities:
       pos: 2.5,-3.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 167
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
-      parent: 1
-      type: Transform
-    - color: '#DF2C38FF'
-      type: AtmosPipeColor
-  - uid: 168
-    components:
-    - pos: 6.5,2.5
-      parent: 1
-      type: Transform
-    - color: '#DF2C38FF'
-      type: AtmosPipeColor
-  - uid: 176
-    components:
-    - pos: 6.5,1.5
-      parent: 1
-      type: Transform
-    - color: '#DF2C38FF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 184
     components:
@@ -1555,14 +1912,14 @@ entities:
     - pos: -3.5,0.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 266
     components:
     - pos: -3.5,-1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 271
     components:
@@ -1585,7 +1942,7 @@ entities:
       pos: -0.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 310
     components:
@@ -1593,14 +1950,14 @@ entities:
       pos: -2.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 311
     components:
     - pos: -3.5,-0.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 343
     components:
@@ -1616,24 +1973,17 @@ entities:
       pos: -3.5,1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 403
-    components:
-    - pos: 5.5,3.5
-      parent: 1
-      type: Transform
-    - color: '#449DFFFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasPipeTJunction
   entities:
-  - uid: 171
+  - uid: 178
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 180
     components:
@@ -1657,7 +2007,7 @@ entities:
       pos: -3.5,-2.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasPort
   entities:
@@ -1669,40 +2019,38 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 196
+  - uid: 166
     components:
     - name: air mix connector port
       type: MetaData
-    - pos: 3.5,-0.5
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,0.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 274
-    components:
-    - name: N2 connector port
-      type: MetaData
-    - pos: 6.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 398
+  - uid: 167
     components:
     - name: O2 connector port
       type: MetaData
-    - pos: 5.5,5.5
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,2.5
       parent: 1
       type: Transform
-- proto: GasPressurePump
-  entities:
-  - uid: 211
+    - color: '#0000CCFF'
+      type: AtmosPipeColor
+  - uid: 399
     components:
-    - name: distribution pump
+    - name: N2 connector port
       type: MetaData
-    - pos: 2.5,-0.5
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,1.5
       parent: 1
       type: Transform
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
+- proto: GasPressurePump
+  entities:
   - uid: 222
     components:
     - name: waste loop pump
@@ -1713,25 +2061,34 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 288
+  - uid: 226
     components:
-    - name: N2 output pump
+    - name: N2 pump
       type: MetaData
     - rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
+      pos: 4.5,1.5
       parent: 1
       type: Transform
-    - color: '#DF2C38FF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 290
+  - uid: 230
+    components:
+    - name: distribution pump
+      type: MetaData
+    - pos: 2.5,0.5
+      parent: 1
+      type: Transform
+    - color: '#0000CCFF'
+      type: AtmosPipeColor
+  - uid: 279
     components:
-    - name: O2 output pump
+    - name: O2 pump
       type: MetaData
     - rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
+      pos: 4.5,2.5
       parent: 1
       type: Transform
-    - color: '#449DFFFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasVentPump
   entities:
@@ -1741,9 +2098,9 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 162
     components:
@@ -1752,9 +2109,9 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 4
       type: DeviceNetwork
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
   - uid: 173
     components:
@@ -1763,19 +2120,20 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
-  - uid: 200
+  - uid: 335
     components:
-    - pos: 1.5,-1.5
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
-    - color: '#0055CCFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GasVentScrubber
   entities:
@@ -1786,7 +2144,7 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
@@ -1797,7 +2155,7 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 4
       type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
@@ -1808,7 +2166,7 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
@@ -1818,39 +2176,21 @@ entities:
       parent: 1
       type: Transform
     - ShutdownSubscribers:
-      - 53
+      - 396
       type: DeviceNetwork
     - color: '#990000FF'
       type: AtmosPipeColor
 - proto: GasVolumePump
   entities:
-  - uid: 279
-    components:
-    - name: N2 input pump
-      type: MetaData
-    - pos: 6.5,4.5
-      parent: 1
-      type: Transform
-    - color: '#DF2C38FF'
-      type: AtmosPipeColor
-  - uid: 396
+  - uid: 274
     components:
     - name: air mix pump
       type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-1.5
-      parent: 1
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 402
-    components:
-    - name: O2 input pump
-      type: MetaData
-    - pos: 5.5,4.5
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,0.5
       parent: 1
       type: Transform
-    - color: '#449DFFFF'
+    - color: '#0000CCFF'
       type: AtmosPipeColor
 - proto: GravityGeneratorMini
   entities:
@@ -1878,12 +2218,6 @@ entities:
     - pos: 1.5,-3.5
       parent: 1
       type: Transform
-  - uid: 21
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-      type: Transform
   - uid: 25
     components:
     - pos: -0.5,0.5
@@ -1922,17 +2256,6 @@ entities:
       pos: 0.5,-6.5
       parent: 1
       type: Transform
-  - uid: 66
-    components:
-    - pos: -2.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 70
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,0.5
-      parent: 1
-      type: Transform
   - uid: 103
     components:
     - rot: 1.5707963267948966 rad
@@ -2002,10 +2325,10 @@ entities:
     - pos: 6.5,-1.5
       parent: 1
       type: Transform
-  - uid: 399
+  - uid: 384
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,2.5
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,3.5
       parent: 1
       type: Transform
 - proto: Gyroscope
@@ -2070,25 +2393,11 @@ entities:
     - pos: 5.2817945,-1.2155304
       parent: 1
       type: Transform
-- proto: LightReplacer
-  entities:
-  - uid: 207
-    components:
-    - pos: 0.46999907,0.77095246
-      parent: 1
-      type: Transform
-- proto: LockerAtmosphericsFilledHardsuit
+- proto: LockerJanitorFilled
   entities:
   - uid: 208
     components:
-    - pos: 1.5,-2.5
-      parent: 1
-      type: Transform
-- proto: LockerCaptainFilledHardsuit
-  entities:
-  - uid: 360
-    components:
-    - pos: -1.5,0.5
+    - pos: 2.5,2.5
       parent: 1
       type: Transform
 - proto: MaterialReclaimer
@@ -2098,13 +2407,6 @@ entities:
     - pos: 3.5,-2.5
       parent: 1
       type: Transform
-- proto: MopBucketFull
-  entities:
-  - uid: 100
-    components:
-    - pos: -1.8705349,-1.1997533
-      parent: 1
-      type: Transform
 - proto: MopItem
   entities:
   - uid: 101
@@ -2112,31 +2414,26 @@ entities:
     - pos: 0.8607421,-0.6631228
       parent: 1
       type: Transform
-  - uid: 250
-    components:
-    - pos: -1.7713447,-1.9079685
-      parent: 1
-      type: Transform
 - proto: NitrogenCanister
   entities:
-  - uid: 36
+  - uid: 210
     components:
-    - pos: 5.5,0.5
+    - anchored: True
+      pos: 5.5,1.5
       parent: 1
       type: Transform
-    - releaseValve: True
-      releasePressure: 1013.25
-      type: GasCanister
+    - bodyType: Static
+      type: Physics
 - proto: OxygenCanister
   entities:
-  - uid: 299
+  - uid: 168
     components:
-    - pos: 5.5,2.5
+    - anchored: True
+      pos: 5.5,2.5
       parent: 1
       type: Transform
-    - releaseValve: True
-      releasePressure: 1013.25
-      type: GasCanister
+    - bodyType: Static
+      type: Physics
 - proto: PaintingFireaxeCabinet
   entities:
   - uid: 229
@@ -2157,11 +2454,9 @@ entities:
     - pos: -1.5008717,1.6219696
       parent: 1
       type: Transform
-  - uid: 409
+  - uid: 462
     components:
-    - name: preflight checklist
-      type: MetaData
-    - pos: 2.0922058,-4.252999
+    - pos: 2.2410665,-5.2790337
       parent: 1
       type: Transform
     - stampState: paper_stamp-ce
@@ -2173,7 +2468,16 @@ entities:
         stampedColor: '#00BE00FF'
         stampedName: stamp-component-stamped-name-approved
       content: >-
-        [head=1]==========================[/head]
+        [color=#1b67a5]█░░█░███[/color][color=#5b97bc]░███░█░█░█░██░░█░█░██░░██░░██░[/color]
+
+        [color=#1b67a5]██░█░░█░[/color][color=#5b97bc]██░░░█░█░█░█░█░█░█░█░█░█░█░█░█[/color]
+
+        [color=#1b67a5]█░██░░█░[/color][color=#5b97bc]░░██░███░█░██░░░█░░███░██░░█░█[/color]
+
+        [color=#1b67a5]█░░█░░█░[/color][color=#5b97bc]███░░█░█░█░█░░░░█░░█░█░█░█░██░[/color]
+
+
+        [head=1]=========================[/head]
 
         [head=1]Liquidator-class service ship[/head]
 
@@ -2181,7 +2485,7 @@ entities:
 
         [head=1]     PREFLIGHT CHECKLIST[/head]
 
-        [head=1]==========================[/head]
+        [head=1]=========================[/head]
 
 
         [head=2]1. Power supply.[/head]
@@ -2196,17 +2500,17 @@ entities:
 
         [bullet/][ ] Check the APC unit's current Load[bold]*[/bold] (W).
 
-        [head=3]1.2. P.A.C.K.M.A.N. generator unit.[/head]
+        [head=3]1.2. S.U.P.E.R.P.A.C.M.A.N. generator unit.[/head]
 
-        [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit is anchored to the floor.
+        [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is anchored to the floor.
 
-        [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation.
+        [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation.
 
-        [bullet/][ ] Check if the P.A.C.K.M.A.N. generator unit is set to HV output.
+        [bullet/][ ] Check if the S.U.P.E.R.P.A.C.M.A.N. generator unit is set to HV output.
 
         [bullet/][ ] Set Target Power for 18-19[bold]**[/bold] [bold]k[/bold]W.
 
-        [bullet/][ ] Start the P.A.C.K.M.A.N. generator unit.
+        [bullet/][ ] Start the S.U.P.E.R.P.A.C.M.A.N. generator unit.
 
 
         [head=2]2. Atmospherics.[/head]
@@ -2235,6 +2539,8 @@ entities:
 
         [bullet/][ ] Enable waste loop pump.
 
+        [bullet/][ ] Set engine room air alarm filtering to wide.
+
 
         [head=2]3. Other checks.[/head]
 
@@ -2247,29 +2553,30 @@ entities:
 
         __________________________________________________________________
 
-        [bold]*[/bold] - Liquidator-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.K.M.A.N. generator unit Target Power output: to keep SMES, substation, and APC fully charged, P.A.C.K.M.A.N. generator unit Target Power output should exceed APC's Load. Remember to check APC Load and adjust the generator unit Target Power after connecting new power-consuming machines.
+        [bold]*[/bold] - Liquidator-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the S.U.P.E.R.P.A.C.M.A.N. generator unit Target Power output: to keep SMES, substation, and APC fully charged, S.U.P.E.R.P.A.C.M.A.N. generator unit Target Power output should exceed APC's Load. Remember to check APC Load and adjust the generator unit Target Power after connecting new power-consuming machines.
 
-        [bold]**[/bold] - Liquidator-class service ships have higher power demand than standard P.A.C.K.M.A.N. generator unit can provide at optimal settings: recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 19 kW. Furthermore, while the portable scrubber unit is online, changing the Target Power value to 20 kW might be advisable.
+        [bold]**[/bold] - Liquidator-class service ships have higher power demand than standard P.A.C.M.A.N. generator unit can provide at optimal settings, so the standard P.A.C.M.A.N. was replaced with S.U.P.E.R.P.A.C.M.A.N.: recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 19 kW. Furthermore, while the portable scrubber unit is online, changing the Target Power value to 20 kW might be advisable.
 
-        [bold]Note:[/bold] Without a working generator, fully charged battery units (SMES and substation) in unmodified Liquidator-class service ships can provide power for approximately 10 minutes before discharging.
+        [bold]Note:[/bold] Without a working generator, fully charged battery units (SMES and substation) in unmodified Liquidator-class service ships can provide power for approximately 10 minutes before fully depleting their charge.
 
         [bold]Note:[/bold] Additional generator units can be purchased at the Frontier Station.
+
+        [bold]Note:[/bold] Be sure to take all necessary protective measures when working with radioactive materials: use a radiation suit, engage internals, make sure to enable Geiger's counter, wash your hands after, and keep radiation shutters closed at all times.
       type: Paper
-- proto: PortableGeneratorPacman
+- proto: PortableGeneratorSuperPacman
   entities:
-  - uid: 245
+  - uid: 386
     components:
     - anchored: True
       pos: 2.5,-5.5
       parent: 1
       type: Transform
     - storage:
-        Plasma: 1500
+        Uranium: 3000
       type: MaterialStorage
     - bodyType: Static
       type: Physics
     - type: InsertingMaterialStorage
-    - type: ItemCooldown
 - proto: PortableScrubber
   entities:
   - uid: 5
@@ -2298,14 +2605,24 @@ entities:
     - pos: 0.5,1.5
       parent: 1
       type: Transform
-- proto: PoweredlightLED
+- proto: PoweredlightEmpty
   entities:
-  - uid: 50
+  - uid: 340
     components:
     - rot: 3.141592653589793 rad
       pos: -0.5,4.5
       parent: 1
       type: Transform
+    - containers:
+        light_bulb: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 341
+      type: ContainerContainer
+    - powerLoad: 100
+      type: ApcPowerReceiver
+- proto: PoweredlightLED
+  entities:
   - uid: 155
     components:
     - pos: -2.5,-1.5
@@ -2316,27 +2633,15 @@ entities:
     - pos: 3.5,-4.5
       parent: 1
       type: Transform
-  - uid: 191
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,4.5
-      parent: 1
-      type: Transform
   - uid: 194
     components:
     - rot: -1.5707963267948966 rad
       pos: -1.5,-6.5
       parent: 1
       type: Transform
-  - uid: 199
-    components:
-    - pos: 5.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 210
+  - uid: 199
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,4.5
+    - pos: 5.5,-1.5
       parent: 1
       type: Transform
   - uid: 221
@@ -2357,24 +2662,12 @@ entities:
       pos: 0.5,1.5
       parent: 1
       type: Transform
-  - uid: 254
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 1
-      type: Transform
 - proto: PoweredSmallLight
   entities:
-  - uid: 383
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 384
+  - uid: 117
     components:
     - rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
+      pos: 5.5,1.5
       parent: 1
       type: Transform
 - proto: Railing
@@ -2462,31 +2755,27 @@ entities:
       type: Transform
 - proto: RandomSpawner100
   entities:
-  - uid: 236
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 283
+  - uid: 97
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-4.5
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
       parent: 1
       type: Transform
-  - uid: 371
+  - uid: 120
     components:
-    - pos: 1.5,1.5
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,5.5
       parent: 1
       type: Transform
-  - uid: 372
+  - uid: 236
     components:
-    - pos: 2.5,-0.5
+    - rot: 3.141592653589793 rad
+      pos: -3.5,-2.5
       parent: 1
       type: Transform
-  - uid: 373
+  - uid: 371
     components:
-    - pos: -1.5,5.5
+    - pos: 1.5,1.5
       parent: 1
       type: Transform
   - uid: 374
@@ -2494,18 +2783,10 @@ entities:
     - pos: 2.5,4.5
       parent: 1
       type: Transform
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 332
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 400
+  - uid: 393
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,0.5
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
       parent: 1
       type: Transform
 - proto: ReinforcedWindow
@@ -2556,11 +2837,6 @@ entities:
       pos: 4.5,-5.5
       parent: 1
       type: Transform
-  - uid: 145
-    components:
-    - pos: -2.5,-7.5
-      parent: 1
-      type: Transform
   - uid: 147
     components:
     - rot: 1.5707963267948966 rad
@@ -2613,12 +2889,6 @@ entities:
       pos: 4.5,-4.5
       parent: 1
       type: Transform
-  - uid: 226
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-      type: Transform
   - uid: 227
     components:
     - rot: 1.5707963267948966 rad
@@ -2630,6 +2900,12 @@ entities:
     - pos: -2.5,-5.5
       parent: 1
       type: Transform
+  - uid: 280
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,3.5
+      parent: 1
+      type: Transform
   - uid: 302
     components:
     - pos: 5.5,-3.5
@@ -2645,93 +2921,145 @@ entities:
     - pos: 6.5,-1.5
       parent: 1
       type: Transform
-- proto: SheetPlasma
+- proto: SheetUranium
   entities:
-  - uid: 387
+  - uid: 329
     components:
-    - pos: 2.4889736,-4.5330315
+    - pos: 2.5721993,-5.4875746
       parent: 1
       type: Transform
-    - count: 15
-      type: Stack
-    - size: 15
-      type: Item
-- proto: ShuttersNormalOpen
+- proto: ShuttersRadiationOpen
   entities:
-  - uid: 389
+  - uid: 100
     components:
-    - pos: -3.5,-7.5
+    - pos: 1.5,-6.5
       parent: 1
       type: Transform
     - links:
-      - 388
+      - 109
       type: DeviceLinkSink
-  - uid: 391
+  - uid: 134
     components:
-    - pos: -1.5,-7.5
+    - pos: 1.5,-3.5
       parent: 1
       type: Transform
     - links:
-      - 388
+      - 109
       type: DeviceLinkSink
-- proto: ShuttersWindowOpen
-  entities:
-  - uid: 386
+  - uid: 179
     components:
-    - pos: -2.5,-7.5
+    - pos: 0.5,-6.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
+      type: DeviceLinkSink
+  - uid: 193
+    components:
+    - pos: 2.5,-3.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
+      type: DeviceLinkSink
+  - uid: 250
+    components:
+    - pos: 3.5,-6.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
+      type: DeviceLinkSink
+  - uid: 360
+    components:
+    - pos: 4.5,-4.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
+      type: DeviceLinkSink
+  - uid: 372
+    components:
+    - pos: 4.5,-5.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
+      type: DeviceLinkSink
+  - uid: 387
+    components:
+    - pos: -0.5,-4.5
       parent: 1
       type: Transform
     - links:
-      - 388
+      - 109
+      type: DeviceLinkSink
+  - uid: 388
+    components:
+    - pos: 2.5,-6.5
+      parent: 1
+      type: Transform
+    - links:
+      - 109
       type: DeviceLinkSink
 - proto: SignalButtonDirectional
   entities:
-  - uid: 188
+  - uid: 107
     components:
-    - desc: 'Reminder: keep... Uhh.. I forgot..'
-      name: Blast Doors Switch
+    - name: door bolts switch
       type: MetaData
     - rot: 1.5707963267948966 rad
-      pos: -0.5,2.5
+      pos: -4.5,-1.5
       parent: 1
       type: Transform
     - linkedPorts:
-        326:
-        - Pressed: Toggle
-        186:
-        - Pressed: Toggle
+        11:
+        - Pressed: DoorBolt
+        9:
+        - Pressed: DoorBolt
       type: DeviceLinkSource
-  - uid: 388
+  - uid: 109
     components:
-    - desc: You think it's enough to keep the greytide out?
-      name: Shutters Switch
+    - name: radiation shutters switch
       type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-1.5
+    - rot: -1.5707963267948966 rad
+      pos: -0.5326209,-3.2285466
       parent: 1
       type: Transform
     - linkedPorts:
-        389:
+        134:
+        - Pressed: Toggle
+        193:
+        - Pressed: Toggle
+        372:
         - Pressed: Toggle
-        386:
+        360:
         - Pressed: Toggle
-        391:
+        250:
+        - Pressed: Toggle
+        388:
+        - Pressed: Toggle
+        100:
+        - Pressed: Toggle
+        179:
+        - Pressed: Toggle
+        387:
         - Pressed: Toggle
       type: DeviceLinkSource
-  - uid: 393
+  - uid: 188
     components:
-    - desc: Will this stop 'em?
-      name: Bolts Switch
+    - desc: 'Reminder: keep... Uhh.. I forgot..'
+      name: blast doors switch
       type: MetaData
     - rot: 1.5707963267948966 rad
-      pos: -4.4988146,-1.174572
+      pos: -0.5,2.5
       parent: 1
       type: Transform
     - linkedPorts:
-        146:
-        - Pressed: DoorBolt
-        237:
-        - Pressed: DoorBolt
+        326:
+        - Pressed: Toggle
+        186:
+        - Pressed: Toggle
       type: DeviceLinkSource
 - proto: SignDirectionalJanitor
   entities:
@@ -2765,6 +3093,14 @@ entities:
       pos: 6.5,3.5
       parent: 1
       type: Transform
+- proto: SignRadiationMed
+  entities:
+  - uid: 397
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 1
+      type: Transform
 - proto: SinkWide
   entities:
   - uid: 356
@@ -2808,12 +3144,18 @@ entities:
     - pos: 1.5,0.5
       parent: 1
       type: Transform
+- proto: SpawnPointPilot
+  entities:
+  - uid: 461
+    components:
+    - pos: -2.5,1.5
+      parent: 1
+      type: Transform
 - proto: SpawnVehicleJanicart
   entities:
-  - uid: 136
+  - uid: 398
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-3.5
+    - pos: 3.5,-0.5
       parent: 1
       type: Transform
 - proto: SubstationBasic
@@ -2823,6 +3165,13 @@ entities:
     - pos: 0.5,-5.5
       parent: 1
       type: Transform
+- proto: SuitStorageEVAAlternate
+  entities:
+  - uid: 53
+    components:
+    - pos: -1.5,0.5
+      parent: 1
+      type: Transform
 - proto: Table
   entities:
   - uid: 3
@@ -2854,6 +3203,17 @@ entities:
     - pos: -1.5,1.5
       parent: 1
       type: Transform
+  - uid: 207
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 404
+    components:
+    - pos: -3.5,2.5
+      parent: 1
+      type: Transform
 - proto: Thruster
   entities:
   - uid: 81
@@ -2909,11 +3269,6 @@ entities:
     - pos: 0.97410214,-0.8047657
       parent: 1
       type: Transform
-  - uid: 329
-    components:
-    - pos: -2.7065673,-1.9787903
-      parent: 1
-      type: Transform
 - proto: VehicleKeyJanicart
   entities:
   - uid: 331
@@ -2928,6 +3283,13 @@ entities:
     - pos: 5.5,-2.5
       parent: 1
       type: Transform
+- proto: VendingMachineJaniDrobe
+  entities:
+  - uid: 70
+    components:
+    - pos: 3.5,2.5
+      parent: 1
+      type: Transform
 - proto: WallReinforced
   entities:
   - uid: 48
@@ -2981,22 +3343,12 @@ entities:
     - pos: -0.5,3.5
       parent: 1
       type: Transform
-  - uid: 139
-    components:
-    - pos: 4.5,-0.5
-      parent: 1
-      type: Transform
   - uid: 161
     components:
     - rot: 1.5707963267948966 rad
       pos: 4.5,3.5
       parent: 1
       type: Transform
-  - uid: 163
-    components:
-    - pos: 5.5,-0.5
-      parent: 1
-      type: Transform
   - uid: 165
     components:
     - pos: 6.5,-0.5
@@ -3012,11 +3364,6 @@ entities:
     - pos: 6.5,2.5
       parent: 1
       type: Transform
-  - uid: 178
-    components:
-    - pos: 3.5,3.5
-      parent: 1
-      type: Transform
   - uid: 185
     components:
     - pos: -4.5,-1.5
@@ -3042,16 +3389,15 @@ entities:
     - pos: 4.5,-6.5
       parent: 1
       type: Transform
-  - uid: 404
+  - uid: 283
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,1.5
+    - pos: -2.5,-7.5
       parent: 1
       type: Transform
-  - uid: 406
+  - uid: 402
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,1.5
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
       parent: 1
       type: Transform
 - proto: WallSolid
@@ -3104,20 +3450,14 @@ entities:
     - pos: -0.5,-3.5
       parent: 1
       type: Transform
-- proto: WarningN2
-  entities:
-  - uid: 164
+  - uid: 400
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-0.5
+    - pos: 4.5,-0.5
       parent: 1
       type: Transform
-- proto: WarningO2
-  entities:
-  - uid: 166
+  - uid: 401
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,1.5
+    - pos: 5.5,-0.5
       parent: 1
       type: Transform
 - proto: WarpPointShip
@@ -3137,12 +3477,30 @@ entities:
       type: Transform
 - proto: WindoorSecure
   entities:
+  - uid: 139
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,1.5
+      parent: 1
+      type: Transform
   - uid: 364
     components:
     - rot: -1.5707963267948966 rad
       pos: 4.5,-1.5
       parent: 1
       type: Transform
+  - uid: 373
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 383
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,2.5
+      parent: 1
+      type: Transform
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 363
@@ -3155,7 +3513,7 @@ entities:
   entities:
   - uid: 408
     components:
-    - pos: 1.8879209,-4.426397
+    - pos: 2.6283937,-5.1236
       parent: 1
       type: Transform
 ...
diff --git a/Resources/Prototypes/Entities/Clothing/base_clothing.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
index 60a94fe2914..c18ab1d448f 100644
--- a/Resources/Prototypes/Entities/Clothing/base_clothing.yml
+++ b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
@@ -16,3 +16,14 @@
   components:
     - type: Geiger
       attachedToSuit: true
+
+# for clothing that has a single item slot to insert and alt click out.
+# inheritors add a whitelisted slot named item
+- type: entity
+  abstract: true
+  id: ClothingSlotBase
+  components:
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      item: !type:ContainerSlot
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml
new file mode 100644
index 00000000000..e9bd9a13b4d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml
@@ -0,0 +1,37 @@
+- type: entity
+  parent: [ClothingNeckBase, ClothingSlotBase]
+  id: ClothingNeckCloakJanitor
+  name: janitor's cloak
+  description: How did you even get this? did you make it yourself?
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
+  - type: ItemSlots
+    slots:
+      item:
+        name: Plunger
+#        insertVerbText: cloak-insert-verb
+#        ejectVerbText: cloak-eject-verb
+        whitelist:
+          tags:
+          - Plunger
+  - type: ItemMapper
+    mapLayers:
+      plunger:
+        whitelist:
+          tags:
+            - Plunger
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
+  - type: Appearance
+
+- type: entity
+  id: ClothingNeckCloakJanitorFilled
+  parent: ClothingNeckCloakJanitor
+  suffix: Filled
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - Plunger
diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
index 6197501dff2..a22a47b1328 100644
--- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
@@ -1,16 +1,26 @@
+# Author Info
+# GitHub: erhardsteinhauer
+# Discord: erhardsteinhauer
+
+# Maintainer Info
+# GitHub: erhardsteinhauer
+# Discord: erhardsteinhauer
+
+# Shuttle Notes:
+#
 - type: vessel
   id: liquidator
   name: NT Liquidator
   description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included).
-  price: 30500
+  price: 31600 # 27480+4120 from 15% markup
   category: Small
   group: Civilian
-  shuttlePath: /Maps/Shuttles/liquidator.yml
+  shuttlePath: /Maps/_NF/Shuttles/liquidator.yml
 
 - type: gameMap
   id: liquidator
-  mapName: 'NT Liquidator'
-  mapPath: /Maps/Shuttles/liquidator.yml
+  mapName: 'NC Liquidator'
+  mapPath: /Maps/_NF/Shuttles/liquidator.yml
   minPlayers: 0
   stations:
     liquidator:
@@ -24,6 +34,7 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Pilot: [ 0, 0 ]
             Janitor: [ 0, 0 ]
             AtmosphericTechnician: [ 0, 0 ]
             Chemist: [ 0, 0 ]
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png
new file mode 100644
index 00000000000..05d5d7b2596
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png
new file mode 100644
index 00000000000..e82fb262a1c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png
new file mode 100644
index 00000000000..bf715e24e24
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png
new file mode 100644
index 00000000000..1ae6bfccba5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json
new file mode 100644
index 00000000000..5ef8985ec58
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, edited by dvir001 on github",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "plunger"
+    },
+    {
+      "name": "plunger-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png
new file mode 100644
index 00000000000..978c7a77800
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png
new file mode 100644
index 00000000000..53f0183cf19
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png differ