From 18aadfacd142dd135ad4b28092e16fbc6197d977 Mon Sep 17 00:00:00 2001
From: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Date: Sun, 1 Dec 2024 22:45:09 -0600
Subject: [PATCH] Saved as grid (Still broken)

---
 .../Maps/Shuttles/DeltaV/listening_post.yml   | 1082 ++++++++---------
 1 file changed, 541 insertions(+), 541 deletions(-)

diff --git a/Resources/Maps/Shuttles/DeltaV/listening_post.yml b/Resources/Maps/Shuttles/DeltaV/listening_post.yml
index 176c22bb31a..182297bb07b 100644
--- a/Resources/Maps/Shuttles/DeltaV/listening_post.yml
+++ b/Resources/Maps/Shuttles/DeltaV/listening_post.yml
@@ -8,6 +8,7 @@ tilemap:
   32: FloorDark
   38: FloorDarkOffset
   41: FloorDarkPlastic
+  1: FloorKitchen
   65: FloorLino
   67: FloorMetalDiamond
   80: FloorReinforced
@@ -25,16 +26,16 @@ entities:
     - type: MetaData
       name: unknown
     - type: Transform
-      parent: 29
+      parent: 1
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: QwAAAAAAewAAAAADQQAAAAAAQQAAAAAAewAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAADQwAAAAAAWQAAAAAAQwAAAAAAKQAAAAABJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAABUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAABKQAAAAABWQAAAAAAQwAAAAAAKQAAAAADKQAAAAACKQAAAAACKQAAAAACKQAAAAACUAAAAAAAfgAAAAAAfgAAAAAAKQAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAABQwAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABfgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAABQwAAAAAAQwAAAAAABwAAAAAABwAAAAAAGQAAAAAAGQAAAAABGQAAAAADGQAAAAADGQAAAAACGQAAAAABGQAAAAACGQAAAAAEQwAAAAAAbQAAAAAAQwAAAAAAbQAAAAAAbQAAAAAABwAAAAAAGQAAAAACGQAAAAAGGQAAAAACGQAAAAAEGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAEGQAAAAABGQAAAAADQwAAAAAABwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAABwAAAAAAfgAAAAAAGQAAAAADGQAAAAAAGQAAAAAGGQAAAAABGQAAAAABGQAAAAAEGQAAAAADGQAAAAAAGQAAAAADGQAAAAABGQAAAAAAGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAFGQAAAAAFGQAAAAAAGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAAGQAAAAABGQAAAAAAGQAAAAAAGQAAAAABGQAAAAAGGQAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAFGQAAAAADGQAAAAABGQAAAAAGGQAAAAADGQAAAAAFGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAABfgAAAAAAGQAAAAACGQAAAAAFGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAABGQAAAAAFGQAAAAAFGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAEAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAGQAAAAACGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: QwAAAAAAewAAAAADQQAAAAAAQQAAAAAAewAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAADQwAAAAAAWQAAAAAAQwAAAAAAKQAAAAABJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAABUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAABbQAAAAAAWQAAAAAAQwAAAAAAKQAAAAADKQAAAAACKQAAAAACKQAAAAACKQAAAAACUAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAABQwAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABfgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAABwAAAAAABwAAAAAAGQAAAAAAGQAAAAABGQAAAAADGQAAAAADGQAAAAACGQAAAAABGQAAAAACGQAAAAAEQwAAAAAAbQAAAAAAQwAAAAAAbQAAAAAAbQAAAAAABwAAAAAAGQAAAAACGQAAAAAGGQAAAAACGQAAAAAEGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAEGQAAAAABGQAAAAADQwAAAAAABwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAABwAAAAAAfgAAAAAAGQAAAAADGQAAAAAAGQAAAAAGGQAAAAABGQAAAAABGQAAAAAEGQAAAAADGQAAAAAAGQAAAAADGQAAAAABGQAAAAAAGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAFGQAAAAAFGQAAAAAAGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAAGQAAAAABGQAAAAAAGQAAAAAAGQAAAAABGQAAAAAGGQAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAFGQAAAAADGQAAAAABGQAAAAAGGQAAAAADGQAAAAAFGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAABfgAAAAAAGQAAAAACGQAAAAAFGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAABGQAAAAAFGQAAAAAFGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAEAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAGQAAAAACGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: GQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAGQAAAAAGGQAAAAABAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAABGQAAAAADAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAACGQAAAAABGQAAAAAAGQAAAAABGQAAAAACGQAAAAABGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAABGQAAAAAAGQAAAAAFGQAAAAACGQAAAAABGQAAAAACGQAAAAAFAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAAFfgAAAAAAGQAAAAABGQAAAAACGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAAEGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAFGQAAAAADGQAAAAAAGQAAAAAFGQAAAAAFGQAAAAAGGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAEGQAAAAAEGQAAAAAFGQAAAAAFGQAAAAAEAAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABGQAAAAAEGQAAAAABGQAAAAAGGQAAAAABGQAAAAAAGQAAAAACGQAAAAABGQAAAAAEGQAAAAABGQAAAAAEGQAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAWQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAACGQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAABQwAAAAAAQwAAAAAAKQAAAAACQwAAAAAAQwAAAAAAQwAAAAAAewAAAAAAewAAAAACewAAAAACQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAGQAAAAABQwAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAQwAAAAAAewAAAAACewAAAAADewAAAAABQwAAAAAAKQAAAAAAKQAAAAABKQAAAAADKQAAAAAAQwAAAAAAGQAAAAAGQwAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABQwAAAAAAewAAAAACewAAAAABewAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAADKQAAAAADQwAAAAAAGQAAAAAGQwAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACQwAAAAAAewAAAAACewAAAAACewAAAAAAQwAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABQwAAAAAAGQAAAAABQwAAAAAAQwAAAAAAKQAAAAACQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAADKQAAAAACewAAAAABewAAAAABewAAAAACewAAAAADKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAACKQAAAAAAUAAAAAAAfgAAAAAAfgAAAAAA
+          tiles: GQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAGQAAAAAGGQAAAAABAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAABGQAAAAADAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAACGQAAAAABGQAAAAAAGQAAAAABGQAAAAACGQAAAAABGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAABGQAAAAAAGQAAAAAFGQAAAAACGQAAAAABGQAAAAACGQAAAAAFAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAAFfgAAAAAAGQAAAAABGQAAAAACGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAAEGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAFGQAAAAADGQAAAAAAGQAAAAAFGQAAAAAFGQAAAAAGGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAEGQAAAAAEGQAAAAAFGQAAAAAFGQAAAAAEAAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABGQAAAAAEGQAAAAABGQAAAAAGGQAAAAABGQAAAAAAGQAAAAACGQAAAAABGQAAAAAEGQAAAAABGQAAAAAEGQAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAWQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAACGQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAABQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAewAAAAAAewAAAAACewAAAAACQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAGQAAAAABQwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAQwAAAAAAewAAAAACewAAAAADewAAAAABQwAAAAAAKQAAAAAAKQAAAAABKQAAAAADKQAAAAAAQwAAAAAAGQAAAAAGQwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAQwAAAAAAewAAAAACewAAAAABewAAAAADbQAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAADQwAAAAAAGQAAAAAGQwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAQwAAAAAAewAAAAACewAAAAACewAAAAAAQwAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABQwAAAAAAGQAAAAABQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAADbQAAAAAAewAAAAABewAAAAABewAAAAACewAAAAADbQAAAAAAKQAAAAACbQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAACKQAAAAAAUAAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -217,15 +218,15 @@ entities:
           0,3:
             0: 1
           0,2:
-            0: 24588
+            0: 24584
           1,0:
             0: 22353
           1,1:
             0: 30736
             1: 1024
           1,2:
-            0: 2049
             1: 256
+            0: 2048
           1,3:
             0: 5
           1,-1:
@@ -307,7 +308,7 @@ entities:
           -2,-2:
             0: 768
           -2,-3:
-            0: 8192
+            0: 11328
           4,-3:
             0: 2
           4,-2:
@@ -356,19 +357,6 @@ entities:
     - type: RadiationGridResistance
     - type: Shuttle
     - type: NavMap
-  - uid: 29
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
 - proto: AirAlarm
   entities:
   - uid: 576
@@ -420,91 +408,75 @@ entities:
       parent: 1
     missingComponents:
     - Docking
-- proto: AirlockSyndicate
+- proto: AirlockSyndicateGlassLocked
   entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 15
+  - uid: 11
     components:
     - type: MetaData
-      name: armory airlock
+      name: to-externals airlock
     - type: Transform
-      pos: 2.5,-5.5
+      pos: 3.5,4.5
       parent: 1
-- proto: AirlockSyndicateGlass
+- proto: AirlockSyndicateNukeopGlassLocked
   entities:
-  - uid: 6
-    components:
-    - type: MetaData
-      name: kitchen airlock
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
   - uid: 7
     components:
-    - type: MetaData
-      name: rec-room airlock
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
+      pos: 7.5,-0.5
       parent: 1
   - uid: 8
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: 5.5,-0.5
       parent: 1
   - uid: 9
     components:
-    - type: MetaData
-      name: hydroponics airlock
     - type: Transform
       pos: 9.5,-3.5
       parent: 1
   - uid: 10
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-0.5
+      pos: 0.5,-0.5
       parent: 1
-- proto: AirlockSyndicateGlassLocked
-  entities:
-  - uid: 11
+  - uid: 13
     components:
-    - type: MetaData
-      name: to-externals airlock
     - type: Transform
-      pos: 3.5,4.5
+      pos: 6.5,-1.5
       parent: 1
-  - uid: 49
+  - uid: 14
     components:
     - type: Transform
-      pos: 7.5,-0.5
+      pos: 2.5,-1.5
       parent: 1
-- proto: AirlockSyndicateLocked
+- proto: AirlockSyndicateNukeopLocked
   entities:
-  - uid: 13
+  - uid: 5
     components:
-    - type: MetaData
-      name: air supply
     - type: Transform
       pos: 2.5,5.5
       parent: 1
-  - uid: 14
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 24
     components:
-    - type: MetaData
-      name: outpost maintenance
     - type: Transform
       pos: 0.5,3.5
       parent: 1
 - proto: AllTraitorCodesPaper
   entities:
-  - uid: 831
+  - uid: 830
     components:
     - type: Transform
-      pos: 9.478524,0.734375
+      pos: 9.499762,0.68090725
       parent: 1
 - proto: AlwaysPoweredLightColoredFrostyBlue
   entities:
@@ -536,20 +508,19 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 1
-- proto: APCBasic
+- proto: APCHyperCapacity
   entities:
-  - uid: 24
+  - uid: 25
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 1
-  - uid: 25
+  - uid: 26
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 3.5,-5.5
       parent: 1
-  - uid: 26
+  - uid: 28
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -562,6 +533,11 @@ entities:
     - type: Transform
       pos: -5.5,2.5
       parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
   - uid: 31
     components:
     - type: Transform
@@ -592,6 +568,11 @@ entities:
     - type: Transform
       pos: 16.5,-9.5
       parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
   - uid: 42
     components:
     - type: Transform
@@ -607,21 +588,6 @@ entities:
     - type: Transform
       pos: -3.5,-10.5
       parent: 1
-  - uid: 47
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 1
   - uid: 53
     components:
     - type: Transform
@@ -687,25 +653,25 @@ entities:
     - type: Transform
       pos: -4.5,0.5
       parent: 1
-  - uid: 88
+  - uid: 79
     components:
     - type: Transform
-      pos: 6.5,-10.5
+      pos: -4.5,-8.5
       parent: 1
-  - uid: 89
+  - uid: 86
     components:
     - type: Transform
-      pos: 7.5,-12.5
+      pos: 3.5,-10.5
       parent: 1
-  - uid: 90
+  - uid: 88
     components:
     - type: Transform
-      pos: 9.5,-7.5
+      pos: 6.5,-10.5
       parent: 1
-  - uid: 91
+  - uid: 89
     components:
     - type: Transform
-      pos: 8.5,-8.5
+      pos: 7.5,-12.5
       parent: 1
   - uid: 94
     components:
@@ -717,11 +683,6 @@ entities:
     - type: Transform
       pos: 15.5,-5.5
       parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: 15.5,-4.5
-      parent: 1
   - uid: 97
     components:
     - type: Transform
@@ -732,10 +693,10 @@ entities:
     - type: Transform
       pos: 15.5,-1.5
       parent: 1
-  - uid: 99
+  - uid: 100
     components:
     - type: Transform
-      pos: 15.5,-2.5
+      pos: 18.5,-1.5
       parent: 1
   - uid: 101
     components:
@@ -797,11 +758,6 @@ entities:
     - type: Transform
       pos: 8.5,-12.5
       parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 17.5,-2.5
-      parent: 1
   - uid: 115
     components:
     - type: Transform
@@ -1002,11 +958,6 @@ entities:
     - type: Transform
       pos: 20.5,2.5
       parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      pos: 16.5,-2.5
-      parent: 1
   - uid: 158
     components:
     - type: Transform
@@ -1017,26 +968,11 @@ entities:
     - type: Transform
       pos: -10.5,5.5
       parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 17.5,-3.5
-      parent: 1
   - uid: 161
     components:
     - type: Transform
       pos: 17.5,-4.5
       parent: 1
-  - uid: 162
-    components:
-    - type: Transform
-      pos: 18.5,-2.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 9.5,-8.5
-      parent: 1
   - uid: 166
     components:
     - type: Transform
@@ -1092,16 +1028,6 @@ entities:
     - type: Transform
       pos: 12.5,-8.5
       parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 15.5,-3.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: 16.5,-3.5
-      parent: 1
   - uid: 179
     components:
     - type: Transform
@@ -1287,6 +1213,11 @@ entities:
     - type: Transform
       pos: -3.5,-14.5
       parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 1
   - uid: 221
     components:
     - type: Transform
@@ -1492,11 +1423,6 @@ entities:
     - type: Transform
       pos: -6.5,-7.5
       parent: 1
-  - uid: 268
-    components:
-    - type: Transform
-      pos: -4.5,-6.5
-      parent: 1
   - uid: 269
     components:
     - type: Transform
@@ -1512,15 +1438,15 @@ entities:
     - type: Transform
       pos: -2.5,-11.5
       parent: 1
-  - uid: 275
+  - uid: 276
     components:
     - type: Transform
-      pos: -1.5,-10.5
+      pos: -5.5,-7.5
       parent: 1
-  - uid: 276
+  - uid: 277
     components:
     - type: Transform
-      pos: -5.5,-7.5
+      pos: -2.5,-10.5
       parent: 1
   - uid: 280
     components:
@@ -1562,6 +1488,11 @@ entities:
     - type: Transform
       pos: 21.5,-3.5
       parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
   - uid: 292
     components:
     - type: Transform
@@ -1592,11 +1523,21 @@ entities:
     - type: Transform
       pos: 4.5,-12.5
       parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
   - uid: 301
     components:
     - type: Transform
       pos: 22.5,3.5
       parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
   - uid: 303
     components:
     - type: Transform
@@ -1672,11 +1613,6 @@ entities:
     - type: Transform
       pos: 12.5,4.5
       parent: 1
-  - uid: 323
-    components:
-    - type: Transform
-      pos: 10.5,4.5
-      parent: 1
   - uid: 324
     components:
     - type: Transform
@@ -1753,11 +1689,8 @@ entities:
       parent: 1
 - proto: BannerSyndicate
   entities:
-  - uid: 33
+  - uid: 43
     components:
-    - type: MetaData
-      desc: A banner that fills you with a strange hatred for NT...
-      name: omnious banner
     - type: Transform
       anchored: True
       pos: 2.5,7.5
@@ -1934,19 +1867,12 @@ entities:
       pos: 1.5,-3.5
       parent: 1
     - type: Emagged
-- proto: BoxFolderClipboard
+- proto: BoxBeaker
   entities:
-  - uid: 407
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.231457,-0.3822682
-      parent: 1
-  - uid: 408
+  - uid: 781
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.185161,-0.43782377
+      pos: 13.283637,-4.474653
       parent: 1
 - proto: BoxHandcuff
   entities:
@@ -1987,36 +1913,17 @@ entities:
   - uid: 401
     components:
     - type: Transform
-      pos: 12.685161,-0.44444445
+      pos: 12.580331,-0.57071495
       parent: 1
   - uid: 402
     components:
     - type: Transform
-      pos: 12.674515,-0.24074075
+      pos: 12.615925,0.015501022
       parent: 1
   - uid: 403
     components:
     - type: Transform
-      pos: 12.68979,-0.3148148
-      parent: 1
-- proto: ButtonFrameCautionSecurity
-  entities:
-  - uid: 828
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-1.5
-      parent: 1
-  - uid: 829
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 839
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-2.5
+      pos: 12.615925,-0.21887398
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -2511,10 +2418,10 @@ entities:
       parent: 1
 - proto: CannabisSeeds
   entities:
-  - uid: 620
+  - uid: 783
     components:
     - type: Transform
-      pos: 11.558193,-4.073787
+      pos: 11.471137,-3.9434028
       parent: 1
 - proto: CarpetBlack
   entities:
@@ -2524,6 +2431,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,2.5
       parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
   - uid: 570
     components:
     - type: Transform
@@ -2605,11 +2518,6 @@ entities:
     - type: Transform
       pos: -1.5,-0.5
       parent: 1
-  - uid: 972
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
   - uid: 973
     components:
     - type: Transform
@@ -2693,7 +2601,7 @@ entities:
       parent: 1
 - proto: ClosetWallBlack
   entities:
-  - uid: 904
+  - uid: 549
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2703,7 +2611,7 @@ entities:
       air:
         volume: 200
         immutable: False
-        temperature: 293.14673
+        temperature: 293.14627
         moles:
         - 1.8856695
         - 7.0937095
@@ -2723,13 +2631,14 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 990
-          - 961
-          - 986
-          - 919
-          - 987
-          - 989
-          - 988
+          - 552
+          - 567
+          - 579
+          - 580
+          - 581
+          - 583
+          - 582
+          - 543
 - proto: ClosetWallMixed
   entities:
   - uid: 388
@@ -2776,43 +2685,27 @@ entities:
           - 392
           - 400
           - 399
-- proto: ClothingBeltSyndieHolster
-  entities:
-  - uid: 371
-    components:
-    - type: Transform
-      parent: 363
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 374
-    components:
-    - type: Transform
-      parent: 363
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHeadHatCone
   entities:
-  - uid: 28
+  - uid: 52
     components:
     - type: Transform
-      pos: -5.0696545,-2.2704234
+      pos: -5.654042,-1.3286643
       parent: 1
-  - uid: 50
+  - uid: 77
     components:
     - type: Transform
-      pos: -5.2969484,-0.6297984
+      pos: -5.200917,-2.0786643
       parent: 1
-  - uid: 1005
+  - uid: 266
     components:
     - type: Transform
-      pos: -5.7188234,-1.3797984
+      pos: -4.435292,-2.3911643
       parent: 1
-  - uid: 1006
+  - uid: 268
     components:
     - type: Transform
-      pos: -4.4759045,-2.6297984
+      pos: -5.200917,-0.56303936
       parent: 1
 - proto: ClothingHeadPyjamaSyndicateBlack
   entities:
@@ -2867,51 +2760,87 @@ entities:
   - uid: 540
     components:
     - type: Transform
-      pos: 11.322666,2.49469
+      pos: 11.346417,2.446512
       parent: 1
   - uid: 541
     components:
     - type: Transform
-      pos: 11.744541,2.541565
+      pos: 10.971417,2.462137
       parent: 1
+- proto: ClothingOuterArmorPlateCarrier
+  entities:
+  - uid: 406
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 408
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ClothingOuterCoatCybersunWindbreaker
   entities:
-  - uid: 961
+  - uid: 581
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingShoesBootsCombat
+- proto: ClothingShoesBootsJack
   entities:
-  - uid: 919
+  - uid: 552
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 990
+  - uid: 567
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingUniformJumpskirtSyndieFormalDress
+- proto: ClothingUniformCybersunAttorney
   entities:
-  - uid: 986
+  - uid: 543
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 987
+- proto: ClothingUniformJumpskirtOperative
+  entities:
+  - uid: 579
+    components:
+    - type: Transform
+      parent: 549
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitChiefEngineerSyndie
+  entities:
+  - uid: 580
+    components:
+    - type: Transform
+      parent: 549
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitOperative
+  entities:
+  - uid: 583
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -2963,19 +2892,12 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitSyndieFormal
+- proto: ClothingUniformJumpsuitRecruitSyndie
   entities:
-  - uid: 988
-    components:
-    - type: Transform
-      parent: 904
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 989
+  - uid: 582
     components:
     - type: Transform
-      parent: 904
+      parent: 549
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -2995,13 +2917,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ComfyChair
-  entities:
-  - uid: 543
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 1
 - proto: ComputerCrewMonitoring
   entities:
   - uid: 548
@@ -3012,7 +2927,7 @@ entities:
       parent: 1
 - proto: ComputerIFFSyndicate
   entities:
-  - uid: 406
+  - uid: 749
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3098,29 +3013,29 @@ entities:
     - type: InsideEntityStorage
 - proto: CurtainsRedOpen
   entities:
-  - uid: 588
+  - uid: 415
     components:
     - type: Transform
-      pos: 6.5,3.5
+      pos: 6.5,1.5
       parent: 1
-  - uid: 589
+  - uid: 416
     components:
     - type: Transform
-      pos: 6.5,1.5
+      pos: 6.5,3.5
       parent: 1
-  - uid: 590
+  - uid: 417
     components:
     - type: Transform
       pos: -1.5,1.5
       parent: 1
-  - uid: 591
+  - uid: 418
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
 - proto: DefibrillatorCabinet
   entities:
-  - uid: 584
+  - uid: 411
     components:
     - type: Transform
       pos: -0.5,-1.5
@@ -3130,13 +3045,13 @@ entities:
         ItemCabinet: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: 585
+          ent: 412
 - proto: DefibrillatorSyndicate
   entities:
-  - uid: 585
+  - uid: 412
     components:
     - type: Transform
-      parent: 584
+      parent: 411
     - type: Physics
       canCollide: False
 - proto: DiagnosisReportPaper
@@ -3225,14 +3140,13 @@ entities:
     - type: Transform
       pos: 1.3040082,1.7302322
       parent: 1
-- proto: EncryptionKeyBinarySyndicate
+- proto: ElectricGuitarInstrument
   entities:
-  - uid: 587
+  - uid: 986
     components:
     - type: Transform
-      parent: 612
-    - type: Physics
-      canCollide: False
+      pos: 8.322474,-4.6358876
+      parent: 1
 - proto: EncryptionKeyCommand
   entities:
   - uid: 613
@@ -3274,7 +3188,7 @@ entities:
       parent: 1
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 567
+  - uid: 414
     components:
     - type: Transform
       pos: 9.5,0.5
@@ -3372,19 +3286,31 @@ entities:
     - type: Transform
       pos: 9.5,-3.5
       parent: 1
-- proto: FloorChasmEntity
+- proto: FlippoLighter
   entities:
-  - uid: 78
+  - uid: 83
     components:
     - type: Transform
-      pos: -3.5,-1.5
+      pos: 4.3162117,1.8119607
       parent: 1
-  - uid: 80
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 4.2849617,1.5150857
+      parent: 1
+- proto: FloorChasmEntity
+  entities:
+  - uid: 30
     components:
     - type: Transform
       pos: -4.5,-1.5
       parent: 1
-  - uid: 272
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 264
     components:
     - type: Transform
       pos: -3.5,-2.5
@@ -4327,11 +4253,29 @@ entities:
       parent: 1
 - proto: KitchenReagentGrinder
   entities:
-  - uid: 604
+  - uid: 34
     components:
     - type: Transform
       pos: 13.5,-4.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        beakerSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 35
+        inputContainer: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: LandMineExplosive
   entities:
   - uid: 756
@@ -4346,14 +4290,15 @@ entities:
       parent: 1
 - proto: LargeBeaker
   entities:
-  - uid: 598
+  - uid: 35
     components:
     - type: Transform
-      pos: 13.2731,-4.3908787
-      parent: 1
+      parent: 34
+    - type: Physics
+      canCollide: False
 - proto: LockerLPOFilled
   entities:
-  - uid: 405
+  - uid: 410
     components:
     - type: Transform
       pos: 10.5,3.5
@@ -4371,8 +4316,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 1.8978151
-        - 7.1394
+        - 1.8978155
+        - 7.139401
         - 0
         - 0
         - 0
@@ -4389,17 +4334,18 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 378
-          - 377
-          - 379
-          - 367
-          - 366
-          - 380
-          - 376
           - 365
+          - 376
           - 118
-          - 374
-          - 371
+          - 380
+          - 366
+          - 407
+          - 367
+          - 379
+          - 377
+          - 408
+          - 406
+          - 378
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -4409,14 +4355,14 @@ entities:
   - uid: 758
     components:
     - type: Transform
-      pos: -0.28039455,-3.70372
+      pos: -0.296875,-3.3793273
       parent: 1
 - proto: MedkitFilled
   entities:
   - uid: 759
     components:
     - type: Transform
-      pos: -0.57726955,-3.500595
+      pos: -0.390625,-3.2230773
       parent: 1
 - proto: Mirror
   entities:
@@ -4428,343 +4374,360 @@ entities:
       parent: 1
 - proto: MountainRock
   entities:
-  - uid: 30
+  - uid: 33
     components:
     - type: Transform
-      pos: 8.5,4.5
+      pos: 6.5,5.5
       parent: 1
-  - uid: 34
+  - uid: 41
     components:
     - type: Transform
-      pos: -3.5,6.5
+      pos: -4.5,4.5
       parent: 1
-  - uid: 35
+  - uid: 47
     components:
     - type: Transform
-      pos: 9.5,4.5
+      pos: 7.5,5.5
       parent: 1
-  - uid: 40
+  - uid: 48
     components:
     - type: Transform
       pos: 8.5,5.5
       parent: 1
-  - uid: 41
+  - uid: 49
     components:
     - type: Transform
-      pos: -2.5,7.5
+      pos: -4.5,-6.5
       parent: 1
-  - uid: 43
+  - uid: 50
     components:
     - type: Transform
-      pos: -3.5,7.5
+      pos: -3.5,-5.5
       parent: 1
-  - uid: 48
+  - uid: 51
     components:
     - type: Transform
-      pos: 3.5,-11.5
+      pos: -3.5,-6.5
       parent: 1
   - uid: 57
     components:
     - type: Transform
-      pos: -3.5,3.5
+      pos: -3.5,-3.5
       parent: 1
   - uid: 58
     components:
     - type: Transform
-      pos: -3.5,4.5
+      pos: -4.5,-4.5
       parent: 1
   - uid: 59
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: -4.5,7.5
       parent: 1
   - uid: 60
     components:
     - type: Transform
-      pos: 1.5,8.5
+      pos: -3.5,7.5
       parent: 1
   - uid: 61
     components:
     - type: Transform
-      pos: -3.5,5.5
+      pos: -4.5,3.5
       parent: 1
   - uid: 66
     components:
     - type: Transform
-      pos: -4.5,7.5
+      pos: -3.5,5.5
       parent: 1
   - uid: 69
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,0.5
+      pos: -3.5,3.5
       parent: 1
   - uid: 70
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.5,1.5
+      pos: -3.5,2.5
       parent: 1
   - uid: 75
     components:
     - type: Transform
-      pos: 3.5,-9.5
+      pos: -3.5,4.5
       parent: 1
   - uid: 76
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -3.5,6.5
       parent: 1
-  - uid: 79
+  - uid: 78
     components:
     - type: Transform
-      pos: 3.5,-10.5
+      pos: -3.5,-4.5
       parent: 1
   - uid: 81
     components:
     - type: Transform
-      pos: 0.5,-9.5
+      pos: -3.5,-8.5
       parent: 1
   - uid: 82
     components:
     - type: Transform
-      pos: -1.5,-9.5
+      pos: -4.5,-7.5
       parent: 1
-  - uid: 83
+  - uid: 84
     components:
     - type: Transform
-      pos: 2.5,-9.5
+      pos: -1.5,-9.5
       parent: 1
-  - uid: 84
+  - uid: 85
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-7.5
+      pos: 16.5,0.5
       parent: 1
-  - uid: 85
+  - uid: 90
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-7.5
+      pos: 16.5,1.5
       parent: 1
-  - uid: 86
+  - uid: 91
     components:
     - type: Transform
-      pos: -2.5,-9.5
+      pos: 9.5,-8.5
       parent: 1
   - uid: 92
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.5,-1.5
+      pos: 8.5,-8.5
       parent: 1
   - uid: 93
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,0.5
+      pos: 14.5,-7.5
       parent: 1
-  - uid: 100
+  - uid: 96
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-0.5
+      pos: 12.5,-7.5
       parent: 1
-  - uid: 113
+  - uid: 99
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 13.5,-7.5
+      pos: 15.5,-4.5
       parent: 1
-  - uid: 138
+  - uid: 113
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,-7.5
+      pos: 16.5,-3.5
       parent: 1
-  - uid: 163
+  - uid: 114
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-6.5
+      pos: 17.5,0.5
       parent: 1
-  - uid: 164
+  - uid: 138
     components:
     - type: Transform
-      pos: -2.5,8.5
+      pos: 17.5,-2.5
       parent: 1
-  - uid: 181
+  - uid: 157
     components:
     - type: Transform
-      pos: -1.5,9.5
+      pos: 17.5,-0.5
       parent: 1
-  - uid: 215
+  - uid: 160
     components:
     - type: Transform
-      pos: -1.5,7.5
+      pos: 16.5,-2.5
       parent: 1
-  - uid: 219
+  - uid: 162
     components:
     - type: Transform
-      pos: -1.5,8.5
+      pos: 18.5,-2.5
       parent: 1
-  - uid: 220
+  - uid: 163
     components:
     - type: Transform
-      pos: -3.5,2.5
+      pos: 17.5,-3.5
       parent: 1
-  - uid: 238
+  - uid: 164
     components:
     - type: Transform
-      pos: -0.5,7.5
+      pos: 13.5,-7.5
       parent: 1
-  - uid: 241
+  - uid: 165
     components:
     - type: Transform
-      pos: 6.5,5.5
+      pos: 14.5,-6.5
       parent: 1
-  - uid: 257
+  - uid: 177
     components:
     - type: Transform
-      pos: -4.5,-9.5
+      pos: 9.5,-7.5
       parent: 1
-  - uid: 258
+  - uid: 178
     components:
     - type: Transform
-      pos: -3.5,-9.5
+      pos: 15.5,-2.5
       parent: 1
-  - uid: 264
+  - uid: 181
     components:
     - type: Transform
-      pos: -4.5,-5.5
+      pos: 15.5,-3.5
       parent: 1
-  - uid: 277
+  - uid: 215
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 15.5,-7.5
       parent: 1
-  - uid: 278
+  - uid: 220
     components:
     - type: Transform
-      pos: -5.5,-10.5
+      pos: -1.5,8.5
       parent: 1
-  - uid: 279
+  - uid: 238
     components:
     - type: Transform
-      pos: -5.5,-9.5
+      pos: -2.5,7.5
       parent: 1
-  - uid: 281
+  - uid: 241
     components:
     - type: Transform
-      pos: -2.5,-10.5
+      pos: -2.5,8.5
       parent: 1
-  - uid: 289
+  - uid: 257
     components:
     - type: Transform
-      pos: 0.5,-10.5
+      pos: -0.5,7.5
       parent: 1
-  - uid: 291
+  - uid: 270
     components:
     - type: Transform
-      pos: 2.5,-10.5
+      pos: -5.5,-6.5
       parent: 1
-  - uid: 294
+  - uid: 272
     components:
     - type: Transform
-      pos: 5.5,-9.5
+      pos: -4.5,-5.5
       parent: 1
-  - uid: 295
+  - uid: 274
     components:
     - type: Transform
-      pos: 4.5,-9.5
+      pos: -3.5,-9.5
       parent: 1
-  - uid: 300
+  - uid: 275
     components:
     - type: Transform
-      pos: -3.5,-5.5
+      pos: -2.5,-9.5
       parent: 1
-  - uid: 302
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 279
     components:
     - type: Transform
       pos: -0.5,-11.5
       parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
   - uid: 319
     components:
     - type: Transform
-      pos: -3.5,-8.5
+      pos: 0.5,-9.5
       parent: 1
   - uid: 320
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      pos: 3.5,-9.5
       parent: 1
   - uid: 321
     components:
     - type: Transform
-      pos: 0.5,-11.5
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 1
   - uid: 326
     components:
     - type: Transform
-      pos: 7.5,5.5
+      pos: 10.5,4.5
       parent: 1
   - uid: 328
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: -1.5,7.5
       parent: 1
   - uid: 334
     components:
     - type: Transform
-      pos: -3.5,-6.5
+      pos: 9.5,4.5
       parent: 1
   - uid: 364
     components:
     - type: Transform
-      pos: -4.5,3.5
+      pos: 1.5,-9.5
       parent: 1
   - uid: 369
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 8.5,4.5
       parent: 1
   - uid: 370
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-1.5
-      parent: 1
-  - uid: 373
-    components:
-    - type: Transform
-      pos: 6.5,-9.5
+      pos: -0.5,-9.5
       parent: 1
-  - uid: 830
+  - uid: 371
     components:
     - type: Transform
-      pos: -3.5,-7.5
+      pos: 1.5,8.5
       parent: 1
-  - uid: 884
+  - uid: 373
     components:
     - type: Transform
-      pos: -4.5,-8.5
+      pos: 0.5,7.5
       parent: 1
-  - uid: 950
+  - uid: 374
     components:
     - type: Transform
-      pos: -4.5,-7.5
+      pos: 0.5,8.5
       parent: 1
-  - uid: 1004
+  - uid: 405
     components:
     - type: Transform
-      pos: 4.5,-11.5
+      pos: 17.5,-1.5
       parent: 1
-- proto: MountainRockMining
-  entities:
-  - uid: 285
+  - uid: 594
     components:
     - type: Transform
-      pos: -0.5,-10.5
+      pos: -3.5,-7.5
       parent: 1
 - proto: NukeDiskFake
   entities:
@@ -4928,40 +4891,84 @@ entities:
       parent: 1
 - proto: PaperStationWarrant
   entities:
-  - uid: 609
+  - uid: 597
     components:
     - type: Transform
-      pos: 8.485705,0.54569983
+      pos: 8.516352,0.6092813
       parent: 1
-  - uid: 715
+  - uid: 598
     components:
     - type: Transform
-      pos: 8.485705,0.54569983
+      pos: 8.516352,0.6092813
       parent: 1
-  - uid: 747
+  - uid: 604
     components:
     - type: Transform
-      pos: 8.485705,0.54569983
+      pos: 8.516352,0.6092813
       parent: 1
-  - uid: 749
+  - uid: 609
     components:
     - type: Transform
-      pos: 8.485705,0.54569983
+      pos: 8.516352,0.6092813
       parent: 1
-  - uid: 827
+  - uid: 610
     components:
     - type: Transform
-      pos: 8.485705,0.54569983
+      pos: 8.516352,0.6092813
       parent: 1
 - proto: PhoneInstrumentSyndicate
   entities:
-  - uid: 748
+  - uid: 750
     components:
     - type: MetaData
-      desc: For evil people to call their evil friends in emergencies.
+      desc: If something were to ever go wrong...
       name: emergency blood-red phone
     - type: Transform
-      pos: 8.503545,1.9569056
+      pos: 8.578852,1.9813755
+      parent: 1
+- proto: PlasmaWindoorSecureNukeopLocked
+  entities:
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+- proto: PlasmaWindoorSyndicateLocked
+  entities:
+  - uid: 589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,5.5
       parent: 1
 - proto: PlushieNuke
   entities:
@@ -4991,7 +4998,7 @@ entities:
       parent: 1
 - proto: PosterContrabandFreeSyndicateEncryptionKey
   entities:
-  - uid: 993
+  - uid: 596
     components:
     - type: Transform
       pos: 8.5,3.5
@@ -5187,16 +5194,6 @@ entities:
       parent: 1
 - proto: RandomPosterContraband
   entities:
-  - uid: 594
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 1
-  - uid: 780
-    components:
-    - type: Transform
-      pos: 9.5,3.5
-      parent: 1
   - uid: 782
     components:
     - type: Transform
@@ -5286,64 +5283,80 @@ entities:
     - type: Transform
       pos: 12.5,-9.5
       parent: 1
-- proto: SalvageSpawnerScrapCommon75
+- proto: SalvageSpawnerEquipmentValuable
   entities:
-  - uid: 991
+  - uid: 904
     components:
     - type: Transform
-      pos: 15.5,6.5
+      pos: 8.5,6.5
       parent: 1
-  - uid: 994
+  - uid: 946
     components:
     - type: Transform
-      pos: 4.5,12.5
+      pos: 14.5,2.5
       parent: 1
-  - uid: 995
+- proto: SalvageSpawnerScrapCommon75
+  entities:
+  - uid: 949
     components:
     - type: Transform
-      pos: 11.5,7.5
+      pos: 10.5,-8.5
       parent: 1
-  - uid: 996
+  - uid: 961
     components:
     - type: Transform
-      pos: -6.5,4.5
+      pos: -6.5,-5.5
       parent: 1
-  - uid: 997
+- proto: SalvageSpawnerScrapValuable75
+  entities:
+  - uid: 831
     components:
     - type: Transform
-      pos: -6.5,-5.5
+      pos: -6.5,-0.5
       parent: 1
-  - uid: 998
+  - uid: 839
     components:
     - type: Transform
-      pos: -2.5,-12.5
+      pos: -3.5,9.5
       parent: 1
-  - uid: 999
+  - uid: 884
     components:
     - type: Transform
-      pos: 3.5,-14.5
+      pos: 3.5,8.5
       parent: 1
-- proto: SalvageSpawnerScrapValuable75
-  entities:
-  - uid: 1000
+  - uid: 919
     components:
     - type: Transform
-      pos: 7.5,-9.5
+      pos: 16.5,3.5
       parent: 1
-  - uid: 1001
+  - uid: 945
     components:
     - type: Transform
       pos: 11.5,-7.5
       parent: 1
-  - uid: 1002
+  - uid: 950
     components:
     - type: Transform
-      pos: 16.5,3.5
+      pos: -5.5,-9.5
       parent: 1
-  - uid: 1003
+  - uid: 972
     components:
     - type: Transform
-      pos: 2.5,8.5
+      pos: 18.5,-3.5
+      parent: 1
+- proto: SalvageSpawnerTreasureValuable
+  entities:
+  - uid: 948
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+- proto: SeedExtractor
+  entities:
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
       parent: 1
 - proto: SheetPlasteel
   entities:
@@ -5494,14 +5507,14 @@ entities:
         22:
         - On: Off
         - Off: On
-- proto: SignSecureMedRed
+- proto: SignDangerMed
   entities:
-  - uid: 77
+  - uid: 80
     components:
     - type: Transform
       pos: -4.5,-0.5
       parent: 1
-  - uid: 274
+  - uid: 818
     components:
     - type: Transform
       pos: -5.5,-2.5
@@ -5533,14 +5546,14 @@ entities:
     - type: Emagged
 - proto: SpaceDisposalUnit
   entities:
-  - uid: 586
+  - uid: 419
     components:
     - type: Transform
       pos: 10.5,-2.5
       parent: 1
-- proto: SpawnMobCatGeneric
+- proto: SpawnMobCat
   entities:
-  - uid: 992
+  - uid: 595
     components:
     - type: Transform
       pos: 3.5,1.5
@@ -5616,34 +5629,34 @@ entities:
         - 0
 - proto: SyndicateBusinessCard
   entities:
-  - uid: 750
+  - uid: 618
     components:
     - type: Transform
-      pos: 8.475458,1.048723
+      pos: 8.469477,1.1405313
       parent: 1
-  - uid: 755
+  - uid: 620
     components:
     - type: Transform
-      pos: 8.475458,1.048723
+      pos: 8.469477,1.1405313
       parent: 1
-  - uid: 781
+  - uid: 715
     components:
     - type: Transform
-      pos: 8.475458,1.048723
+      pos: 8.469477,1.1405313
       parent: 1
-  - uid: 787
+  - uid: 747
     components:
     - type: Transform
-      pos: 8.475458,1.048723
+      pos: 8.469477,1.1405313
       parent: 1
-  - uid: 788
+  - uid: 748
     components:
     - type: Transform
-      pos: 8.475458,1.048723
+      pos: 8.469477,1.1405313
       parent: 1
 - proto: SyndicateMicrowave
   entities:
-  - uid: 593
+  - uid: 420
     components:
     - type: Transform
       pos: 1.5,-2.5
@@ -5668,17 +5681,22 @@ entities:
       parent: 1
 - proto: SyndieFlag
   entities:
-  - uid: 752
+  - uid: 755
     components:
     - type: Transform
-      pos: 1.5,-5.5
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 912
+    components:
+    - type: Transform
+      pos: 9.5,3.5
       parent: 1
 - proto: SyndieHandyFlag
   entities:
   - uid: 951
     components:
     - type: Transform
-      pos: 1.4957145,-7.5177317
+      pos: 1.3885965,-7.6115885
       parent: 1
 - proto: SynthesizerInstrument
   entities:
@@ -5727,7 +5745,7 @@ entities:
       parent: 1
 - proto: TablePlasmaGlass
   entities:
-  - uid: 592
+  - uid: 413
     components:
     - type: Transform
       pos: 13.5,-4.5
@@ -5786,7 +5804,6 @@ entities:
           - 613
           - 614
           - 615
-          - 587
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -5795,6 +5812,15 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+- proto: Telecrystal5
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ToiletEmpty
   entities:
   - uid: 832
@@ -5817,10 +5843,10 @@ entities:
       parent: 1
 - proto: TowelColorSyndicate
   entities:
-  - uid: 818
+  - uid: 752
     components:
     - type: Transform
-      pos: -0.6221545,-3.5128791
+      pos: -0.734375,-3.5043273
       parent: 1
 - proto: ToyFigurineNukie
   entities:
@@ -5852,7 +5878,7 @@ entities:
       parent: 1
 - proto: VendingMachineBoozeSyndicate
   entities:
-  - uid: 597
+  - uid: 586
     components:
     - type: Transform
       pos: 4.5,-4.5
@@ -5865,6 +5891,7 @@ entities:
     - type: Transform
       pos: 4.5,0.5
       parent: 1
+    - type: Emagged
 - proto: VendingMachineGames
   entities:
   - uid: 840
@@ -5881,6 +5908,14 @@ entities:
       pos: 12.5,-2.5
       parent: 1
     - type: Emagged
+- proto: VendingMachinePride
+  entities:
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+    - type: Emagged
 - proto: VendingMachineSeedsUnlocked
   entities:
   - uid: 842
@@ -5891,7 +5926,7 @@ entities:
     - type: Emagged
 - proto: VendingMachineSnack
   entities:
-  - uid: 595
+  - uid: 584
     components:
     - type: Transform
       pos: 4.5,-3.5
@@ -5899,7 +5934,7 @@ entities:
     - type: Emagged
 - proto: VendingMachineSoda
   entities:
-  - uid: 596
+  - uid: 585
     components:
     - type: Transform
       pos: 4.5,-2.5
@@ -6277,11 +6312,6 @@ entities:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-  - uid: 912
-    components:
-    - type: Transform
-      pos: 8.5,3.5
-      parent: 1
   - uid: 913
     components:
     - type: Transform
@@ -6417,6 +6447,11 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 1
+  - uid: 987
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
 - proto: WarpPoint
   entities:
   - uid: 942
@@ -6466,54 +6501,12 @@ entities:
     - type: InsideEntityStorage
 - proto: Windoor
   entities:
-  - uid: 618
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 945
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 946
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 1
   - uid: 947
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,0.5
       parent: 1
-- proto: WindoorSecure
-  entities:
-  - uid: 610
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-7.5
-      parent: 1
-  - uid: 783
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 948
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 949
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 1
 - proto: WoodDoor
   entities:
   - uid: 12
@@ -6521,16 +6514,23 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
-- proto: WoodenSign
+- proto: WoodenSignRight
   entities:
-  - uid: 266
+  - uid: 827
     components:
     - type: Transform
-      pos: -5.5000734,-2.8641734
+      pos: -4.4870634,-0.88498926
       parent: 1
-  - uid: 270
+  - uid: 828
+    components:
+    - type: Transform
+      pos: -5.507897,-2.8780448
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 829
     components:
     - type: Transform
-      pos: -4.5156984,-0.8485484
+      pos: -5.855119,-0.34332252
       parent: 1
 ...