From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 20 Aug 2024 03:48:17 +0000 (-0600)
Subject: bagel update (#31228)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=800b4a7c29b6c22ff053d8d348aa2f7b92328fdd;p=space-station-14.git

bagel update (#31228)

* bagel update

* remove invalid
---

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index c2e48b0bf3..555827c7b6 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -210,7 +210,7 @@ entities:
           version: 6
         -4,0:
           ind: -4,0
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAABcAAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACLwAAAAABHwAAAAADLwAAAAABHwAAAAADLwAAAAAAHwAAAAADLwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAADTQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACfgAAAAAAOAAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABcAAAAAACcAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAAAcAAAAAADHwAAAAACHwAAAAABHwAAAAAAKAAAAAABHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAfgAAAAAAHwAAAAADKAAAAAACKAAAAAABKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAABcAAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACLwAAAAABHwAAAAADLwAAAAABHwAAAAADLwAAAAAAHwAAAAADLwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACfgAAAAAAOAAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAKAAAAAABHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADKAAAAAACKAAAAAABKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAA
           version: 6
         -4,-3:
           ind: -4,-3
@@ -294,7 +294,7 @@ entities:
           version: 6
         -4,1:
           ind: -4,1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACZAAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABKAAAAAACTwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACegAAAAABegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABZAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAXQAAAAAATgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAZAAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACegAAAAABegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABZAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAXQAAAAAATgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAZAAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA
           version: 6
         -2,1:
           ind: -2,1
@@ -541,6 +541,12 @@ entities:
             3691: -40,-4
             3734: -8,51
             3735: -8,43
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            3981: -55,14
         - node:
             color: '#FFFFFFFF'
             id: ArrowsGreyscale
@@ -611,8 +617,6 @@ entities:
             1066: -26,2
             1221: -52,13
             1222: -50,13
-            1231: -55,16
-            1232: -56,16
             1264: -58,-4
             1265: -57,-4
             1266: -56,-4
@@ -642,7 +646,6 @@ entities:
             1979: -41,-10
             1997: -42,-8
             2007: -57,7
-            2008: -57,14
             2009: -44,-4
             2057: -40,-20
             2139: -11,32
@@ -693,6 +696,8 @@ entities:
             3896: -13,11
             3941: -5,17
             3954: 13,-14
+            3979: -56,13
+            3980: -54,13
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -1006,6 +1011,7 @@ entities:
             1130: -52,5
             1938: -46,-4
             1990: -43,12
+            3968: -57,14
         - node:
             color: '#DE3A3A96'
             id: BrickTileSteelCornerNw
@@ -1066,6 +1072,7 @@ entities:
             1918: -50,-9
             1932: -46,-11
             1991: -43,11
+            3966: -57,11
         - node:
             color: '#DE3A3A96'
             id: BrickTileSteelCornerSw
@@ -1080,6 +1087,7 @@ entities:
             908: -51,14
             1898: -50,4
             1904: -48,0
+            3973: -55,14
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
@@ -1101,6 +1109,7 @@ entities:
           decals:
             907: -51,14
             1131: -52,4
+            3972: -55,14
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
@@ -1205,6 +1214,9 @@ entities:
             1939: -45,-4
             1940: -44,-4
             1941: -43,-4
+            3969: -56,14
+            3970: -54,14
+            3971: -53,14
         - node:
             color: '#DE3A3A96'
             id: BrickTileSteelLineN
@@ -1250,6 +1262,8 @@ entities:
             1993: -41,11
             1994: -42,11
             2010: -45,-11
+            3964: -53,11
+            3965: -54,11
         - node:
             color: '#DE3A3A96'
             id: BrickTileSteelLineS
@@ -1305,6 +1319,7 @@ entities:
             2049: -45,7
             2050: -45,8
             2051: -45,9
+            3967: -57,12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
@@ -1839,14 +1854,6 @@ entities:
             id: BrickTileWhiteLineS
           decals:
             808: -44,6
-        - node:
-            color: '#D381C996'
-            id: BrickTileWhiteLineS
-          decals:
-            2000: -54,14
-            2001: -55,14
-            2002: -56,14
-            2003: -57,14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -2100,7 +2107,6 @@ entities:
           decals:
             1067: -27,-1
             1662: -9,-21
-            2511: -55,17
             3839: -26,32
         - node:
             color: '#DE3A3A96'
@@ -2288,22 +2294,6 @@ entities:
             339: -56,9
             340: -55,9
             341: -54,9
-            342: -54,10
-            343: -55,10
-            344: -56,10
-            345: -57,10
-            346: -57,11
-            347: -56,11
-            348: -55,11
-            349: -54,11
-            350: -54,12
-            351: -55,12
-            352: -56,12
-            353: -57,12
-            354: -57,13
-            355: -56,13
-            356: -55,13
-            357: -54,13
         - node:
             color: '#D4D4D406'
             id: CheckerNWSE
@@ -2891,7 +2881,6 @@ entities:
             451: -39,24
             452: -42,22
             453: -43,21
-            454: -56,16
             460: -58,20
             461: -59,18
             462: -60,17
@@ -4883,10 +4872,6 @@ entities:
             id: QuarterTileOverlayGreyscale90
           decals:
             1596: -35,9
-            2506: -55,17
-            2507: -56,17
-            2508: -57,17
-            2509: -54,17
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
@@ -5501,6 +5486,7 @@ entities:
             3329: -27,40
             3339: -15,42
             3870: -25,-1
+            3963: -54,6
         - node:
             color: '#52B4E996'
             id: WarnFullGreyscale
@@ -5511,6 +5497,8 @@ entities:
             id: WarnFullGreyscale
           decals:
             1999: -58,0
+            3977: -56,10
+            3978: -55,10
         - node:
             color: '#FFFFFFFF'
             id: WarnFullGreyscale
@@ -5537,7 +5525,6 @@ entities:
             862: -12,3
             863: -12,4
             864: -12,5
-            909: -54,16
             1353: -2,32
             1354: -2,33
             1355: -2,34
@@ -5556,13 +5543,11 @@ entities:
             1775: 17,-9
             1787: -21,26
             1850: -15,-3
-            1891: -54,6
             1894: -52,1
             1895: -48,1
             2113: -2,25
             2268: -3,26
             2269: -3,22
-            2510: -54,17
             2845: 45,-16
             3041: 3,34
             3042: 3,35
@@ -5708,6 +5693,8 @@ entities:
             1235: -54,2
             1238: -56,2
             1998: -58,1
+            3974: -56,11
+            3975: -55,11
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleS
@@ -5810,6 +5797,7 @@ entities:
             3542: 5,-56
             3543: 5,-55
             3544: 5,-54
+            3976: -57,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -5854,6 +5842,8 @@ entities:
             3333: -16,42
             3744: -7,31
             3745: -6,31
+            3961: -56,6
+            3962: -55,6
         - node:
             color: '#DE3A3A96'
             id: WarnLineS
@@ -5892,7 +5882,6 @@ entities:
             1776: 15,-9
             1786: -23,26
             1849: -17,-3
-            1892: -56,6
             1893: -54,1
             1896: -50,1
             2114: 2,25
@@ -7639,17 +7628,17 @@ entities:
           -15,1:
             0: 45175
           -15,2:
-            0: 47547
+            0: 45499
           -15,3:
             0: 15355
           -15,4:
-            0: 29439
+            0: 29303
           -14,1:
-            0: 30591
+            0: 30527
           -14,2:
-            0: 30583
+            0: 62327
           -14,3:
-            0: 1919
+            0: 12287
           -14,4:
             0: 28791
           -13,4:
@@ -9378,8 +9367,8 @@ entities:
           id: docking43669
           localAnchorB: -47.5,-40
           localAnchorA: 0.5,0
-          damping: 1560.1519
-          stiffness: 14003.891
+          damping: 1560.1493
+          stiffness: 14003.869
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 2133
@@ -9481,6 +9470,17 @@ entities:
       - 8957
       - 6018
       - 8388
+  - uid: 7065
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -57.5,7.5
+      parent: 60
+    - type: DeviceList
+      devices:
+      - 9471
+      - 9382
+      - 9674
   - uid: 7116
     components:
     - type: Transform
@@ -9558,9 +9558,10 @@ entities:
       parent: 60
     - type: DeviceList
       devices:
-      - 21628
-      - 9631
       - 9651
+      - 9428
+      - 9631
+      - 9472
   - uid: 12192
     components:
     - type: Transform
@@ -13084,11 +13085,6 @@ entities:
     - type: Transform
       pos: -57.5,0.5
       parent: 60
-  - uid: 9473
-    components:
-    - type: Transform
-      pos: -53.5,5.5
-      parent: 60
   - uid: 9479
     components:
     - type: MetaData
@@ -13096,6 +13092,12 @@ entities:
     - type: Transform
       pos: -35.5,13.5
       parent: 60
+  - uid: 9573
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -55.5,10.5
+      parent: 60
   - uid: 9578
     components:
     - type: MetaData
@@ -13103,17 +13105,21 @@ entities:
     - type: Transform
       pos: -50.5,15.5
       parent: 60
-  - uid: 9630
+  - uid: 11564
     components:
-    - type: MetaData
-      name: Lockers-Xenoarch
     - type: Transform
-      pos: -52.5,12.5
+      pos: -55.5,5.5
       parent: 60
-  - uid: 11564
+  - uid: 13862
     components:
     - type: Transform
-      pos: -55.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: -54.5,10.5
+      parent: 60
+  - uid: 15200
+    components:
+    - type: Transform
+      pos: -54.5,15.5
       parent: 60
 - proto: AirlockScienceLocked
   entities:
@@ -13370,6 +13376,9 @@ entities:
     - type: Transform
       pos: -54.5,9.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 7065
   - uid: 12571
     components:
     - type: Transform
@@ -13767,13 +13776,6 @@ entities:
     - type: Transform
       pos: 8.465609,23.526558
       parent: 60
-- proto: AnalysisComputerCircuitboard
-  entities:
-  - uid: 9455
-    components:
-    - type: Transform
-      pos: -53.57029,14.702276
-      parent: 60
 - proto: AnomalyScanner
   entities:
   - uid: 9421
@@ -13948,6 +13950,14 @@ entities:
     - type: Transform
       pos: 36.5,-15.5
       parent: 60
+  - uid: 6162
+    components:
+    - type: MetaData
+      name: RND APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -41.5,-11.5
+      parent: 60
   - uid: 6263
     components:
     - type: MetaData
@@ -14049,14 +14059,6 @@ entities:
     - type: Transform
       pos: -44.5,15.5
       parent: 60
-  - uid: 9571
-    components:
-    - type: MetaData
-      name: RND APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.5,-11.5
-      parent: 60
   - uid: 9694
     components:
     - type: MetaData
@@ -14335,13 +14337,6 @@ entities:
     - type: Transform
       pos: 10.5,2.5
       parent: 60
-- proto: ArtifactAnalyzerMachineCircuitboard
-  entities:
-  - uid: 9437
-    components:
-    - type: Transform
-      pos: -53.47654,14.530401
-      parent: 60
 - proto: Ashtray
   entities:
   - uid: 9547
@@ -16606,13 +16601,12 @@ entities:
     - type: Transform
       pos: -48.5,15.5
       parent: 60
-- proto: ButtonFrameExit
+- proto: ButtonFrameCautionSecurity
   entities:
-  - uid: 15263
+  - uid: 5659
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -52.5,14.5
+      pos: -52.5,15.5
       parent: 60
 - proto: CableApcExtension
   entities:
@@ -17026,6 +17020,11 @@ entities:
     - type: Transform
       pos: -60.5,-22.5
       parent: 60
+  - uid: 3331
+    components:
+    - type: Transform
+      pos: -41.5,-11.5
+      parent: 60
   - uid: 3348
     components:
     - type: Transform
@@ -19031,6 +19030,11 @@ entities:
     - type: Transform
       pos: -46.5,16.5
       parent: 60
+  - uid: 9630
+    components:
+    - type: Transform
+      pos: -54.5,14.5
+      parent: 60
   - uid: 9866
     components:
     - type: Transform
@@ -19806,11 +19810,6 @@ entities:
     - type: Transform
       pos: -42.5,-16.5
       parent: 60
-  - uid: 10176
-    components:
-    - type: Transform
-      pos: -42.5,-11.5
-      parent: 60
   - uid: 10177
     components:
     - type: Transform
@@ -19866,11 +19865,6 @@ entities:
     - type: Transform
       pos: -40.5,-12.5
       parent: 60
-  - uid: 10188
-    components:
-    - type: Transform
-      pos: -42.5,-10.5
-      parent: 60
   - uid: 10189
     components:
     - type: Transform
@@ -19936,11 +19930,6 @@ entities:
     - type: Transform
       pos: -41.5,-9.5
       parent: 60
-  - uid: 10202
-    components:
-    - type: Transform
-      pos: -40.5,-9.5
-      parent: 60
   - uid: 10203
     components:
     - type: Transform
@@ -26751,6 +26740,11 @@ entities:
     - type: Transform
       pos: -27.5,26.5
       parent: 60
+  - uid: 15837
+    components:
+    - type: Transform
+      pos: -41.5,-10.5
+      parent: 60
   - uid: 15840
     components:
     - type: Transform
@@ -32166,6 +32160,16 @@ entities:
     - type: Transform
       pos: 12.5,-10.5
       parent: 60
+  - uid: 24671
+    components:
+    - type: Transform
+      pos: -54.5,15.5
+      parent: 60
+  - uid: 24672
+    components:
+    - type: Transform
+      pos: -54.5,16.5
+      parent: 60
 - proto: CableApcStack
   entities:
   - uid: 9517
@@ -42751,11 +42755,21 @@ entities:
     - type: Transform
       pos: 36.5,-16.5
       parent: 60
+  - uid: 6159
+    components:
+    - type: Transform
+      pos: -41.5,-12.5
+      parent: 60
   - uid: 6161
     components:
     - type: Transform
       pos: -3.5,-55.5
       parent: 60
+  - uid: 6166
+    components:
+    - type: Transform
+      pos: -53.5,4.5
+      parent: 60
   - uid: 6170
     components:
     - type: Transform
@@ -42801,6 +42815,11 @@ entities:
     - type: Transform
       pos: -9.5,-54.5
       parent: 60
+  - uid: 6583
+    components:
+    - type: Transform
+      pos: -41.5,-11.5
+      parent: 60
   - uid: 6643
     components:
     - type: Transform
@@ -43241,6 +43260,11 @@ entities:
     - type: Transform
       pos: 33.5,-16.5
       parent: 60
+  - uid: 9437
+    components:
+    - type: Transform
+      pos: -54.5,4.5
+      parent: 60
   - uid: 9495
     components:
     - type: Transform
@@ -43501,11 +43525,6 @@ entities:
     - type: Transform
       pos: -54.5,5.5
       parent: 60
-  - uid: 9744
-    components:
-    - type: Transform
-      pos: -53.5,5.5
-      parent: 60
   - uid: 9745
     components:
     - type: Transform
@@ -43566,11 +43585,6 @@ entities:
     - type: Transform
       pos: -42.5,-12.5
       parent: 60
-  - uid: 9766
-    components:
-    - type: Transform
-      pos: -42.5,-11.5
-      parent: 60
   - uid: 9767
     components:
     - type: Transform
@@ -55908,11 +55922,6 @@ entities:
       parent: 60
 - proto: ChairOfficeDark
   entities:
-  - uid: 1278
-    components:
-    - type: Transform
-      pos: -54.5,13.5
-      parent: 60
   - uid: 1379
     components:
     - type: Transform
@@ -55986,12 +55995,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -42.5,8.5
       parent: 60
-  - uid: 5659
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -53.5,8.5
-      parent: 60
   - uid: 5799
     components:
     - type: Transform
@@ -56107,12 +56110,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 7536
-  - uid: 11404
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -54.5,9.5
-      parent: 60
   - uid: 11685
     components:
     - type: Transform
@@ -56135,6 +56132,11 @@ entities:
     - type: Transform
       pos: 41.5,-0.5
       parent: 60
+  - uid: 13590
+    components:
+    - type: Transform
+      pos: -54.34717,7.772402
+      parent: 60
   - uid: 13659
     components:
     - type: Transform
@@ -56955,29 +56957,11 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 9139
+  - uid: 11346
     components:
     - type: Transform
-      pos: -49.5,11.5
+      pos: -51.5,11.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: ClosetChefFilled
   entities:
   - uid: 2620
@@ -58243,11 +58227,6 @@ entities:
         - 0
 - proto: ClosetRadiationSuitFilled
   entities:
-  - uid: 2085
-    components:
-    - type: Transform
-      pos: -51.5,11.5
-      parent: 60
   - uid: 9589
     components:
     - type: Transform
@@ -58271,6 +58250,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 11403
+    components:
+    - type: Transform
+      pos: -49.5,11.5
+      parent: 60
   - uid: 15539
     components:
     - type: Transform
@@ -58633,6 +58617,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 9477
+    components:
+    - type: Transform
+      pos: -58.5,8.5
+      parent: 60
   - uid: 19148
     components:
     - type: Transform
@@ -60524,6 +60513,15 @@ entities:
       linkedPorts:
         9442:
         - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
+  - uid: 24680
+    components:
+    - type: Transform
+      pos: -52.5,14.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        9570:
+        - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
 - proto: computerBodyScanner
   entities:
   - uid: 627
@@ -60946,11 +60944,6 @@ entities:
     - type: Transform
       pos: -47.5,24.5
       parent: 60
-  - uid: 7416
-    components:
-    - type: Transform
-      pos: -55.5,14.5
-      parent: 60
 - proto: ContainmentFieldGenerator
   entities:
   - uid: 16152
@@ -65749,6 +65742,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,-5.5
       parent: 60
+  - uid: 9453
+    components:
+    - type: Transform
+      pos: -55.5,6.5
+      parent: 60
   - uid: 12003
     components:
     - type: Transform
@@ -65802,12 +65800,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -55.5,5.5
       parent: 60
-  - uid: 13862
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -55.5,6.5
-      parent: 60
   - uid: 13863
     components:
     - type: Transform
@@ -68465,11 +68457,6 @@ entities:
     - type: Transform
       pos: -29.5,12.5
       parent: 60
-  - uid: 21738
-    components:
-    - type: Transform
-      pos: -52.5,11.5
-      parent: 60
   - uid: 21739
     components:
     - type: Transform
@@ -68621,10 +68608,10 @@ entities:
     - type: Transform
       pos: -48.5,-21.5
       parent: 60
-  - uid: 11403
+  - uid: 7416
     components:
     - type: Transform
-      pos: -53.5,11.5
+      pos: -53.5,8.5
       parent: 60
   - uid: 15570
     components:
@@ -68800,9 +68787,6 @@ entities:
       parent: 60
     - type: DeviceList
       devices:
-      - 9472
-      - 9391
-      - 9471
       - 9382
   - uid: 11347
     components:
@@ -70501,11 +70485,6 @@ entities:
     - type: Transform
       pos: 45.5,4.5
       parent: 60
-  - uid: 9391
-    components:
-    - type: Transform
-      pos: -53.5,6.5
-      parent: 60
   - uid: 9409
     components:
     - type: Transform
@@ -70526,16 +70505,6 @@ entities:
     - type: Transform
       pos: -39.5,0.5
       parent: 60
-  - uid: 9471
-    components:
-    - type: Transform
-      pos: -54.5,6.5
-      parent: 60
-  - uid: 9472
-    components:
-    - type: Transform
-      pos: -55.5,6.5
-      parent: 60
   - uid: 9526
     components:
     - type: Transform
@@ -72543,6 +72512,16 @@ entities:
     - type: Transform
       pos: -51.5,16.5
       parent: 60
+  - uid: 9585
+    components:
+    - type: Transform
+      pos: -53.5,16.5
+      parent: 60
+  - uid: 9652
+    components:
+    - type: Transform
+      pos: -55.5,16.5
+      parent: 60
   - uid: 9668
     components:
     - type: Transform
@@ -73934,6 +73913,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17289
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -47.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17290
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -52.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17586
     components:
     - type: Transform
@@ -76709,6 +76704,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 1279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -48.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 1281
     components:
     - type: Transform
@@ -81628,8 +81631,7 @@ entities:
   - uid: 5993
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -55.5,8.5
+      pos: -55.5,11.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -83282,6 +83284,16 @@ entities:
     - type: Transform
       pos: -51.5,15.5
       parent: 60
+  - uid: 9391
+    components:
+    - type: Transform
+      pos: -55.5,15.5
+      parent: 60
+  - uid: 9487
+    components:
+    - type: Transform
+      pos: -53.5,15.5
+      parent: 60
   - uid: 9609
     components:
     - type: Transform
@@ -83354,14 +83366,6 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9652
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -52.5,12.5
-      parent: 60
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9653
     components:
     - type: Transform
@@ -83483,6 +83487,22 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10695
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -51.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10696
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -49.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10828
     components:
     - type: Transform
@@ -87419,6 +87439,14 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17288
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,11.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17341
     components:
     - type: Transform
@@ -92989,18 +93017,25 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9637
+  - uid: 9455
     components:
     - type: Transform
-      pos: -55.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: -55.5,8.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9656
+  - uid: 9458
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -55.5,11.5
+      pos: -52.5,12.5
+      parent: 60
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 9637
+    components:
+    - type: Transform
+      pos: -55.5,13.5
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -94347,6 +94382,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -47.5,13.5
       parent: 60
+  - uid: 11404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,13.5
+      parent: 60
+  - uid: 12597
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -55.5,13.5
+      parent: 60
   - uid: 14720
     components:
     - type: Transform
@@ -94514,6 +94561,17 @@ entities:
     - type: Transform
       pos: -51.5,14.5
       parent: 60
+  - uid: 9493
+    components:
+    - type: Transform
+      pos: -55.5,14.5
+      parent: 60
+  - uid: 9509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,14.5
+      parent: 60
   - uid: 14660
     components:
     - type: MetaData
@@ -95722,6 +95780,28 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9471
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -54.5,8.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 7065
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 9472
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -52.5,13.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11464
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9607
     components:
     - type: Transform
@@ -95736,14 +95816,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,13.5
       parent: 60
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9673
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -54.5,11.5
-      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11464
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9678
@@ -97157,6 +97232,16 @@ entities:
       parent: 60
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9428
+    components:
+    - type: Transform
+      pos: -47.5,12.5
+      parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11464
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9608
     components:
     - type: Transform
@@ -97170,6 +97255,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -51.5,12.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 11464
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9641
@@ -97186,6 +97274,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -55.5,9.5
       parent: 60
+    - type: DeviceNetwork
+      deviceLists:
+      - 7065
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9677
@@ -98263,6 +98354,11 @@ entities:
     - type: Transform
       pos: 6.5,7.5
       parent: 60
+  - uid: 1278
+    components:
+    - type: Transform
+      pos: -53.5,5.5
+      parent: 60
   - uid: 1286
     components:
     - type: Transform
@@ -98464,6 +98560,11 @@ entities:
     - type: Transform
       pos: -23.5,-25.5
       parent: 60
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: -56.5,17.5
+      parent: 60
   - uid: 2099
     components:
     - type: Transform
@@ -100802,6 +100903,11 @@ entities:
     - type: Transform
       pos: 20.5,1.5
       parent: 60
+  - uid: 9596
+    components:
+    - type: Transform
+      pos: -53.5,10.5
+      parent: 60
   - uid: 9632
     components:
     - type: Transform
@@ -100847,6 +100953,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -47.5,10.5
       parent: 60
+  - uid: 9766
+    components:
+    - type: Transform
+      pos: -53.5,15.5
+      parent: 60
   - uid: 9809
     components:
     - type: Transform
@@ -100857,6 +100968,11 @@ entities:
     - type: Transform
       pos: -35.5,14.5
       parent: 60
+  - uid: 10176
+    components:
+    - type: Transform
+      pos: -55.5,15.5
+      parent: 60
   - uid: 10421
     components:
     - type: Transform
@@ -102095,6 +102211,11 @@ entities:
     - type: Transform
       pos: -20.5,33.5
       parent: 60
+  - uid: 15263
+    components:
+    - type: Transform
+      pos: -56.5,16.5
+      parent: 60
   - uid: 15392
     components:
     - type: Transform
@@ -106805,10 +106926,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,18.5
       parent: 60
-  - uid: 13590
+  - uid: 9473
     components:
     - type: Transform
-      pos: -1.5,12.5
+      pos: 2.5,12.5
       parent: 60
   - uid: 23847
     components:
@@ -107514,29 +107635,6 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 13916
-    components:
-    - type: Transform
-      pos: -58.5,8.5
-      parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
   - uid: 17035
     components:
     - type: Transform
@@ -108006,75 +108104,16 @@ entities:
       parent: 60
 - proto: LockerScienceFilled
   entities:
-  - uid: 9572
-    components:
-    - type: Transform
-      pos: -56.5,12.5
-      parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 9573
+  - uid: 9574
     components:
     - type: Transform
       pos: -56.5,11.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 9574
+  - uid: 9577
     components:
     - type: Transform
-      pos: -56.5,10.5
+      pos: -56.5,12.5
       parent: 60
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.6495836
-        - 6.2055764
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
   - uid: 16539
     components:
     - type: Transform
@@ -108351,6 +108390,11 @@ entities:
     - type: Transform
       pos: -50.5,17.5
       parent: 60
+  - uid: 9570
+    components:
+    - type: Transform
+      pos: -54.5,17.5
+      parent: 60
 - proto: MachineCentrifuge
   entities:
   - uid: 2457
@@ -108622,18 +108666,6 @@ entities:
     - type: Transform
       pos: 56.487034,-17.432411
       parent: 60
-- proto: MaterialReclaimer
-  entities:
-  - uid: 16992
-    components:
-    - type: Transform
-      pos: -10.5,-43.5
-      parent: 60
-  - uid: 19792
-    components:
-    - type: Transform
-      pos: 56.5,7.5
-      parent: 60
 - proto: MaterialWoodPlank
   entities:
   - uid: 3309
@@ -109346,11 +109378,6 @@ entities:
     - type: Transform
       pos: -27.5,35.5
       parent: 60
-  - uid: 17478
-    components:
-    - type: Transform
-      pos: -54.5,16.5
-      parent: 60
   - uid: 23550
     components:
     - type: Transform
@@ -109361,6 +109388,11 @@ entities:
     - type: Transform
       pos: -63.5,43.5
       parent: 60
+  - uid: 24673
+    components:
+    - type: Transform
+      pos: -57.5,17.5
+      parent: 60
 - proto: NitrousOxideCanister
   entities:
   - uid: 15180
@@ -109538,11 +109570,6 @@ entities:
     - type: Transform
       pos: -24.5,35.5
       parent: 60
-  - uid: 17475
-    components:
-    - type: Transform
-      pos: -55.5,16.5
-      parent: 60
   - uid: 17903
     components:
     - type: Transform
@@ -109568,6 +109595,11 @@ entities:
     - type: Transform
       pos: -57.5,36.5
       parent: 60
+  - uid: 24678
+    components:
+    - type: Transform
+      pos: -57.5,16.5
+      parent: 60
 - proto: OxygenTankFilled
   entities:
   - uid: 17242
@@ -109991,11 +110023,6 @@ entities:
       parent: 60
 - proto: PaperBin5
   entities:
-  - uid: 1279
-    components:
-    - type: Transform
-      pos: -53.5,10.5
-      parent: 60
   - uid: 4255
     components:
     - type: Transform
@@ -110860,21 +110887,11 @@ entities:
       parent: 60
 - proto: PosterContrabandPunchShit
   entities:
-  - uid: 3331
-    components:
-    - type: Transform
-      pos: -61.5,-11.5
-      parent: 60
   - uid: 3413
     components:
     - type: Transform
       pos: -60.5,-11.5
       parent: 60
-  - uid: 6590
-    components:
-    - type: Transform
-      pos: -61.5,-11.5
-      parent: 60
   - uid: 18106
     components:
     - type: Transform
@@ -112115,11 +112132,6 @@ entities:
       parent: 60
     - type: Physics
       canCollide: False
-  - uid: 7414
-    components:
-    - type: Transform
-      pos: -54.5,14.5
-      parent: 60
   - uid: 8162
     components:
     - type: Transform
@@ -112962,14 +112974,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 9440
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -51.5,13.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 9441
     components:
     - type: Transform
@@ -112986,6 +112990,18 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 9629
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -56.5,11.5
+      parent: 60
+  - uid: 10202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -56.5,8.5
+      parent: 60
   - uid: 10667
     components:
     - type: Transform
@@ -113147,22 +113163,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 10695
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -53.5,11.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -56.5,11.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 10697
     components:
     - type: Transform
@@ -115200,13 +115200,6 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 17730
-    components:
-    - type: Transform
-      pos: -54.5,17.5
-      parent: 60
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 17731
     components:
     - type: Transform
@@ -115496,6 +115489,12 @@ entities:
       parent: 60
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 21738
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -55.5,17.5
+      parent: 60
   - uid: 22450
     components:
     - type: Transform
@@ -115625,6 +115624,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-13.5
       parent: 60
+  - uid: 24670
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,17.5
+      parent: 60
 - proto: PoweredSmallLightEmpty
   entities:
   - uid: 6450
@@ -116406,15 +116411,15 @@ entities:
     - type: Transform
       pos: -49.5,16.5
       parent: 60
-  - uid: 15849
+  - uid: 17728
     components:
     - type: Transform
-      pos: -51.5,16.5
+      pos: -58.5,49.5
       parent: 60
-  - uid: 17728
+  - uid: 19792
     components:
     - type: Transform
-      pos: -58.5,49.5
+      pos: -55.5,16.5
       parent: 60
 - proto: RandomArtifactSpawner20
   entities:
@@ -116673,11 +116678,6 @@ entities:
     - type: Transform
       pos: -60.5,19.5
       parent: 60
-  - uid: 18014
-    components:
-    - type: Transform
-      pos: -54.5,18.5
-      parent: 60
   - uid: 18018
     components:
     - type: Transform
@@ -119617,6 +119617,11 @@ entities:
     - type: Transform
       pos: -2.5,-76.5
       parent: 60
+  - uid: 7414
+    components:
+    - type: Transform
+      pos: -53.5,10.5
+      parent: 60
   - uid: 7415
     components:
     - type: Transform
@@ -120044,6 +120049,11 @@ entities:
     - type: Transform
       pos: 40.5,-21.5
       parent: 60
+  - uid: 9427
+    components:
+    - type: Transform
+      pos: -53.5,5.5
+      parent: 60
   - uid: 9446
     components:
     - type: Transform
@@ -120064,6 +120074,11 @@ entities:
     - type: Transform
       pos: -51.5,15.5
       parent: 60
+  - uid: 9572
+    components:
+    - type: Transform
+      pos: -56.5,16.5
+      parent: 60
   - uid: 9643
     components:
     - type: Transform
@@ -120935,6 +120950,11 @@ entities:
     - type: Transform
       pos: -0.5,22.5
       parent: 60
+  - uid: 15849
+    components:
+    - type: Transform
+      pos: -53.5,15.5
+      parent: 60
   - uid: 16022
     components:
     - type: Transform
@@ -120950,6 +120970,11 @@ entities:
     - type: Transform
       pos: 3.5,29.5
       parent: 60
+  - uid: 16081
+    components:
+    - type: Transform
+      pos: -55.5,15.5
+      parent: 60
   - uid: 16116
     components:
     - type: Transform
@@ -121027,6 +121052,11 @@ entities:
     - type: Transform
       pos: 4.5,39.5
       parent: 60
+  - uid: 16992
+    components:
+    - type: Transform
+      pos: -56.5,17.5
+      parent: 60
   - uid: 17259
     components:
     - type: Transform
@@ -121882,15 +121912,15 @@ entities:
       parent: 60
 - proto: SheetGlass
   entities:
-  - uid: 6159
+  - uid: 9744
     components:
     - type: Transform
-      pos: -53.455166,13.5206375
+      pos: -53.494404,6.8752375
       parent: 60
-  - uid: 6160
+  - uid: 10188
     components:
     - type: Transform
-      pos: -53.455166,13.5206375
+      pos: -53.494404,6.8752375
       parent: 60
   - uid: 17027
     components:
@@ -122037,15 +122067,15 @@ entities:
       parent: 60
 - proto: SheetPlastic
   entities:
-  - uid: 9585
+  - uid: 9673
     components:
     - type: Transform
-      pos: -53.46743,13.76821
+      pos: -53.48943,7.209055
       parent: 60
-  - uid: 9586
+  - uid: 13916
     components:
     - type: Transform
-      pos: -53.46743,13.76821
+      pos: -53.48943,7.209055
       parent: 60
   - uid: 16456
     components:
@@ -122065,15 +122095,10 @@ entities:
     - type: Transform
       pos: 50.57873,-36.45204
       parent: 60
-  - uid: 6162
-    components:
-    - type: Transform
-      pos: -53.47079,14.0518875
-      parent: 60
-  - uid: 6166
+  - uid: 6590
     components:
     - type: Transform
-      pos: -53.47079,14.0518875
+      pos: -53.494404,7.5158625
       parent: 60
   - uid: 7205
     components:
@@ -122085,6 +122110,11 @@ entities:
     - type: Transform
       pos: 7.513824,-45.156796
       parent: 60
+  - uid: 9429
+    components:
+    - type: Transform
+      pos: -53.494404,7.5158625
+      parent: 60
   - uid: 10586
     components:
     - type: Transform
@@ -123299,6 +123329,15 @@ entities:
         - Pressed: Toggle
         1022:
         - Pressed: Toggle
+  - uid: 9571
+    components:
+    - type: Transform
+      pos: -52.5,15.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        13639:
+        - Pressed: Toggle
   - uid: 11257
     components:
     - type: Transform
@@ -123541,18 +123580,6 @@ entities:
         - Pressed: Toggle
         2506:
         - Pressed: Toggle
-  - uid: 15200
-    components:
-    - type: MetaData
-      name: Maint Shutter
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -52.5,14.5
-      parent: 60
-    - type: DeviceLinkSource
-      linkedPorts:
-        13639:
-        - Pressed: Toggle
   - uid: 16370
     components:
     - type: Transform
@@ -123785,15 +123812,15 @@ entities:
         - Off: Off
 - proto: SignAnomaly
   entities:
-  - uid: 9453
+  - uid: 9496
     components:
     - type: Transform
-      pos: -52.5,13.5
+      pos: -43.5,14.5
       parent: 60
-  - uid: 9496
+  - uid: 24702
     components:
     - type: Transform
-      pos: -43.5,14.5
+      pos: -56.5,10.5
       parent: 60
 - proto: SignAnomaly2
   entities:
@@ -123968,6 +123995,11 @@ entities:
     - type: Transform
       pos: 68.5,-25.5
       parent: 60
+  - uid: 9656
+    components:
+    - type: Transform
+      pos: -54.5,18.5
+      parent: 60
 - proto: SignDirectionalBar
   entities:
   - uid: 19453
@@ -124688,10 +124720,10 @@ entities:
       parent: 7536
 - proto: SignEngineering
   entities:
-  - uid: 6583
+  - uid: 11345
     components:
     - type: Transform
-      pos: 2.5,12.5
+      pos: -1.5,12.5
       parent: 60
   - uid: 16099
     components:
@@ -128340,15 +128372,15 @@ entities:
     - type: Transform
       pos: -45.5,-6.5
       parent: 60
-  - uid: 17456
+  - uid: 24705
     components:
     - type: Transform
-      pos: -55.5,10.5
+      pos: -55.5,7.5
       parent: 60
-  - uid: 17457
+  - uid: 24706
     components:
     - type: Transform
-      pos: -55.5,9.5
+      pos: -55.5,8.5
       parent: 60
 - proto: SpawnPointResearchDirector
   entities:
@@ -128376,25 +128408,25 @@ entities:
       parent: 60
 - proto: SpawnPointScientist
   entities:
-  - uid: 11345
+  - uid: 17273
     components:
     - type: Transform
-      pos: -55.5,11.5
+      pos: -44.5,-6.5
       parent: 60
-  - uid: 11346
+  - uid: 17274
     components:
     - type: Transform
-      pos: -55.5,12.5
+      pos: -44.5,-8.5
       parent: 60
-  - uid: 17273
+  - uid: 24703
     components:
     - type: Transform
-      pos: -44.5,-6.5
+      pos: -54.5,7.5
       parent: 60
-  - uid: 17274
+  - uid: 24704
     components:
     - type: Transform
-      pos: -44.5,-8.5
+      pos: -54.5,8.5
       parent: 60
 - proto: SpawnPointSecurityCadet
   entities:
@@ -128958,11 +128990,6 @@ entities:
     - type: Transform
       pos: 34.5,-43.5
       parent: 60
-  - uid: 12597
-    components:
-    - type: Transform
-      pos: -48.5,14.5
-      parent: 60
   - uid: 14704
     components:
     - type: Transform
@@ -131475,6 +131502,11 @@ entities:
     - type: Transform
       pos: -48.5,11.5
       parent: 60
+  - uid: 9139
+    components:
+    - type: Transform
+      pos: -53.5,7.5
+      parent: 60
   - uid: 9144
     components:
     - type: Transform
@@ -131490,6 +131522,11 @@ entities:
     - type: Transform
       pos: 40.5,4.5
       parent: 60
+  - uid: 9440
+    components:
+    - type: Transform
+      pos: -53.5,6.5
+      parent: 60
   - uid: 9464
     components:
     - type: Transform
@@ -131547,11 +131584,6 @@ entities:
     - type: Transform
       pos: -53.5,9.5
       parent: 60
-  - uid: 9596
-    components:
-    - type: Transform
-      pos: -53.5,10.5
-      parent: 60
   - uid: 9601
     components:
     - type: Transform
@@ -132143,6 +132175,16 @@ entities:
     - type: Transform
       pos: 11.5,-10.5
       parent: 60
+  - uid: 24700
+    components:
+    - type: Transform
+      pos: -52.5,11.5
+      parent: 60
+  - uid: 24701
+    components:
+    - type: Transform
+      pos: -53.5,11.5
+      parent: 60
 - proto: TableCarpet
   entities:
   - uid: 29
@@ -132681,21 +132723,11 @@ entities:
     - type: Transform
       pos: -37.5,10.5
       parent: 60
-  - uid: 9477
-    components:
-    - type: Transform
-      pos: -53.5,13.5
-      parent: 60
   - uid: 9494
     components:
     - type: Transform
       pos: -42.5,12.5
       parent: 60
-  - uid: 9570
-    components:
-    - type: Transform
-      pos: -54.5,14.5
-      parent: 60
   - uid: 9593
     components:
     - type: Transform
@@ -132746,11 +132778,6 @@ entities:
     - type: Transform
       pos: -15.5,26.5
       parent: 60
-  - uid: 15837
-    components:
-    - type: Transform
-      pos: -53.5,14.5
-      parent: 60
   - uid: 16068
     components:
     - type: Transform
@@ -139023,6 +139050,11 @@ entities:
     - type: Transform
       pos: 14.5,27.5
       parent: 60
+  - uid: 6160
+    components:
+    - type: Transform
+      pos: -42.5,-11.5
+      parent: 60
   - uid: 6172
     components:
     - type: Transform
@@ -139561,11 +139593,6 @@ entities:
     - type: Transform
       pos: -41.5,-11.5
       parent: 60
-  - uid: 7065
-    components:
-    - type: Transform
-      pos: -42.5,-11.5
-      parent: 60
   - uid: 7083
     components:
     - type: Transform
@@ -140440,21 +140467,6 @@ entities:
     - type: Transform
       pos: -57.5,7.5
       parent: 60
-  - uid: 9427
-    components:
-    - type: Transform
-      pos: -53.5,15.5
-      parent: 60
-  - uid: 9428
-    components:
-    - type: Transform
-      pos: -54.5,15.5
-      parent: 60
-  - uid: 9429
-    components:
-    - type: Transform
-      pos: -55.5,15.5
-      parent: 60
   - uid: 9431
     components:
     - type: Transform
@@ -143138,6 +143150,21 @@ entities:
     - type: Transform
       pos: -60.5,15.5
       parent: 60
+  - uid: 17456
+    components:
+    - type: Transform
+      pos: -53.5,18.5
+      parent: 60
+  - uid: 17457
+    components:
+    - type: Transform
+      pos: -54.5,18.5
+      parent: 60
+  - uid: 17475
+    components:
+    - type: Transform
+      pos: -55.5,18.5
+      parent: 60
   - uid: 17476
     components:
     - type: Transform
@@ -143148,6 +143175,11 @@ entities:
     - type: Transform
       pos: -60.5,28.5
       parent: 60
+  - uid: 17478
+    components:
+    - type: Transform
+      pos: -56.5,18.5
+      parent: 60
   - uid: 17566
     components:
     - type: Transform
@@ -148052,11 +148084,6 @@ entities:
     - type: Transform
       pos: -54.5,0.5
       parent: 60
-  - uid: 9458
-    components:
-    - type: Transform
-      pos: -52.5,13.5
-      parent: 60
   - uid: 9462
     components:
     - type: Transform
@@ -148072,21 +148099,16 @@ entities:
     - type: Transform
       pos: -43.5,14.5
       parent: 60
-  - uid: 9577
+  - uid: 9586
     components:
     - type: Transform
-      pos: -52.5,11.5
+      pos: -56.5,10.5
       parent: 60
   - uid: 9590
     components:
     - type: Transform
       pos: -56.5,5.5
       parent: 60
-  - uid: 9629
-    components:
-    - type: Transform
-      pos: -52.5,14.5
-      parent: 60
   - uid: 9687
     components:
     - type: Transform
@@ -148958,21 +148980,6 @@ entities:
     - type: Transform
       pos: -38.5,18.5
       parent: 60
-  - uid: 17288
-    components:
-    - type: Transform
-      pos: -53.5,18.5
-      parent: 60
-  - uid: 17289
-    components:
-    - type: Transform
-      pos: -54.5,18.5
-      parent: 60
-  - uid: 17290
-    components:
-    - type: Transform
-      pos: -55.5,18.5
-      parent: 60
   - uid: 17293
     components:
     - type: Transform
@@ -149775,11 +149782,6 @@ entities:
     - type: Transform
       pos: -56.5,23.5
       parent: 60
-  - uid: 16081
-    components:
-    - type: Transform
-      pos: -56.5,18.5
-      parent: 60
   - uid: 17331
     components:
     - type: Transform
@@ -151528,24 +151530,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -50.5,-32.5
       parent: 60
-  - uid: 9487
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,11.5
-      parent: 60
-  - uid: 9493
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -39.5,12.5
-      parent: 60
-  - uid: 9509
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -39.5,12.5
-      parent: 60
   - uid: 9511
     components:
     - type: Transform
@@ -151574,6 +151558,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,23.5
       parent: 60
+  - uid: 17730
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,12.5
+      parent: 60
+  - uid: 18014
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,11.5
+      parent: 60
   - uid: 18091
     components:
     - type: Transform