diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml
index 532367138ca..a14799ba7f7 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml
@@ -13,6 +13,7 @@ tilemap:
   99: FloorSteelDirty
   107: FloorTechMaint
   124: Lattice
+  4: Plating
 entities:
 - proto: ""
   entities:
@@ -20,16 +21,16 @@ entities:
     components:
     - type: MetaData
       name: Paladin
-    - type: BecomesStation
-      id: Paladin
     - type: Transform
       pos: -0.4917612,-0.4486041
       parent: invalid
+    - type: BecomesStation
+      id: Paladin
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: HgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAHgAAAAADQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAACQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAHgAAAAADQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAACQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -37,7 +38,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -83,6 +84,7 @@ entities:
             32: 1,-1
             34: 2,0
             35: 2,-1
+            54: -1.9825078,-0.007940888
         - node:
             color: '#4B653E50'
             id: CheckerNWSE
@@ -120,14 +122,14 @@ entities:
         tiles:
           0,0:
             0: 4871
-            1: 3200
+            1: 3072
             2: 16384
           0,-1:
             0: 32563
             1: 32776
           -1,0:
-            0: 34952
-            1: 546
+            0: 34956
+            1: 544
           0,1:
             1: 48
             2: 68
@@ -189,13 +191,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirCanister
-  entities:
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
 - proto: AirlockGlassShuttleNfsdLocked
   entities:
   - uid: 46
@@ -226,11 +221,11 @@ entities:
       parent: 1
 - proto: APCBasic
   entities:
-  - uid: 69
+  - uid: 190
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -1.5,0.5
+      pos: -2.5,-0.5
       parent: 1
 - proto: AtmosDeviceFanDirectional
   entities:
@@ -271,6 +266,11 @@ entities:
     - type: Transform
       pos: -2.5,2.5
       parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
   - uid: 171
     components:
     - type: Transform
@@ -299,8 +299,7 @@ entities:
   - uid: 176
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,5.5
+      pos: 2.5,-4.5
       parent: 1
   - uid: 177
     components:
@@ -347,6 +346,11 @@ entities:
     - type: Transform
       pos: -2.5,-4.5
       parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
 - proto: ButtonFrameCaution
   entities:
   - uid: 37
@@ -355,11 +359,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,4.5
       parent: 1
-  - uid: 118
+  - uid: 128
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
       parent: 1
 - proto: ButtonFrameCautionSecurity
   entities:
@@ -376,55 +380,75 @@ entities:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
   - uid: 10
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-  - uid: 52
+  - uid: 13
     components:
     - type: Transform
-      pos: -1.5,-3.5
+      pos: 0.5,-3.5
       parent: 1
-  - uid: 70
+  - uid: 15
     components:
     - type: Transform
-      pos: 3.5,-3.5
+      pos: 2.5,-1.5
       parent: 1
-  - uid: 87
+  - uid: 16
     components:
     - type: Transform
-      pos: -2.5,-3.5
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 108
+  - uid: 19
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 114
+  - uid: 22
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: 3.5,2.5
       parent: 1
-  - uid: 117
+  - uid: 52
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: -1.5,-3.5
       parent: 1
-  - uid: 125
+  - uid: 70
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 3.5,-3.5
       parent: 1
-  - uid: 130
+  - uid: 76
     components:
     - type: Transform
       pos: 2.5,-0.5
       parent: 1
-  - uid: 135
+  - uid: 87
     components:
     - type: Transform
-      pos: -0.5,-0.5
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
       parent: 1
   - uid: 136
     components:
@@ -496,94 +520,94 @@ entities:
     - type: Transform
       pos: -2.5,1.5
       parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
   - uid: 151
     components:
     - type: Transform
       pos: 2.5,-1.5
       parent: 1
-  - uid: 152
+  - uid: 188
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      pos: -2.5,-0.5
       parent: 1
-  - uid: 159
+  - uid: 191
     components:
     - type: Transform
-      pos: -1.5,0.5
+      pos: -0.5,-1.5
       parent: 1
 - proto: CableHV
   entities:
-  - uid: 15
+  - uid: 30
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 0.5,-3.5
       parent: 1
-  - uid: 16
+  - uid: 32
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: 1.5,-3.5
       parent: 1
-  - uid: 22
+  - uid: 35
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 0.5,-4.5
       parent: 1
-  - uid: 23
+  - uid: 69
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: -0.5,-3.5
       parent: 1
-  - uid: 34
+  - uid: 130
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
-  - uid: 97
+  - uid: 158
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 1
 - proto: CableMV
   entities:
-  - uid: 24
+  - uid: 23
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 0.5,-4.5
       parent: 1
-  - uid: 25
+  - uid: 39
     components:
     - type: Transform
-      pos: -0.5,-2.5
+      pos: -0.5,-1.5
       parent: 1
-  - uid: 30
+  - uid: 88
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      pos: 0.5,-1.5
       parent: 1
-  - uid: 54
+  - uid: 150
     components:
     - type: Transform
-      pos: -0.5,-0.5
+      pos: 0.5,-2.5
       parent: 1
-  - uid: 99
+  - uid: 152
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: 0.5,-3.5
       parent: 1
-  - uid: 157
+  - uid: 193
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: -0.5,-0.5
       parent: 1
-  - uid: 158
+  - uid: 194
     components:
     - type: Transform
-      pos: -1.5,0.5
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
       parent: 1
 - proto: Catwalk
   entities:
@@ -611,6 +635,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,5.5
       parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
   - uid: 78
     components:
     - type: Transform
@@ -623,12 +653,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-1.5
       parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
   - uid: 163
     components:
     - type: Transform
@@ -647,43 +671,19 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-1.5
       parent: 1
-- proto: Chair
-  entities:
-  - uid: 75
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-2.5
-      parent: 1
-- proto: ChairFolding
+- proto: ChairPilotSeat
   entities:
-  - uid: 104
+  - uid: 77
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5073862,2.6148412
-      parent: 1
-- proto: ChairFoldingSpawnFolded
-  entities:
-  - uid: 61
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.4848302,-3.3352299
+      pos: 1.5,-0.5
       parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 134
+  - uid: 120
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
+      pos: 2.5,-0.5
       parent: 1
 - proto: ComputerRadar
   entities:
@@ -694,37 +694,37 @@ entities:
       parent: 1
 - proto: ComputerTabletopIFF
   entities:
-  - uid: 123
+  - uid: 54
     components:
     - type: Transform
-      pos: 2.5,0.5
+      pos: 1.5,0.5
       parent: 1
 - proto: ComputerTabletopShuttle
   entities:
-  - uid: 121
+  - uid: 159
     components:
     - type: Transform
-      pos: 1.5,0.5
+      pos: 2.5,0.5
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 160
+  - uid: 89
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 166
+  - uid: 133
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: -1.5,2.5
       parent: 1
 - proto: FaxMachineShip
   entities:
-  - uid: 3
+  - uid: 121
     components:
     - type: Transform
       pos: 0.5,0.5
@@ -744,6 +744,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-2.5
       parent: 1
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 103
@@ -770,20 +782,36 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 51
+  - uid: 75
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 53
+      color: '#0055CCFF'
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 101
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 72
@@ -814,13 +842,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 0.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 119
     components:
     - type: Transform
@@ -837,11 +858,11 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 80
+  - uid: 81
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
+      pos: 0.5,-0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -861,21 +882,29 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 105
+  - uid: 112
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-2.5
+      pos: 0.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 128
+  - uid: 104
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
+      pos: 1.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -884,24 +913,24 @@ entities:
   - uid: 7
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 122
+  - uid: 105
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 131
+  - uid: 122
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -919,10 +948,8 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -0.5,-3.5
+      pos: -0.5,-2.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 162
     components:
     - type: Transform
@@ -933,42 +960,35 @@ entities:
       color: '#990000FF'
 - proto: GeneratorWallmountAPU
   entities:
-  - uid: 40
+  - uid: 29
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 1
-  - uid: 96
+  - uid: 102
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
 - proto: GravityGeneratorMini
   entities:
-  - uid: 79
+  - uid: 73
     components:
     - type: Transform
-      pos: -2.5,0.5
+      pos: 0.5,-3.5
       parent: 1
 - proto: Grille
   entities:
-  - uid: 19
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-4.5
-      parent: 1
   - uid: 21
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,1.5
       parent: 1
-  - uid: 39
+  - uid: 34
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
+      pos: 1.5,-4.5
       parent: 1
   - uid: 68
     components:
@@ -976,6 +996,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,0.5
       parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
 - proto: LockableButtonSecurity
   entities:
   - uid: 12
@@ -1000,66 +1031,82 @@ entities:
         - Pressed: Toggle
         67:
         - Pressed: Toggle
-  - uid: 63
+  - uid: 131
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        42:
-        - Pressed: Toggle
         67:
         - Pressed: Toggle
-- proto: LockerNfsdSilver
+        42:
+        - Pressed: Toggle
+- proto: LockerNfsdEvidence
   entities:
-  - uid: 116
+  - uid: 26
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: -1.5,-0.5
       parent: 1
-- proto: LockerWallColorGenericGreen
+- proto: LockerWallEVAColorNfsdFilled
   entities:
-  - uid: 89
+  - uid: 108
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,-2.5
       parent: 1
-- proto: LockerWallEVAColorNfsdFilled
-  entities:
-  - uid: 133
+  - uid: 111
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
       parent: 1
 - proto: MagazineGrenadeEMP
   entities:
-  - uid: 168
+  - uid: 199
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: 0.06988621,-2.7058449
       parent: 1
-  - uid: 169
+  - uid: 200
     components:
     - type: Transform
-      pos: 0.5,5.5
+      pos: 0.8667612,-2.7214813
+      parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 82
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,-3.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      anchored: True
+      pos: 1.5,-3.5
       parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: PlastitaniumWindow
   entities:
-  - uid: 8
+  - uid: 31
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
+      pos: -0.5,-4.5
       parent: 1
-  - uid: 102
+  - uid: 99
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
+      pos: 1.5,-4.5
       parent: 1
   - uid: 109
     components:
@@ -1073,27 +1120,33 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,1.5
       parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
 - proto: Poweredlight
   entities:
-  - uid: 31
+  - uid: 3
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,0.5
+      pos: -1.5,-0.5
       parent: 1
-  - uid: 32
+  - uid: 126
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-3.5
+      pos: 2.5,-1.5
       parent: 1
-  - uid: 126
+  - uid: 157
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,-1.5
+      pos: 0.5,-3.5
       parent: 1
-- proto: PoweredlightColoredFrostyBlue
+- proto: PoweredlightCyan
   entities:
   - uid: 36
     components:
@@ -1128,8 +1181,8 @@ entities:
   - uid: 170
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.555489,-0.021983266
+      rot: 1.5707963267948966 rad
+      pos: 0.3969773,-0.13097924
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
@@ -1163,39 +1216,69 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,1.5
       parent: 1
-- proto: SubstationWallBasic
+- proto: Stool
   entities:
-  - uid: 35
+  - uid: 63
     components:
     - type: Transform
+      anchored: True
       rot: 3.141592653589793 rad
-      pos: -0.5,-4.5
+      pos: 2.5,2.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 195
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+- proto: SuitStorageWallmountDeputy
+  entities:
+  - uid: 79
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
       parent: 1
 - proto: TableReinforced
   entities:
-  - uid: 73
+  - uid: 40
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,0.5
+      pos: 0.5,-0.5
       parent: 1
-  - uid: 76
+  - uid: 53
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 0.5,0.5
       parent: 1
-  - uid: 77
+  - uid: 56
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 2.5,0.5
       parent: 1
-  - uid: 111
+  - uid: 168
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,0.5
+      pos: 1.5,0.5
       parent: 1
 - proto: ThrusterNfsd
   entities:
@@ -1235,12 +1318,6 @@ entities:
       parent: 1
 - proto: WallPlastitanium
   entities:
-  - uid: 13
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 1
   - uid: 14
     components:
     - type: Transform
@@ -1253,7 +1330,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 1
-  - uid: 26
+  - uid: 25
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1263,13 +1340,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 29
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-4.5
+      pos: 0.5,-4.5
       parent: 1
   - uid: 41
     components:
@@ -1306,44 +1377,52 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-2.5
       parent: 1
-  - uid: 71
+  - uid: 91
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 1.5,-4.5
+      pos: 3.5,-2.5
       parent: 1
-  - uid: 81
+  - uid: 92
     components:
     - type: Transform
-      pos: 3.5,1.5
+      pos: 1.5,1.5
       parent: 1
-  - uid: 82
+  - uid: 93
     components:
     - type: Transform
-      pos: -1.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
       parent: 1
-  - uid: 91
+  - uid: 94
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: -1.5,4.5
       parent: 1
-  - uid: 92
+  - uid: 96
     components:
     - type: Transform
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,0.5
       parent: 1
-  - uid: 93
+  - uid: 134
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
+      pos: -1.5,-3.5
       parent: 1
-  - uid: 94
+  - uid: 169
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 1
 - proto: WallPlastitaniumDiagonal
   entities:
@@ -1359,27 +1438,25 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
-  - uid: 88
+  - uid: 123
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-0.5
+      pos: -1.5,0.5
       parent: 1
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
-  - uid: 188
+  - uid: 198
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
+      pos: 0.5,-1.5
       parent: 1
 - proto: WeaponCapacitorRecharger
   entities:
-  - uid: 56
+  - uid: 125
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 0.5,-0.5
       parent: 1
 - proto: WindoorSecureSecurityLocked
   entities: