bagel update (#24104)

* bagel update

* argh

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index c6b2a5b1bea24b7a37c3b8d97612cbd74245990d..481f5b18b39186f979693065ed2c8da79befc6d4 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -286,7 +286,7 @@ entities:
           version: 6\r
         -3,1:\r
           ind: -3,1\r
-          tiles: ZAAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAZAAAAAADZAAAAAADZAAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAADdgAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAACWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAACdgAAAAADdgAAAAADdgAAAAACeQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAADWQAAAAABdgAAAAADdgAAAAACdgAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAAATAAAAAACWQAAAAACTAAAAAACWQAAAAABTAAAAAADWQAAAAAATAAAAAADWQAAAAAAdgAAAAADdgAAAAADdgAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA\r
+          tiles: ZAAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAZAAAAAADZAAAAAADZAAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAADLAAAAAAALAAAAAAALAAAAAAALAAAAAAAWQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAACLAAAAAAALAAAAAAALAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAADWQAAAAABdgAAAAADdgAAAAACdgAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAAATAAAAAACWQAAAAACTAAAAAACWQAAAAABTAAAAAADWQAAAAAATAAAAAADWQAAAAAAdgAAAAADdgAAAAADdgAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA\r
           version: 6\r
         -4,1:\r
           ind: -4,1\r
@@ -5508,6 +5508,26 @@ entities:
             id: WarnCornerGreyscaleNW\r
           decals:\r
             1705: -31,-3\r
+        - node:\r
+            color: '#FFFFFFFF'\r
+            id: WarnCornerNE\r
+          decals:\r
+            3833: -46,19\r
+        - node:\r
+            color: '#FFFFFFFF'\r
+            id: WarnCornerNW\r
+          decals:\r
+            3832: -48,19\r
+        - node:\r
+            color: '#FFFFFFFF'\r
+            id: WarnCornerSE\r
+          decals:\r
+            3836: -46,21\r
+        - node:\r
+            color: '#FFFFFFFF'\r
+            id: WarnCornerSW\r
+          decals:\r
+            3834: -48,21\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerSmallNE\r
@@ -5917,6 +5937,7 @@ entities:
             3386: -16,42\r
             3825: -7,31\r
             3826: -6,31\r
+            3835: -47,21\r
         - node:\r
             color: '#DE3A3A96'\r
             id: WarnLineS\r
@@ -6037,6 +6058,7 @@ entities:
             3396: -43,-2\r
             3827: -7,29\r
             3828: -6,29\r
+            3831: -47,19\r
         - node:\r
             angle: -3.141592653589793 rad\r
             color: '#FFFFFFFF'\r
@@ -11019,17 +11041,6 @@ entities:
     - type: DeviceLinkSink\r
       links:\r
       - 21026\r
-  - uid: 17600\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-      name: Dorm Room 4\r
-    - type: Transform\r
-      pos: -44.5,20.5\r
-      parent: 60\r
-    - type: DeviceLinkSink\r
-      links:\r
-      - 8396\r
   - uid: 19905\r
     components:\r
     - type: MetaData\r
@@ -12794,6 +12805,11 @@ entities:
     - type: Transform\r
       pos: 16.5,-20.5\r
       parent: 60\r
+  - uid: 9621\r
+    components:\r
+    - type: Transform\r
+      pos: -44.5,20.5\r
+      parent: 60\r
   - uid: 10656\r
     components:\r
     - type: Transform\r
@@ -16039,16 +16055,6 @@ entities:
     - type: Transform\r
       pos: -45.5,23.5\r
       parent: 60\r
-  - uid: 17456\r
-    components:\r
-    - type: Transform\r
-      pos: -45.5,21.5\r
-      parent: 60\r
-  - uid: 17457\r
-    components:\r
-    - type: Transform\r
-      pos: -45.5,19.5\r
-      parent: 60\r
   - uid: 17800\r
     components:\r
     - type: Transform\r
@@ -16278,16 +16284,6 @@ entities:
     - type: Transform\r
       pos: -55.5,21.5\r
       parent: 60\r
-  - uid: 17661\r
-    components:\r
-    - type: Transform\r
-      pos: -45.5,19.5\r
-      parent: 60\r
-  - uid: 17662\r
-    components:\r
-    - type: Transform\r
-      pos: -45.5,21.5\r
-      parent: 60\r
   - uid: 17663\r
     components:\r
     - type: Transform\r
@@ -49281,36 +49277,6 @@ entities:
       rot: 3.141592653589793 rad\r
       pos: 26.5,-16.5\r
       parent: 60\r
-  - uid: 17649\r
-    components:\r
-    - type: Transform\r
-      pos: -47.5,21.5\r
-      parent: 60\r
-  - uid: 17650\r
-    components:\r
-    - type: Transform\r
-      pos: -47.5,20.5\r
-      parent: 60\r
-  - uid: 17651\r
-    components:\r
-    - type: Transform\r
-      pos: -47.5,19.5\r
-      parent: 60\r
-  - uid: 17652\r
-    components:\r
-    - type: Transform\r
-      pos: -46.5,21.5\r
-      parent: 60\r
-  - uid: 17653\r
-    components:\r
-    - type: Transform\r
-      pos: -46.5,20.5\r
-      parent: 60\r
-  - uid: 17654\r
-    components:\r
-    - type: Transform\r
-      pos: -46.5,19.5\r
-      parent: 60\r
   - uid: 21097\r
     components:\r
     - type: Transform\r
@@ -60561,12 +60527,6 @@ entities:
       rot: 3.141592653589793 rad\r
       pos: -55.5,19.5\r
       parent: 60\r
-  - uid: 17682\r
-    components:\r
-    - type: Transform\r
-      rot: -1.5707963267948966 rad\r
-      pos: -47.5,20.5\r
-      parent: 60\r
   - uid: 18477\r
     components:\r
     - type: Transform\r
@@ -61070,11 +61030,6 @@ entities:
     - type: Transform\r
       pos: -55.5,14.5\r
       parent: 60\r
-  - uid: 9621\r
-    components:\r
-    - type: Transform\r
-      pos: -46.5,21.5\r
-      parent: 60\r
   - uid: 19120\r
     components:\r
     - type: Transform\r
@@ -61532,10 +61487,6 @@ entities:
     - type: Transform\r
       pos: -65.5,-19.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61554,15 +61505,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 3600\r
     components:\r
     - type: Transform\r
       pos: 15.5,-43.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61581,15 +61532,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 6582\r
     components:\r
     - type: Transform\r
       pos: 5.5,13.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61608,15 +61559,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 17023\r
     components:\r
     - type: Transform\r
       pos: -4.5,29.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61635,6 +61586,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
 - proto: CrateEngineeringCableHV\r
   entities:\r
   - uid: 3440\r
@@ -61642,10 +61597,6 @@ entities:
     - type: Transform\r
       pos: 32.5,-52.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61664,15 +61615,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 11479\r
     components:\r
     - type: Transform\r
       pos: -11.5,-31.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61691,15 +61642,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 20420\r
     components:\r
     - type: Transform\r
       pos: 63.5,-39.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61718,6 +61669,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
 - proto: CrateEngineeringCableLV\r
   entities:\r
   - uid: 2034\r
@@ -61725,10 +61680,6 @@ entities:
     - type: Transform\r
       pos: -32.5,-30.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61747,6 +61698,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
 - proto: CrateEngineeringCableMV\r
   entities:\r
   - uid: 3756\r
@@ -61754,10 +61709,6 @@ entities:
     - type: Transform\r
       pos: 60.5,-30.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61776,15 +61727,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 11680\r
     components:\r
     - type: Transform\r
       pos: -4.5,-48.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61803,15 +61754,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 19314\r
     components:\r
     - type: Transform\r
       pos: 27.5,16.5\r
       parent: 60\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -61830,6 +61781,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
 - proto: CrateEngineeringSecure\r
   entities:\r
   - uid: 3669\r
@@ -62240,6 +62195,34 @@ entities:
     - type: Transform\r
       pos: 12.4967985,-62.46449\r
       parent: 60\r
+- proto: CryogenicSleepUnit\r
+  entities:\r
+  - uid: 13893\r
+    components:\r
+    - type: Transform\r
+      pos: -45.5,21.5\r
+      parent: 60\r
+  - uid: 16531\r
+    components:\r
+    - type: Transform\r
+      pos: -45.5,19.5\r
+      parent: 60\r
+- proto: CryogenicSleepUnitSpawner\r
+  entities:\r
+  - uid: 16532\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: -47.5,21.5\r
+      parent: 60\r
+- proto: CryogenicSleepUnitSpawnerLateJoin\r
+  entities:\r
+  - uid: 13899\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: -47.5,19.5\r
+      parent: 60\r
 - proto: CryoPod\r
   entities:\r
   - uid: 3031\r
@@ -62492,6 +62475,11 @@ entities:
       parent: 60\r
 - proto: DefaultStationBeaconDorms\r
   entities:\r
+  - uid: 7645\r
+    components:\r
+    - type: Transform\r
+      pos: -46.5,20.5\r
+      parent: 60\r
   - uid: 18705\r
     components:\r
     - type: Transform\r
@@ -104323,6 +104311,16 @@ entities:
     - type: Transform\r
       pos: -57.5,18.5\r
       parent: 60\r
+  - uid: 17456\r
+    components:\r
+    - type: Transform\r
+      pos: -44.5,19.5\r
+      parent: 60\r
+  - uid: 17457\r
+    components:\r
+    - type: Transform\r
+      pos: -44.5,21.5\r
+      parent: 60\r
   - uid: 17551\r
     components:\r
     - type: Transform\r
@@ -112682,6 +112680,11 @@ entities:
     - type: Transform\r
       pos: 3.5,22.5\r
       parent: 60\r
+  - uid: 16550\r
+    components:\r
+    - type: Transform\r
+      pos: -46.5,22.5\r
+      parent: 60\r
 - proto: PosterLegitHighClassMartini\r
   entities:\r
   - uid: 7794\r
@@ -115626,6 +115629,13 @@ entities:
       parent: 60\r
     - type: ApcPowerReceiver\r
       powerLoad: 0\r
+  - uid: 16535\r
+    components:\r
+    - type: MetaData\r
+      flags: PvsPriority\r
+    - type: Transform\r
+      pos: -46.5,21.5\r
+      parent: 60\r
   - uid: 16536\r
     components:\r
     - type: MetaData\r
@@ -117384,13 +117394,6 @@ entities:
       parent: 60\r
     - type: ApcPowerReceiver\r
       powerLoad: 0\r
-  - uid: 17468\r
-    components:\r
-    - type: Transform\r
-      pos: -46.5,21.5\r
-      parent: 60\r
-    - type: ApcPowerReceiver\r
-      powerLoad: 0\r
   - uid: 17469\r
     components:\r
     - type: Transform\r
@@ -118971,6 +118974,11 @@ entities:
     - type: Transform\r
       pos: 18.5,-12.5\r
       parent: 60\r
+  - uid: 16551\r
+    components:\r
+    - type: Transform\r
+      pos: -46.5,26.5\r
+      parent: 60\r
   - uid: 18003\r
     components:\r
     - type: Transform\r
@@ -118986,11 +118994,6 @@ entities:
     - type: Transform\r
       pos: -33.5,19.5\r
       parent: 60\r
-  - uid: 18008\r
-    components:\r
-    - type: Transform\r
-      pos: -45.5,22.5\r
-      parent: 60\r
   - uid: 18009\r
     components:\r
     - type: Transform\r
@@ -122106,6 +122109,11 @@ entities:
     - type: Transform\r
       pos: 52.5,18.5\r
       parent: 60\r
+  - uid: 8396\r
+    components:\r
+    - type: Transform\r
+      pos: -44.5,19.5\r
+      parent: 60\r
   - uid: 8427\r
     components:\r
     - type: Transform\r
@@ -123202,6 +123210,11 @@ entities:
     - type: Transform\r
       pos: 2.5,37.5\r
       parent: 60\r
+  - uid: 16534\r
+    components:\r
+    - type: Transform\r
+      pos: -44.5,21.5\r
+      parent: 60\r
   - uid: 17259\r
     components:\r
     - type: Transform\r
@@ -125833,18 +125846,6 @@ entities:
         - Pressed: Toggle\r
         1022:\r
         - Pressed: Toggle\r
-  - uid: 8396\r
-    components:\r
-    - type: MetaData\r
-      name: Door Lock\r
-    - type: Transform\r
-      rot: -1.5707963267948966 rad\r
-      pos: -44.5,19.5\r
-      parent: 60\r
-    - type: DeviceLinkSource\r
-      linkedPorts:\r
-        17600:\r
-        - Pressed: DoorBolt\r
   - uid: 11477\r
     components:\r
     - type: Transform\r
@@ -126521,6 +126522,12 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: 42.49971,-21.305145\r
       parent: 60\r
+  - uid: 16533\r
+    components:\r
+    - type: Transform\r
+      rot: -1.5707963267948966 rad\r
+      pos: -29.5,22.5\r
+      parent: 60\r
 - proto: SignDirectionalDorms\r
   entities:\r
   - uid: 13771\r
@@ -127440,11 +127447,6 @@ entities:
       parent: 60\r
 - proto: SignRedFour\r
   entities:\r
-  - uid: 7645\r
-    components:\r
-    - type: Transform\r
-      pos: -44.5,21.5\r
-      parent: 60\r
   - uid: 24155\r
     components:\r
     - type: Transform\r
@@ -135714,11 +135716,6 @@ entities:
     - type: Transform\r
       pos: -47.5,25.5\r
       parent: 60\r
-  - uid: 17680\r
-    components:\r
-    - type: Transform\r
-      pos: -47.5,21.5\r
-      parent: 60\r
   - uid: 17802\r
     components:\r
     - type: Transform\r
@@ -136480,11 +136477,6 @@ entities:
     - type: Transform\r
       pos: -63.5,2.5\r
       parent: 60\r
-  - uid: 17681\r
-    components:\r
-    - type: Transform\r
-      pos: -47.5,21.5\r
-      parent: 60\r
   - uid: 17838\r
     components:\r
     - type: Transform\r
@@ -156427,13 +156419,6 @@ entities:
     - type: Transform\r
       pos: -44.5,22.5\r
       parent: 60\r
-  - uid: 13893\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      pos: -44.5,19.5\r
-      parent: 60\r
   - uid: 13898\r
     components:\r
     - type: MetaData\r
@@ -156441,13 +156426,6 @@ entities:
     - type: Transform\r
       pos: -47.5,22.5\r
       parent: 60\r
-  - uid: 13899\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      pos: -44.5,21.5\r
-      parent: 60\r
   - uid: 13903\r
     components:\r
     - type: MetaData\r