diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
index dee3dc64ce1..ec7d61daf66 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
@@ -39,7 +39,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -266,7 +266,7 @@ entities:
           0,-4:
             0: 65535
           -1,-4:
-            0: 61015
+            0: 60503
           0,-3:
             0: 12287
           -1,-3:
@@ -346,13 +346,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirCanister
-  entities:
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 3
 - proto: AirlockCaptainGlassLocked
   entities:
   - uid: 271
@@ -446,7 +439,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-14.5
       parent: 3
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 139
     components:
@@ -471,32 +464,37 @@ entities:
   - uid: 144
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-14.5
       parent: 3
   - uid: 145
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-16.5
       parent: 3
   - uid: 146
     components:
     - type: Transform
-      pos: 9.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-16.5
       parent: 3
   - uid: 147
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-14.5
       parent: 3
   - uid: 148
     components:
     - type: Transform
-      pos: -4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 3
-  - uid: 242
+  - uid: 559
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: 4.5,-16.5
       parent: 3
 - proto: AtmosFixBlockerMarker
   entities:
@@ -681,46 +679,26 @@ entities:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 69
     components:
     - type: Transform
       pos: 3.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 70
     components:
     - type: Transform
       pos: 0.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 76
     components:
     - type: Transform
       pos: 1.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 528
     components:
     - type: Transform
       pos: 4.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
 - proto: BookHowToSurvive
   entities:
   - uid: 531
@@ -1611,6 +1589,11 @@ entities:
     - type: Transform
       pos: -1.5,-9.5
       parent: 3
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
 - proto: ChairFolding
   entities:
   - uid: 214
@@ -1851,16 +1834,28 @@ entities:
     - type: Transform
       pos: 5.286945,-7.6460857
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 236
     components:
     - type: Transform
       pos: 5.5473614,-7.3856688
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 239
     components:
     - type: Transform
       pos: 5.7348614,-7.6669188
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
 - proto: DrinkRumBottleFull
   entities:
   - uid: 228
@@ -1948,6 +1943,19 @@ entities:
     - type: Transform
       pos: 5.5,-13.5
       parent: 3
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
+      parent: 3
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 448
@@ -1957,16 +1965,24 @@ entities:
       pos: 2.5,-17.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 373
+  - uid: 187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 242
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 375
     components:
     - type: Transform
@@ -1974,14 +1990,14 @@ entities:
       pos: -1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 419
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 443
     components:
     - type: Transform
@@ -1989,7 +2005,7 @@ entities:
       pos: 0.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 383
@@ -1998,7 +2014,7 @@ entities:
       pos: 1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasPipeStraight
   entities:
   - uid: 374
@@ -2008,15 +2024,7 @@ entities:
       pos: -1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-10.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 378
     components:
     - type: Transform
@@ -2024,7 +2032,7 @@ entities:
       pos: -1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 379
     components:
     - type: Transform
@@ -2032,7 +2040,7 @@ entities:
       pos: -1.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 380
     components:
     - type: Transform
@@ -2040,7 +2048,7 @@ entities:
       pos: -1.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 381
     components:
     - type: Transform
@@ -2048,7 +2056,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 382
     components:
     - type: Transform
@@ -2056,7 +2064,7 @@ entities:
       pos: 0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 384
     components:
     - type: Transform
@@ -2064,7 +2072,7 @@ entities:
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 385
     components:
     - type: Transform
@@ -2072,7 +2080,7 @@ entities:
       pos: 3.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 386
     components:
     - type: Transform
@@ -2080,7 +2088,7 @@ entities:
       pos: 4.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 387
     components:
     - type: Transform
@@ -2088,7 +2096,7 @@ entities:
       pos: 5.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 389
     components:
     - type: Transform
@@ -2096,7 +2104,7 @@ entities:
       pos: 1.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 390
     components:
     - type: Transform
@@ -2104,7 +2112,7 @@ entities:
       pos: 1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 391
     components:
     - type: Transform
@@ -2112,7 +2120,7 @@ entities:
       pos: 1.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 392
     components:
     - type: Transform
@@ -2120,7 +2128,7 @@ entities:
       pos: 1.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 394
     components:
     - type: Transform
@@ -2128,7 +2136,7 @@ entities:
       pos: 1.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 395
     components:
     - type: Transform
@@ -2136,7 +2144,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 396
     components:
     - type: Transform
@@ -2144,7 +2152,7 @@ entities:
       pos: 1.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 397
     components:
     - type: Transform
@@ -2152,7 +2160,7 @@ entities:
       pos: 1.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 398
     components:
     - type: Transform
@@ -2160,15 +2168,7 @@ entities:
       pos: 1.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 399
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 400
     components:
     - type: Transform
@@ -2176,84 +2176,84 @@ entities:
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 405
     components:
     - type: Transform
       pos: 6.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 406
     components:
     - type: Transform
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 407
     components:
     - type: Transform
       pos: 6.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 408
     components:
     - type: Transform
       pos: 6.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 414
     components:
     - type: Transform
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 416
     components:
     - type: Transform
       pos: 2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 417
     components:
     - type: Transform
       pos: 2.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 420
     components:
     - type: Transform
       pos: 2.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 421
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 423
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 425
     components:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 426
     components:
     - type: Transform
@@ -2261,7 +2261,7 @@ entities:
       pos: 1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 427
     components:
     - type: Transform
@@ -2269,7 +2269,7 @@ entities:
       pos: 0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 428
     components:
     - type: Transform
@@ -2277,7 +2277,7 @@ entities:
       pos: -0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 429
     components:
     - type: Transform
@@ -2285,7 +2285,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 430
     components:
     - type: Transform
@@ -2293,7 +2293,7 @@ entities:
       pos: -2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 431
     components:
     - type: Transform
@@ -2301,7 +2301,7 @@ entities:
       pos: 3.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 432
     components:
     - type: Transform
@@ -2309,7 +2309,7 @@ entities:
       pos: 4.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 433
     components:
     - type: Transform
@@ -2317,7 +2317,7 @@ entities:
       pos: 5.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 434
     components:
     - type: Transform
@@ -2325,7 +2325,7 @@ entities:
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 435
     components:
     - type: Transform
@@ -2333,7 +2333,7 @@ entities:
       pos: 3.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 436
     components:
     - type: Transform
@@ -2341,7 +2341,7 @@ entities:
       pos: 4.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 437
     components:
     - type: Transform
@@ -2349,7 +2349,7 @@ entities:
       pos: 5.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 438
     components:
     - type: Transform
@@ -2357,7 +2357,7 @@ entities:
       pos: 6.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 444
     components:
     - type: Transform
@@ -2365,7 +2365,7 @@ entities:
       pos: 0.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 445
     components:
     - type: Transform
@@ -2373,7 +2373,7 @@ entities:
       pos: 0.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 446
     components:
     - type: Transform
@@ -2381,7 +2381,7 @@ entities:
       pos: 0.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 447
     components:
     - type: Transform
@@ -2389,7 +2389,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 376
@@ -2399,14 +2399,14 @@ entities:
       pos: -0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 388
     components:
     - type: Transform
       pos: 6.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 393
     components:
     - type: Transform
@@ -2414,7 +2414,7 @@ entities:
       pos: 1.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 411
     components:
     - type: Transform
@@ -2422,7 +2422,7 @@ entities:
       pos: 2.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 413
     components:
     - type: Transform
@@ -2430,7 +2430,7 @@ entities:
       pos: 2.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 415
     components:
     - type: Transform
@@ -2438,7 +2438,7 @@ entities:
       pos: 2.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 422
     components:
     - type: Transform
@@ -2446,7 +2446,7 @@ entities:
       pos: 2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 424
     components:
     - type: Transform
@@ -2454,9 +2454,16 @@ entities:
       pos: 2.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPort
   entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 372
     components:
     - type: Transform
@@ -2464,7 +2471,7 @@ entities:
       pos: -2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentPump
   entities:
   - uid: 401
@@ -2474,14 +2481,14 @@ entities:
       pos: 3.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 402
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 403
     components:
     - type: Transform
@@ -2489,7 +2496,7 @@ entities:
       pos: -1.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 404
     components:
     - type: Transform
@@ -2497,7 +2504,7 @@ entities:
       pos: 7.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 409
     components:
     - type: Transform
@@ -2505,7 +2512,7 @@ entities:
       pos: 6.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 410
     components:
     - type: Transform
@@ -2513,7 +2520,7 @@ entities:
       pos: 1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 412
@@ -2523,7 +2530,7 @@ entities:
       pos: 3.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 418
     components:
     - type: Transform
@@ -2531,7 +2538,7 @@ entities:
       pos: 3.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 439
     components:
     - type: Transform
@@ -2539,14 +2546,14 @@ entities:
       pos: 7.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 440
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 441
     components:
     - type: Transform
@@ -2554,7 +2561,7 @@ entities:
       pos: 7.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 442
     components:
     - type: Transform
@@ -2562,7 +2569,7 @@ entities:
       pos: -3.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
   - uid: 120
@@ -2578,16 +2585,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 77
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: HarmonicaInstrument
   entities:
   - uid: 453
@@ -2595,12 +2598,12 @@ entities:
     - type: Transform
       pos: 6.464443,-9.590082
       parent: 3
-- proto: SyndicateMicrowave
+- proto: LockerWallMaterialsFuelPlasmaFilled2
   entities:
-  - uid: 109
+  - uid: 377
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -2.5,-8.5
       parent: 3
 - proto: LockerWallMedicalFilled
   entities:
@@ -2698,6 +2701,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 3
+- proto: NitrogenCanister
+  entities:
+  - uid: 98
+    components:
+    - type: Transform
+      anchored: True
+      pos: -2.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      anchored: True
+      pos: 0.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
 - proto: Paper
   entities:
   - uid: 449
@@ -2877,11 +2900,6 @@ entities:
     - type: Transform
       pos: 2.5,-12.5
       parent: 3
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 3
   - uid: 557
     components:
     - type: Transform
@@ -2942,13 +2960,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 3
-- proto: SheetPlasma
-  entities:
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 0.5504579,-9.491902
-      parent: 3
 - proto: ShuttersNormalOpen
   entities:
   - uid: 72
@@ -2956,110 +2967,66 @@ entities:
     - type: Transform
       pos: 0.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 73
     components:
     - type: Transform
       pos: 1.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 136
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 137
     components:
     - type: Transform
       pos: 3.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 138
     components:
     - type: Transform
       pos: 4.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 243
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 244
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 245
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 246
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 247
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 248
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 249
     components:
     - type: Transform
       pos: 2.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 250
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 191
@@ -3068,20 +3035,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
   - uid: 192
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
 - proto: SignalButtonDirectional
   entities:
   - uid: 152
@@ -3250,6 +3209,13 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 3
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 3
 - proto: TableCarpet
   entities:
   - uid: 89
@@ -3340,117 +3306,87 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 38
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 39
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 40
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 41
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 42
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 46
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 58
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 59
     components:
     - type: Transform
       pos: 7.5,-4.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 82
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 99
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 118
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 119
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: ToolboxElectrical
   entities:
   - uid: 481