diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
index fb22e288160..4faea90a58d 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -9206,13 +9206,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-26.5
       parent: 1
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 797
-    components:
-    - type: Transform
-      pos: 12.5,-24.5
-      parent: 1
 - proto: MaterialReclaimer
   entities:
   - uid: 1446
diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml
index 96bd6b9f386..13f7f6169ce 100644
--- a/Resources/Maps/_NF/Shuttles/crescent.yml
+++ b/Resources/Maps/_NF/Shuttles/crescent.yml
@@ -16773,23 +16773,6 @@ entities:
     - type: Transform
       pos: -17.5,10.5
       parent: 1
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: -23.5,33.5
-      parent: 1
-  - uid: 2247
-    components:
-    - type: Transform
-      pos: -23.5,32.5
-      parent: 1
-  - uid: 2248
-    components:
-    - type: Transform
-      pos: -23.5,31.5
-      parent: 1
 - proto: MachineElectrolysisUnit
   entities:
   - uid: 3691
diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml
index 88b51fa8bdf..7c72835dafb 100644
--- a/Resources/Maps/_NF/Shuttles/spectre.yml
+++ b/Resources/Maps/_NF/Shuttles/spectre.yml
@@ -38,7 +38,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAANwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC
+          tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC
           version: 6
         0,-1:
           ind: 0,-1
@@ -149,11 +149,6 @@ entities:
             id: BrickTileWhiteCornerNe
           decals:
             513: 2,18
-        - node:
-            color: '#5E7C16FF'
-            id: BrickTileWhiteCornerNe
-          decals:
-            472: 7,9
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNe
@@ -177,11 +172,6 @@ entities:
             64: -14,1
             88: 10,0
             108: -8,1
-        - node:
-            color: '#5E7C16FF'
-            id: BrickTileWhiteCornerSe
-          decals:
-            471: 7,8
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSe
@@ -315,6 +305,16 @@ entities:
             59: 1,5
             60: 2,3
             61: 1,3
+        - node:
+            color: '#1861D5FF'
+            id: DeliveryGreyscale
+          decals:
+            542: -1,-6
+        - node:
+            color: '#951710FF'
+            id: DeliveryGreyscale
+          decals:
+            541: -1,-5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -355,6 +355,9 @@ entities:
             475: -6,-4
             514: -1,17
             515: -1,18
+            544: 7,8
+            545: 7,9
+            546: 6,6
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -370,7 +373,6 @@ entities:
             280: 0,13
             281: 0,14
             284: 6,9
-            285: 7,9
             323: 1,10
             347: 0,6
             348: 0,-1
@@ -418,8 +420,6 @@ entities:
             268: 0,16
             269: -1,15
             270: -1,16
-            286: 7,9
-            287: 7,8
             314: 0,11
             318: 0,10
             326: 1,11
@@ -432,8 +432,6 @@ entities:
             id: DirtHeavy
           decals:
             282: 6,9
-            288: 7,8
-            289: 7,9
             290: 6,10
             296: 0,2
             297: -1,2
@@ -728,6 +726,7 @@ entities:
             466: 0,22
             467: 12,2
             520: -1,18
+            543: 6,8
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -780,7 +779,6 @@ entities:
             id: DirtMedium
           decals:
             291: 6,11
-            292: 6,12
             300: 1,2
             301: -1,1
             302: -2,2
@@ -832,11 +830,6 @@ entities:
             id: LoadingArea
           decals:
             49: 1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnBox
-          decals:
-            155: 6,12
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
@@ -859,11 +852,6 @@ entities:
             id: WarnLineGreyscaleN
           decals:
             66: -12,1
-        - node:
-            color: '#5E7C16FF'
-            id: WarnLineGreyscaleN
-          decals:
-            470: 6,6
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleN
@@ -890,11 +878,6 @@ entities:
             id: WarnLineGreyscaleS
           decals:
             501: -12,3
-        - node:
-            color: '#5E7C16FF'
-            id: WarnLineGreyscaleS
-          decals:
-            469: 6,8
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleS
@@ -976,15 +959,9 @@ entities:
             color: '#1D1D2172'
             id: splatter
           decals:
+            487: -5.236245,-3.889092
             539: -4.6765676,-2.645174
             540: -6.1140676,-4.129549
-        - node:
-            cleanable: True
-            angle: 3.141592653589793 rad
-            color: '#1D1D2172'
-            id: splatter
-          decals:
-            487: -5.236245,-3.889092
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
@@ -1032,192 +1009,160 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          -1,0:
-            0: 65535
+            0: 65521
           0,-1:
             0: 65535
+          -1,0:
+            0: 61408
           0,1:
-            0: 65535
+            0: 32767
+          -1,1:
+            0: 52974
           0,2:
-            0: 65535
+            0: 30577
+          -1,2:
+            0: 52416
+            1: 1
           0,3:
-            0: 65535
+            0: 30583
+          -1,3:
+            0: 52428
+          0,4:
+            0: 6007
           1,0:
-            0: 65535
-          1,1:
-            0: 65535
+            0: 61422
           1,2:
             1: 1
+            0: 17612
+          1,1:
+            0: 20206
+          1,-1:
             0: 61166
           1,3:
-            0: 43758
+            0: 4
             1: 1024
           2,0:
-            0: 39935
+            0: 29
             1: 9216
-          2,1:
-            0: 39321
-            1: 546
           2,2:
-            0: 2203
             1: 256
+          2,-1:
+            0: 64977
+          2,1:
+            1: 546
           3,0:
-            0: 14335
+            0: 4471
             1: 18432
           3,1:
-            0: 9011
+            0: 17
           3,2:
-            0: 50
             1: 768
+          3,-1:
+            0: 65527
+          4,0:
+            1: 16
           -4,0:
-            0: 36079
             1: 16912
-          -4,1:
-            0: 34952
+            0: 204
+          -4,-1:
+            0: 65532
           -3,0:
-            0: 15359
+            0: 4375
             1: 33792
           -3,1:
-            0: 9011
+            0: 17
             1: 2184
+          -4,2:
+            1: 2048
           -3,2:
-            0: 562
             1: 256
+          -3,-1:
+            0: 63345
           -2,0:
+            0: 61183
+          -2,-1:
             0: 65535
           -2,1:
-            0: 65535
+            0: 20206
           -2,2:
-            0: 61183
+            0: 17510
             1: 256
           -2,3:
-            0: 44782
-          -1,1:
-            0: 65535
-          -1,2:
-            1: 1
-            0: 61166
-          -1,3:
+            0: 4
+            1: 1024
+          -1,-1:
             0: 61166
+          -1,4:
+            0: 3276
           0,-3:
             1: 1792
-            0: 28672
+          -1,-3:
+            1: 3072
           0,-2:
-            0: 63351
+            0: 29491
             1: 2048
-          1,-1:
-            0: 65535
+          -1,-2:
+            0: 51336
+            1: 512
           1,-3:
-            0: 8736
             1: 192
           1,-2:
-            0: 65262
+            0: 36032
           2,-3:
             1: 16
-            0: 43688
           2,-2:
-            0: 48059
-          2,-1:
-            0: 65535
-          2,-4:
-            0: 32768
+            0: 272
           3,-4:
-            1: 61440
+            1: 28672
+            2: 32768
           3,-3:
-            0: 65416
+            0: 28672
           3,-2:
-            0: 65535
-          3,-1:
-            0: 65535
-          0,4:
-            0: 65535
+            0: 29303
+          4,-2:
+            1: 8448
+          4,-1:
+            0: 13104
           0,5:
-            0: 65527
+            0: 12595
             1: 8
+          -1,5:
+            0: 32904
+            1: 2
           0,6:
-            0: 30719
+            0: 819
+          -1,6:
+            0: 2184
           0,7:
-            0: 30519
             1: 64
           1,4:
-            0: 46
             1: 192
-          -4,-4:
-            1: 57344
-          -4,-3:
-            0: 60962
           -4,-2:
             1: 256
-            0: 65262
-          -4,-1:
-            0: 65535
+            0: 51404
+          -5,-2:
+            1: 32768
+          -5,-1:
+            0: 34944
+          -4,-4:
+            2: 8192
+            1: 49152
+          -4,-3:
+            0: 49152
           -3,-4:
             1: 4096
-            0: 8192
           -3,-3:
-            0: 48034
+            0: 4096
           -3,-2:
-            0: 48059
-          -3,-1:
-            0: 65535
+            0: 4113
           -2,-3:
             1: 112
-            0: 34944
           -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
-          -1,-1:
-            0: 65535
-          -1,-2:
-            0: 64716
-            1: 512
-          -1,-3:
-            1: 3072
-            0: 49152
+            0: 10096
           -2,4:
-            0: 142
             1: 96
-          -1,4:
-            0: 61166
-          -1,5:
-            1: 2
-            0: 61164
-          -1,6:
-            0: 52462
           -1,7:
-            0: 52364
             1: 64
-          -1,8:
-            0: 52428
-          -1,9:
-            0: 52428
-          -1,10:
-            0: 1092
-          0,8:
-            0: 30583
-          0,9:
-            0: 30583
-          0,10:
-            0: 1092
-          -4,2:
-            0: 136
-            1: 2048
-          -5,-2:
-            1: 32768
-          -5,-1:
-            0: 34952
-          4,-2:
-            1: 8448
-            0: 4096
-          4,-1:
-            0: 13107
-          4,0:
-            0: 3
-            1: 16
-          -5,0:
-            0: 8
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1234,6 +1179,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1264,16 +1224,11 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 908
-      - 907
-      - 909
       - 1103
       - 1101
       - 969
       - 967
       - 978
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 54
     components:
     - type: Transform
@@ -1288,8 +1243,6 @@ entities:
       - 992
       - 964
       - 682
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 905
     components:
     - type: Transform
@@ -1304,15 +1257,11 @@ entities:
       - 1112
       - 534
       - 1114
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 972
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 989
     components:
     - type: Transform
@@ -1320,16 +1269,11 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 912
-      - 911
-      - 910
       - 1090
       - 1091
       - 962
       - 966
       - 977
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 990
     components:
     - type: Transform
@@ -1344,8 +1288,6 @@ entities:
       - 975
       - 1092
       - 1096
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 991
     components:
     - type: Transform
@@ -1360,8 +1302,6 @@ entities:
       - 1104
       - 1094
       - 1097
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1045
     components:
     - type: Transform
@@ -1374,8 +1314,6 @@ entities:
       - 535
       - 963
       - 1110
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: AirCanister
   entities:
   - uid: 473
@@ -1383,8 +1321,6 @@ entities:
     - type: Transform
       pos: 0.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: Airlock
   entities:
   - uid: 330
@@ -1501,16 +1437,13 @@ entities:
     - type: Transform
       pos: -11.5,2.5
       parent: 3
-- proto: AirlockMercenaryGlass
+- proto: AirlockScience
   entities:
-  - uid: 1007
+  - uid: 62
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 6.5,7.5
       parent: 3
-- proto: AirlockScience
-  entities:
   - uid: 1018
     components:
     - type: Transform
@@ -1654,28 +1587,18 @@ entities:
       injecting: True
     - type: ContainerContainer
       containers:
-        AmeFuel: !type:ContainerSlot
+        fuelSlot: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: 32
+          ent: 201
 - proto: AmeJar
   entities:
-  - uid: 32
+  - uid: 201
     components:
     - type: Transform
       parent: 202
     - type: Physics
       canCollide: False
-  - uid: 1037
-    components:
-    - type: Transform
-      pos: 0.7160515,-2.5026875
-      parent: 3
-  - uid: 1207
-    components:
-    - type: Transform
-      pos: 0.30980158,-2.5026875
-      parent: 3
 - proto: AmeShielding
   entities:
   - uid: 14
@@ -1804,60 +1727,60 @@ entities:
     - type: Transform
       pos: 11.5,1.5
       parent: 3
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-1.5
+      parent: 3
   - uid: 416
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -16.5,-0.5
       parent: 3
   - uid: 419
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-0.5
       parent: 3
   - uid: 420
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 17.5,-2.5
       parent: 3
-  - uid: 505
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-0.5
-      parent: 3
-  - uid: 741
+  - uid: 468
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 17.5,-1.5
       parent: 3
-  - uid: 742
+  - uid: 505
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-2.5
       parent: 3
-  - uid: 1105
+  - uid: 528
     components:
     - type: Transform
       pos: -12.5,-5.5
       parent: 3
-  - uid: 1106
+  - uid: 546
     components:
     - type: Transform
       pos: -6.5,-4.5
       parent: 3
-  - uid: 1108
+  - uid: 557
     components:
     - type: Transform
       pos: 7.5,-4.5
       parent: 3
-  - uid: 1109
+  - uid: 642
     components:
     - type: Transform
       pos: 13.5,-5.5
@@ -1879,6 +1802,11 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 3
+  - uid: 625
+    components:
+    - type: Transform
+      pos: -5.5,14.5
+      parent: 3
   - uid: 1107
     components:
     - type: Transform
@@ -2178,6 +2106,14 @@ entities:
     - type: Transform
       pos: -9.5,0.5
       parent: 3
+- proto: BaseAdvancedPen
+  entities:
+  - uid: 1032
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.2843938,24.057287
+      parent: 3
 - proto: Bed
   entities:
   - uid: 876
@@ -2211,7 +2147,6 @@ entities:
       parent: 3
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaCorpLeft
@@ -2222,8 +2157,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,16.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 637
@@ -2232,8 +2165,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,17.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 549
@@ -2241,8 +2172,6 @@ entities:
     - type: Transform
       pos: 1.5,18.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoor
   entities:
   - uid: 1026
@@ -2250,17 +2179,11 @@ entities:
     - type: Transform
       pos: 13.5,-9.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 762
   - uid: 1027
     components:
     - type: Transform
       pos: 7.5,-7.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 766
   - uid: 1028
     components:
     - type: Transform
@@ -2268,16 +2191,11 @@ entities:
       parent: 3
     - type: DeviceLinkSink
       invokeCounter: 4
-      links:
-      - 767
   - uid: 1029
     components:
     - type: Transform
       pos: -12.5,-9.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 765
 - proto: BlockGameArcade
   entities:
   - uid: 98
@@ -3609,36 +3527,19 @@ entities:
     - type: Transform
       pos: 13.5,1.5
       parent: 3
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-5.5
-      parent: 3
 - proto: ClothingBeltUtilityEngineering
   entities:
   - uid: 641
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: 3.4289713,-0.46644413
       parent: 3
 - proto: ClothingEyesGlassesThermal
   entities:
   - uid: 996
     components:
     - type: Transform
-      pos: 3.5,-0.5
-      parent: 3
-- proto: ClothingHandsGlovesRobohands
-  entities:
-  - uid: 1086
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
+      pos: 3.6373043,-0.47686076
       parent: 3
 - proto: ClothingNeckTieSci
   entities:
@@ -3711,11 +3612,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 3
-  - uid: 442
+  - uid: 1016
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,23.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,24.5
       parent: 3
 - proto: ComputerTabletopShuttle
   entities:
@@ -3740,34 +3641,23 @@ entities:
       parent: 3
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 533
+  - uid: 427
     components:
     - type: Transform
-      pos: -14.5,0.5
+      pos: -15.5,0.5
       parent: 3
-    - type: Physics
-      canCollide: False
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
-    - type: ItemSlots
   - uid: 665
     components:
     - type: Transform
-      pos: 15.5,0.5
+      pos: 16.5,0.5
       parent: 3
-    - type: Physics
-      canCollide: False
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
-    - type: ItemSlots
 - proto: CrateArtifactContainer
   entities:
+  - uid: 553
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 3
   - uid: 1039
     components:
     - type: Transform
@@ -4014,22 +3904,6 @@ entities:
     - type: Transform
       pos: 2.5,14.5
       parent: 3
-- proto: EncryptionKeyCommon
-  entities:
-  - uid: 587
-    components:
-    - type: Transform
-      parent: 998
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeyTraffic
-  entities:
-  - uid: 1000
-    components:
-    - type: Transform
-      parent: 998
-    - type: Physics
-      canCollide: False
 - proto: ExosuitFabricator
   entities:
   - uid: 735
@@ -4059,10 +3933,10 @@ entities:
       parent: 3
 - proto: FaxMachineShip
   entities:
-  - uid: 655
+  - uid: 32
     components:
     - type: Transform
-      pos: 7.5,9.5
+      pos: 1.5,23.5
       parent: 3
 - proto: filingCabinetRandom
   entities:
@@ -4080,14 +3954,9 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 912
-      - 911
-      - 910
       - 1090
       - 1091
       - 1035
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 906
     components:
     - type: Transform
@@ -4095,14 +3964,9 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 908
-      - 907
-      - 909
       - 1103
       - 1101
       - 1100
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 210
@@ -4111,62 +3975,46 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,15.5
       parent: 3
-- proto: FirelockGlass
+- proto: FirelockEdge
   entities:
-  - uid: 907
+  - uid: 175
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 908
+  - uid: 566
     components:
     - type: Transform
-      pos: 14.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 909
+  - uid: 732
     components:
     - type: Transform
-      pos: 12.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 910
+  - uid: 907
     components:
     - type: Transform
-      pos: -13.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -11.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
-  - uid: 911
+  - uid: 908
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -12.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
-  - uid: 912
+  - uid: 909
     components:
     - type: Transform
-      pos: -11.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
+- proto: FirelockGlass
+  entities:
   - uid: 1035
     components:
     - type: Transform
@@ -4331,16 +4179,17 @@ entities:
     - type: Transform
       pos: -4.5,-0.5
       parent: 3
-- proto: GasMixer
+- proto: GasMixerOn
   entities:
-  - uid: 455
+  - uid: 459
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
@@ -4350,8 +4199,6 @@ entities:
     - type: Transform
       pos: 6.5,14.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1062
@@ -4360,32 +4207,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1063
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1064
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: GasPipeBend
   entities:
   - uid: 456
@@ -4394,6 +4233,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-5.5
       parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 457
     components:
     - type: Transform
@@ -4499,14 +4340,7 @@ entities:
   - uid: 19
     components:
     - type: Transform
-      pos: 6.5,7.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 6.5,8.5
+      pos: 6.5,7.5
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -4526,13 +4360,6 @@ entities:
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 6.5,9.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 235
     components:
     - type: Transform
@@ -4689,6 +4516,14 @@ entities:
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 680
     components:
     - type: Transform
@@ -5368,6 +5203,22 @@ entities:
       parent: 3
 - proto: GasPipeTJunction
   entities:
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,8.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,9.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 469
     components:
     - type: Transform
@@ -5472,30 +5323,36 @@ entities:
       color: '#0055CCFF'
 - proto: GasPort
   entities:
+  - uid: 450
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,8.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-5.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-  - uid: 1031
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 655
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1054
@@ -5503,85 +5360,55 @@ entities:
     - type: Transform
       pos: 12.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1055
     components:
     - type: Transform
       pos: 14.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1056
     components:
     - type: Transform
       pos: -11.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1057
     components:
     - type: Transform
       pos: -13.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: GasPressurePump
   entities:
-  - uid: 236
-    components:
-    - type: MetaData
-      name: waste pump
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,11.5
-      parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 468
-    components:
-    - type: MetaData
-      name: distro pump
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1058
     components:
     - type: Transform
       pos: -11.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1059
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1060
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1061
     components:
     - type: Transform
       pos: 12.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,11.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentPump
   entities:
   - uid: 963
@@ -5593,8 +5420,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 1045
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 964
@@ -5606,8 +5431,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 965
@@ -5619,8 +5442,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 990
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 966
@@ -5654,8 +5475,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 991
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 973
@@ -5664,8 +5483,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 984
@@ -5673,8 +5490,6 @@ entities:
     - type: Transform
       pos: 12.5,3.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1114
@@ -5685,8 +5500,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 905
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -5699,8 +5512,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 905
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 535
@@ -5712,8 +5523,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 1045
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 682
@@ -5725,8 +5534,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 958
@@ -5735,8 +5542,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 959
@@ -5748,8 +5553,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 991
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 962
@@ -5761,8 +5564,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 989
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 969
@@ -5774,8 +5575,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 17
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 970
@@ -5787,8 +5586,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 990
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -5863,6 +5660,11 @@ entities:
     - type: Transform
       pos: -0.5,8.5
       parent: 3
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 3
   - uid: 562
     components:
     - type: Transform
@@ -5927,11 +5729,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,6.5
       parent: 3
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -5.5,14.5
-      parent: 3
   - uid: 618
     components:
     - type: Transform
@@ -6111,6 +5908,14 @@ entities:
     - type: Transform
       pos: 8.5,0.5
       parent: 3
+- proto: LockerWallMaterialsFuelAmeJarFilled
+  entities:
+  - uid: 742
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-5.5
+      parent: 3
 - proto: MachineAnomalyGenerator
   entities:
   - uid: 400
@@ -6151,21 +5956,11 @@ entities:
     - type: Transform
       pos: -12.5,-7.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 662
   - uid: 1038
     components:
     - type: Transform
       pos: 13.5,-7.5
       parent: 3
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -11.5,5.5
-      parent: 3
 - proto: MachineFrame
   entities:
   - uid: 80
@@ -6203,8 +5998,14 @@ entities:
     - type: Transform
       pos: -0.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+  - uid: 741
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,-4.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
 - proto: OperatingTable
   entities:
   - uid: 405
@@ -6219,28 +6020,33 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-- proto: PaperBin10
-  entities:
-  - uid: 994
+  - uid: 651
     components:
     - type: Transform
-      pos: 7.5,8.5
+      anchored: True
+      pos: -0.5,-5.5
       parent: 3
-- proto: PaperCaptainsThoughts
+    - type: Physics
+      bodyType: Static
+- proto: PaperBin20
   entities:
-  - uid: 1206
+  - uid: 1031
     components:
     - type: Transform
-      pos: -5.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 1.7531438,23.885412
       parent: 3
 - proto: PortableScrubber
   entities:
-  - uid: 1032
+  - uid: 77
     components:
     - type: Transform
-      pos: 6.5,12.5
+      pos: 7.5,9.5
+      parent: 3
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 7.5,8.5
       parent: 3
 - proto: PosterContrabandAtmosiaDeclarationIndependence
   entities:
@@ -6500,11 +6306,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-0.5
       parent: 3
-  - uid: 201
+  - uid: 455
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-4.5
       parent: 3
 - proto: RandomDrinkGlass
   entities:
@@ -6776,11 +6582,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,27.5
       parent: 3
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 5.5,11.5
-      parent: 3
   - uid: 895
     components:
     - type: Transform
@@ -6793,11 +6594,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,27.5
       parent: 3
-  - uid: 1044
-    components:
-    - type: Transform
-      pos: -5.5,14.5
-      parent: 3
   - uid: 1067
     components:
     - type: Transform
@@ -6950,13 +6746,13 @@ entities:
     - type: Transform
       pos: 4.5,3.5
       parent: 3
-- proto: SignAtmosMinsky
+- proto: SignAtmos
   entities:
-  - uid: 459
+  - uid: 1002
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 3
 - proto: SignBar
   entities:
@@ -7054,27 +6850,19 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 3
-- proto: SignScience1
+- proto: SignScience
   entities:
-  - uid: 745
+  - uid: 738
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -16.5,-3.5
-      parent: 3
-  - uid: 1227
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,19.5
+      pos: 17.5,-3.5
       parent: 3
-- proto: SignScience2
-  entities:
-  - uid: 738
+  - uid: 745
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 17.5,-3.5
+      pos: -16.5,-3.5
       parent: 3
   - uid: 1226
     components:
@@ -7082,6 +6870,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,19.5
       parent: 3
+  - uid: 1227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,19.5
+      parent: 3
 - proto: SignSurgery
   entities:
   - uid: 398
@@ -7113,20 +6907,6 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 3
-- proto: SolidSecretDoor
-  entities:
-  - uid: 625
-    components:
-    - type: Transform
-      pos: -5.5,12.5
-      parent: 3
-- proto: SpawnMobSmile
-  entities:
-  - uid: 1211
-    components:
-    - type: Transform
-      pos: 0.5,14.5
-      parent: 3
 - proto: SpawnPointLatejoin
   entities:
   - uid: 1339
@@ -7166,15 +6946,11 @@ entities:
     - type: Transform
       pos: 1.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1213
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: SubstationBasic
   entities:
   - uid: 341
@@ -7281,18 +7057,6 @@ entities:
     - type: Transform
       pos: 1.5,17.5
       parent: 3
-- proto: TableCounterMetal
-  entities:
-  - uid: 450
-    components:
-    - type: Transform
-      pos: 7.5,9.5
-      parent: 3
-  - uid: 451
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 3
 - proto: TableReinforced
   entities:
   - uid: 6
@@ -7320,6 +7084,12 @@ entities:
     - type: Transform
       pos: 1.5,23.5
       parent: 3
+  - uid: 994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,24.5
+      parent: 3
 - proto: TableWoodReinforced
   entities:
   - uid: 167
@@ -7347,35 +7117,18 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 3
-  - uid: 553
+  - uid: 617
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -0.5,14.5
       parent: 3
 - proto: TelecomServerFilledShuttle
   entities:
-  - uid: 998
+  - uid: 587
     components:
     - type: Transform
-      pos: -5.5,11.5
+      pos: -5.5,12.5
       parent: 3
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1000
-          - 587
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: Thruster
   entities:
   - uid: 21
@@ -7417,12 +7170,6 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 3
-  - uid: 62
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-10.5
-      parent: 3
   - uid: 64
     components:
     - type: Transform
@@ -7498,12 +7245,6 @@ entities:
     - type: Transform
       pos: -5.5,17.5
       parent: 3
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-10.5
-      parent: 3
   - uid: 560
     components:
     - type: Transform
@@ -7522,13 +7263,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-9.5
       parent: 3
-- proto: ToyAi
-  entities:
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: 0.5,3.5
-      parent: 3
 - proto: VendingMachineBooze
   entities:
   - uid: 552
@@ -7543,26 +7277,12 @@ entities:
     - type: Transform
       pos: 2.5,7.5
       parent: 3
-- proto: VendingMachineGeneDrobe
-  entities:
-  - uid: 558
-    components:
-    - type: Transform
-      pos: -5.5,13.5
-      parent: 3
-- proto: VendingMachineRoboDrobe
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      pos: -7.5,-3.5
-      parent: 3
 - proto: VendingMachineRobotics
   entities:
-  - uid: 175
+  - uid: 739
     components:
     - type: Transform
-      pos: -7.5,-2.5
+      pos: -7.5,-3.5
       parent: 3
 - proto: VendingMachineSciDrobe
   entities:
@@ -9190,6 +8910,12 @@ entities:
       parent: 3
 - proto: WarningWaste
   entities:
+  - uid: 234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 3
   - uid: 997
     components:
     - type: Transform
@@ -9219,6 +8945,16 @@ entities:
       parent: 3
 - proto: Window
   entities:
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 3
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 3
   - uid: 1204
     components:
     - type: Transform