From 9383ad548d0dfb9c39656275f2246b89c7ca1d5d Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Wed, 17 Jan 2024 06:18:19 -0700
Subject: [PATCH] bagel update (#24191)

* bagel update

* ok a lot more
---
 Resources/Maps/bagel.yml | 346 ++++++++++++++++++++++-----------------
 1 file changed, 197 insertions(+), 149 deletions(-)

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