diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index d7038fe2358..11f3c321102 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -39,7 +39,9 @@ tilemap:
   59: FloorHydro
   60: FloorIce
   63: FloorLino
+  65: FloorMetalDiamond
   66: FloorMime
+  68: FloorMiningDark
   73: FloorOldConcreteSmooth
   75: FloorPlanetGrass
   77: FloorRGlass
@@ -217,7 +219,7 @@ entities:
           version: 6
         -1,-3:
           ind: -1,-3
-          tiles: egAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAMAAAAAAATgAAAAAAdgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAMAAAAAAATgAAAAAAdgAAAAADegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAATgAAAAAAdgAAAAABHgAAAAADegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAdgAAAAABHgAAAAADegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAdgAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAADHgAAAAADegAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAHgAAAAAATgAAAAAAdgAAAAABdgAAAAADdgAAAAADdgAAAAABcAAAAAACHgAAAAACTgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAACHgAAAAABTgAAAAAAdgAAAAADdgAAAAACdgAAAAABdgAAAAAAcAAAAAACHgAAAAACTgAAAAAAHgAAAAAATQAAAAACTQAAAAACTQAAAAABHgAAAAACHgAAAAABHgAAAAABHgAAAAADTgAAAAAAdgAAAAADdgAAAAABdgAAAAABdgAAAAACcAAAAAACHgAAAAAATQAAAAACHgAAAAADTQAAAAACTQAAAAABTQAAAAACHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAdgAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAABHgAAAAACTgAAAAAAHgAAAAADTQAAAAABTQAAAAABTQAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAdgAAAAACcAAAAAAATQAAAAABTQAAAAABTQAAAAABHgAAAAAATgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABegAAAAAAagAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAACTQAAAAADTQAAAAAATQAAAAAATQAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAawAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAADTQAAAAACTQAAAAACTQAAAAADHgAAAAABegAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAawAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAACcAAAAAAAcAAAAAABcAAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAACegAAAAAAawAAAAABegAAAAAAegAAAAAAZwAAAAABZwAAAAACZwAAAAADegAAAAAAcAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAACHgAAAAABegAAAAAAawAAAAACegAAAAAAegAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAADcAAAAAACHgAAAAAAegAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADHgAAAAAAegAAAAAAagAAAAAAegAAAAAAegAAAAAAZwAAAAAAZwAAAAABZwAAAAAAZwAAAAADcAAAAAAC
+          tiles: egAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAMAAAAAAATgAAAAAAdgAAAAACegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAMAAAAAAATgAAAAAAdgAAAAADegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAATgAAAAAAdgAAAAABHgAAAAADegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAdgAAAAABHgAAAAADegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAdgAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAADHgAAAAADegAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAHgAAAAAATgAAAAAAdgAAAAABdgAAAAADdgAAAAADdgAAAAABcAAAAAACHgAAAAACTgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAACHgAAAAABTgAAAAAAdgAAAAADdgAAAAACdgAAAAABdgAAAAAAcAAAAAACHgAAAAACTgAAAAAAHgAAAAAATQAAAAACTQAAAAACTQAAAAABHgAAAAACHgAAAAABHgAAAAABHgAAAAADTgAAAAAAdgAAAAADdgAAAAABdgAAAAABdgAAAAACcAAAAAACHgAAAAAATQAAAAACHgAAAAADTQAAAAACTQAAAAABTQAAAAACHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAdgAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAABHgAAAAACQQAAAAAAHgAAAAADTQAAAAABTQAAAAABTQAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAdgAAAAACcAAAAAAATQAAAAABTQAAAAABTQAAAAABHgAAAAAATgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABegAAAAAAagAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAACTQAAAAADTQAAAAAATQAAAAAATQAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAawAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAADTQAAAAACTQAAAAACTQAAAAADHgAAAAABegAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAawAAAAAAegAAAAAAegAAAAAAdgAAAAADcAAAAAACcAAAAAAAcAAAAAABcAAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAACegAAAAAAawAAAAABegAAAAAAegAAAAAAZwAAAAABZwAAAAACZwAAAAADegAAAAAAcAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAACHgAAAAABegAAAAAAawAAAAACegAAAAAAegAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAADcAAAAAACHgAAAAAAegAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADHgAAAAAAegAAAAAAagAAAAAAegAAAAAAegAAAAAAZwAAAAAAZwAAAAABZwAAAAAAZwAAAAADcAAAAAAC
           version: 6
         1,-3:
           ind: 1,-3
@@ -249,7 +251,7 @@ entities:
           version: 6
         -2,2:
           ind: -2,2
-          tiles: egAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATQAAAAAATQAAAAABTQAAAAACegAAAAAATQAAAAADTQAAAAACTQAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATQAAAAABTQAAAAAATQAAAAABegAAAAAATQAAAAACTQAAAAADTQAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAADegAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAABHgAAAAACTQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAABHgAAAAABHgAAAAAAHgAAAAABHgAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAADHgAAAAAAegAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAADHgAAAAACHgAAAAABHgAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAAAHgAAAAADegAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAATQAAAAAAHgAAAAAATQAAAAADTQAAAAABTQAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAACTgAAAAAATgAAAAAATgAAAAAATQAAAAABHgAAAAABHgAAAAABegAAAAAATQAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAHgAAAAADHgAAAAAAegAAAAAAagAAAAAATgAAAAAATgAAAAAATQAAAAAATgAAAAAATQAAAAADTgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATQAAAAACTQAAAAAAegAAAAAAagAAAAAATgAAAAAATgAAAAAATQAAAAAATgAAAAAATQAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAMAAAAAAA
+          tiles: egAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATQAAAAAATQAAAAABTQAAAAACegAAAAAATQAAAAADTQAAAAACTQAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATQAAAAABTQAAAAAATQAAAAABegAAAAAATQAAAAACTQAAAAADTQAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAADegAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAABHgAAAAACTQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAABHgAAAAABHgAAAAAAHgAAAAABHgAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAADHgAAAAAAegAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAADHgAAAAACHgAAAAABHgAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAAAHgAAAAADegAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAATQAAAAAAHgAAAAAAegAAAAAAegAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAATQAAAAACTgAAAAAATgAAAAAATgAAAAAATQAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAARAAAAAAARAAAAAAATQAAAAAARAAAAAAATQAAAAAARAAAAAAARAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAHgAAAAADHgAAAAAAegAAAAAAegAAAAAARAAAAAAARAAAAAAATQAAAAAARAAAAAAATQAAAAADRAAAAAAARAAAAAAAegAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAATQAAAAACTQAAAAAAegAAAAAAegAAAAAARAAAAAAARAAAAAAATQAAAAAARAAAAAAATQAAAAABRAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAATgAAAAAAegAAAAAAMAAAAAAA
           version: 6
         -3,2:
           ind: -3,2
@@ -433,7 +435,7 @@ entities:
           version: 6
         -2,3:
           ind: -2,3
-          tiles: TQAAAAADegAAAAAATQAAAAABegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAAATgAAAAAATQAAAAABTgAAAAAAegAAAAAAMAAAAAAATQAAAAAATgAAAAAAagAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAMAAAAAAAHgAAAAAATQAAAAADagAAAAAAagAAAAAAawAAAAABawAAAAACagAAAAAAawAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAegAAAAAAMAAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAABMAAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAACegAAAAAAegAAAAAAegAAAAAAMAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAAAdAAAAAAAdAAAAAADegAAAAAAbQAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAAAbQAAAAABegAAAAAAMAAAAAAATQAAAAADTQAAAAADTQAAAAACegAAAAAAdAAAAAABdAAAAAABdAAAAAAAegAAAAAAbQAAAAACbQAAAAABbQAAAAAAbQAAAAAAbQAAAAADbQAAAAACTgAAAAAAMAAAAAAATQAAAAACTQAAAAADTQAAAAAAegAAAAAAdAAAAAAAdAAAAAAAdAAAAAAATQAAAAADbQAAAAACbQAAAAABTQAAAAADTQAAAAACbQAAAAABbQAAAAAATgAAAAAAMAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAADdAAAAAABdAAAAAABegAAAAAAbQAAAAACbQAAAAADTQAAAAACTQAAAAACbQAAAAAAbQAAAAABTgAAAAAAMAAAAAAAbQAAAAADbQAAAAAAbQAAAAACTgAAAAAAdAAAAAABdAAAAAAAdAAAAAAATgAAAAAAbQAAAAADbQAAAAACTQAAAAABTQAAAAADbQAAAAABbQAAAAABTgAAAAAAMAAAAAAAbQAAAAADbQAAAAADbQAAAAACTgAAAAAAdAAAAAAAdAAAAAACdAAAAAACTgAAAAAAbQAAAAADbQAAAAACbQAAAAAAbQAAAAADbQAAAAABbQAAAAACTgAAAAAAMAAAAAAAbQAAAAAAbQAAAAAAbQAAAAADTQAAAAADdAAAAAABdAAAAAACdAAAAAAATgAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAAAbQAAAAACbQAAAAADegAAAAAAMAAAAAAAbQAAAAAAbQAAAAADbQAAAAADTQAAAAADdAAAAAAAdAAAAAACdAAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAATQAAAAAAbQAAAAAAbQAAAAABbQAAAAACTgAAAAAAdAAAAAADdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAACdAAAAAABdAAAAAACdAAAAAADdAAAAAADdAAAAAABdAAAAAACdAAAAAADbQAAAAAAbQAAAAAAbQAAAAACTgAAAAAAdAAAAAAATQAAAAABTQAAAAABTQAAAAABdAAAAAACdAAAAAACdAAAAAABdAAAAAADdAAAAAACdAAAAAACTQAAAAADTQAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAAATQAAAAAATQAAAAACTQAAAAADdAAAAAACdAAAAAADdAAAAAABdAAAAAADdAAAAAABdAAAAAACTQAAAAADTQAAAAAB
+          tiles: TQAAAAADegAAAAAAegAAAAAAegAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAATgAAAAAAegAAAAAAMAAAAAAATQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAMAAAAAAAHgAAAAAATQAAAAADagAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAMAAAAAAAHgAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAABMAAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAACegAAAAAAegAAAAAAegAAAAAAMAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAAAdAAAAAAAdAAAAAADegAAAAAAbQAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAAAbQAAAAABegAAAAAAMAAAAAAATQAAAAADTQAAAAADTQAAAAACegAAAAAAdAAAAAABdAAAAAABdAAAAAAAegAAAAAAbQAAAAACbQAAAAABbQAAAAAAbQAAAAAAbQAAAAADbQAAAAACTgAAAAAAMAAAAAAATQAAAAACTQAAAAADTQAAAAAAegAAAAAAdAAAAAAAdAAAAAAAdAAAAAAATQAAAAADbQAAAAACbQAAAAABTQAAAAADTQAAAAACbQAAAAABbQAAAAAATgAAAAAAMAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAADdAAAAAABdAAAAAABegAAAAAAbQAAAAACbQAAAAADTQAAAAACTQAAAAACbQAAAAAAbQAAAAABTgAAAAAAMAAAAAAAbQAAAAADbQAAAAAAbQAAAAACTgAAAAAAdAAAAAABdAAAAAAAdAAAAAAATgAAAAAAbQAAAAADbQAAAAACTQAAAAABTQAAAAADbQAAAAABbQAAAAABTgAAAAAAMAAAAAAAbQAAAAADbQAAAAADbQAAAAACTgAAAAAAdAAAAAAAdAAAAAACdAAAAAACTgAAAAAAbQAAAAADbQAAAAACbQAAAAAAbQAAAAADbQAAAAABbQAAAAACTgAAAAAAMAAAAAAAbQAAAAAAbQAAAAAAbQAAAAADTQAAAAADdAAAAAABdAAAAAACdAAAAAAATgAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAAAbQAAAAACbQAAAAADegAAAAAAMAAAAAAAbQAAAAAAbQAAAAADbQAAAAADTQAAAAADdAAAAAAAdAAAAAACdAAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAATQAAAAAAbQAAAAAAbQAAAAABbQAAAAACTgAAAAAAdAAAAAADdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAACdAAAAAABdAAAAAACdAAAAAADdAAAAAADdAAAAAABdAAAAAACdAAAAAADbQAAAAAAbQAAAAAAbQAAAAACTgAAAAAAdAAAAAAATQAAAAABTQAAAAABTQAAAAABdAAAAAACdAAAAAACdAAAAAABdAAAAAADdAAAAAACdAAAAAACTQAAAAADTQAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAdAAAAAAATQAAAAAATQAAAAACTQAAAAADdAAAAAACdAAAAAADdAAAAAABdAAAAAADdAAAAAABdAAAAAACTQAAAAADTQAAAAAB
           version: 6
         -5,3:
           ind: -5,3
@@ -1532,6 +1534,11 @@ entities:
             385: 13,16
             386: -11,16
             1748: 31,7
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            6767: -20,48
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteCornerNe
@@ -1566,7 +1573,6 @@ entities:
             895: -33,31
             896: -33,35
             909: -13,45
-            919: -19,48
             925: -17,42
             1175: -10,22
             4818: -32,51
@@ -1740,6 +1746,12 @@ entities:
             1892: -13,-14
             4937: 6,16
             4938: 5,15
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            6738: -28,48
+            6739: -29,47
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteCornerNw
@@ -1775,7 +1787,6 @@ entities:
             892: -37,35
             894: -37,31
             913: -17,45
-            920: -28,48
             926: -19,42
             4817: -34,51
         - node:
@@ -1931,6 +1942,12 @@ entities:
             1651: 13,9
             1747: 31,5
             1804: 10,-3
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            6736: -23,44
+            6766: -20,47
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteCornerSe
@@ -1966,9 +1983,7 @@ entities:
             873: -9,28
             897: -33,29
             898: -33,33
-            922: -23,44
             923: -17,39
-            945: -19,47
             4820: -33,37
             4821: -32,44
         - node:
@@ -2123,6 +2138,11 @@ entities:
             1650: 5,9
             1779: 8,-3
             1949: -9,18
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            6740: -29,44
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteCornerSw
@@ -2162,7 +2182,6 @@ entities:
             891: -37,29
             893: -37,33
             914: -17,44
-            921: -28,44
             924: -19,39
             4819: -34,37
         - node:
@@ -2377,6 +2396,11 @@ entities:
             1896: 0,-13
             1901: 37,-14
             4939: 6,15
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            6764: -28,47
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteInnerNw
@@ -2457,6 +2481,11 @@ entities:
             1789: 10,5
             1948: -32,19
             1952: 2,17
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            6763: -23,47
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteInnerSe
@@ -2469,7 +2498,6 @@ entities:
           decals:
             741: -6,39
             875: -20,29
-            918: -23,47
             4834: -33,44
         - node:
             color: '#B04DB5FF'
@@ -2779,6 +2807,12 @@ entities:
             6692: 35,-7
             6693: 35,-6
             6695: 35,-5
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteLineE
+          decals:
+            6761: -23,45
+            6762: -23,46
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteLineE
@@ -2864,8 +2898,6 @@ entities:
             766: -33,30
             767: -17,41
             768: -17,40
-            769: -23,46
-            770: -23,45
             818: -5,33
             819: -5,34
             4822: -32,45
@@ -3404,6 +3436,17 @@ entities:
             1900: 4,-13
             2887: -7,3
             4852: -16,-15
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteLineN
+          decals:
+            6748: -27,48
+            6749: -26,48
+            6750: -25,48
+            6751: -24,48
+            6752: -23,48
+            6753: -22,48
+            6754: -21,48
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteLineN
@@ -3511,14 +3554,6 @@ entities:
             910: -14,45
             911: -15,45
             912: -16,45
-            927: -27,48
-            928: -26,48
-            929: -25,48
-            930: -24,48
-            931: -23,48
-            932: -22,48
-            933: -21,48
-            934: -20,48
             935: -18,42
             1145: -24,22
             1146: -23,22
@@ -4142,6 +4177,18 @@ entities:
             1947: -31,19
             3849: -27,19
             4617: -20,19
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteLineS
+          decals:
+            6742: -24,44
+            6743: -26,44
+            6744: -26,44
+            6745: -27,44
+            6746: -25,44
+            6747: -28,44
+            6758: -22,47
+            6768: -21,47
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteLineS
@@ -4247,13 +4294,6 @@ entities:
             915: -16,44
             916: -15,44
             941: -18,39
-            942: -22,47
-            943: -21,47
-            944: -20,47
-            946: -27,44
-            947: -26,44
-            948: -25,44
-            949: -24,44
         - node:
             color: '#B04DB5FF'
             id: BrickTileWhiteLineS
@@ -4704,6 +4744,12 @@ entities:
             1836: 0,-11
             6691: 34,-7
             6694: 34,-5
+        - node:
+            color: '#951710FF'
+            id: BrickTileWhiteLineW
+          decals:
+            6759: -29,45
+            6760: -29,46
         - node:
             color: '#9DDFBAFF'
             id: BrickTileWhiteLineW
@@ -4789,9 +4835,6 @@ entities:
             816: -9,34
             817: -9,33
             842: -23,25
-            936: -28,47
-            937: -28,46
-            938: -28,45
             939: -19,41
             940: -19,40
             4835: -34,38
@@ -6822,7 +6865,6 @@ entities:
             6171: -35,65
             6172: 12,76
             6173: -10,70
-            6174: -28,48
             6175: 1,46
             6176: 25,47
             6177: 65,58
@@ -6912,7 +6954,6 @@ entities:
             6261: 19,41
             6262: 1,45
             6263: -13,45
-            6264: -27,44
             6265: -28,41
             6266: -27,55
             6267: -30,60
@@ -12426,6 +12467,18 @@ entities:
     - type: LoadedMap
 - proto: ActionToggleBlock
   entities:
+  - uid: 28912
+    components:
+    - type: Transform
+      parent: 5116
+    - type: InstantAction
+      container: 5116
+  - uid: 28913
+    components:
+    - type: Transform
+      parent: 15524
+    - type: InstantAction
+      container: 15524
   - uid: 32473
     components:
     - type: Transform
@@ -12492,6 +12545,18 @@ entities:
       parent: 15583
     - type: InstantAction
       container: 15583
+  - uid: 16291
+    components:
+    - type: Transform
+      parent: 7937
+    - type: InstantAction
+      container: 7937
+  - uid: 16335
+    components:
+    - type: Transform
+      parent: 8031
+    - type: InstantAction
+      container: 8031
 - proto: AirAlarm
   entities:
   - uid: 22
@@ -12806,6 +12871,19 @@ entities:
       - 26032
     - type: AtmosDevice
       joinedGrid: 2
+  - uid: 16607
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,52.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16481
+      - 16416
+      - 16550
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 17901
     components:
     - type: Transform
@@ -13016,7 +13094,6 @@ entities:
       - 9039
       - 28386
       - 28605
-      - 17011
       - 17030
     - type: AtmosDevice
       joinedGrid: 2
@@ -13044,7 +13121,6 @@ entities:
       - 28385
       - 25959
       - 25958
-      - 17011
       - 9039
       - 28386
     - type: AtmosDevice
@@ -14595,8 +14671,6 @@ entities:
       - 27752
       - 27755
       - 27756
-      - 27750
-      - 27749
       - 28429
       - 3889
       - 3881
@@ -14611,6 +14685,8 @@ entities:
       - 28431
       - 27299
       - 28213
+      - 29085
+      - 29086
     - type: AtmosDevice
       joinedGrid: 2
   - uid: 25299
@@ -14817,6 +14893,11 @@ entities:
       - 25200
       - 25077
       - 25188
+      - 29025
+      - 29024
+      - 29026
+      - 29030
+      - 29040
     - type: AtmosDevice
       joinedGrid: 2
   - uid: 25317
@@ -15632,6 +15713,38 @@ entities:
       - 26869
     - type: AtmosDevice
       joinedGrid: 2
+  - uid: 29039
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -44.5,63.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 28597
+      - 29030
+      - 29022
+      - 25188
+      - 25200
+      - 25335
+      - 29040
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 29087
+    components:
+    - type: Transform
+      pos: 75.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 29085
+      - 29086
+      - 16549
+      - 28426
+      - 16551
+      - 28427
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 30628
     components:
     - type: Transform
@@ -16879,6 +16992,11 @@ entities:
       parent: 2
 - proto: AirlockGlass
   entities:
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 53.5,25.5
+      parent: 2
   - uid: 611
     components:
     - type: Transform
@@ -17975,11 +18093,6 @@ entities:
       parent: 2
 - proto: AirlockMaintSecLocked
   entities:
-  - uid: 2076
-    components:
-    - type: Transform
-      pos: -29.5,45.5
-      parent: 2
   - uid: 5295
     components:
     - type: Transform
@@ -17990,11 +18103,6 @@ entities:
     - type: Transform
       pos: -16.5,60.5
       parent: 2
-  - uid: 15827
-    components:
-    - type: Transform
-      pos: -29.5,48.5
-      parent: 2
   - uid: 22626
     components:
     - type: Transform
@@ -18466,12 +18574,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 51.5,18.5
       parent: 2
-  - uid: 22679
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 53.5,25.5
-      parent: 2
 - proto: AirlockScienceGlassLocked
   entities:
   - uid: 22582
@@ -18855,6 +18957,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 31.5,16.5
       parent: 2
+  - uid: 16550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16607
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 23254
     components:
     - type: Transform
@@ -19448,6 +19561,9 @@ entities:
     - type: Transform
       pos: 73.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 29087
   - uid: 28427
     components:
     - type: Transform
@@ -19456,6 +19572,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25300
+      - 29087
   - uid: 28428
     components:
     - type: Transform
@@ -19839,6 +19956,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25316
+      - 29039
   - uid: 28598
     components:
     - type: Transform
@@ -20046,6 +20164,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-4.5
       parent: 2
+  - uid: 29040
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,65.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 29039
+      - 25316
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 30412
     components:
     - type: Transform
@@ -20110,6 +20240,19 @@ entities:
     - type: Transform
       pos: -67.5,33.5
       parent: 2
+- proto: AlwaysPoweredLightColoredRed
+  entities:
+  - uid: 4888
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,45.5
+      parent: 2
+  - uid: 28968
+    components:
+    - type: Transform
+      pos: -20.5,48.5
+      parent: 2
 - proto: AmeController
   entities:
   - uid: 18616
@@ -20139,10 +20282,10 @@ entities:
       parent: 2
 - proto: AmmoTechFab
   entities:
-  - uid: 16495
+  - uid: 808
     components:
     - type: Transform
-      pos: -27.5,45.5
+      pos: -28.5,44.5
       parent: 2
 - proto: AnomalyLocator
   entities:
@@ -20158,12 +20301,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 42.44306,39.594418
       parent: 2
-  - uid: 5280
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.44306,40.125668
-      parent: 2
 - proto: AnomalyScanner
   entities:
   - uid: 5276
@@ -24440,72 +24577,6 @@ entities:
     - type: DeviceLinkSink
       links:
       - 15119
-  - uid: 19376
-    components:
-    - type: Transform
-      pos: -24.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19377
-    components:
-    - type: Transform
-      pos: -25.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19378
-    components:
-    - type: Transform
-      pos: -26.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19379
-    components:
-    - type: Transform
-      pos: -21.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19380
-    components:
-    - type: Transform
-      pos: -20.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19381
-    components:
-    - type: Transform
-      pos: -19.5,49.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19382
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,47.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
-  - uid: 19383
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,46.5
-      parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 19389
   - uid: 19385
     components:
     - type: Transform
@@ -24932,6 +25003,11 @@ entities:
     - type: Transform
       pos: 21.531042,-23.255095
       parent: 2
+  - uid: 28980
+    components:
+    - type: Transform
+      pos: -23.633635,46.4414
+      parent: 2
 - proto: BoxBodyBag
   entities:
   - uid: 1380
@@ -25220,6 +25296,13 @@ entities:
     - type: Transform
       pos: 34.284397,7.4699078
       parent: 2
+- proto: BoxLethalshot
+  entities:
+  - uid: 28975
+    components:
+    - type: Transform
+      pos: -23.3003,46.71223
+      parent: 2
 - proto: BoxLightMixed
   entities:
   - uid: 18535
@@ -25255,45 +25338,22 @@ entities:
       parent: 2
 - proto: BoxMagazinePistolSubMachineGun
   entities:
-  - uid: 16538
+  - uid: 28979
     components:
     - type: Transform
-      pos: -25.32418,46.66584
+      pos: -25.661413,46.38584
       parent: 2
 - proto: BoxMagazinePistolSubMachineGunPractice
   entities:
-  - uid: 9690
-    components:
-    - type: Transform
-      pos: -33.587025,38.24255
-      parent: 2
-- proto: BoxMagazinePistolSubMachineGunRubber
-  entities:
-  - uid: 16533
-    components:
-    - type: Transform
-      pos: -25.60543,46.775215
-      parent: 2
-- proto: BoxMagazinePistolSubMachineGunTopMounted
-  entities:
-  - uid: 16547
-    components:
-    - type: Transform
-      pos: -27.611324,48.1461
-      parent: 2
-- proto: BoxMagazineShotgunBeanbag
-  entities:
-  - uid: 16542
+  - uid: 4455
     components:
     - type: Transform
-      pos: -23.628233,46.72834
+      pos: -25.31419,46.6914
       parent: 2
-- proto: BoxMagazineShotgunSlug
-  entities:
-  - uid: 16543
+  - uid: 9690
     components:
     - type: Transform
-      pos: -23.346983,46.618965
+      pos: -33.587025,38.24255
       parent: 2
 - proto: BoxMaintenanceLightbulb
   entities:
@@ -26136,11 +26196,6 @@ entities:
     - type: Transform
       pos: 38.5,46.5
       parent: 2
-  - uid: 3551
-    components:
-    - type: Transform
-      pos: -31.5,46.5
-      parent: 2
   - uid: 3582
     components:
     - type: Transform
@@ -26161,11 +26216,6 @@ entities:
     - type: Transform
       pos: -12.5,44.5
       parent: 2
-  - uid: 3816
-    components:
-    - type: Transform
-      pos: -29.5,46.5
-      parent: 2
   - uid: 3833
     components:
     - type: Transform
@@ -26316,11 +26366,6 @@ entities:
     - type: Transform
       pos: -42.5,68.5
       parent: 2
-  - uid: 4888
-    components:
-    - type: Transform
-      pos: -30.5,46.5
-      parent: 2
   - uid: 4904
     components:
     - type: Transform
@@ -26436,6 +26481,11 @@ entities:
     - type: Transform
       pos: 87.5,18.5
       parent: 2
+  - uid: 6327
+    components:
+    - type: Transform
+      pos: -31.5,44.5
+      parent: 2
   - uid: 6387
     components:
     - type: Transform
@@ -26641,6 +26691,11 @@ entities:
     - type: Transform
       pos: 2.5,19.5
       parent: 2
+  - uid: 7553
+    components:
+    - type: Transform
+      pos: -27.5,44.5
+      parent: 2
   - uid: 7570
     components:
     - type: Transform
@@ -26826,11 +26881,6 @@ entities:
     - type: Transform
       pos: -74.5,5.5
       parent: 2
-  - uid: 8469
-    components:
-    - type: Transform
-      pos: -28.5,46.5
-      parent: 2
   - uid: 8744
     components:
     - type: Transform
@@ -26861,16 +26911,6 @@ entities:
     - type: Transform
       pos: -44.5,23.5
       parent: 2
-  - uid: 9305
-    components:
-    - type: Transform
-      pos: -29.5,47.5
-      parent: 2
-  - uid: 9517
-    components:
-    - type: Transform
-      pos: -29.5,48.5
-      parent: 2
   - uid: 9618
     components:
     - type: Transform
@@ -36106,11 +36146,6 @@ entities:
     - type: Transform
       pos: -35.5,34.5
       parent: 2
-  - uid: 15641
-    components:
-    - type: Transform
-      pos: -29.5,45.5
-      parent: 2
   - uid: 15644
     components:
     - type: Transform
@@ -36156,6 +36191,11 @@ entities:
     - type: Transform
       pos: -40.5,26.5
       parent: 2
+  - uid: 15859
+    components:
+    - type: Transform
+      pos: -23.5,43.5
+      parent: 2
   - uid: 15883
     components:
     - type: Transform
@@ -44576,11 +44616,6 @@ entities:
     - type: Transform
       pos: -20.5,48.5
       parent: 2
-  - uid: 21815
-    components:
-    - type: Transform
-      pos: -19.5,48.5
-      parent: 2
   - uid: 21816
     components:
     - type: Transform
@@ -56691,16 +56726,6 @@ entities:
     - type: Transform
       pos: -24.5,43.5
       parent: 2
-  - uid: 34121
-    components:
-    - type: Transform
-      pos: -18.5,47.5
-      parent: 2
-  - uid: 34122
-    components:
-    - type: Transform
-      pos: -18.5,46.5
-      parent: 2
   - uid: 34123
     components:
     - type: Transform
@@ -56721,11 +56746,6 @@ entities:
     - type: Transform
       pos: -29.5,43.5
       parent: 2
-  - uid: 34127
-    components:
-    - type: Transform
-      pos: -29.5,44.5
-      parent: 2
   - uid: 34128
     components:
     - type: Transform
@@ -61067,6 +61087,11 @@ entities:
     - type: Transform
       pos: -31.5,52.5
       parent: 2
+  - uid: 8469
+    components:
+    - type: Transform
+      pos: -18.5,46.5
+      parent: 2
   - uid: 8690
     components:
     - type: Transform
@@ -61127,11 +61152,6 @@ entities:
     - type: Transform
       pos: -97.5,-34.5
       parent: 2
-  - uid: 9318
-    components:
-    - type: Transform
-      pos: -25.5,49.5
-      parent: 2
   - uid: 9515
     components:
     - type: Transform
@@ -67092,21 +67112,11 @@ entities:
     - type: Transform
       pos: -33.5,52.5
       parent: 2
-  - uid: 15535
-    components:
-    - type: Transform
-      pos: -24.5,49.5
-      parent: 2
   - uid: 15536
     components:
     - type: Transform
       pos: -26.5,23.5
       parent: 2
-  - uid: 15543
-    components:
-    - type: Transform
-      pos: -30.5,49.5
-      parent: 2
   - uid: 15545
     components:
     - type: Transform
@@ -67122,11 +67132,6 @@ entities:
     - type: Transform
       pos: -31.5,23.5
       parent: 2
-  - uid: 15645
-    components:
-    - type: Transform
-      pos: -26.5,49.5
-      parent: 2
   - uid: 15679
     components:
     - type: Transform
@@ -67292,11 +67297,6 @@ entities:
     - type: Transform
       pos: 0.5,28.5
       parent: 2
-  - uid: 16282
-    components:
-    - type: Transform
-      pos: -26.5,50.5
-      parent: 2
   - uid: 16283
     components:
     - type: Transform
@@ -73752,76 +73752,6 @@ entities:
     - type: Transform
       pos: -17.5,51.5
       parent: 2
-  - uid: 36152
-    components:
-    - type: Transform
-      pos: -23.5,49.5
-      parent: 2
-  - uid: 36153
-    components:
-    - type: Transform
-      pos: -22.5,49.5
-      parent: 2
-  - uid: 36154
-    components:
-    - type: Transform
-      pos: -21.5,49.5
-      parent: 2
-  - uid: 36155
-    components:
-    - type: Transform
-      pos: -20.5,49.5
-      parent: 2
-  - uid: 36156
-    components:
-    - type: Transform
-      pos: -19.5,49.5
-      parent: 2
-  - uid: 36157
-    components:
-    - type: Transform
-      pos: -28.5,45.5
-      parent: 2
-  - uid: 36158
-    components:
-    - type: Transform
-      pos: -28.5,46.5
-      parent: 2
-  - uid: 36159
-    components:
-    - type: Transform
-      pos: -28.5,47.5
-      parent: 2
-  - uid: 36160
-    components:
-    - type: Transform
-      pos: -28.5,48.5
-      parent: 2
-  - uid: 36161
-    components:
-    - type: Transform
-      pos: -28.5,49.5
-      parent: 2
-  - uid: 36162
-    components:
-    - type: Transform
-      pos: -27.5,49.5
-      parent: 2
-  - uid: 36163
-    components:
-    - type: Transform
-      pos: -28.5,44.5
-      parent: 2
-  - uid: 36164
-    components:
-    - type: Transform
-      pos: -28.5,43.5
-      parent: 2
-  - uid: 36165
-    components:
-    - type: Transform
-      pos: -27.5,43.5
-      parent: 2
   - uid: 36166
     components:
     - type: Transform
@@ -73877,11 +73807,6 @@ entities:
     - type: Transform
       pos: -19.5,46.5
       parent: 2
-  - uid: 36177
-    components:
-    - type: Transform
-      pos: -18.5,46.5
-      parent: 2
   - uid: 36178
     components:
     - type: Transform
@@ -73907,11 +73832,6 @@ entities:
     - type: Transform
       pos: -17.5,49.5
       parent: 2
-  - uid: 36183
-    components:
-    - type: Transform
-      pos: -18.5,49.5
-      parent: 2
   - uid: 36185
     components:
     - type: Transform
@@ -90767,6 +90687,11 @@ entities:
       parent: 2
 - proto: ClosetJanitorFilled
   entities:
+  - uid: 15996
+    components:
+    - type: Transform
+      pos: -37.5,22.5
+      parent: 2
   - uid: 18517
     components:
     - type: Transform
@@ -90774,10 +90699,10 @@ entities:
       parent: 2
 - proto: ClosetL3JanitorFilled
   entities:
-  - uid: 18518
+  - uid: 15961
     components:
     - type: Transform
-      pos: -37.500065,22.496
+      pos: -38.5,21.5
       parent: 2
 - proto: ClosetL3ScienceFilled
   entities:
@@ -91426,6 +91351,18 @@ entities:
     - type: Transform
       pos: 87.56079,41.157158
       parent: 2
+- proto: ClothingHeadHelmetRiot
+  entities:
+  - uid: 8203
+    components:
+    - type: Transform
+      pos: -18.352938,47.849854
+      parent: 2
+  - uid: 28971
+    components:
+    - type: Transform
+      pos: -18.707106,47.655407
+      parent: 2
 - proto: ClothingHeadHelmetScaf
   entities:
   - uid: 33617
@@ -91515,6 +91452,18 @@ entities:
     - type: Transform
       pos: 92.000565,27.21315
       parent: 2
+- proto: ClothingMaskGasSwat
+  entities:
+  - uid: 8406
+    components:
+    - type: Transform
+      pos: -18.727938,47.662354
+      parent: 2
+  - uid: 28884
+    components:
+    - type: Transform
+      pos: -18.359882,47.898464
+      parent: 2
 - proto: ClothingMaskMime
   entities:
   - uid: 33589
@@ -91777,6 +91726,18 @@ entities:
     - type: Transform
       pos: -20.244751,45.862785
       parent: 2
+- proto: ClothingOuterArmorRiot
+  entities:
+  - uid: 28953
+    components:
+    - type: Transform
+      pos: -18.665438,47.36374
+      parent: 2
+  - uid: 28956
+    components:
+    - type: Transform
+      pos: -18.345993,47.56513
+      parent: 2
 - proto: ClothingOuterClownPriest
   entities:
   - uid: 14112
@@ -94223,6 +94184,18 @@ entities:
     - type: Transform
       pos: -55.5,-7.5
       parent: 2
+- proto: CrateFunPlushie
+  entities:
+  - uid: 34039
+    components:
+    - type: Transform
+      pos: -67.5,14.5
+      parent: 2
+  - uid: 34040
+    components:
+    - type: Transform
+      pos: -67.5,15.5
+      parent: 2
 - proto: CrateHydroponicsSeeds
   entities:
   - uid: 18198
@@ -94296,13 +94269,6 @@ entities:
       parent: 2
     - type: Lock
       locked: False
-- proto: CrateSecurityHelmet
-  entities:
-  - uid: 15830
-    components:
-    - type: Transform
-      pos: -19.5,48.5
-      parent: 2
 - proto: CrateSecurityNonlethal
   entities:
   - uid: 15490
@@ -94312,10 +94278,10 @@ entities:
       parent: 2
 - proto: CrateSecurityRiot
   entities:
-  - uid: 22668
+  - uid: 15995
     components:
     - type: Transform
-      pos: -21.219345,48.691765
+      pos: -24.5,44.5
       parent: 2
 - proto: CrateServiceJanitorialSupplies
   entities:
@@ -94324,11 +94290,6 @@ entities:
     - type: Transform
       pos: 33.5,-2.5
       parent: 2
-  - uid: 18519
-    components:
-    - type: Transform
-      pos: -38.5,21.5
-      parent: 2
 - proto: CrateServicePersonnel
   entities:
   - uid: 5718
@@ -95241,11 +95202,6 @@ entities:
     - type: Transform
       pos: -26.5,48.5
       parent: 2
-  - uid: 16507
-    components:
-    - type: Transform
-      pos: -24.5,48.5
-      parent: 2
   - uid: 16508
     components:
     - type: Transform
@@ -105089,12 +105045,6 @@ entities:
     - type: Transform
       pos: 3.5,7.5
       parent: 2
-  - uid: 7553
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-2.5
-      parent: 2
   - uid: 7713
     components:
     - type: Transform
@@ -105382,6 +105332,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 63.5,29.5
       parent: 2
+  - uid: 15998
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 2
   - uid: 16553
     components:
     - type: Transform
@@ -111153,12 +111109,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,11.5
       parent: 2
-  - uid: 17011
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,44.5
-      parent: 2
   - uid: 17030
     components:
     - type: Transform
@@ -111232,7 +111182,7 @@ entities:
       pos: -34.5,7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -22674.162
+      secondsUntilStateChange: -29192.9
       state: Closing
   - uid: 24108
     components:
@@ -111366,7 +111316,7 @@ entities:
       pos: -34.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -86886.96
+      secondsUntilStateChange: -93405.695
   - uid: 25327
     components:
     - type: Transform
@@ -111524,6 +111474,65 @@ entities:
     - type: Transform
       pos: -33.5,7.5
       parent: 2
+  - uid: 29022
+    components:
+    - type: Transform
+      pos: -34.5,64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 29039
+  - uid: 29024
+    components:
+    - type: Transform
+      pos: -28.5,60.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25316
+  - uid: 29025
+    components:
+    - type: Transform
+      pos: -28.5,59.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25316
+  - uid: 29026
+    components:
+    - type: Transform
+      pos: -24.5,55.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25316
+  - uid: 29030
+    components:
+    - type: Transform
+      pos: -28.5,64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25316
+      - 29039
+  - uid: 29085
+    components:
+    - type: Transform
+      pos: 70.5,-17.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25298
+      - 29087
+  - uid: 29086
+    components:
+    - type: Transform
+      pos: 70.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 25298
+      - 29087
   - uid: 31106
     components:
     - type: Transform
@@ -111648,13 +111657,41 @@ entities:
   - uid: 7937
     components:
     - type: Transform
-      pos: -42.302696,19.79333
+      pos: -42.70451,20.179436
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 16291
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 16291
+    - type: ActionsContainer
   - uid: 8031
     components:
     - type: Transform
-      pos: -42.458946,19.894892
+      pos: -42.35034,20.408602
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 16335
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 16335
+    - type: ActionsContainer
   - uid: 9601
     components:
     - type: Transform
@@ -114262,7 +114299,7 @@ entities:
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 5652
@@ -116207,14 +116244,14 @@ entities:
       pos: -62.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34698
     components:
     - type: Transform
       pos: -57.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34712
     components:
     - type: Transform
@@ -116222,7 +116259,7 @@ entities:
       pos: -62.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34713
     components:
     - type: Transform
@@ -116230,7 +116267,7 @@ entities:
       pos: -64.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34714
     components:
     - type: Transform
@@ -116238,7 +116275,7 @@ entities:
       pos: -65.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34715
     components:
     - type: Transform
@@ -116246,7 +116283,7 @@ entities:
       pos: -67.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34716
     components:
     - type: Transform
@@ -116254,7 +116291,7 @@ entities:
       pos: -66.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34717
     components:
     - type: Transform
@@ -116262,7 +116299,7 @@ entities:
       pos: -63.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34772
     components:
     - type: Transform
@@ -116270,7 +116307,7 @@ entities:
       pos: -57.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34773
     components:
     - type: Transform
@@ -116278,7 +116315,7 @@ entities:
       pos: -68.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34775
     components:
     - type: Transform
@@ -116286,7 +116323,7 @@ entities:
       pos: -58.5,56.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34780
     components:
     - type: Transform
@@ -116294,7 +116331,7 @@ entities:
       pos: -59.5,57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34785
     components:
     - type: Transform
@@ -118192,6 +118229,86 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16491
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16497
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -62.5,56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16530
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -62.5,58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16531
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16542
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18020
     components:
     - type: Transform
@@ -139175,14 +139292,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 27717
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 72.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 27718
     components:
     - type: Transform
@@ -139319,14 +139428,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 27735
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 74.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 27736
     components:
     - type: Transform
@@ -142524,14 +142625,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 29287
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 29288
     components:
     - type: Transform
@@ -142548,14 +142641,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 29291
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 29693
     components:
     - type: Transform
@@ -142955,14 +143040,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 31447
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -62.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 31636
     components:
     - type: Transform
@@ -143506,7 +143583,7 @@ entities:
       pos: -61.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34694
     components:
     - type: Transform
@@ -143514,7 +143591,7 @@ entities:
       pos: -60.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34695
     components:
     - type: Transform
@@ -143522,87 +143599,7 @@ entities:
       pos: -59.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34699
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -64.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34700
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -64.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34701
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -63.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34702
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -64.5,56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34703
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -64.5,58.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34704
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -63.5,56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34705
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -63.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34706
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -62.5,56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34707
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -62.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34708
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -62.5,58.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34710
     components:
     - type: Transform
@@ -143618,21 +143615,14 @@ entities:
       pos: -57.5,60.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34718
-    components:
-    - type: Transform
-      pos: -67.5,60.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34719
     components:
     - type: Transform
       pos: -67.5,59.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34720
     components:
     - type: Transform
@@ -143640,27 +143630,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 34721
-    components:
-    - type: Transform
-      pos: -66.5,59.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34722
-    components:
-    - type: Transform
-      pos: -65.5,60.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34723
-    components:
-    - type: Transform
-      pos: -65.5,59.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 34724
     components:
     - type: Transform
@@ -143668,81 +143637,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 34725
-    components:
-    - type: Transform
-      pos: -64.5,59.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34726
-    components:
-    - type: Transform
-      pos: -63.5,60.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34727
-    components:
-    - type: Transform
-      pos: -63.5,59.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 34728
     components:
     - type: Transform
       pos: -62.5,60.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34729
-    components:
-    - type: Transform
-      pos: -62.5,59.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34741
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -63.5,58.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34742
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -65.5,58.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34743
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -65.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34744
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -65.5,56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34745
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -65.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34746
     components:
     - type: Transform
@@ -143750,15 +143651,7 @@ entities:
       pos: -66.5,58.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34747
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -66.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34748
     components:
     - type: Transform
@@ -143767,22 +143660,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 34749
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -66.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34750
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -67.5,58.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 34751
     components:
     - type: Transform
@@ -143791,14 +143668,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 34752
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -67.5,56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 34753
     components:
     - type: Transform
@@ -143806,15 +143675,7 @@ entities:
       pos: -67.5,55.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34754
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -68.5,57.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34755
     components:
     - type: Transform
@@ -143822,15 +143683,7 @@ entities:
       pos: -68.5,56.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 34756
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -68.5,55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34757
     components:
     - type: Transform
@@ -143838,7 +143691,7 @@ entities:
       pos: -68.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34758
     components:
     - type: Transform
@@ -143846,7 +143699,7 @@ entities:
       pos: -67.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34759
     components:
     - type: Transform
@@ -143854,7 +143707,7 @@ entities:
       pos: -66.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34760
     components:
     - type: Transform
@@ -143862,7 +143715,7 @@ entities:
       pos: -65.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34761
     components:
     - type: Transform
@@ -143870,7 +143723,7 @@ entities:
       pos: -64.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34762
     components:
     - type: Transform
@@ -143878,7 +143731,7 @@ entities:
       pos: -63.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34763
     components:
     - type: Transform
@@ -143886,7 +143739,7 @@ entities:
       pos: -62.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34764
     components:
     - type: Transform
@@ -143894,7 +143747,7 @@ entities:
       pos: -61.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34765
     components:
     - type: Transform
@@ -143902,7 +143755,7 @@ entities:
       pos: -60.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34766
     components:
     - type: Transform
@@ -143910,7 +143763,7 @@ entities:
       pos: -59.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34767
     components:
     - type: Transform
@@ -143918,21 +143771,21 @@ entities:
       pos: -58.5,53.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34768
     components:
     - type: Transform
       pos: -57.5,54.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34778
     components:
     - type: Transform
       pos: -58.5,59.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34786
     components:
     - type: Transform
@@ -143940,7 +143793,7 @@ entities:
       pos: -58.5,58.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34787
     components:
     - type: Transform
@@ -144810,6 +144663,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16409
+    components:
+    - type: Transform
+      pos: 74.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16412
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16518
     components:
     - type: Transform
@@ -147115,14 +146983,14 @@ entities:
       pos: -57.5,56.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34770
     components:
     - type: Transform
       pos: -58.5,61.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34776
     components:
     - type: Transform
@@ -147130,7 +146998,7 @@ entities:
       pos: -58.5,57.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34777
     components:
     - type: Transform
@@ -147138,7 +147006,7 @@ entities:
       pos: -58.5,60.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34789
     components:
     - type: Transform
@@ -147403,7 +147271,7 @@ entities:
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34782
     components:
     - type: Transform
@@ -147833,6 +147701,32 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16481
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16607
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 29087
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 16823
     components:
     - type: Transform
@@ -148042,6 +147936,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25316
+      - 29039
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
@@ -148055,6 +147950,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25316
+      - 29039
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
@@ -149569,16 +149465,6 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 27749
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-15.5
-      parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 27751
     components:
     - type: Transform
@@ -149950,16 +149836,6 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 29292
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,50.5
-      parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 34118
     components:
     - type: Transform
@@ -150310,6 +150186,31 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16416
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16607
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16549
+    components:
+    - type: Transform
+      pos: 72.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 29087
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 24007
     components:
     - type: Transform
@@ -150420,6 +150321,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 25316
+      - 29039
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
@@ -151988,16 +151890,6 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 27750
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-17.5
-      parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 27752
     components:
     - type: Transform
@@ -152375,16 +152267,6 @@ entities:
       joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 29293
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -25.5,50.5
-      parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 34073
     components:
     - type: Transform
@@ -152477,7 +152359,7 @@ entities:
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34794
     components:
     - type: Transform
@@ -152486,7 +152368,7 @@ entities:
     - type: AtmosDevice
       joinedGrid: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 34797
     components:
     - type: Transform
@@ -152727,11 +152609,6 @@ entities:
     - type: Transform
       pos: -7.5,8.5
       parent: 2
-  - uid: 168
-    components:
-    - type: Transform
-      pos: -14.5,-38.5
-      parent: 2
   - uid: 201
     components:
     - type: Transform
@@ -153407,11 +153284,6 @@ entities:
     - type: Transform
       pos: -24.5,57.5
       parent: 2
-  - uid: 2803
-    components:
-    - type: Transform
-      pos: -21.5,49.5
-      parent: 2
   - uid: 2828
     components:
     - type: Transform
@@ -153862,11 +153734,6 @@ entities:
     - type: Transform
       pos: -87.5,39.5
       parent: 2
-  - uid: 3761
-    components:
-    - type: Transform
-      pos: -42.5,18.5
-      parent: 2
   - uid: 3794
     components:
     - type: Transform
@@ -155007,11 +154874,6 @@ entities:
     - type: Transform
       pos: -57.5,-0.5
       parent: 2
-  - uid: 7430
-    components:
-    - type: Transform
-      pos: -41.5,18.5
-      parent: 2
   - uid: 7443
     components:
     - type: Transform
@@ -156112,11 +155974,6 @@ entities:
     - type: Transform
       pos: -49.5,52.5
       parent: 2
-  - uid: 9487
-    components:
-    - type: Transform
-      pos: -30.5,49.5
-      parent: 2
   - uid: 9489
     components:
     - type: Transform
@@ -157067,11 +156924,6 @@ entities:
     - type: Transform
       pos: -38.5,71.5
       parent: 2
-  - uid: 15792
-    components:
-    - type: Transform
-      pos: -25.5,49.5
-      parent: 2
   - uid: 15817
     components:
     - type: Transform
@@ -157112,11 +156964,6 @@ entities:
     - type: Transform
       pos: -11.5,42.5
       parent: 2
-  - uid: 15977
-    components:
-    - type: Transform
-      pos: -26.5,49.5
-      parent: 2
   - uid: 15989
     components:
     - type: Transform
@@ -157127,11 +156974,6 @@ entities:
     - type: Transform
       pos: -54.5,-0.5
       parent: 2
-  - uid: 15995
-    components:
-    - type: Transform
-      pos: -20.5,49.5
-      parent: 2
   - uid: 16243
     components:
     - type: Transform
@@ -157167,11 +157009,6 @@ entities:
     - type: Transform
       pos: -50.5,-0.5
       parent: 2
-  - uid: 16335
-    components:
-    - type: Transform
-      pos: -28.5,46.5
-      parent: 2
   - uid: 16341
     components:
     - type: Transform
@@ -157197,21 +157034,11 @@ entities:
     - type: Transform
       pos: -17.5,57.5
       parent: 2
-  - uid: 16409
-    components:
-    - type: Transform
-      pos: -28.5,47.5
-      parent: 2
   - uid: 16413
     components:
     - type: Transform
       pos: -17.5,45.5
       parent: 2
-  - uid: 16416
-    components:
-    - type: Transform
-      pos: -24.5,49.5
-      parent: 2
   - uid: 16473
     components:
     - type: Transform
@@ -157222,11 +157049,6 @@ entities:
     - type: Transform
       pos: 9.5,61.5
       parent: 2
-  - uid: 16484
-    components:
-    - type: Transform
-      pos: -19.5,49.5
-      parent: 2
   - uid: 16686
     components:
     - type: Transform
@@ -157832,6 +157654,12 @@ entities:
     - type: Transform
       pos: -81.5,-15.5
       parent: 2
+  - uid: 19382
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,22.5
+      parent: 2
   - uid: 19457
     components:
     - type: Transform
@@ -158502,6 +158330,12 @@ entities:
     - type: Transform
       pos: -52.5,-42.5
       parent: 2
+  - uid: 23582
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,33.5
+      parent: 2
   - uid: 23707
     components:
     - type: Transform
@@ -158592,6 +158426,12 @@ entities:
     - type: Transform
       pos: 33.5,-12.5
       parent: 2
+  - uid: 25359
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,34.5
+      parent: 2
   - uid: 26846
     components:
     - type: Transform
@@ -158647,11 +158487,6 @@ entities:
     - type: Transform
       pos: -20.5,46.5
       parent: 2
-  - uid: 27972
-    components:
-    - type: Transform
-      pos: -18.5,46.5
-      parent: 2
   - uid: 28007
     components:
     - type: Transform
@@ -158682,6 +158517,56 @@ entities:
     - type: Transform
       pos: -33.5,63.5
       parent: 2
+  - uid: 28944
+    components:
+    - type: Transform
+      pos: -30.5,51.5
+      parent: 2
+  - uid: 28967
+    components:
+    - type: Transform
+      pos: -18.5,46.5
+      parent: 2
+  - uid: 28984
+    components:
+    - type: Transform
+      pos: -42.5,18.5
+      parent: 2
+  - uid: 28994
+    components:
+    - type: Transform
+      pos: -41.5,18.5
+      parent: 2
+  - uid: 28995
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,22.5
+      parent: 2
+  - uid: 28997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,22.5
+      parent: 2
+  - uid: 28999
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,22.5
+      parent: 2
+  - uid: 29011
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,25.5
+      parent: 2
+  - uid: 29013
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,24.5
+      parent: 2
   - uid: 29298
     components:
     - type: Transform
@@ -159730,6 +159615,46 @@ entities:
     - type: Transform
       pos: -92.5,67.5
       parent: 2
+- proto: GunSafeLaserCarbine
+  entities:
+  - uid: 28886
+    components:
+    - type: Transform
+      anchored: True
+      pos: -25.5,48.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: GunSafePistolMk58
+  entities:
+  - uid: 28891
+    components:
+    - type: Transform
+      anchored: True
+      pos: -25.5,47.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: GunSafeShotgunKammerer
+  entities:
+  - uid: 28885
+    components:
+    - type: Transform
+      anchored: True
+      pos: -23.5,47.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: GunSafeSubMachineGunDrozd
+  entities:
+  - uid: 28963
+    components:
+    - type: Transform
+      anchored: True
+      pos: -23.5,48.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: GunSafeSubMachineGunWt550
   entities:
   - uid: 15781
@@ -160000,6 +159925,206 @@ entities:
       parent: 2
     - type: AtmosDevice
       joinedGrid: 2
+  - uid: 16482
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,56.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16483
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -67.5,60.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16484
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -62.5,59.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16488
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,57.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16490
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,58.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16493
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,55.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16494
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -62.5,57.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16495
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -62.5,55.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,60.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16502
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -68.5,57.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16503
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -64.5,59.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -68.5,55.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16515
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -63.5,60.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16533
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,56.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -67.5,56.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -65.5,58.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -66.5,55.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16538
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -66.5,57.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16539
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -67.5,58.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -66.5,59.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 34688
     components:
     - type: Transform
@@ -160021,11 +160146,6 @@ entities:
     - type: Transform
       pos: -21.5,44.5
       parent: 2
-  - uid: 23582
-    components:
-    - type: Transform
-      pos: -28.5,44.5
-      parent: 2
 - proto: HighSecCommandLocked
   entities:
   - uid: 3968
@@ -160174,7 +160294,7 @@ entities:
       pos: 12.5,14.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -53860.91
+      secondsUntilStateChange: -60379.65
   - uid: 1457
     components:
     - type: Transform
@@ -160458,7 +160578,7 @@ entities:
       pos: -13.5,4.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -95931.11
+      secondsUntilStateChange: -102449.84
   - uid: 8381
     components:
     - type: Transform
@@ -160569,12 +160689,6 @@ entities:
     - type: Transform
       pos: -70.5,1.5
       parent: 2
-  - uid: 15609
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,25.5
-      parent: 2
   - uid: 15720
     components:
     - type: Transform
@@ -160601,12 +160715,6 @@ entities:
     - type: Transform
       pos: -28.5,40.5
       parent: 2
-  - uid: 15961
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,24.5
-      parent: 2
   - uid: 16588
     components:
     - type: Transform
@@ -160664,36 +160772,6 @@ entities:
     - type: Transform
       pos: -20.5,-6.5
       parent: 2
-  - uid: 16607
-    components:
-    - type: Transform
-      pos: -7.5,22.5
-      parent: 2
-  - uid: 16608
-    components:
-    - type: Transform
-      pos: -6.5,22.5
-      parent: 2
-  - uid: 16609
-    components:
-    - type: Transform
-      pos: -5.5,22.5
-      parent: 2
-  - uid: 16610
-    components:
-    - type: Transform
-      pos: -4.5,22.5
-      parent: 2
-  - uid: 16611
-    components:
-    - type: Transform
-      pos: -9.5,34.5
-      parent: 2
-  - uid: 16612
-    components:
-    - type: Transform
-      pos: -9.5,33.5
-      parent: 2
   - uid: 16613
     components:
     - type: Transform
@@ -162749,7 +162827,7 @@ entities:
   - uid: 16532
     components:
     - type: Transform
-      pos: -27.38668,48.681465
+      pos: -28.439362,47.629753
       parent: 2
 - proto: MagazineBoxPistolPractice
   entities:
@@ -162768,7 +162846,7 @@ entities:
   - uid: 16534
     components:
     - type: Transform
-      pos: -27.527306,48.743965
+      pos: -28.762278,47.661003
       parent: 2
 - proto: MailingUnit
   entities:
@@ -164729,6 +164807,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,-48.5
       parent: 2
+- proto: OreProcessor
+  entities:
+  - uid: 16608
+    components:
+    - type: Transform
+      pos: -14.5,-38.5
+      parent: 2
 - proto: OrganHumanAppendix
   entities:
   - uid: 30079
@@ -165367,11 +165452,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.190088,-42.2273
       parent: 2
-  - uid: 29296
-    components:
-    - type: Transform
-      pos: -22.765234,50.489704
-      parent: 2
   - uid: 33448
     components:
     - type: Transform
@@ -165726,12 +165806,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 35.5,57.5
       parent: 2
-  - uid: 6315
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,34.5
-      parent: 2
   - uid: 6383
     components:
     - type: Transform
@@ -165850,12 +165924,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-14.5
       parent: 2
-  - uid: 8829
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,33.5
-      parent: 2
   - uid: 9115
     components:
     - type: Transform
@@ -165877,12 +165945,6 @@ entities:
     - type: Transform
       pos: 47.5,27.5
       parent: 2
-  - uid: 10016
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,48.5
-      parent: 2
   - uid: 11100
     components:
     - type: Transform
@@ -165916,6 +165978,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 38.5,39.5
       parent: 2
+  - uid: 27717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,48.5
+      parent: 2
   - uid: 30394
     components:
     - type: Transform
@@ -167431,11 +167499,6 @@ entities:
       parent: 2
 - proto: PottedPlantRandom
   entities:
-  - uid: 374
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 2
   - uid: 602
     components:
     - type: Transform
@@ -167566,11 +167629,6 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-  - uid: 1709
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 2
   - uid: 1715
     components:
     - type: Transform
@@ -168181,6 +168239,16 @@ entities:
     - type: Transform
       pos: 6.5,7.5
       parent: 2
+  - uid: 27749
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 2
+  - uid: 29016
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 2
   - uid: 29709
     components:
     - type: Transform
@@ -168774,12 +168842,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,25.5
       parent: 2
-  - uid: 15238
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,45.5
-      parent: 2
   - uid: 15240
     components:
     - type: Transform
@@ -169008,11 +169070,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,28.5
       parent: 2
-  - uid: 17818
-    components:
-    - type: Transform
-      pos: -18.5,48.5
-      parent: 2
   - uid: 17819
     components:
     - type: Transform
@@ -172173,15 +172230,15 @@ entities:
     - type: Transform
       pos: -52.5,-14.5
       parent: 2
-  - uid: 3948
+  - uid: 3816
     components:
     - type: Transform
-      pos: -81.5,1.5
+      pos: -26.5,44.5
       parent: 2
-  - uid: 4455
+  - uid: 3948
     components:
     - type: Transform
-      pos: -18.5,47.5
+      pos: -81.5,1.5
       parent: 2
   - uid: 5119
     components:
@@ -172486,37 +172543,12 @@ entities:
     - type: Transform
       pos: -11.5,68.5
       parent: 2
-  - uid: 15859
-    components:
-    - type: Transform
-      pos: -18.5,48.5
-      parent: 2
   - uid: 15988
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -65.5,-20.5
       parent: 2
-  - uid: 16490
-    components:
-    - type: Transform
-      pos: -23.5,47.5
-      parent: 2
-  - uid: 16491
-    components:
-    - type: Transform
-      pos: -25.5,48.5
-      parent: 2
-  - uid: 16493
-    components:
-    - type: Transform
-      pos: -23.5,48.5
-      parent: 2
-  - uid: 16494
-    components:
-    - type: Transform
-      pos: -25.5,47.5
-      parent: 2
   - uid: 16498
     components:
     - type: Transform
@@ -172608,6 +172640,11 @@ entities:
     - type: Transform
       pos: -40.5,24.5
       parent: 2
+  - uid: 19378
+    components:
+    - type: Transform
+      pos: -18.5,48.5
+      parent: 2
   - uid: 19428
     components:
     - type: Transform
@@ -172775,11 +172812,21 @@ entities:
     - type: Transform
       pos: -56.5,-14.5
       parent: 2
+  - uid: 28894
+    components:
+    - type: Transform
+      pos: -18.5,47.5
+      parent: 2
   - uid: 28969
     components:
     - type: Transform
       pos: 34.5,3.5
       parent: 2
+  - uid: 28972
+    components:
+    - type: Transform
+      pos: -21.5,48.5
+      parent: 2
   - uid: 29610
     components:
     - type: Transform
@@ -173379,12 +173426,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 65.5,-15.5
       parent: 2
-  - uid: 6327
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,47.5
-      parent: 2
   - uid: 6328
     components:
     - type: Transform
@@ -177072,11 +177113,6 @@ entities:
     - type: Transform
       pos: -50.5,54.5
       parent: 2
-  - uid: 2075
-    components:
-    - type: Transform
-      pos: -18.5,46.5
-      parent: 2
   - uid: 2202
     components:
     - type: Transform
@@ -177237,11 +177273,6 @@ entities:
     - type: Transform
       pos: -113.5,41.5
       parent: 2
-  - uid: 5536
-    components:
-    - type: Transform
-      pos: -30.5,49.5
-      parent: 2
   - uid: 5540
     components:
     - type: Transform
@@ -177522,31 +177553,11 @@ entities:
     - type: Transform
       pos: -24.5,43.5
       parent: 2
-  - uid: 15996
-    components:
-    - type: Transform
-      pos: -21.5,49.5
-      parent: 2
   - uid: 16281
     components:
     - type: Transform
       pos: -15.5,40.5
       parent: 2
-  - uid: 16481
-    components:
-    - type: Transform
-      pos: -26.5,49.5
-      parent: 2
-  - uid: 16482
-    components:
-    - type: Transform
-      pos: -25.5,49.5
-      parent: 2
-  - uid: 16483
-    components:
-    - type: Transform
-      pos: -24.5,49.5
-      parent: 2
   - uid: 16528
     components:
     - type: Transform
@@ -177557,25 +177568,10 @@ entities:
     - type: Transform
       pos: -17.5,45.5
       parent: 2
-  - uid: 16548
-    components:
-    - type: Transform
-      pos: -20.5,49.5
-      parent: 2
-  - uid: 16549
-    components:
-    - type: Transform
-      pos: -19.5,49.5
-      parent: 2
-  - uid: 16550
-    components:
-    - type: Transform
-      pos: -28.5,47.5
-      parent: 2
-  - uid: 16551
+  - uid: 16612
     components:
     - type: Transform
-      pos: -28.5,46.5
+      pos: -30.5,51.5
       parent: 2
   - uid: 18103
     components:
@@ -177837,6 +177833,18 @@ entities:
     - type: Transform
       pos: 29.5,44.5
       parent: 2
+  - uid: 22668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,33.5
+      parent: 2
+  - uid: 22679
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,34.5
+      parent: 2
   - uid: 23769
     components:
     - type: Transform
@@ -177877,6 +177885,11 @@ entities:
     - type: Transform
       pos: -33.5,36.5
       parent: 2
+  - uid: 27972
+    components:
+    - type: Transform
+      pos: -18.5,46.5
+      parent: 2
   - uid: 30674
     components:
     - type: Transform
@@ -180991,6 +181004,24 @@ entities:
     - type: Transform
       pos: -52.5,-47.5
       parent: 2
+  - uid: 19380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,24.5
+      parent: 2
+  - uid: 19381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,25.5
+      parent: 2
+  - uid: 19383
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,22.5
+      parent: 2
   - uid: 19452
     components:
     - type: Transform
@@ -181391,6 +181422,18 @@ entities:
     - type: Transform
       pos: -46.5,-48.5
       parent: 2
+  - uid: 21815
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,22.5
+      parent: 2
+  - uid: 22420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,22.5
+      parent: 2
   - uid: 23044
     components:
     - type: Transform
@@ -181501,6 +181544,12 @@ entities:
     - type: Transform
       pos: -43.5,-39.5
       parent: 2
+  - uid: 29001
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,22.5
+      parent: 2
   - uid: 29304
     components:
     - type: Transform
@@ -181987,13 +182036,29 @@ entities:
   - uid: 5116
     components:
     - type: Transform
-      pos: -18.601517,47.758553
+      pos: -21.559855,48.603073
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 28912
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 28912
   - uid: 15524
     components:
     - type: Transform
-      pos: -18.39058,47.610115
+      pos: -21.372355,48.415573
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 28913
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 28913
 - proto: RiotShield
   entities:
   - uid: 16523
@@ -182086,11 +182151,6 @@ entities:
     - type: Transform
       pos: -4.5,-49.5
       parent: 2
-  - uid: 25359
-    components:
-    - type: Transform
-      pos: 12.5,-27.5
-      parent: 2
   - uid: 25418
     components:
     - type: Transform
@@ -182137,10 +182197,10 @@ entities:
       parent: 2
 - proto: SecurityTechFab
   entities:
-  - uid: 17027
+  - uid: 28918
     components:
     - type: Transform
-      pos: -27.5,46.5
+      pos: -28.5,45.5
       parent: 2
 - proto: SeedExtractor
   entities:
@@ -182263,7 +182323,7 @@ entities:
   - uid: 16505
     components:
     - type: Transform
-      pos: -25.212278,46.15545
+      pos: -28.270676,46.46827
       parent: 2
   - uid: 35085
     components:
@@ -182334,7 +182394,7 @@ entities:
   - uid: 16506
     components:
     - type: Transform
-      pos: -25.618528,46.077324
+      pos: -28.583176,46.496048
       parent: 2
 - proto: SheetSteel
   entities:
@@ -182388,7 +182448,7 @@ entities:
   - uid: 16504
     components:
     - type: Transform
-      pos: -25.446653,46.1242
+      pos: -28.534563,46.746048
       parent: 2
 - proto: SheetSteel1
   entities:
@@ -183119,24 +183179,6 @@ entities:
     - type: Transform
       pos: -27.5,43.5
       parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        19383:
-        - Pressed: Toggle
-        19382:
-        - Pressed: Toggle
-        19378:
-        - Pressed: Toggle
-        19377:
-        - Pressed: Toggle
-        19376:
-        - Pressed: Toggle
-        19379:
-        - Pressed: Toggle
-        19381:
-        - Pressed: Toggle
-        19380:
-        - Pressed: Toggle
   - uid: 19938
     components:
     - type: Transform
@@ -183775,11 +183817,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -41.5,36.5
       parent: 2
-  - uid: 22420
-    components:
-    - type: Transform
-      pos: -30.5,45.5
-      parent: 2
   - uid: 34665
     components:
     - type: Transform
@@ -188626,6 +188663,11 @@ entities:
     - type: Transform
       pos: -41.5,19.5
       parent: 2
+  - uid: 29060
+    components:
+    - type: Transform
+      pos: -42.5,19.5
+      parent: 2
 - proto: SpawnVehicleSecway
   entities:
   - uid: 9654
@@ -188767,10 +188809,40 @@ entities:
     - type: Transform
       pos: -1.5,-34.5
       parent: 2
-  - uid: 8406
+  - uid: 28917
     components:
     - type: Transform
-      pos: -75.5,10.5
+      pos: 12.5,-27.5
+      parent: 2
+  - uid: 28920
+    components:
+    - type: Transform
+      pos: -33.5,-12.5
+      parent: 2
+  - uid: 28940
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 2
+  - uid: 29017
+    components:
+    - type: Transform
+      pos: 48.5,-0.5
+      parent: 2
+  - uid: 29018
+    components:
+    - type: Transform
+      pos: -42.5,11.5
+      parent: 2
+  - uid: 29019
+    components:
+    - type: Transform
+      pos: 5.5,24.5
+      parent: 2
+  - uid: 29021
+    components:
+    - type: Transform
+      pos: -0.5,57.5
       parent: 2
   - uid: 30296
     components:
@@ -189482,27 +189554,644 @@ entities:
       parent: 2
 - proto: SurveillanceCameraCommand
   entities:
+  - uid: 9510
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,75.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Telecomms.
   - uid: 22955
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 23.5,57.5
       parent: 2
+  - uid: 31276
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,52.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: The Golden Carp
+  - uid: 31301
+    components:
+    - type: Transform
+      pos: 18.5,52.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Bridge
+  - uid: 31305
+    components:
+    - type: Transform
+      pos: 24.5,49.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Captain's Quarters
+  - uid: 31307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,39.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Vault
+  - uid: 31403
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,44.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Main Hall
+  - uid: 31447
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,43.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Front Desk
+  - uid: 32100
+    components:
+    - type: Transform
+      pos: 26.5,45.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: East Hall
+  - uid: 32101
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,50.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: The Council
+  - uid: 32106
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: EVA Storage
 - proto: SurveillanceCameraEngineering
   entities:
-  - uid: 808
+  - uid: 28921
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,15.5
       parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Hall South
+  - uid: 32415
+    components:
+    - type: Transform
+      pos: -49.5,20.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering Lounge
+  - uid: 32434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -49.5,27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Tech Vault
+  - uid: 32435
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -50.5,18.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Front Desk
+  - uid: 32442
+    components:
+    - type: Transform
+      pos: -49.5,11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: CE's Office
+  - uid: 32444
+    components:
+    - type: Transform
+      pos: -60.5,12.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: CE's Room
+  - uid: 32445
+    components:
+    - type: Transform
+      pos: -60.5,15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Gravity Generator
+  - uid: 32451
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -59.5,31.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: AME
+  - uid: 33652
+    components:
+    - type: Transform
+      pos: -41.5,37.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmospherics South
+  - uid: 33690
+    components:
+    - type: Transform
+      pos: -52.5,43.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmospherics North
+  - uid: 34032
+    components:
+    - type: Transform
+      pos: -55.5,55.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: TEG
+  - uid: 34033
+    components:
+    - type: Transform
+      pos: -98.5,48.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Particle Accelerator
+  - uid: 34036
+    components:
+    - type: Transform
+      pos: -52.5,29.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Hall North
+  - uid: 34037
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -45.5,35.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Atmos Locker Room
+  - uid: 34038
+    components:
+    - type: Transform
+      pos: -55.5,33.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering Locker Room
+- proto: SurveillanceCameraGeneral
+  entities:
+  - uid: 29088
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Arrivals North
+  - uid: 29089
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-49.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Arrivals South
+  - uid: 29245
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-17.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Dining Hall
+  - uid: 29247
+    components:
+    - type: Transform
+      pos: -53.5,7.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: West Engineering Front
+  - uid: 29252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,23.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Crossing North
+  - uid: 29253
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: South Crossing
+  - uid: 29287
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: South Hall
+  - uid: 29293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: North Hall
+  - uid: 29296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,52.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Court Entrance
+  - uid: 30415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,65.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Northerner Hall
+  - uid: 31063
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,78.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Evac West
+  - uid: 31111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,78.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Evac East
+  - uid: 32124
+    components:
+    - type: Transform
+      pos: -15.5,19.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: West Security Front
+  - uid: 32140
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -40.5,17.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: West Hall
+  - uid: 32144
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,-1.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: West Hydro Front
+  - uid: 32146
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: East Hall
+  - uid: 32147
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-16.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Easterner Hall
+  - uid: 32148
+    components:
+    - type: Transform
+      pos: -17.5,-15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: West Logistics Front
+  - uid: 32412
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-3.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Park
 - proto: SurveillanceCameraMedical
   entities:
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 22.5,-2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Chemistry 2
+  - uid: 3761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,14.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Medical lounge
+  - uid: 3763
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-9.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: CMO's Office
+  - uid: 8716
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,13.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Morgue
+  - uid: 8829
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Cryonics
+  - uid: 9318
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Cloning
+  - uid: 9487
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,0.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Chemistry 1
+  - uid: 18518
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-8.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Group therapy Room
+  - uid: 18519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-8.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Therapy room
+  - uid: 19376
+    components:
+    - type: Transform
+      pos: -18.5,1.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Medical
   - uid: 22954
     components:
     - type: Transform
       pos: 11.5,9.5
       parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Medbay
+  - uid: 28909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: CMO's Room
+  - uid: 28910
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology
+  - uid: 29291
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Waiting Room North
+  - uid: 29292
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Waiting Room South
 - proto: SurveillanceCameraRouterCircuitboard
   entities:
   - uid: 35828
@@ -189561,36 +190250,870 @@ entities:
       parent: 2
 - proto: SurveillanceCameraScience
   entities:
+  - uid: 1707
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Epimestics lounge
+  - uid: 1709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,19.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Chapel West
   - uid: 22951
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 30.5,30.5
       parent: 2
+  - uid: 22956
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,25.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Locker Room
+  - uid: 28901
+    components:
+    - type: Transform
+      pos: 44.5,28.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Mystagogue's Room
+  - uid: 28902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,25.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Mystagogue's Office
+  - uid: 28903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,22.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Chapel East
+  - uid: 29062
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Front Desk
+  - uid: 29068
+    components:
+    - type: Transform
+      pos: 46.5,32.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Mantis' Room
+  - uid: 29075
+    components:
+    - type: Transform
+      pos: 46.5,36.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Anomaly Generator
+  - uid: 29076
+    components:
+    - type: Transform
+      pos: 46.5,42.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Robotics
+  - uid: 29079
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,38.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Hall
+  - uid: 29082
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,51.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Xenoarchaeology
+  - uid: 29084
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,26.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Chaplain's Room
 - proto: SurveillanceCameraSecurity
   entities:
+  - uid: 6314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,64.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Psych. Ward
+  - uid: 7797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,65.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Psych. Ward Bar
+  - uid: 8714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,44.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Shooting range
+  - uid: 15792
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,31.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Evidence room
+  - uid: 15977
+    components:
+    - type: Transform
+      pos: -27.5,28.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Brig
+  - uid: 15997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,42.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Warden's Office
+  - uid: 16282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Detective's Office
+  - uid: 19379
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -23.5,56.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Psych. Ward lounge
   - uid: 22953
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,30.5
       parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: South Hall
+  - uid: 27750
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -18.5,34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Interrogation Room 2
+  - uid: 28878
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,48.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Armory
+  - uid: 28887
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,38.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: North Hall
+  - uid: 28927
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,67.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Corpsman's Room
+  - uid: 28929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,26.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: HOS's Office
+  - uid: 28930
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: HOS's Room
+  - uid: 28961
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Interrogation Room 1
+  - uid: 28966
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,38.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Changing room
+  - uid: 28981
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,59.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Psych. Ward Hydroponics
+  - uid: 29250
+    components:
+    - type: Transform
+      pos: -18.5,24.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Front Desk
 - proto: SurveillanceCameraService
   entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: -6.5,58.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Lawyer's Office
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen West
+  - uid: 15543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -39.5,24.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Custodial Office
+  - uid: 15609
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Disposals
+  - uid: 17011
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Bar
+  - uid: 17027
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-24.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Boxing Ring
   - uid: 22952
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -73.5,10.5
       parent: 2
+  - uid: 29083
+    components:
+    - type: Transform
+      pos: 54.5,26.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Library
+  - uid: 29134
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,-28.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen 4
+  - uid: 29147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-28.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen 3
+  - uid: 29154
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -56.5,-22.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen 2
+  - uid: 29155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -54.5,-14.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen 1
+  - uid: 29157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -57.5,-8.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Freezer
+  - uid: 29186
+    components:
+    - type: Transform
+      pos: -52.5,-3.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Hydro Locker Room
+  - uid: 29192
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -57.5,-3.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Hydro Lounge
+  - uid: 29193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -62.5,2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Hydro West
+  - uid: 29194
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -49.5,4.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Hydro East
+  - uid: 29200
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -71.5,2.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Tools Room
+  - uid: 29201
+    components:
+    - type: Transform
+      pos: -77.5,3.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Theatre
+  - uid: 29202
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -86.5,6.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Center
+  - uid: 29206
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -82.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Water Kingdom
+  - uid: 29212
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -106.5,26.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Rocky Roofs
+  - uid: 29213
+    components:
+    - type: Transform
+      pos: -82.5,19.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo N Hall
+  - uid: 29214
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -94.5,22.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo NW Hall
+  - uid: 29217
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -96.5,11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo W Hall
+  - uid: 29229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -106.5,10.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Terra
+  - uid: 29235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -94.5,-7.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo SW Hall
+  - uid: 29237
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -106.5,-9.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Sandy Sorrows
+  - uid: 29238
+    components:
+    - type: Transform
+      pos: -86.5,-13.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zoo Snowland
+  - uid: 29240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -87.5,-3.5
+      parent: 2
+  - uid: 32107
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: HOP's Room
+  - uid: 32109
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: HOP's Office
+  - uid: 32145
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-9.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Reporter's Office
+  - uid: 34034
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -69.5,15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Zookeeper's office
 - proto: SurveillanceCameraSupply
   entities:
-  - uid: 22956
+  - uid: 28926
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-18.5
       parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Front Desk
+  - uid: 29090
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-39.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage
+  - uid: 29091
+    components:
+    - type: Transform
+      pos: -28.5,-44.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Docks 1
+  - uid: 29094
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-46.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Docks 2
+  - uid: 29095
+    components:
+    - type: Transform
+      pos: -20.5,-35.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: 'Belts Hell '
+  - uid: 29100
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Locker Room
+  - uid: 29112
+    components:
+    - type: Transform
+      pos: -13.5,-30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Logistics Lounge
+  - uid: 29117
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Mailroom
+  - uid: 29121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -22.5,-22.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Unloading Bay
+  - uid: 29122
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-23.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: LO's Room
+  - uid: 29130
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,-20.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: LO's Office
+  - uid: 29196
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -46.5,-32.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Backrooms South
+  - uid: 29198
+    components:
+    - type: Transform
+      pos: -56.5,-29.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Backrooms West
+  - uid: 29199
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -59.5,-19.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Backrooms North
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 22950
@@ -191252,11 +192775,6 @@ entities:
     - type: Transform
       pos: -33.5,38.5
       parent: 2
-  - uid: 9510
-    components:
-    - type: Transform
-      pos: -30.5,44.5
-      parent: 2
   - uid: 15450
     components:
     - type: Transform
@@ -191277,6 +192795,12 @@ entities:
     - type: Transform
       pos: -21.5,33.5
       parent: 2
+  - uid: 15810
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,47.5
+      parent: 2
   - uid: 16278
     components:
     - type: Transform
@@ -191292,16 +192816,6 @@ entities:
     - type: Transform
       pos: -33.5,42.5
       parent: 2
-  - uid: 16488
-    components:
-    - type: Transform
-      pos: -27.5,47.5
-      parent: 2
-  - uid: 16497
-    components:
-    - type: Transform
-      pos: -27.5,48.5
-      parent: 2
   - uid: 16649
     components:
     - type: Transform
@@ -191379,6 +192893,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-6.5
       parent: 2
+  - uid: 28919
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -28.5,46.5
+      parent: 2
   - uid: 29538
     components:
     - type: Transform
@@ -191741,12 +193261,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-2.5
       parent: 2
-  - uid: 1707
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-2.5
-      parent: 2
   - uid: 1798
     components:
     - type: Transform
@@ -193084,6 +194598,12 @@ entities:
     - type: Transform
       pos: -69.5,5.5
       parent: 2
+  - uid: 28934
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 2
   - uid: 29704
     components:
     - type: Transform
@@ -193563,6 +195083,16 @@ entities:
     - type: Transform
       pos: -16.5,35.5
       parent: 2
+  - uid: 16610
+    components:
+    - type: Transform
+      pos: -41.5,18.5
+      parent: 2
+  - uid: 16611
+    components:
+    - type: Transform
+      pos: -42.5,18.5
+      parent: 2
   - uid: 23388
     components:
     - type: Transform
@@ -194496,7 +196026,12 @@ entities:
   - uid: 23760
     components:
     - type: Transform
-      pos: -42.49801,19.51208
+      pos: -41.80608,20.429436
+      parent: 2
+  - uid: 29061
+    components:
+    - type: Transform
+      pos: -41.450512,24.241388
       parent: 2
 - proto: VehicleKeySecway
   entities:
@@ -194783,10 +196318,10 @@ entities:
       parent: 2
 - proto: VendingMachineDrGibb
   entities:
-  - uid: 134
+  - uid: 27735
     components:
     - type: Transform
-      pos: 4.5,-12.5
+      pos: 4.5,-18.5
       parent: 2
 - proto: VendingMachineEngiDrobe
   entities:
@@ -194953,15 +196488,15 @@ entities:
       parent: 2
 - proto: VendingMachineSec
   entities:
-  - uid: 15523
+  - uid: 15578
     components:
     - type: Transform
-      pos: -24.5,44.5
+      pos: -7.5,43.5
       parent: 2
-  - uid: 15578
+  - uid: 28941
     components:
     - type: Transform
-      pos: -7.5,43.5
+      pos: -27.5,48.5
       parent: 2
 - proto: VendingMachineSecDrobe
   entities:
@@ -198819,6 +200354,11 @@ entities:
     - type: Transform
       pos: -10.5,-12.5
       parent: 2
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -28.5,50.5
+      parent: 2
   - uid: 164
     components:
     - type: Transform
@@ -199657,7 +201197,7 @@ entities:
   - uid: 2713
     components:
     - type: Transform
-      pos: -28.5,45.5
+      pos: -25.5,50.5
       parent: 2
   - uid: 2736
     components:
@@ -199739,6 +201279,11 @@ entities:
     - type: Transform
       pos: -11.5,46.5
       parent: 2
+  - uid: 2803
+    components:
+    - type: Transform
+      pos: -26.5,50.5
+      parent: 2
   - uid: 2806
     components:
     - type: Transform
@@ -200229,6 +201774,11 @@ entities:
     - type: Transform
       pos: 40.5,-35.5
       parent: 2
+  - uid: 3551
+    components:
+    - type: Transform
+      pos: -27.5,49.5
+      parent: 2
   - uid: 3552
     components:
     - type: Transform
@@ -202414,6 +203964,11 @@ entities:
     - type: Transform
       pos: -99.5,-0.5
       parent: 2
+  - uid: 6315
+    components:
+    - type: Transform
+      pos: -26.5,49.5
+      parent: 2
   - uid: 6324
     components:
     - type: Transform
@@ -202514,6 +204069,11 @@ entities:
     - type: Transform
       pos: 54.5,-32.5
       parent: 2
+  - uid: 6527
+    components:
+    - type: Transform
+      pos: -27.5,50.5
+      parent: 2
   - uid: 6558
     components:
     - type: Transform
@@ -202834,6 +204394,11 @@ entities:
     - type: Transform
       pos: -66.5,-7.5
       parent: 2
+  - uid: 7430
+    components:
+    - type: Transform
+      pos: -25.5,49.5
+      parent: 2
   - uid: 7431
     components:
     - type: Transform
@@ -203089,11 +204654,6 @@ entities:
     - type: Transform
       pos: -91.5,-6.5
       parent: 2
-  - uid: 7797
-    components:
-    - type: Transform
-      pos: -30.5,51.5
-      parent: 2
   - uid: 7808
     components:
     - type: Transform
@@ -205064,6 +206624,11 @@ entities:
     - type: Transform
       pos: 36.5,50.5
       parent: 2
+  - uid: 9305
+    components:
+    - type: Transform
+      pos: -29.5,49.5
+      parent: 2
   - uid: 9335
     components:
     - type: Transform
@@ -205329,6 +206894,11 @@ entities:
     - type: Transform
       pos: -59.5,56.5
       parent: 2
+  - uid: 9517
+    components:
+    - type: Transform
+      pos: -20.5,49.5
+      parent: 2
   - uid: 9528
     components:
     - type: Transform
@@ -205544,6 +207114,11 @@ entities:
     - type: Transform
       pos: -47.5,58.5
       parent: 2
+  - uid: 10016
+    components:
+    - type: Transform
+      pos: -29.5,44.5
+      parent: 2
   - uid: 10028
     components:
     - type: Transform
@@ -206394,6 +207969,11 @@ entities:
     - type: Transform
       pos: -1.5,65.5
       parent: 2
+  - uid: 15238
+    components:
+    - type: Transform
+      pos: -20.5,50.5
+      parent: 2
   - uid: 15254
     components:
     - type: Transform
@@ -206799,6 +208379,16 @@ entities:
     - type: Transform
       pos: -35.5,36.5
       parent: 2
+  - uid: 15523
+    components:
+    - type: Transform
+      pos: -22.5,50.5
+      parent: 2
+  - uid: 15535
+    components:
+    - type: Transform
+      pos: -29.5,47.5
+      parent: 2
   - uid: 15573
     components:
     - type: Transform
@@ -206854,6 +208444,16 @@ entities:
     - type: Transform
       pos: -19.5,42.5
       parent: 2
+  - uid: 15641
+    components:
+    - type: Transform
+      pos: -23.5,50.5
+      parent: 2
+  - uid: 15645
+    components:
+    - type: Transform
+      pos: -29.5,48.5
+      parent: 2
   - uid: 15646
     components:
     - type: Transform
@@ -206904,6 +208504,11 @@ entities:
     - type: Transform
       pos: -30.5,38.5
       parent: 2
+  - uid: 15668
+    components:
+    - type: Transform
+      pos: -28.5,48.5
+      parent: 2
   - uid: 15678
     components:
     - type: Transform
@@ -206954,6 +208559,11 @@ entities:
     - type: Transform
       pos: -16.5,67.5
       parent: 2
+  - uid: 15827
+    components:
+    - type: Transform
+      pos: -21.5,49.5
+      parent: 2
   - uid: 15831
     components:
     - type: Transform
@@ -207039,16 +208649,6 @@ entities:
     - type: Transform
       pos: -17.5,43.5
       parent: 2
-  - uid: 15997
-    components:
-    - type: Transform
-      pos: -28.5,48.5
-      parent: 2
-  - uid: 15998
-    components:
-    - type: Transform
-      pos: -28.5,49.5
-      parent: 2
   - uid: 15999
     components:
     - type: Transform
@@ -207109,11 +208709,6 @@ entities:
     - type: Transform
       pos: -11.5,43.5
       parent: 2
-  - uid: 16291
-    components:
-    - type: Transform
-      pos: -18.5,49.5
-      parent: 2
   - uid: 16294
     components:
     - type: Transform
@@ -207279,11 +208874,6 @@ entities:
     - type: Transform
       pos: -37.5,33.5
       parent: 2
-  - uid: 16412
-    components:
-    - type: Transform
-      pos: -27.5,49.5
-      parent: 2
   - uid: 16414
     components:
     - type: Transform
@@ -207379,6 +208969,11 @@ entities:
     - type: Transform
       pos: -21.5,68.5
       parent: 2
+  - uid: 16609
+    components:
+    - type: Transform
+      pos: -24.5,49.5
+      parent: 2
   - uid: 16656
     components:
     - type: Transform
@@ -207419,6 +209014,11 @@ entities:
     - type: Transform
       pos: -34.5,48.5
       parent: 2
+  - uid: 17818
+    components:
+    - type: Transform
+      pos: -19.5,50.5
+      parent: 2
   - uid: 17910
     components:
     - type: Transform
@@ -208774,6 +210374,11 @@ entities:
     - type: Transform
       pos: -61.5,44.5
       parent: 2
+  - uid: 19377
+    components:
+    - type: Transform
+      pos: -18.5,50.5
+      parent: 2
   - uid: 19466
     components:
     - type: Transform
@@ -209919,6 +211524,51 @@ entities:
     - type: Transform
       pos: -25.5,-29.5
       parent: 2
+  - uid: 28895
+    components:
+    - type: Transform
+      pos: -30.5,49.5
+      parent: 2
+  - uid: 28900
+    components:
+    - type: Transform
+      pos: -24.5,50.5
+      parent: 2
+  - uid: 28907
+    components:
+    - type: Transform
+      pos: -18.5,49.5
+      parent: 2
+  - uid: 28908
+    components:
+    - type: Transform
+      pos: -21.5,50.5
+      parent: 2
+  - uid: 28942
+    components:
+    - type: Transform
+      pos: -28.5,49.5
+      parent: 2
+  - uid: 28945
+    components:
+    - type: Transform
+      pos: -19.5,49.5
+      parent: 2
+  - uid: 28950
+    components:
+    - type: Transform
+      pos: -29.5,45.5
+      parent: 2
+  - uid: 28951
+    components:
+    - type: Transform
+      pos: -30.5,44.5
+      parent: 2
+  - uid: 28952
+    components:
+    - type: Transform
+      pos: -29.5,46.5
+      parent: 2
   - uid: 28960
     components:
     - type: Transform
@@ -219698,12 +221348,13 @@ entities:
   - uid: 16544
     components:
     - type: Transform
-      pos: -27.5,47.5
+      pos: -28.5,46.5
       parent: 2
   - uid: 16545
     components:
     - type: Transform
-      pos: -27.5,48.5
+      rot: 1.5707963267948966 rad
+      pos: -28.5,47.5
       parent: 2
   - uid: 19405
     components:
@@ -219763,23 +221414,6 @@ entities:
     - type: Transform
       pos: -120.430046,10.346216
       parent: 2
-- proto: WeaponLaserCarbine
-  entities:
-  - uid: 16501
-    components:
-    - type: Transform
-      pos: -25.579115,48.72853
-      parent: 2
-  - uid: 16503
-    components:
-    - type: Transform
-      pos: -25.46974,48.47853
-      parent: 2
-  - uid: 16536
-    components:
-    - type: Transform
-      pos: -25.494751,48.550285
-      parent: 2
 - proto: WeaponLaserCarbinePractice
   entities:
   - uid: 8738
@@ -219797,68 +221431,24 @@ entities:
     - type: Transform
       pos: 72.465744,41.351635
       parent: 2
-- proto: WeaponLaserGun
-  entities:
-  - uid: 16499
-    components:
-    - type: Transform
-      pos: -23.422865,48.41603
-      parent: 2
-  - uid: 16502
-    components:
-    - type: Transform
-      pos: -23.56349,48.60353
-      parent: 2
-  - uid: 16537
-    components:
-    - type: Transform
-      pos: -23.510376,48.519035
-      parent: 2
 - proto: WeaponLauncherRocket
   entities:
   - uid: 4454
     components:
     - type: Transform
-      pos: -18.492142,48.610115
-      parent: 2
-- proto: WeaponPistolMk58
-  entities:
-  - uid: 16515
-    components:
-    - type: Transform
-      pos: -25.393858,47.57209
-      parent: 2
-  - uid: 16530
-    components:
-    - type: Transform
-      pos: -25.541626,47.62841
-      parent: 2
-  - uid: 16531
-    components:
-    - type: Transform
-      pos: -25.369751,47.47216
-      parent: 2
-  - uid: 16535
-    components:
-    - type: Transform
-      pos: -25.447876,47.612785
+      pos: -18.462254,48.516518
       parent: 2
-- proto: WeaponShotgunKammererNonLethal
+- proto: WeaponPistolMk58Nonlethal
   entities:
-  - uid: 16514
-    components:
-    - type: Transform
-      pos: -23.550108,47.618965
-      parent: 2
-  - uid: 16516
+  - uid: 5280
     components:
     - type: Transform
-      pos: -23.518858,47.525215
+      pos: -26.218739,44.70984
       parent: 2
-  - uid: 16539
+  - uid: 5536
     components:
     - type: Transform
-      pos: -23.425108,47.44709
+      pos: -26.395823,44.45984
       parent: 2
 - proto: WeaponTurretXeno
   entities:
@@ -220064,6 +221654,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-8.5
       parent: 2
+  - uid: 28892
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -15.5,47.5
+      parent: 2
 - proto: WindoorBarLocked
   entities:
   - uid: 25230
@@ -220198,11 +221794,17 @@ entities:
       parent: 2
 - proto: WindoorSecureArmoryLocked
   entities:
-  - uid: 8203
+  - uid: 15830
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -30.5,44.5
+      pos: -19.5,48.5
+      parent: 2
+  - uid: 28955
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,47.5
       parent: 2
   - uid: 36114
     components:
@@ -220227,6 +221829,12 @@ entities:
     - type: Transform
       pos: -13.5,-22.5
       parent: 2
+  - uid: 28982
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,-38.5
+      parent: 2
 - proto: WindoorSecureChemistryLocked
   entities:
   - uid: 1158
@@ -220411,6 +222019,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,-2.5
       parent: 2
+- proto: WindoorSecureSalvageLocked
+  entities:
+  - uid: 29057
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,-38.5
+      parent: 2
 - proto: WindoorSecureScienceLocked
   entities:
   - uid: 3957
@@ -221284,11 +222900,6 @@ entities:
     - type: Transform
       pos: -14.5,-26.5
       parent: 2
-  - uid: 6527
-    components:
-    - type: Transform
-      pos: -14.5,-38.5
-      parent: 2
   - uid: 6541
     components:
     - type: Transform
@@ -221424,16 +223035,6 @@ entities:
     - type: Transform
       pos: -40.5,-26.5
       parent: 2
-  - uid: 8714
-    components:
-    - type: Transform
-      pos: -41.5,18.5
-      parent: 2
-  - uid: 8716
-    components:
-    - type: Transform
-      pos: -42.5,18.5
-      parent: 2
   - uid: 10193
     components:
     - type: Transform
@@ -223796,11 +225397,6 @@ entities:
     - type: Transform
       pos: -21.5,-12.5
       parent: 2
-  - uid: 3763
-    components:
-    - type: Transform
-      pos: -5.5,22.5
-      parent: 2
   - uid: 4007
     components:
     - type: Transform
@@ -223913,11 +225509,6 @@ entities:
     - type: Transform
       pos: -29.5,-13.5
       parent: 2
-  - uid: 6314
-    components:
-    - type: Transform
-      pos: -7.5,22.5
-      parent: 2
   - uid: 6534
     components:
     - type: Transform
@@ -223930,16 +225521,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-16.5
       parent: 2
-  - uid: 15668
-    components:
-    - type: Transform
-      pos: -6.5,22.5
-      parent: 2
-  - uid: 15810
-    components:
-    - type: Transform
-      pos: -4.5,22.5
-      parent: 2
   - uid: 15948
     components:
     - type: Transform
@@ -224335,18 +225916,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,40.5
       parent: 2
-  - uid: 36350
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,25.5
-      parent: 2
-  - uid: 36351
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,24.5
-      parent: 2
 - proto: Wirecutter
   entities:
   - uid: 29262