bagel update (#24191)

* bagel update

* ok a lot more

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 10dcb205f960498d0338f287e815e37c89c54249..284edeef17c272fedd3e4683036d0efea4283464 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -118,7 +118,7 @@ entities:
           version: 6\r
         -2,-1:\r
           ind: -2,-1\r
-          tiles: eQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAADHQAAAAACHQAAAAABHQAAAAACHQAAAAADeQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABHQAAAAABHQAAAAACeQAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAADeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAbAAAAAACbAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAACbAAAAAADbAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAACeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADJgAAAAAAWQAAAAACHQAAAAAAWQAAAAABWQAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABHQAAAAACWQAAAAACWQAAAAACeQAAAAAAWQAAAAACeQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAAAeQAAAAAAHQAAAAACHQAAAAABeQAAAAAASwAAAAADeQAAAAAAHQAAAAABWQAAAAAAWQAAAAABeQAAAAAAHQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABSwAAAAADSwAAAAAAWQAAAAABTQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABeQAAAAAAWQAAAAABWQAAAAAD\r
+          tiles: eQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAADHQAAAAACHQAAAAABHQAAAAACHQAAAAADeQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABHQAAAAABHQAAAAACeQAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAADeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAbAAAAAACbAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAACbAAAAAADbAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAACeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACHQAAAAAAWQAAAAABWQAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABHQAAAAACWQAAAAACWQAAAAACeQAAAAAAWQAAAAACeQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAAAeQAAAAAAHQAAAAACHQAAAAABeQAAAAAASwAAAAADeQAAAAAAHQAAAAABWQAAAAAAWQAAAAABeQAAAAAAHQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABSwAAAAADSwAAAAAAWQAAAAABTQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABeQAAAAAAWQAAAAABWQAAAAAD\r
           version: 6\r
         -2,0:\r
           ind: -2,0\r
@@ -603,7 +603,6 @@ entities:
             807: 46,26\r
             916: 44,26\r
             1046: -4,-69\r
-            1071: -28,2\r
             1072: -26,2\r
             1227: -52,13\r
             1228: -50,13\r
@@ -683,6 +682,7 @@ entities:
             3496: 39,-13\r
             3542: 45,-9\r
             3675: -17,-54\r
+            3845: 2,27\r
         - node:\r
             angle: 1.5707963267948966 rad\r
             color: '#FFFFFFFF'\r
@@ -721,6 +721,8 @@ entities:
             3257: 6,-36\r
             3352: -19,46\r
             3748: 50,-11\r
+            3837: -25,-1\r
+            3838: -25,0\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: BotLeftGreyscale\r
@@ -754,6 +756,13 @@ entities:
             id: BotRightGreyscale\r
           decals:\r
             2077: -45,7\r
+        - node:\r
+            color: '#FFFFFFFF'\r
+            id: BotRightGreyscale\r
+          decals:\r
+            3840: -29,-1\r
+            3841: -29,0\r
+            3842: -29,1\r
         - node:\r
             color: '#79150096'\r
             id: Box\r
@@ -5512,22 +5521,22 @@ entities:
             color: '#FFFFFFFF'\r
             id: WarnCornerNE\r
           decals:\r
-            3841: -33,21\r
+            3835: -33,21\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerNW\r
           decals:\r
-            3838: -31,21\r
+            3832: -31,21\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerSE\r
           decals:\r
-            3842: -33,19\r
+            3836: -33,19\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerSW\r
           decals:\r
-            3837: -31,19\r
+            3831: -31,19\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerSmallNE\r
@@ -5555,6 +5564,7 @@ entities:
             1055: -2,-78\r
             1367: -2,36\r
             3393: -19,42\r
+            3843: -29,-1\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnCornerSmallSW\r
@@ -5565,6 +5575,7 @@ entities:
             2571: 40,-35\r
             3382: -27,40\r
             3392: -15,42\r
+            3839: -25,-1\r
         - node:\r
             color: '#52B4E996'\r
             id: WarnFullGreyscale\r
@@ -5639,7 +5650,7 @@ entities:
             3204: 56,11\r
             3391: -19,41\r
             3443: 1,-13\r
-            3840: -33,20\r
+            3834: -33,20\r
         - node:\r
             color: '#52B4E996'\r
             id: WarnLineGreyscaleE\r
@@ -5895,11 +5906,9 @@ entities:
             color: '#FFFFFFFF'\r
             id: WarnLineN\r
           decals:\r
-            709: -25,-1\r
             710: -26,-1\r
             711: -27,-1\r
             712: -28,-1\r
-            713: -29,-1\r
             731: -31,36\r
             743: -117,18\r
             744: -118,18\r
@@ -5989,7 +5998,7 @@ entities:
             3381: -27,39\r
             3387: -15,41\r
             3444: -1,-13\r
-            3839: -31,20\r
+            3833: -31,20\r
         - node:\r
             color: '#DE3A3A96'\r
             id: WarnLineW\r
@@ -13596,14 +13605,6 @@ entities:
       parent: 60\r
 - proto: AirlockMedicalLocked\r
   entities:\r
-  - uid: 54\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-      name: Brig Medical\r
-    - type: Transform\r
-      pos: -17.5,-4.5\r
-      parent: 60\r
   - uid: 103\r
     components:\r
     - type: MetaData\r
@@ -17094,6 +17095,11 @@ entities:
       unspawnedCount: 12\r
 - proto: BoxBodyBag\r
   entities:\r
+  - uid: 54\r
+    components:\r
+    - type: Transform\r
+      pos: -19.561207,-5.30166\r
+      parent: 60\r
   - uid: 172\r
     components:\r
     - type: Transform\r
@@ -56181,11 +56187,6 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: -48.5,-34.5\r
       parent: 60\r
-  - uid: 7622\r
-    components:\r
-    - type: Transform\r
-      pos: -18.5,-2.5\r
-      parent: 60\r
   - uid: 7635\r
     components:\r
     - type: Transform\r
@@ -56504,6 +56505,12 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: -43.5,3.5\r
       parent: 60\r
+  - uid: 11558\r
+    components:\r
+    - type: Transform\r
+      rot: -1.5707963267948966 rad\r
+      pos: -18.5,-4.5\r
+      parent: 60\r
   - uid: 21697\r
     components:\r
     - type: Transform\r
@@ -58016,6 +58023,11 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+  - uid: 2758\r
+    components:\r
+    - type: Transform\r
+      pos: -19.5,-2.5\r
+      parent: 60\r
 - proto: ClosetL3VirologyFilled\r
   entities:\r
   - uid: 2962\r
@@ -60766,6 +60778,12 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: -22.5,1.5\r
       parent: 60\r
+  - uid: 1988\r
+    components:\r
+    - type: Transform\r
+      rot: -1.5707963267948966 rad\r
+      pos: -18.5,-15.5\r
+      parent: 60\r
   - uid: 2024\r
     components:\r
     - type: Transform\r
@@ -62347,6 +62365,13 @@ entities:
     - type: Transform\r
       pos: -16.5,-29.5\r
       parent: 60\r
+- proto: DefaultStationBeacon\r
+  entities:\r
+  - uid: 20983\r
+    components:\r
+    - type: Transform\r
+      pos: 35.5,16.5\r
+      parent: 60\r
 - proto: DefaultStationBeaconAICore\r
   entities:\r
   - uid: 18703\r
@@ -62754,11 +62779,6 @@ entities:
     - type: Transform\r
       pos: 30.5,-18.5\r
       parent: 60\r
-  - uid: 4709\r
-    components:\r
-    - type: Transform\r
-      pos: -18.5,-1.5\r
-      parent: 60\r
   - uid: 7666\r
     components:\r
     - type: Transform\r
@@ -62775,6 +62795,12 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: 37.5,-14.5\r
       parent: 60\r
+  - uid: 19450\r
+    components:\r
+    - type: Transform\r
+      rot: -1.5707963267948966 rad\r
+      pos: -17.5,-3.5\r
+      parent: 60\r
   - uid: 21264\r
     components:\r
     - type: Transform\r
@@ -62846,11 +62872,6 @@ entities:
     - type: Transform\r
       pos: 33.5,-20.5\r
       parent: 60\r
-  - uid: 315\r
-    components:\r
-    - type: Transform\r
-      pos: 20.5,-20.5\r
-      parent: 60\r
   - uid: 430\r
     components:\r
     - type: Transform\r
@@ -63270,6 +63291,11 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: 44.5,5.5\r
       parent: 60\r
+  - uid: 19449\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-13.5\r
+      parent: 60\r
   - uid: 21354\r
     components:\r
     - type: Transform\r
@@ -63324,6 +63350,11 @@ entities:
     - type: Transform\r
       pos: 16.5,5.5\r
       parent: 60\r
+  - uid: 1182\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-20.5\r
+      parent: 60\r
   - uid: 1277\r
     components:\r
     - type: Transform\r
@@ -66470,6 +66501,26 @@ entities:
     - type: Transform\r
       pos: -31.5,25.5\r
       parent: 60\r
+  - uid: 18697\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-19.5\r
+      parent: 60\r
+  - uid: 18698\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-18.5\r
+      parent: 60\r
+  - uid: 18785\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-17.5\r
+      parent: 60\r
+  - uid: 18800\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-16.5\r
+      parent: 60\r
   - uid: 18943\r
     components:\r
     - type: Transform\r
@@ -66751,6 +66802,16 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: 17.5,24.5\r
       parent: 60\r
+  - uid: 19162\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-15.5\r
+      parent: 60\r
+  - uid: 19446\r
+    components:\r
+    - type: Transform\r
+      pos: 20.5,-14.5\r
+      parent: 60\r
   - uid: 21355\r
     components:\r
     - type: Transform\r
@@ -67184,6 +67245,12 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: 47.5,14.5\r
       parent: 60\r
+  - uid: 19447\r
+    components:\r
+    - type: Transform\r
+      rot: 1.5707963267948966 rad\r
+      pos: 19.5,-13.5\r
+      parent: 60\r
   - uid: 21353\r
     components:\r
     - type: Transform\r
@@ -68813,13 +68880,6 @@ entities:
     - type: Transform\r
       pos: -8.5,16.5\r
       parent: 60\r
-- proto: filingCabinet\r
-  entities:\r
-  - uid: 5568\r
-    components:\r
-    - type: Transform\r
-      pos: -18.5,-15.5\r
-      parent: 60\r
 - proto: filingCabinetDrawerRandom\r
   entities:\r
   - uid: 4172\r
@@ -107522,10 +107582,10 @@ entities:
       parent: 60\r
 - proto: GunSafeRifleLecter\r
   entities:\r
-  - uid: 4109\r
+  - uid: 2183\r
     components:\r
     - type: Transform\r
-      pos: -27.5,2.5\r
+      pos: -28.5,1.5\r
       parent: 60\r
 - proto: GunSafeShotgunKammerer\r
   entities:\r
@@ -109673,6 +109733,11 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+  - uid: 10368\r
+    components:\r
+    - type: Transform\r
+      pos: -34.5,-19.5\r
+      parent: 60\r
 - proto: LockerSyndicatePersonal\r
   entities:\r
   - uid: 9113\r
@@ -109715,11 +109780,6 @@ entities:
           ent: null\r
 - proto: LockerWallMedicalFilled\r
   entities:\r
-  - uid: 2183\r
-    components:\r
-    - type: Transform\r
-      pos: -19.5,-1.5\r
-      parent: 60\r
   - uid: 4137\r
     components:\r
     - type: Transform\r
@@ -110288,6 +110348,11 @@ entities:
       parent: 60\r
 - proto: MedkitFilled\r
   entities:\r
+  - uid: 5568\r
+    components:\r
+    - type: Transform\r
+      pos: -19.576832,-4.61416\r
+      parent: 60\r
   - uid: 5914\r
     components:\r
     - type: Transform\r
@@ -110501,6 +110566,11 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+  - uid: 315\r
+    components:\r
+    - type: Transform\r
+      pos: -18.5,-2.5\r
+      parent: 60\r
   - uid: 319\r
     components:\r
     - type: Transform\r
@@ -110693,12 +110763,6 @@ entities:
         - 0\r
         - 0\r
         - 0\r
-  - uid: 10368\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -19.5,-5.5\r
-      parent: 60\r
   - uid: 11882\r
     components:\r
     - type: Transform\r
@@ -111741,6 +111805,13 @@ entities:
     - type: Transform\r
       pos: 68.478806,-13.493814\r
       parent: 60\r
+- proto: PartRodMetal10\r
+  entities:\r
+  - uid: 19451\r
+    components:\r
+    - type: Transform\r
+      pos: -59.47583,24.547897\r
+      parent: 60\r
 - proto: Pen\r
   entities:\r
   - uid: 935\r
@@ -127353,11 +127424,6 @@ entities:
     - type: Transform\r
       pos: 36.5,-21.5\r
       parent: 60\r
-  - uid: 7918\r
-    components:\r
-    - type: Transform\r
-      pos: -17.5,-3.5\r
-      parent: 60\r
 - proto: SignMinerDock\r
   entities:\r
   - uid: 13251\r
@@ -131698,6 +131764,11 @@ entities:
     - type: Transform\r
       pos: -8.5,36.5\r
       parent: 60\r
+  - uid: 19452\r
+    components:\r
+    - type: Transform\r
+      pos: 2.5,27.5\r
+      parent: 60\r
 - proto: SuitStorageEVA\r
   entities:\r
   - uid: 1885\r
@@ -134652,11 +134723,6 @@ entities:
     - type: Transform\r
       pos: 34.5,-9.5\r
       parent: 60\r
-  - uid: 11567\r
-    components:\r
-    - type: Transform\r
-      pos: -19.5,-2.5\r
-      parent: 60\r
   - uid: 12355\r
     components:\r
     - type: Transform\r
@@ -134783,11 +134849,6 @@ entities:
     - type: Transform\r
       pos: -24.5,2.5\r
       parent: 60\r
-  - uid: 1988\r
-    components:\r
-    - type: Transform\r
-      pos: -28.5,2.5\r
-      parent: 60\r
   - uid: 2212\r
     components:\r
     - type: Transform\r
@@ -134993,6 +135054,11 @@ entities:
     - type: Transform\r
       pos: -112.5,13.5\r
       parent: 60\r
+  - uid: 7622\r
+    components:\r
+    - type: Transform\r
+      pos: -27.5,2.5\r
+      parent: 60\r
   - uid: 8139\r
     components:\r
     - type: Transform\r
@@ -135171,6 +135237,11 @@ entities:
     - type: Transform\r
       pos: -18.5,32.5\r
       parent: 60\r
+  - uid: 18008\r
+    components:\r
+    - type: Transform\r
+      pos: -28.5,2.5\r
+      parent: 60\r
   - uid: 18491\r
     components:\r
     - type: Transform\r
@@ -135217,11 +135288,6 @@ entities:
     - type: Transform\r
       pos: 37.5,17.5\r
       parent: 60\r
-  - uid: 21013\r
-    components:\r
-    - type: Transform\r
-      pos: -28.5,1.5\r
-      parent: 60\r
   - uid: 23055\r
     components:\r
     - type: Transform\r
@@ -135354,6 +135420,11 @@ entities:
       parent: 60\r
 - proto: TableReinforcedGlass\r
   entities:\r
+  - uid: 308\r
+    components:\r
+    - type: Transform\r
+      pos: -19.5,-5.5\r
+      parent: 60\r
   - uid: 2151\r
     components:\r
     - type: Transform\r
@@ -135384,6 +135455,11 @@ entities:
     - type: Transform\r
       pos: 37.5,-28.5\r
       parent: 60\r
+  - uid: 4109\r
+    components:\r
+    - type: Transform\r
+      pos: -19.5,-4.5\r
+      parent: 60\r
   - uid: 4128\r
     components:\r
     - type: Transform\r
@@ -142205,6 +142281,13 @@ entities:
     - type: Transform\r
       pos: -6.5,-44.5\r
       parent: 60\r
+  - uid: 4709\r
+    components:\r
+    - type: MetaData\r
+      flags: PvsPriority\r
+    - type: Transform\r
+      pos: -17.5,-4.5\r
+      parent: 60\r
   - uid: 4712\r
     components:\r
     - type: MetaData\r
@@ -158259,31 +158342,6 @@ entities:
         - 0\r
         - 0\r
         - 0\r
-- proto: WardrobeSecurityFilled\r
-  entities:\r
-  - uid: 308\r
-    components:\r
-    - type: Transform\r
-      pos: -34.5,-19.5\r
-      parent: 60\r
-    - type: EntityStorage\r
-      air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
 - proto: WardrobeVirology\r
   entities:\r
   - uid: 3073\r
@@ -158375,15 +158433,6 @@ entities:
     - type: Transform\r
       pos: -55.5,39.5\r
       parent: 60\r
-- proto: WarpPoint\r
-  entities:\r
-  - uid: 2758\r
-    components:\r
-    - type: Transform\r
-      pos: 37.5,14.5\r
-      parent: 60\r
-    - type: WarpPoint\r
-      location: newsroom\r
 - proto: WaterCooler\r
   entities:\r
   - uid: 592\r
@@ -158576,35 +158625,35 @@ entities:
       canCollide: False\r
 - proto: WeaponLaserCarbine\r
   entities:\r
-  - uid: 1182\r
-    components:\r
-    - type: Transform\r
-      pos: -28.497345,1.4258263\r
-      parent: 60\r
-  - uid: 11558\r
+  - uid: 7918\r
     components:\r
     - type: Transform\r
-      pos: -28.497345,1.8789513\r
+      pos: -27.662745,2.675323\r
       parent: 60\r
   - uid: 14627\r
     components:\r
     - type: Transform\r
-      pos: -28.49841,2.1372187\r
+      pos: -27.58462,2.597198\r
       parent: 60\r
   - uid: 14629\r
     components:\r
     - type: Transform\r
-      pos: -28.49841,2.6528437\r
+      pos: -28.318995,2.425323\r
       parent: 60\r
   - uid: 14630\r
     components:\r
     - type: Transform\r
-      pos: -28.49841,2.4028437\r
+      pos: -28.49087,2.690948\r
+      parent: 60\r
+  - uid: 16444\r
+    components:\r
+    - type: Transform\r
+      pos: -28.39712,2.565948\r
       parent: 60\r
-  - uid: 21021\r
+  - uid: 16445\r
     components:\r
     - type: Transform\r
-      pos: -28.497345,1.6445763\r
+      pos: -27.49087,2.440948\r
       parent: 60\r
 - proto: WeaponRifleAk\r
   entities:\r
@@ -159057,22 +159106,20 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: -23.5,-9.5\r
       parent: 60\r
-  - uid: 12188\r
+  - uid: 11567\r
     components:\r
     - type: Transform\r
-      rot: 1.5707963267948966 rad\r
-      pos: -29.5,-9.5\r
+      pos: -27.5,2.5\r
       parent: 60\r
-  - uid: 20984\r
+  - uid: 12188\r
     components:\r
     - type: Transform\r
       rot: 1.5707963267948966 rad\r
-      pos: -28.5,1.5\r
+      pos: -29.5,-9.5\r
       parent: 60\r
-  - uid: 20989\r
+  - uid: 18693\r
     components:\r
     - type: Transform\r
-      rot: 1.5707963267948966 rad\r
       pos: -28.5,2.5\r
       parent: 60\r
   - uid: 24115\r
@@ -159655,24 +159702,6 @@ entities:
       rot: 3.141592653589793 rad\r
       pos: -51.5,-32.5\r
       parent: 60\r
-  - uid: 16444\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: 35.5,15.5\r
-      parent: 60\r
-  - uid: 16445\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: 36.5,15.5\r
-      parent: 60\r
-  - uid: 16447\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: 37.5,15.5\r
-      parent: 60\r
   - uid: 21347\r
     components:\r
     - type: Transform\r
@@ -159816,6 +159845,24 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: 48.5,23.5\r
       parent: 60\r
+  - uid: 18544\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: 37.5,15.5\r
+      parent: 60\r
+  - uid: 18546\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: 36.5,15.5\r
+      parent: 60\r
+  - uid: 18683\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: 35.5,15.5\r
+      parent: 60\r
   - uid: 21618\r
     components:\r
     - type: Transform\r
@@ -160642,6 +160689,12 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: -0.5,26.5\r
       parent: 60\r
+  - uid: 16447\r
+    components:\r
+    - type: Transform\r
+      rot: 1.5707963267948966 rad\r
+      pos: -27.5,2.5\r
+      parent: 60\r
   - uid: 16996\r
     components:\r
     - type: Transform\r
@@ -160736,11 +160789,6 @@ entities:
     - type: Transform\r
       pos: -47.5,5.5\r
       parent: 60\r
-  - uid: 20983\r
-    components:\r
-    - type: Transform\r
-      pos: -28.5,1.5\r
-      parent: 60\r
   - uid: 21144\r
     components:\r
     - type: Transform\r