diff --git a/Resources/Maps/_NF/Shuttles/nightlight.yml b/Resources/Maps/_NF/Shuttles/nightlight.yml
index 2499e593f4e..3dea26d6aa5 100644
--- a/Resources/Maps/_NF/Shuttles/nightlight.yml
+++ b/Resources/Maps/_NF/Shuttles/nightlight.yml
@@ -31,11 +31,11 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: CAAAAAAACAAAAAAACAAAAAAABgAAAAAABgAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAABQAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAABwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAACgAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAACgAAAAAACgAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAwAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAABgAAAAAABgAAAAAACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAABQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAABQAAAAAABQAAAAAABQAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABQAAAAAABQAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -69,51 +69,59 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            542: -4,8
-            543: -4,6
+            620: -5,6
+            621: -4,6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
           decals:
-            557: 2,9
-            565: 4,8
+            603: 2,10
+            604: 3,9
+            605: 5,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
           decals:
-            558: 1,9
+            606: 1,10
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
           decals:
-            564: 4,6
+            611: 5,6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
             561: 1,6
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerNe
+          decals:
+            608: 2,9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            567: 4,7
+            610: 5,7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            566: 3,8
+            609: 4,8
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
             562: 2,6
             563: 3,6
+            612: 4,6
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
             559: 1,8
             560: 1,7
+            607: 1,9
         - node:
             color: '#DE3A3AFF'
             id: BrickTileSteelLineE
@@ -144,7 +152,7 @@ entities:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerNe
           decals:
-            535: -1,9
+            613: -1,10
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteCornerNe
@@ -160,7 +168,7 @@ entities:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerNw
           decals:
-            534: -2,9
+            614: -2,10
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteCornerNw
@@ -176,7 +184,7 @@ entities:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerSe
           decals:
-            536: -1,6
+            589: -1,6
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteCornerSe
@@ -193,7 +201,7 @@ entities:
             color: '#4B709CFF'
             id: BrickTileWhiteCornerSw
           decals:
-            537: -2,6
+            590: -2,6
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteCornerSw
@@ -242,6 +250,7 @@ entities:
           decals:
             538: -1,7
             539: -1,8
+            615: -1,9
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteLineE
@@ -301,6 +310,7 @@ entities:
           decals:
             540: -2,7
             541: -2,8
+            616: -2,9
         - node:
             color: '#DDC3A1FF'
             id: BrickTileWhiteLineW
@@ -400,61 +410,41 @@ entities:
             color: '#1861D5FF'
             id: DeliveryGreyscale
           decals:
-            545: -1,6
+            619: -5,8
         - node:
             color: '#951710FF'
             id: DeliveryGreyscale
           decals:
-            544: -2,6
+            618: -4,8
         - node:
             color: '#9FED587F'
             id: MiniTileCheckerBOverlay
           decals:
-            483: 1,9
             484: 1,8
             485: 1,7
             486: 1,6
             487: 2,6
             488: 2,7
             489: 2,8
-            490: 2,9
-            491: 3,8
             492: 3,7
             493: 3,6
-            494: 4,6
-            495: 4,7
-            497: 4,8
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkCornerNe
-          decals:
-            546: 4,8
-            548: 2,9
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkCornerNw
-          decals:
-            547: 1,9
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkCornerSe
-          decals:
-            549: 4,6
+            591: 4,7
+            592: 4,6
+            593: 5,6
+            594: 5,7
+            595: 5,8
+            596: 4,8
+            597: 3,8
+            598: 3,9
+            599: 2,9
+            600: 1,9
+            601: 1,10
+            602: 2,10
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerSw
           decals:
             550: 1,6
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineE
-          decals:
-            555: 4,7
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineN
-          decals:
-            556: 3,8
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
@@ -531,20 +521,22 @@ entities:
             19: -5,0
             20: -5,-1
             232: -5,3
-            533: 0,7
             570: 6,3
+            624: 0,8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleN
           decals:
             35: -1,-5
             428: 3,5
+            623: 1,-5
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
           decals:
             38: -1,-5
             426: 3,5
+            622: 1,-5
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleW
@@ -554,8 +546,8 @@ entities:
             5: 5,0
             6: 5,-1
             231: -5,3
-            532: 0,7
             571: 6,3
+            625: 0,8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -577,6 +569,11 @@ entities:
           decals:
             29: -1,-7
             44: 1,-7
+        - node:
+            color: '#52B4E9FF'
+            id: corgi
+          decals:
+            617: -1,10
     - type: GridAtmosphere
       version: 2
       data:
@@ -588,25 +585,25 @@ entities:
           -1,0:
             0: 65519
           0,1:
-            0: 65167
+            0: 61071
           -1,1:
             0: 64783
           0,2:
-            0: 110
-            1: 2048
+            0: 1775
+            1: 32768
           -1,2:
-            0: 205
-            1: 512
+            0: 3277
+            1: 8448
           1,0:
             0: 29455
             2: 34816
           1,1:
-            0: 4355
-            1: 52224
+            0: 13059
             2: 8
+            1: 34816
           1,2:
-            0: 1
-            1: 32
+            0: 3
+            1: 320
           1,-1:
             0: 61713
             1: 192
@@ -623,10 +620,11 @@ entities:
             0: 61440
             1: 112
           -2,1:
-            1: 26128
-            0: 6
+            1: 8720
+            0: 34822
           -2,2:
-            1: 128
+            1: 64
+            0: 8
           -1,-1:
             0: 65535
           0,-2:
@@ -691,66 +689,43 @@ entities:
     - type: RadiationGridResistance
 - proto: AirAlarm
   entities:
-  - uid: 240
+  - uid: 45
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,5.5
       parent: 1
     - type: DeviceList
       devices:
-      - 441
-      - 442
-      - 9
-      - 446
-      - 447
-      - 448
-      - 449
-      - 450
-      - 451
-      - 568
-      - 326
-      - 571
-      - 569
-      - 460
       - 461
-      - 480
+      - 460
+      - 569
+      - 571
+      - 326
+      - 568
       - 602
-      - 482
-      - 466
-      - 471
+      - 252
+      - 619
+      - 442
+      - 59
       - 470
-      - 445
+      - 273
+      - 189
     - type: DeviceLinkSource
       linkedPorts:
-        576:
-        - AirDanger: Toggle
-        577:
-        - AirDanger: Close
-        578:
-        - AirDanger: Close
-        579:
+        143:
         - AirDanger: Close
-        580:
+        471:
         - AirDanger: Close
-        308:
-        - AirDanger: Close
-        309:
-        - AirDanger: Close
-        310:
-        - AirDanger: Close
-        311:
-        - AirDanger: Close
-        312:
-        - AirDanger: Close
-        313:
+        476:
         - AirDanger: Close
-        314:
+        472:
         - AirDanger: Close
-        307:
+        469:
         - AirDanger: Close
-        306:
+        467:
         - AirDanger: Close
-        305:
+        617:
         - AirDanger: Close
   - uid: 603
     components:
@@ -760,22 +735,22 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 452
-      - 455
-      - 575
-      - 428
-      - 593
+      - 445
+      - 446
+      - 447
+      - 448
+      - 449
+      - 450
+      - 451
+      - 456
+      - 453
       - 454
       - 457
-      - 453
-      - 456
-      - 451
-      - 450
-      - 449
-      - 448
-      - 447
-      - 446
-      - 445
+      - 593
+      - 428
+      - 575
+      - 455
+      - 452
     - type: DeviceLinkSource
       linkedPorts:
         305:
@@ -800,10 +775,10 @@ entities:
         - AirDanger: Close
 - proto: AirlockCommandGlass
   entities:
-  - uid: 190
+  - uid: 430
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 0.5,8.5
       parent: 1
 - proto: AirlockExternalGlass
   entities:
@@ -912,14 +887,14 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
 - proto: APCBasic
   entities:
-  - uid: 234
+  - uid: 348
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,6.5
       parent: 1
 - proto: AtmosDeviceFanDirectional
   entities:
@@ -965,11 +940,26 @@ entities:
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1
   - uid: 192
     components:
     - type: Transform
       pos: 7.5,-2.5
       parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
   - uid: 258
     components:
     - type: Transform
@@ -1005,46 +995,6 @@ entities:
     - type: Transform
       pos: 7.5,7.5
       parent: 1
-  - uid: 273
-    components:
-    - type: Transform
-      pos: 6.5,7.5
-      parent: 1
-  - uid: 274
-    components:
-    - type: Transform
-      pos: 6.5,6.5
-      parent: 1
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 3.5,10.5
-      parent: 1
-  - uid: 276
-    components:
-    - type: Transform
-      pos: 5.5,9.5
-      parent: 1
-  - uid: 277
-    components:
-    - type: Transform
-      pos: -2.5,10.5
-      parent: 1
-  - uid: 278
-    components:
-    - type: Transform
-      pos: -4.5,9.5
-      parent: 1
-  - uid: 279
-    components:
-    - type: Transform
-      pos: -5.5,7.5
-      parent: 1
-  - uid: 280
-    components:
-    - type: Transform
-      pos: -5.5,6.5
-      parent: 1
   - uid: 281
     components:
     - type: Transform
@@ -1065,6 +1015,16 @@ entities:
     - type: Transform
       pos: -7.5,5.5
       parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
   - uid: 414
     components:
     - type: Transform
@@ -1085,25 +1045,10 @@ entities:
     - type: Transform
       pos: 2.5,-6.5
       parent: 1
-  - uid: 607
-    components:
-    - type: Transform
-      pos: -6.5,8.5
-      parent: 1
-  - uid: 608
-    components:
-    - type: Transform
-      pos: -5.5,8.5
-      parent: 1
-  - uid: 609
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 1
-  - uid: 610
+  - uid: 475
     components:
     - type: Transform
-      pos: 6.5,8.5
+      pos: 4.5,10.5
       parent: 1
 - proto: AtmosFixFreezerMarker
   entities:
@@ -1131,10 +1076,10 @@ entities:
       parent: 1
 - proto: BarSpoon
   entities:
-  - uid: 584
+  - uid: 355
     components:
     - type: Transform
-      pos: 4.4375,2.6025705
+      pos: 4.913182,4.684615
       parent: 1
 - proto: BenchSofaCorpCorner
   entities:
@@ -1198,65 +1143,57 @@ entities:
   - uid: 229
     components:
     - type: Transform
-      pos: 2.978877,8.751599
+      pos: 4.384118,8.571932
       parent: 1
 - proto: ButtonFrameCaution
   entities:
-  - uid: 232
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,6.75
-      parent: 1
-  - uid: 345
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,8.25
-      parent: 1
-  - uid: 484
+  - uid: 427
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,7.5
+      pos: -5.5,7.75
       parent: 1
 - proto: ButtonFrameCautionSecurity
   entities:
   - uid: 120
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,8.75
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.75
       parent: 1
-- proto: ButtonFrameExit
+- proto: ButtonFrameGrey
   entities:
-  - uid: 75
+  - uid: 62
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 4.25,1.5
+      pos: 4.75,1.5
       parent: 1
-- proto: ButtonFrameGrey
-  entities:
-  - uid: 62
+  - uid: 581
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,2.75
+      pos: 0.5,7.25
       parent: 1
-  - uid: 581
+  - uid: 582
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,6.75
+      rot: 1.5707963267948966 rad
+      pos: -5.5,7.25
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,7.75
       parent: 1
 - proto: ButtonFrameJanitor
   entities:
-  - uid: 103
+  - uid: 298
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,4.25
+      rot: 3.141592653589793 rad
+      pos: 4.25,1.5
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -1305,6 +1242,11 @@ entities:
     - type: Transform
       pos: 0.5,7.5
       parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 1
   - uid: 349
     components:
     - type: Transform
@@ -1577,54 +1519,50 @@ entities:
       parent: 1
 - proto: CableHV
   entities:
-  - uid: 93
+  - uid: 95
     components:
     - type: Transform
       pos: -3.5,6.5
       parent: 1
-  - uid: 94
+  - uid: 362
     components:
     - type: Transform
-      pos: -3.5,7.5
+      pos: -3.5,5.5
       parent: 1
-  - uid: 139
+  - uid: 563
     components:
     - type: Transform
-      pos: -3.5,8.5
+      pos: -4.5,6.5
       parent: 1
-  - uid: 339
+  - uid: 580
     components:
     - type: Transform
-      pos: -2.5,6.5
+      pos: -3.5,6.5
       parent: 1
 - proto: CableMV
   entities:
   - uid: 74
     components:
     - type: Transform
-      pos: 0.5,6.5
+      pos: -3.5,6.5
       parent: 1
   - uid: 109
     components:
     - type: Transform
       pos: -2.5,6.5
       parent: 1
-  - uid: 362
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 1
-  - uid: 427
+  - uid: 464
     components:
     - type: Transform
-      pos: -1.5,6.5
+      pos: -3.5,5.5
       parent: 1
 - proto: CableTerminal
   entities:
-  - uid: 86
+  - uid: 610
     components:
     - type: Transform
-      pos: -3.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,6.5
       parent: 1
 - proto: Carpet
   entities:
@@ -1734,11 +1672,11 @@ entities:
       parent: 1
 - proto: ChairPilotSeat
   entities:
-  - uid: 255
+  - uid: 544
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,8.5
+      pos: -0.5,9.5
       parent: 1
 - proto: ChairWood
   entities:
@@ -1811,17 +1749,17 @@ entities:
       parent: 1
 - proto: ComputerTabletopShuttle
   entities:
-  - uid: 249
+  - uid: 616
     components:
     - type: Transform
-      pos: -1.5,9.5
+      pos: -0.5,10.5
       parent: 1
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 250
+  - uid: 615
     components:
     - type: Transform
-      pos: -0.5,9.5
+      pos: -1.5,10.5
       parent: 1
 - proto: ComputerWallmountWithdrawBankATM
   entities:
@@ -1852,12 +1790,34 @@ entities:
     - type: Transform
       pos: -2.4479167,1.5713204
       parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 4.3343086,4.815199
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 4.9488916,4.794366
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 4.7301416,4.544366
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 4.3863916,4.450616
+      parent: 1
 - proto: DrinkShaker
   entities:
-  - uid: 583
+  - uid: 338
     components:
     - type: Transform
-      pos: 4.78125,2.5400705
+      pos: 4.5798483,4.684615
       parent: 1
 - proto: EmergencyLight
   entities:
@@ -1885,12 +1845,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,2.5
       parent: 1
-  - uid: 544
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,7.5
-      parent: 1
   - uid: 562
     components:
     - type: Transform
@@ -1902,6 +1856,12 @@ entities:
     - type: Transform
       pos: -3.5,8.5
       parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 363
@@ -1916,10 +1876,10 @@ entities:
       parent: 1
 - proto: FaxMachineShip
   entities:
-  - uid: 251
+  - uid: 361
     components:
     - type: Transform
-      pos: -0.5,8.5
+      pos: -1.5,9.5
       parent: 1
 - proto: FirelockGlass
   entities:
@@ -1929,18 +1889,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,3.5
       parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 240
-  - uid: 441
+  - uid: 59
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,7.5
+      pos: 0.5,8.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
   - uid: 442
     components:
     - type: Transform
@@ -1949,7 +1905,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
   - uid: 443
     components:
     - type: Transform
@@ -1965,7 +1921,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 446
     components:
     - type: Transform
@@ -1975,7 +1930,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 447
     components:
     - type: Transform
@@ -1985,7 +1939,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 448
     components:
     - type: Transform
@@ -1995,7 +1948,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 449
     components:
     - type: Transform
@@ -2005,7 +1957,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 450
     components:
     - type: Transform
@@ -2015,7 +1966,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
   - uid: 451
     components:
     - type: Transform
@@ -2025,7 +1975,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 603
-      - 240
 - proto: FloorDrain
   entities:
   - uid: 523
@@ -2041,7 +1990,7 @@ entities:
   - uid: 605
     components:
     - type: Transform
-      pos: 0.8370018,4.7102814
+      pos: 0.7981141,4.6325316
       parent: 1
 - proto: FoodShakerPepper
   entities:
@@ -2067,31 +2016,37 @@ entities:
     - type: Transform
       pos: 1.907615,4.793615
       parent: 1
-- proto: GasMixerOn
+- proto: GasMixerOnFlipped
   entities:
-  - uid: 122
+  - uid: 275
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,7.5
       parent: 1
     - type: GasMixer
-      inletTwoConcentration: 0.20999998
-      inletOneConcentration: 0.79
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
-  - uid: 463
+  - uid: 190
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,6.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
 - proto: GasPipeBend
   entities:
+  - uid: 128
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 186
     components:
     - type: Transform
@@ -2100,95 +2055,135 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 330
+  - uid: 573
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,7.5
+      pos: -2.5,4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 467
+  - uid: 594
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 473
+  - uid: 595
     components:
     - type: Transform
-      pos: 1.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 558
+- proto: GasPipeFourway
+  entities:
+  - uid: 184
     components:
     - type: Transform
-      pos: 2.5,7.5
+      pos: 1.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 559
+  - uid: 246
     components:
     - type: Transform
-      pos: 3.5,8.5
+      pos: 3.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 573
+  - uid: 507
     components:
     - type: Transform
-      pos: -2.5,4.5
+      pos: 1.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 594
+  - uid: 508
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 98
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-3.5
+      pos: 2.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 595
+  - uid: 119
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 165
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,-2.5
+      pos: -2.5,7.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 472
+  - uid: 167
     components:
     - type: Transform
-      pos: 1.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,7.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 507
+  - uid: 170
     components:
     - type: Transform
-      pos: 1.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 1.5,4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 508
+  - uid: 173
     components:
     - type: Transform
-      pos: -0.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeStraight
-  entities:
   - uid: 176
     components:
     - type: Transform
-      pos: 2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -2199,61 +2194,99 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 465
+  - uid: 230
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,7.5
+      pos: 1.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 474
+  - uid: 234
     components:
     - type: Transform
-      pos: 1.5,8.5
+      pos: 1.5,3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 475
+  - uid: 240
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 476
+  - uid: 243
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,8.5
+      pos: 1.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 249
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,7.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 477
+  - uid: 250
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,8.5
+      pos: 3.5,8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 478
+  - uid: 251
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,7.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,9.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 479
+  - uid: 276
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 478
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 483
     components:
     - type: Transform
@@ -2671,63 +2704,28 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 560
+  - uid: 564
     components:
     - type: Transform
-      pos: 2.5,6.5
+      pos: 3.5,4.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 561
+      color: '#990000FF'
+  - uid: 565
     components:
     - type: Transform
-      pos: 2.5,5.5
+      pos: 3.5,5.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 563
+      color: '#990000FF'
+  - uid: 574
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: -2.5,3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 564
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 565
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 566
-    components:
-    - type: Transform
-      pos: 3.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 567
-    components:
-    - type: Transform
-      pos: 3.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 574
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 596
+  - uid: 596
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2784,52 +2782,52 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 226
+  - uid: 169
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-3.5
+      pos: -0.5,7.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 354
+      color: '#0055CCFF'
+  - uid: 187
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,6.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 468
+      color: '#990000FF'
+  - uid: 226
     components:
     - type: Transform
-      pos: -2.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 469
+  - uid: 274
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,7.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 481
+      color: '#0055CCFF'
+  - uid: 354
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 529
+      color: '#0055CCFF'
+  - uid: 468
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: -2.5,8.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 530
     components:
     - type: Transform
@@ -2859,14 +2857,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 547
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 551
     components:
     - type: Transform
@@ -2877,32 +2867,51 @@ entities:
       color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 156
+  - uid: 129
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,6.5
+      pos: -4.5,8.5
       parent: 1
-  - uid: 332
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 255
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,6.5
+      pos: -3.5,8.5
       parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPressurePumpOnMax
   entities:
-  - uid: 462
+  - uid: 228
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVentPump
   entities:
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 45
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 273
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 45
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 326
     components:
     - type: Transform
@@ -2910,7 +2919,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 452
@@ -2962,29 +2971,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 471
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 240
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 480
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,6.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 571
@@ -2995,7 +2982,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 575
@@ -3011,6 +2998,17 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
+  - uid: 189
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 45
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 428
     components:
     - type: Transform
@@ -3063,18 +3061,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 466
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,8.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 470
@@ -3084,17 +3071,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 482
-    components:
-    - type: Transform
-      pos: 2.5,9.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 488
@@ -3112,7 +3089,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 569
@@ -3123,22 +3100,32 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 240
+      - 45
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 45
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 184
+  - uid: 529
     components:
     - type: Transform
-      pos: -5.5,6.5
+      pos: -0.5,6.5
       parent: 1
 - proto: Grille
   entities:
-  - uid: 121
+  - uid: 126
     components:
     - type: Transform
-      pos: 0.5,10.5
+      pos: -1.5,11.5
       parent: 1
   - uid: 150
     components:
@@ -3200,53 +3187,55 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 1
-  - uid: 169
+  - uid: 227
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
+      pos: 0.5,9.5
       parent: 1
-  - uid: 170
+  - uid: 278
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,10.5
+      pos: 2.5,11.5
       parent: 1
-  - uid: 172
+  - uid: 466
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,11.5
       parent: 1
-  - uid: 173
+  - uid: 473
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,10.5
+      pos: 3.5,10.5
       parent: 1
-  - uid: 227
+  - uid: 474
     components:
     - type: Transform
-      pos: 0.5,9.5
+      pos: 0.5,10.5
       parent: 1
-  - uid: 346
+  - uid: 477
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,8.5
+      pos: -2.5,10.5
       parent: 1
-- proto: GrilleDiagonal
-  entities:
-  - uid: 118
+  - uid: 479
     components:
     - type: Transform
-      pos: -2.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,11.5
       parent: 1
-  - uid: 144
+  - uid: 527
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,10.5
+      pos: 0.5,11.5
+      parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -3.5,10.5
       parent: 1
   - uid: 146
     components:
@@ -3260,12 +3249,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-5.5
       parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,10.5
+      parent: 1
 - proto: Gyroscope
   entities:
-  - uid: 185
+  - uid: 618
     components:
     - type: Transform
-      pos: 6.5,6.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,6.5
       parent: 1
 - proto: HospitalCurtains
   entities:
@@ -3281,37 +3288,34 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,9.5
+      pos: 5.5,6.5
       parent: 1
-  - uid: 228
+  - uid: 332
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,8.5
+      pos: 1.5,10.5
       parent: 1
   - uid: 341
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,8.5
+      pos: 5.5,7.5
       parent: 1
-  - uid: 356
+  - uid: 458
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,9.5
+      pos: 3.5,9.5
       parent: 1
-  - uid: 432
+  - uid: 480
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,6.5
+      pos: 2.5,10.5
       parent: 1
-  - uid: 433
+  - uid: 607
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,7.5
+      pos: 5.5,8.5
       parent: 1
 - proto: Icebox
   entities:
@@ -3433,10 +3437,10 @@ entities:
       canCollide: False
 - proto: LockerBotanistFilled
   entities:
-  - uid: 337
+  - uid: 561
     components:
     - type: Transform
-      pos: 3.5,8.5
+      pos: 1.5,7.5
       parent: 1
 - proto: LockerFreezerBase
   entities:
@@ -3447,11 +3451,11 @@ entities:
       parent: 1
 - proto: LockerWallEVAColorServiceWorkerFilled
   entities:
-  - uid: 420
+  - uid: 75
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,9.5
+      pos: -2.5,8.5
       parent: 1
 - proto: LockerWallMaterialsBasicFilled
   entities:
@@ -3463,11 +3467,11 @@ entities:
       parent: 1
 - proto: LockerWallMaterialsFuelUraniumFilled
   entities:
-  - uid: 458
+  - uid: 130
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,8.5
+      pos: -5.5,6.5
       parent: 1
 - proto: MaterialReclaimer
   entities:
@@ -3481,7 +3485,7 @@ entities:
   - uid: 191
     components:
     - type: Transform
-      pos: 2.9839418,8.712855
+      pos: 4.430993,8.650057
       parent: 1
 - proto: NapkinDrum5
   entities:
@@ -3541,14 +3545,22 @@ entities:
       parent: 1
 - proto: NitrogenCanister
   entities:
-  - uid: 115
+  - uid: 127
     components:
     - type: Transform
       anchored: True
-      pos: -1.5,6.5
+      pos: -3.5,8.5
       parent: 1
     - type: Physics
       bodyType: Static
+- proto: NoticeBoardNF
+  entities:
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,9.5
+      parent: 1
 - proto: OilJarCorn
   entities:
   - uid: 214
@@ -3572,45 +3584,37 @@ entities:
       parent: 1
 - proto: OxygenCanister
   entities:
-  - uid: 59
+  - uid: 463
     components:
     - type: Transform
       anchored: True
-      pos: -0.5,6.5
+      pos: -4.5,8.5
       parent: 1
     - type: Physics
       bodyType: Static
 - proto: PaperBin20
   entities:
-  - uid: 252
+  - uid: 356
     components:
     - type: Transform
-      pos: -0.20995831,8.876982
+      pos: -1.7588046,9.852005
       parent: 1
 - proto: Pen
   entities:
-  - uid: 254
+  - uid: 144
     components:
     - type: Transform
-      pos: -0.7255833,9.033232
+      pos: -1.2588046,9.977005
       parent: 1
 - proto: PortableGeneratorSuperPacmanShuttle
   entities:
-  - uid: 230
+  - uid: 121
     components:
     - type: Transform
-      pos: -3.5,8.5
+      pos: -4.5,6.5
       parent: 1
     - type: FuelGenerator
       targetPower: 23000
-- proto: PosterLegitSMFires
-  entities:
-  - uid: 464
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,5.5
-      parent: 1
 - proto: PosterLegitSMPoisoning
   entities:
   - uid: 73
@@ -3628,15 +3632,16 @@ entities:
       parent: 1
 - proto: Poweredlight
   entities:
-  - uid: 66
+  - uid: 81
     components:
     - type: Transform
-      pos: 4.5,8.5
+      pos: -5.5,-2.5
       parent: 1
-  - uid: 81
+  - uid: 135
     components:
     - type: Transform
-      pos: -5.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,7.5
       parent: 1
   - uid: 147
     components:
@@ -3644,11 +3649,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,4.5
       parent: 1
-  - uid: 189
+  - uid: 185
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,7.5
+      pos: -4.5,7.5
       parent: 1
   - uid: 217
     components:
@@ -3689,11 +3694,11 @@ entities:
     - type: Transform
       pos: 6.5,-2.5
       parent: 1
-  - uid: 333
+  - uid: 336
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -0.5,6.5
+      pos: 3.5,9.5
       parent: 1
   - uid: 358
     components:
@@ -3701,6 +3706,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,2.5
       parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
 - proto: PoweredlightGreen
   entities:
   - uid: 329
@@ -3843,6 +3853,13 @@ entities:
       parent: 1
 - proto: ShuttersNormalOpen
   entities:
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 2
   - uid: 305
     components:
     - type: Transform
@@ -3923,41 +3940,48 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       invokeCounter: 3
-  - uid: 576
+  - uid: 467
     components:
     - type: Transform
-      pos: -1.5,10.5
+      pos: -1.5,11.5
       parent: 1
     - type: DeviceLinkSink
-      invokeCounter: 3
-  - uid: 577
+      invokeCounter: 1
+  - uid: 469
     components:
     - type: Transform
-      pos: -0.5,10.5
+      pos: -0.5,11.5
       parent: 1
     - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 578
+      invokeCounter: 1
+  - uid: 471
     components:
     - type: Transform
-      pos: 0.5,10.5
+      pos: 2.5,11.5
       parent: 1
     - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 579
+      invokeCounter: 1
+  - uid: 472
     components:
     - type: Transform
-      pos: 1.5,10.5
+      pos: 0.5,11.5
       parent: 1
     - type: DeviceLinkSink
-      invokeCounter: 2
-  - uid: 580
+      invokeCounter: 1
+  - uid: 476
     components:
     - type: Transform
-      pos: 2.5,10.5
+      pos: 1.5,11.5
       parent: 1
     - type: DeviceLinkSink
-      invokeCounter: 2
+      invokeCounter: 1
+  - uid: 617
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 296
@@ -4022,7 +4046,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 1
-  - uid: 98
+  - uid: 93
     components:
     - type: Transform
       pos: 0.5,10.5
@@ -4033,37 +4057,48 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-5.5
       parent: 1
-  - uid: 123
+  - uid: 279
     components:
     - type: Transform
-      pos: -1.5,10.5
+      pos: -1.5,11.5
       parent: 1
-  - uid: 126
+  - uid: 280
     components:
     - type: Transform
-      pos: 1.5,10.5
+      pos: 0.5,11.5
       parent: 1
-  - uid: 127
+  - uid: 319
     components:
     - type: Transform
-      pos: 2.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,9.5
       parent: 1
-  - uid: 243
+  - uid: 322
     components:
     - type: Transform
-      pos: -0.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,11.5
       parent: 1
-  - uid: 319
+  - uid: 422
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,9.5
+      pos: 1.5,11.5
       parent: 1
-  - uid: 359
+  - uid: 481
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,8.5
+      pos: -2.5,10.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 3.5,10.5
       parent: 1
 - proto: ShuttleWindowDiagonal
   entities:
@@ -4079,77 +4114,70 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-5.5
       parent: 1
-  - uid: 119
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 435
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,10.5
+      pos: 4.5,10.5
       parent: 1
-  - uid: 143
+  - uid: 441
     components:
     - type: Transform
-      pos: -2.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,11.5
       parent: 1
 - proto: SignalButton
   entities:
-  - uid: 298
+  - uid: 103
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,4.25
+      rot: 3.141592653589793 rad
+      pos: 4.75,1.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        147:
-        - Pressed: Toggle
-        315:
-        - Pressed: Toggle
-        50:
-        - Pressed: Toggle
-        242:
-        - Pressed: Toggle
-        300:
+        308:
         - Pressed: Toggle
-        262:
+        309:
         - Pressed: Toggle
-        318:
+        310:
         - Pressed: Toggle
-        260:
+        311:
         - Pressed: Toggle
-        425:
+        312:
         - Pressed: Toggle
-        263:
+        313:
         - Pressed: Toggle
-        259:
+        314:
         - Pressed: Toggle
-        261:
+        307:
         - Pressed: Toggle
-        266:
+        306:
         - Pressed: Toggle
-  - uid: 335
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,6.75
-      parent: 1
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        296:
+        305:
         - Pressed: Toggle
-  - uid: 336
+  - uid: 134
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,8.75
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.75
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        183:
-        - Pressed: DoorBolt
         182:
         - Pressed: DoorBolt
+        183:
+        - Pressed: DoorBolt
         80:
         - Pressed: DoorBolt
         159:
@@ -4158,29 +4186,33 @@ entities:
         - Pressed: DoorBolt
         42:
         - Pressed: DoorBolt
-  - uid: 355
+  - uid: 232
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.25,1.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.25
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        338:
-        - Pressed: DoorBolt
-  - uid: 365
+        296:
+        - Pressed: Toggle
+  - uid: 335
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,8.25
+      pos: -5.5,7.75
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        435:
+        558:
         - Pressed: Toggle
         140:
         - Pressed: Toggle
-        527:
+        285:
+        - Pressed: Toggle
+        136:
+        - Pressed: Toggle
+        254:
         - Pressed: Toggle
         141:
         - Pressed: Toggle
@@ -4188,65 +4220,75 @@ entities:
         - Pressed: Toggle
         137:
         - Pressed: Toggle
-        136:
-        - Pressed: Toggle
-        285:
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,7.25
+      parent: 1
+    - type: SignalSwitch
+      state: True
+    - type: DeviceLinkSource
+      linkedPorts:
+        296:
         - Pressed: Toggle
   - uid: 421
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,2.75
+      rot: 3.141592653589793 rad
+      pos: 4.25,1.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        308:
+        242:
         - Pressed: Toggle
-        309:
+        147:
         - Pressed: Toggle
-        310:
+        315:
         - Pressed: Toggle
-        311:
+        50:
         - Pressed: Toggle
-        312:
+        262:
         - Pressed: Toggle
-        313:
+        300:
         - Pressed: Toggle
-        314:
+        266:
         - Pressed: Toggle
-        307:
+        261:
         - Pressed: Toggle
-        306:
+        318:
         - Pressed: Toggle
-        305:
+        81:
         - Pressed: Toggle
-  - uid: 519
+        259:
+        - Pressed: Toggle
+        263:
+        - Pressed: Toggle
+        425:
+        - Pressed: Toggle
+        260:
+        - Pressed: Toggle
+  - uid: 609
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,7.5
+      pos: 0.5,7.75
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        296:
+        617:
         - Pressed: Toggle
-  - uid: 582
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,6.75
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        576:
+        467:
         - Pressed: Toggle
-        577:
+        469:
         - Pressed: Toggle
-        578:
+        472:
         - Pressed: Toggle
-        579:
+        476:
         - Pressed: Toggle
-        580:
+        471:
+        - Pressed: Toggle
+        143:
         - Pressed: Toggle
 - proto: SignKitchen
   entities:
@@ -4270,14 +4312,15 @@ entities:
       parent: 1
 - proto: SinkWide
   entities:
-  - uid: 422
+  - uid: 465
     components:
     - type: Transform
-      pos: 4.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,6.5
       parent: 1
 - proto: SMESBasic
   entities:
-  - uid: 361
+  - uid: 560
     components:
     - type: Transform
       pos: -3.5,6.5
@@ -4341,11 +4384,11 @@ entities:
       parent: 1
 - proto: SubstationWallBasic
   entities:
-  - uid: 95
+  - uid: 339
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -3.5,5.5
       parent: 1
 - proto: TableCarpet
   entities:
@@ -4373,26 +4416,11 @@ entities:
     - type: Transform
       pos: -2.5,4.5
       parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: 4.5,2.5
-      parent: 1
-  - uid: 187
+  - uid: 132
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -0.5,9.5
-      parent: 1
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -0.5,8.5
-      parent: 1
   - uid: 302
     components:
     - type: Transform
@@ -4420,6 +4448,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,4.5
       parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 1
 - proto: TableWood
   entities:
   - uid: 79
@@ -4500,6 +4544,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,6.5
       parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
   - uid: 284
     components:
     - type: Transform
@@ -4512,29 +4561,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-2.5
       parent: 1
-  - uid: 435
-    components:
-    - type: Transform
-      pos: -5.5,8.5
-      parent: 1
-  - uid: 527
+  - uid: 558
     components:
     - type: Transform
-      pos: 6.5,8.5
+      pos: -6.5,7.5
       parent: 1
 - proto: ToolboxMechanicalFilled
   entities:
-  - uid: 430
+  - uid: 359
     components:
     - type: Transform
-      pos: -3.5058122,6.955002
+      pos: -3.5073605,6.8587217
       parent: 1
 - proto: ToyFigurineChef
   entities:
-  - uid: 253
+  - uid: 547
     components:
     - type: Transform
-      pos: -0.6943333,9.064482
+      pos: -1.2171379,10.029089
       parent: 1
 - proto: VendingMachineBooze
   entities:
@@ -4679,12 +4723,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,5.5
       parent: 1
-  - uid: 45
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,5.5
-      parent: 1
   - uid: 46
     components:
     - type: Transform
@@ -4738,6 +4776,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-1.5
       parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 1
   - uid: 99
     components:
     - type: Transform
@@ -4764,42 +4808,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,2.5
       parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: -7.5,-1.5
-      parent: 1
-  - uid: 128
+  - uid: 115
     components:
     - type: Transform
-      pos: 5.5,8.5
+      pos: -5.5,8.5
       parent: 1
-  - uid: 129
+  - uid: 124
     components:
     - type: Transform
-      pos: 3.5,9.5
+      pos: -7.5,-1.5
       parent: 1
   - uid: 131
     components:
     - type: Transform
       pos: 4.5,9.5
       parent: 1
-  - uid: 132
+  - uid: 139
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,6.5
       parent: 1
-  - uid: 135
+  - uid: 145
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,6.5
+      pos: -3.5,9.5
       parent: 1
-  - uid: 145
+  - uid: 156
     components:
     - type: Transform
-      pos: -3.5,9.5
+      pos: 0.5,7.5
       parent: 1
   - uid: 158
     components:
@@ -4807,21 +4845,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 5.5,7.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      pos: -4.5,7.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      pos: -4.5,8.5
-      parent: 1
   - uid: 168
     components:
     - type: Transform
@@ -4901,17 +4924,51 @@ entities:
     - type: Transform
       pos: -2.5,8.5
       parent: 1
-  - uid: 348
+  - uid: 429
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,6.5
+      pos: 5.5,1.5
       parent: 1
-  - uid: 429
+  - uid: 433
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,9.5
+      parent: 1
+  - uid: 576
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -5.5,7.5
       parent: 1
 - proto: WallShuttleDiagonal
   entities:
@@ -4927,10 +4984,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 1
-  - uid: 117
+  - uid: 118
     components:
     - type: Transform
-      pos: -4.5,9.5
+      pos: -5.5,9.5
       parent: 1
   - uid: 125
     components:
@@ -4938,12 +4995,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-6.5
       parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,9.5
-      parent: 1
   - uid: 268
     components:
     - type: Transform
@@ -4961,24 +5012,11 @@ entities:
     - type: Transform
       pos: -7.5,5.5
       parent: 1
-  - uid: 606
-    components:
-    - type: Transform
-      pos: -6.5,8.5
-      parent: 1
-  - uid: 611
+  - uid: 559
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,8.5
-      parent: 1
-- proto: WarningWaste
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,6.5
+      pos: 6.5,9.5
       parent: 1
 - proto: WarpPoint
   entities:
@@ -4987,11 +5025,4 @@ entities:
     - type: Transform
       pos: 0.5,0.5
       parent: 1
-- proto: Windoor
-  entities:
-  - uid: 338
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
 ...
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png
index 89326979f40..962c993cf45 100644
Binary files a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/nightlight.png differ