]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b2d374b)
Bagel (#23075)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Thu, 28 Dec 2023 01:39:56 +0000 (18:39 -0700)
committerGitHub <noreply@github.com>
Thu, 28 Dec 2023 01:39:56 +0000 (18:39 -0700)
* bagel update

* kill christmas

Resources/Maps/bagel.yml patch | blob | history

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index e9f1f53258adc13291d0de432de82f1f0ba24567..b3e6e0664660ab31a03e977bb5b89236f7053089 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -2104,29 +2104,6 @@ entities:
             1361: -20,-7\r
             1362: -19,-7\r
             1363: -19,-8\r
-        - node:\r
-            color: '#5E7C1679'\r
-            id: CheckerNESW\r
-          decals:\r
-            3772: 16,-26\r
-        - node:\r
-            color: '#5E7C167F'\r
-            id: CheckerNESW\r
-          decals:\r
-            3741: 10,-29\r
-            3742: 10,-28\r
-            3743: 10,-27\r
-            3744: 11,-27\r
-            3745: 12,-27\r
-            3746: 13,-27\r
-            3747: 14,-27\r
-            3748: 16,-27\r
-            3749: 15,-27\r
-            3750: 17,-27\r
-            3751: 18,-27\r
-            3752: 19,-27\r
-            3753: 20,-27\r
-            3754: 21,-27\r
         - node:\r
             color: '#D4D4D428'\r
             id: CheckerNESW\r
@@ -6093,7 +6070,7 @@ entities:
             id: WoodTrimThinInnerSe\r
           decals:\r
             1215: -12,19\r
-            3769: 10,-27\r
+            3813: 10,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinInnerSw\r
@@ -6135,8 +6112,8 @@ entities:
             2369: 24,-17\r
             2370: 24,-16\r
             3672: -12,-52\r
-            3770: 10,-29\r
-            3771: 10,-28\r
+            3810: 10,-29\r
+            3811: 10,-28\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineN\r
@@ -6209,17 +6186,17 @@ entities:
             3270: -27,22\r
             3739: 13,20\r
             3740: 12,20\r
-            3758: 21,-27\r
-            3759: 20,-27\r
-            3760: 19,-27\r
-            3761: 18,-27\r
-            3762: 17,-27\r
-            3763: 16,-27\r
-            3764: 15,-27\r
-            3765: 14,-27\r
-            3766: 13,-27\r
-            3767: 12,-27\r
-            3768: 11,-27\r
+            3812: 11,-27\r
+            3814: 12,-27\r
+            3815: 13,-27\r
+            3816: 14,-27\r
+            3817: 15,-27\r
+            3818: 16,-27\r
+            3819: 17,-27\r
+            3820: 18,-27\r
+            3821: 19,-27\r
+            3822: 20,-27\r
+            3823: 21,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineW\r
@@ -13575,17 +13552,15 @@ entities:
     - pos: -6.5,-16.5\r
       parent: 60\r
       type: Transform\r
-- proto: AirlockServiceGlassLocked\r
+- proto: AirlockServiceLocked\r
   entities:\r
-  - uid: 1393\r
+  - uid: 1333\r
     components:\r
-    - name: Reporter's Room\r
+    - name: Reporters News Room\r
       type: MetaData\r
     - pos: 38.5,14.5\r
       parent: 60\r
       type: Transform\r
-- proto: AirlockServiceLocked\r
-  entities:\r
   - uid: 14179\r
     components:\r
     - name: Librarian's Room\r
@@ -14180,42 +14155,63 @@ entities:
   entities:\r
   - uid: 283\r
     components:\r
+    - name: HoP APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: 4.5,-33.5\r
       parent: 60\r
       type: Transform\r
   - uid: 322\r
     components:\r
+    - name: Morgue APC\r
+      type: MetaData\r
     - rot: 1.5707963267948966 rad\r
       pos: 35.5,-7.5\r
       parent: 60\r
       type: Transform\r
   - uid: 548\r
     components:\r
+    - name: Medical Cryo APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: 52.5,-22.5\r
       parent: 60\r
       type: Transform\r
   - uid: 834\r
     components:\r
+    - name: Janitor Closet APC\r
+      type: MetaData\r
     - pos: -6.5,-29.5\r
       parent: 60\r
       type: Transform\r
     - startingCharge: 12000\r
       type: Battery\r
+  - uid: 2277\r
+    components:\r
+    - name: Engineering North APC\r
+      type: MetaData\r
+    - pos: -9.5,30.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2576\r
     components:\r
+    - name: Bar APC\r
+      type: MetaData\r
     - pos: 11.5,-29.5\r
       parent: 60\r
       type: Transform\r
   - uid: 3130\r
     components:\r
+    - name: Medical Examination APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: 36.5,-19.5\r
       parent: 60\r
       type: Transform\r
   - uid: 3339\r
     components:\r
+    - name: Solars South APC\r
+      type: MetaData\r
     - pos: 30.5,-51.5\r
       parent: 60\r
       type: Transform\r
@@ -14227,28 +14223,38 @@ entities:
       type: PowerNetworkBattery\r
   - uid: 3390\r
     components:\r
+    - name: Solar West APC\r
+      type: MetaData\r
     - pos: -60.5,-16.5\r
       parent: 60\r
       type: Transform\r
   - uid: 3826\r
     components:\r
+    - name: Arrivals South APC\r
+      type: MetaData\r
     - pos: -1.5,-74.5\r
       parent: 60\r
       type: Transform\r
   - uid: 3907\r
     components:\r
+    - name: Disposals APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: -1.5,-42.5\r
       parent: 60\r
       type: Transform\r
   - uid: 4086\r
     components:\r
+    - name: Maints South East APC\r
+      type: MetaData\r
     - rot: 1.5707963267948966 rad\r
       pos: 39.5,-44.5\r
       parent: 60\r
       type: Transform\r
   - uid: 4182\r
     components:\r
+    - name: Court Room APC\r
+      type: MetaData\r
     - pos: -46.5,-14.5\r
       parent: 60\r
       type: Transform\r
@@ -14261,11 +14267,15 @@ entities:
       type: PowerNetworkBattery\r
   - uid: 5093\r
     components:\r
+    - name: Arrivals West APC\r
+      type: MetaData\r
     - pos: -15.5,-52.5\r
       parent: 60\r
       type: Transform\r
   - uid: 5589\r
     components:\r
+    - name: RD Office APC\r
+      type: MetaData\r
     - pos: -41.5,6.5\r
       parent: 60\r
       type: Transform\r
@@ -14278,16 +14288,22 @@ entities:
       type: PowerNetworkBattery\r
   - uid: 5669\r
     components:\r
+    - name: Science APC\r
+      type: MetaData\r
     - pos: -52.5,5.5\r
       parent: 60\r
       type: Transform\r
   - uid: 5807\r
     components:\r
+    - name: Maint South West APC\r
+      type: MetaData\r
     - pos: -47.5,-22.5\r
       parent: 60\r
       type: Transform\r
   - uid: 6263\r
     components:\r
+    - name: Tool Room APC\r
+      type: MetaData\r
     - pos: 13.5,16.5\r
       parent: 60\r
       type: Transform\r
@@ -14299,25 +14315,41 @@ entities:
       type: PowerNetworkBattery\r
   - uid: 6975\r
     components:\r
+    - name: Arrivals East APC\r
+      type: MetaData\r
     - pos: 10.5,-52.5\r
       parent: 60\r
       type: Transform\r
   - uid: 7124\r
     components:\r
+    - name: Arrivals APC\r
+      type: MetaData\r
     - pos: -1.5,-59.5\r
       parent: 60\r
       type: Transform\r
   - uid: 7128\r
     components:\r
+    - name: Arrivals North APC\r
+      type: MetaData\r
     - pos: -2.5,-52.5\r
       parent: 60\r
       type: Transform\r
   - uid: 7281\r
     components:\r
+    - name: Maint Dock APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: -42.5,-29.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7490\r
+    components:\r
+    - name: Captain's Office APC\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -1.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 8110\r
     components:\r
     - pos: 5.5,-0.5\r
@@ -14335,140 +14367,194 @@ entities:
       type: Transform\r
   - uid: 8244\r
     components:\r
+    - name: Security Locker Room APC\r
+      type: MetaData\r
     - pos: -32.5,-14.5\r
       parent: 60\r
       type: Transform\r
   - uid: 8684\r
     components:\r
+    - name: Security Entrance APC\r
+      type: MetaData\r
     - pos: -24.5,-17.5\r
       parent: 60\r
       type: Transform\r
   - uid: 8695\r
     components:\r
+    - name: Security North APC\r
+      type: MetaData\r
     - pos: -29.5,-1.5\r
       parent: 60\r
       type: Transform\r
   - uid: 9448\r
     components:\r
+    - name: Xenoarch APC\r
+      type: MetaData\r
     - pos: -44.5,15.5\r
       parent: 60\r
       type: Transform\r
   - uid: 9571\r
     components:\r
+    - name: RND APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -42.5,-11.5\r
       parent: 60\r
       type: Transform\r
   - uid: 9694\r
     components:\r
+    - name: Robotics APC\r
+      type: MetaData\r
     - pos: -31.5,16.5\r
       parent: 60\r
       type: Transform\r
   - uid: 9999\r
     components:\r
+    - name: Main Hall South Security APC\r
+      type: MetaData\r
     - pos: -28.5,-25.5\r
       parent: 60\r
       type: Transform\r
   - uid: 10314\r
     components:\r
+    - name: Technical Storage APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: 18.5,20.5\r
       parent: 60\r
       type: Transform\r
   - uid: 10840\r
     components:\r
+    - name: Telecomms APC\r
+      type: MetaData\r
     - pos: 21.5,5.5\r
       parent: 60\r
       type: Transform\r
   - uid: 11158\r
     components:\r
+    - name: Salvage Bay APC\r
+      type: MetaData\r
     - pos: 46.5,4.5\r
       parent: 60\r
       type: Transform\r
   - uid: 11255\r
     components:\r
+    - name: Hydroponics APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: 33.5,-38.5\r
       parent: 60\r
       type: Transform\r
   - uid: 11566\r
     components:\r
+    - name: TEG APC\r
+      type: MetaData\r
     - pos: -23.5,47.5\r
       parent: 60\r
       type: Transform\r
   - uid: 12002\r
     components:\r
+    - name: Main Hall North Departures APC\r
+      type: MetaData\r
     - pos: 27.5,22.5\r
       parent: 60\r
       type: Transform\r
   - uid: 12070\r
     components:\r
+    - name: Theater APC\r
+      type: MetaData\r
     - pos: 23.5,-14.5\r
       parent: 60\r
       type: Transform\r
   - uid: 12279\r
     components:\r
+    - name: Medical North APC\r
+      type: MetaData\r
     - pos: 43.5,-7.5\r
       parent: 60\r
       type: Transform\r
   - uid: 12443\r
     components:\r
+    - name: Medical Chemistry APC\r
+      type: MetaData\r
     - pos: 39.5,-33.5\r
       parent: 60\r
       type: Transform\r
   - uid: 12467\r
     components:\r
+    - name: Medical Virology APC\r
+      type: MetaData\r
     - pos: 52.5,-24.5\r
       parent: 60\r
       type: Transform\r
   - uid: 13493\r
     components:\r
+    - name: Cargo Bay APC\r
+      type: MetaData\r
     - pos: 51.5,15.5\r
       parent: 60\r
       type: Transform\r
   - uid: 14328\r
     components:\r
+    - name: Library APC\r
+      type: MetaData\r
     - pos: -13.5,14.5\r
       parent: 60\r
       type: Transform\r
   - uid: 14552\r
     components:\r
+    - name: Chapel APC\r
+      type: MetaData\r
     - pos: -23.5,22.5\r
       parent: 60\r
       type: Transform\r
   - uid: 15692\r
     components:\r
+    - name: Atmos Lobby APC\r
+      type: MetaData\r
     - pos: -18.5,31.5\r
       parent: 60\r
       type: Transform\r
   - uid: 16503\r
     components:\r
+    - name: Singulo APC\r
+      type: MetaData\r
     - pos: 5.5,37.5\r
       parent: 60\r
       type: Transform\r
   - uid: 16701\r
     components:\r
+    - name: Engineering APC\r
+      type: MetaData\r
     - pos: 2.5,22.5\r
       parent: 60\r
       type: Transform\r
   - uid: 17971\r
     components:\r
+    - name: Bridge APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -2.5,-1.5\r
       parent: 60\r
       type: Transform\r
   - uid: 19332\r
     components:\r
+    - name: Cargo Entrance APC\r
+      type: MetaData\r
     - pos: 37.5,12.5\r
       parent: 60\r
       type: Transform\r
   - uid: 19553\r
     components:\r
+    - name: Departures APC\r
+      type: MetaData\r
     - pos: 42.5,26.5\r
       parent: 60\r
       type: Transform\r
   - uid: 20087\r
     components:\r
+    - name: Solar South East APC\r
+      type: MetaData\r
     - pos: 62.5,-36.5\r
       parent: 60\r
       type: Transform\r
@@ -14477,6 +14563,13 @@ entities:
     - pos: -24.5,62.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21604\r
+    components:\r
+    - name: Dorms APC\r
+      type: MetaData\r
+    - pos: -36.5,27.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 23599\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -14485,26 +14578,42 @@ entities:
       type: Transform\r
   - uid: 23725\r
     components:\r
+    - name: Grav Gen APC\r
+      type: MetaData\r
     - pos: -7.5,6.5\r
       parent: 60\r
       type: Transform\r
   - uid: 23758\r
     components:\r
+    - name: Medical Storage APC\r
+      type: MetaData\r
     - rot: -1.5707963267948966 rad\r
       pos: 50.5,-11.5\r
       parent: 60\r
       type: Transform\r
   - uid: 23770\r
     components:\r
+    - name: Bridge South APC\r
+      type: MetaData\r
     - rot: 1.5707963267948966 rad\r
       pos: -1.5,-11.5\r
       parent: 60\r
       type: Transform\r
   - uid: 23788\r
     components:\r
+    - name: Kitchen APC\r
+      type: MetaData\r
     - pos: 27.5,-34.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24380\r
+    components:\r
+    - name: Atmospherics APC\r
+      type: MetaData\r
+    - rot: 3.141592653589793 rad\r
+      pos: -31.5,37.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: APCElectronics\r
   entities:\r
   - uid: 5032\r
@@ -14528,34 +14637,46 @@ entities:
   entities:\r
   - uid: 22431\r
     components:\r
+    - name: AI Sat Airlock APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -94.5,15.5\r
       parent: 60\r
       type: Transform\r
   - uid: 22486\r
     components:\r
+    - name: AI Sat Maints APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -120.5,14.5\r
       parent: 60\r
       type: Transform\r
   - uid: 22487\r
     components:\r
+    - name: AI Sat Upload APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -113.5,7.5\r
       parent: 60\r
       type: Transform\r
   - uid: 22488\r
     components:\r
+    - name: AI Sat Core APC\r
+      type: MetaData\r
     - pos: -110.5,24.5\r
       parent: 60\r
       type: Transform\r
   - uid: 22489\r
     components:\r
+    - name: AI Sat Foyer APC\r
+      type: MetaData\r
     - pos: -110.5,20.5\r
       parent: 60\r
       type: Transform\r
   - uid: 22490\r
     components:\r
+    - name: AI Sat Entrance APC\r
+      type: MetaData\r
     - rot: 3.141592653589793 rad\r
       pos: -104.5,14.5\r
       parent: 60\r
@@ -14567,6 +14688,8 @@ entities:
       type: Transform\r
   - uid: 24134\r
     components:\r
+    - name: Perma Brig APC\r
+      type: MetaData\r
     - pos: -5.5,-16.5\r
       parent: 60\r
       type: Transform\r
@@ -16030,7 +16153,8 @@ entities:
       parent: 60\r
       type: Transform\r
     - links:\r
-      - 16543\r
+      - 4260\r
+      - 18295\r
       type: DeviceLinkSink\r
   - uid: 16542\r
     components:\r
@@ -16038,7 +16162,8 @@ entities:
       parent: 60\r
       type: Transform\r
     - links:\r
-      - 16543\r
+      - 4260\r
+      - 18295\r
       type: DeviceLinkSink\r
   - uid: 16973\r
     components:\r
@@ -17128,6 +17253,16 @@ entities:
     - pos: -54.5,-18.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 1393\r
+    components:\r
+    - pos: -11.5,26.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 1449\r
+    components:\r
+    - pos: -11.5,25.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 1555\r
     components:\r
     - pos: -25.5,-20.5\r
@@ -17223,6 +17358,16 @@ entities:
     - pos: 33.5,-36.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2228\r
+    components:\r
+    - pos: -36.5,27.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 2231\r
+    components:\r
+    - pos: -36.5,26.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2309\r
     components:\r
     - pos: 33.5,-38.5\r
@@ -17403,6 +17548,11 @@ entities:
     - pos: -65.5,-0.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 4259\r
+    components:\r
+    - pos: -31.5,37.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 4267\r
     components:\r
     - pos: -52.5,-14.5\r
@@ -25978,16 +26128,6 @@ entities:
     - pos: -15.5,24.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 14388\r
-    components:\r
-    - pos: -14.5,24.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 14389\r
-    components:\r
-    - pos: -13.5,24.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 14390\r
     components:\r
     - pos: -12.5,24.5\r
@@ -26788,16 +26928,6 @@ entities:
     - pos: -18.5,24.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 15672\r
-    components:\r
-    - pos: -24.5,24.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 15673\r
-    components:\r
-    - pos: -25.5,24.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 15674\r
     components:\r
     - pos: -26.5,24.5\r
@@ -27133,16 +27263,6 @@ entities:
     - pos: 6.5,31.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 16741\r
-    components:\r
-    - pos: -3.5,25.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 16742\r
-    components:\r
-    - pos: -3.5,26.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 16743\r
     components:\r
     - pos: -3.5,27.5\r
@@ -27598,11 +27718,6 @@ entities:
     - pos: -30.5,31.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 16834\r
-    components:\r
-    - pos: -31.5,31.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 16835\r
     components:\r
     - pos: -32.5,31.5\r
@@ -27958,11 +28073,6 @@ entities:
     - pos: -28.5,42.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 16906\r
-    components:\r
-    - pos: -27.5,42.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 16907\r
     components:\r
     - pos: -27.5,43.5\r
@@ -28230,7 +28340,7 @@ entities:
       type: Transform\r
   - uid: 17009\r
     components:\r
-    - pos: -26.5,42.5\r
+    - pos: -1.5,-4.5\r
       parent: 60\r
       type: Transform\r
   - uid: 17010\r
@@ -28718,16 +28828,6 @@ entities:
     - pos: -2.5,-1.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 18295\r
-    components:\r
-    - pos: -2.5,-2.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 18296\r
-    components:\r
-    - pos: -2.5,-3.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 18297\r
     components:\r
     - pos: -3.5,-3.5\r
@@ -30858,6 +30958,11 @@ entities:
     - pos: 13.5,2.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21599\r
+    components:\r
+    - pos: -2.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 22548\r
     components:\r
     - pos: -94.5,15.5\r
@@ -32263,6 +32368,31 @@ entities:
     - pos: 12.5,-70.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24381\r
+    components:\r
+    - pos: -31.5,38.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24382\r
+    components:\r
+    - pos: -31.5,39.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24383\r
+    components:\r
+    - pos: -32.5,39.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24384\r
+    components:\r
+    - pos: -33.5,39.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24408\r
+    components:\r
+    - pos: -11.5,27.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CableApcStack\r
   entities:\r
   - uid: 6603\r
@@ -42078,6 +42208,11 @@ entities:
     - pos: -57.5,-18.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 3559\r
+    components:\r
+    - pos: -9.5,29.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 4457\r
     components:\r
     - pos: -31.5,5.5\r
@@ -42598,6 +42733,11 @@ entities:
     - pos: -18.5,-12.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7197\r
+    components:\r
+    - pos: -9.5,30.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 7359\r
     components:\r
     - pos: -13.5,-54.5\r
@@ -46678,6 +46818,21 @@ entities:
     - pos: 46.5,-32.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21603\r
+    components:\r
+    - pos: -1.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21605\r
+    components:\r
+    - pos: -24.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21607\r
+    components:\r
+    - pos: -25.5,24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 22492\r
     components:\r
     - pos: -116.5,19.5\r
@@ -47043,11 +47198,61 @@ entities:
     - pos: -59.5,40.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 23670\r
+    components:\r
+    - pos: -26.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23672\r
+    components:\r
+    - pos: -27.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23673\r
+    components:\r
+    - pos: -28.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23674\r
+    components:\r
+    - pos: -29.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23675\r
+    components:\r
+    - pos: -30.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23676\r
+    components:\r
+    - pos: -31.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23688\r
+    components:\r
+    - pos: -32.5,24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 23698\r
     components:\r
     - pos: 45.5,-32.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 23699\r
+    components:\r
+    - pos: -33.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23705\r
+    components:\r
+    - pos: -34.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23706\r
+    components:\r
+    - pos: -35.5,24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 23709\r
     components:\r
     - pos: 3.5,-3.5\r
@@ -47373,6 +47578,141 @@ entities:
     - pos: 14.5,-23.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24376\r
+    components:\r
+    - pos: -36.5,24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24377\r
+    components:\r
+    - pos: -36.5,25.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24378\r
+    components:\r
+    - pos: -36.5,26.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24379\r
+    components:\r
+    - pos: -36.5,27.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24385\r
+    components:\r
+    - pos: -19.5,29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24386\r
+    components:\r
+    - pos: -20.5,29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24387\r
+    components:\r
+    - pos: -21.5,29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24388\r
+    components:\r
+    - pos: -21.5,30.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24389\r
+    components:\r
+    - pos: -21.5,31.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24390\r
+    components:\r
+    - pos: -21.5,32.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24391\r
+    components:\r
+    - pos: -21.5,33.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24392\r
+    components:\r
+    - pos: -21.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24393\r
+    components:\r
+    - pos: -22.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24394\r
+    components:\r
+    - pos: -23.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24395\r
+    components:\r
+    - pos: -24.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24396\r
+    components:\r
+    - pos: -25.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24397\r
+    components:\r
+    - pos: -26.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24398\r
+    components:\r
+    - pos: -27.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24399\r
+    components:\r
+    - pos: -28.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24400\r
+    components:\r
+    - pos: -29.5,34.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24401\r
+    components:\r
+    - pos: -29.5,35.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24402\r
+    components:\r
+    - pos: -29.5,36.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24403\r
+    components:\r
+    - pos: -29.5,37.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24404\r
+    components:\r
+    - pos: -29.5,38.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24405\r
+    components:\r
+    - pos: -30.5,38.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24406\r
+    components:\r
+    - pos: -31.5,38.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24407\r
+    components:\r
+    - pos: -31.5,37.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CableMVStack\r
   entities:\r
   - uid: 6605\r
@@ -47508,22 +47848,6 @@ entities:
       pos: 11.5,-73.5\r
       parent: 60\r
       type: Transform\r
-- proto: CandleGreenSmallInfinite\r
-  entities:\r
-  - uid: 21598\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 19.558498,-32.618916\r
-      parent: 60\r
-      type: Transform\r
-- proto: CandleRedSmallInfinite\r
-  entities:\r
-  - uid: 2231\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 19.433498,-32.462666\r
-      parent: 60\r
-      type: Transform\r
 - proto: CandyBowl\r
   entities:\r
   - uid: 15506\r
@@ -47582,11 +47906,6 @@ entities:
     - pos: -20.5,1.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 4259\r
-    components:\r
-    - pos: 21.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 4276\r
     components:\r
     - pos: -45.5,-17.5\r
@@ -47612,26 +47931,11 @@ entities:
     - pos: -21.5,0.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7197\r
-    components:\r
-    - pos: 20.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 7293\r
     components:\r
     - pos: -26.5,-29.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7490\r
-    components:\r
-    - pos: 21.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7493\r
-    components:\r
-    - pos: 20.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 10823\r
     components:\r
     - pos: 3.5,-3.5\r
@@ -47779,21 +48083,6 @@ entities:
     - pos: -31.5,19.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21604\r
-    components:\r
-    - pos: 19.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 21605\r
-    components:\r
-    - pos: 19.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23673\r
-    components:\r
-    - pos: 2.5,-57.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 24171\r
     components:\r
     - pos: -26.5,-28.5\r
@@ -48364,6 +48653,26 @@ entities:
     - pos: 12.5,17.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7494\r
+    components:\r
+    - pos: 18.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9350\r
+    components:\r
+    - pos: 18.5,-30.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9373\r
+    components:\r
+    - pos: 20.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9664\r
+    components:\r
+    - pos: 18.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 13603\r
     components:\r
     - pos: -8.5,-13.5\r
@@ -48384,6 +48693,16 @@ entities:
     - pos: -8.5,-12.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 15672\r
+    components:\r
+    - pos: 20.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 16543\r
+    components:\r
+    - pos: 20.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 17813\r
     components:\r
     - pos: -35.5,20.5\r
@@ -48424,6 +48743,11 @@ entities:
     - pos: 44.5,14.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21335\r
+    components:\r
+    - pos: 19.5,-30.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 21348\r
     components:\r
     - pos: 10.5,20.5\r
@@ -48439,6 +48763,31 @@ entities:
     - pos: 8.5,20.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21500\r
+    components:\r
+    - pos: 20.5,-30.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21598\r
+    components:\r
+    - pos: 18.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24409\r
+    components:\r
+    - pos: 19.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24410\r
+    components:\r
+    - pos: 19.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24417\r
+    components:\r
+    - pos: 19.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CarpetPink\r
   entities:\r
   - uid: 17640\r
@@ -55819,12 +56168,6 @@ entities:
       pos: 56.5,-35.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 3559\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 18.5,-31.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 3738\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -55855,12 +56198,6 @@ entities:
       pos: -45.5,-18.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 4260\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 20.5,-31.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 5636\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -55927,10 +56264,10 @@ entities:
       pos: 23.5,-18.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7494\r
+  - uid: 7492\r
     components:\r
     - rot: 1.5707963267948966 rad\r
-      pos: 18.5,-32.5\r
+      pos: 18.5,-30.5\r
       parent: 60\r
       type: Transform\r
   - uid: 7633\r
@@ -55998,6 +56335,18 @@ entities:
       pos: -7.5,25.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 14388\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 14389\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 14440\r
     components:\r
     - pos: -11.5,21.5\r
@@ -56109,28 +56458,40 @@ entities:
     - pos: -18.5,21.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 14804\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 16131\r
     components:\r
     - rot: -1.5707963267948966 rad\r
       pos: 17.5,-38.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 18095\r
+  - uid: 24411\r
     components:\r
     - rot: -1.5707963267948966 rad\r
-      pos: 20.5,-33.5\r
+      pos: 20.5,-30.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23699\r
+  - uid: 24412\r
     components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 18.5,-33.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 20.5,-31.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23705\r
+  - uid: 24413\r
     components:\r
     - rot: -1.5707963267948966 rad\r
-      pos: 20.5,-32.5\r
+      pos: 20.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24414\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 20.5,-28.5\r
       parent: 60\r
       type: Transform\r
 - proto: CheapRollerBed\r
@@ -59334,48 +59695,6 @@ entities:
     - pos: 22.509872,-51.419544\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingOuterSanta\r
-  entities:\r
-  - uid: 1333\r
-    components:\r
-    - pos: -32.503136,-18.457027\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 1449\r
-    components:\r
-    - pos: -32.48751,-17.535152\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 21599\r
-    components:\r
-    - pos: -32.48751,-17.535152\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23670\r
-    components:\r
-    - pos: -32.503136,-18.457027\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23672\r
-    components:\r
-    - pos: -32.48751,-17.535152\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23675\r
-    components:\r
-    - pos: -32.48751,-17.535152\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23688\r
-    components:\r
-    - pos: -32.503136,-18.457027\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23706\r
-    components:\r
-    - pos: -32.503136,-18.457027\r
-      parent: 60\r
-      type: Transform\r
 - proto: ClothingOuterSkub\r
   entities:\r
   - uid: 6793\r
@@ -61683,11 +62002,6 @@ entities:
     - pos: -16.5,-29.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23674\r
-    components:\r
-    - pos: 2.5,-56.5\r
-      parent: 60\r
-      type: Transform\r
 - proto: DefibrillatorCabinetFilled\r
   entities:\r
   - uid: 4626\r
@@ -71235,13 +71549,6 @@ entities:
     - pos: -65.522354,23.506481\r
       parent: 60\r
       type: Transform\r
-- proto: FloraTreeChristmas02\r
-  entities:\r
-  - uid: 7492\r
-    components:\r
-    - pos: 20.568558,-29.361916\r
-      parent: 60\r
-      type: Transform\r
 - proto: FoodApple\r
   entities:\r
   - uid: 7496\r
@@ -72981,14 +73288,6 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 9373\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: -55.5,-4.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#FF1212FF'\r
-      type: AtmosPipeColor\r
   - uid: 9638\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -72997,13 +73296,6 @@ entities:
       type: Transform\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
-  - uid: 9664\r
-    components:\r
-    - pos: -54.5,-4.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#FF1212FF'\r
-      type: AtmosPipeColor\r
   - uid: 10829\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -73475,6 +73767,21 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
+  - uid: 16741\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -55.5,-3.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
+  - uid: 16834\r
+    components:\r
+    - pos: -54.5,-3.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 16969\r
     components:\r
     - pos: -11.5,45.5\r
@@ -82882,14 +83189,6 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 9350\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: -55.5,-3.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#FF1212FF'\r
-      type: AtmosPipeColor\r
   - uid: 9358\r
     components:\r
     - pos: -49.5,15.5\r
@@ -83127,6 +83426,8 @@ entities:
     - pos: -55.5,-1.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 12627\r
     components:\r
     - pos: 38.5,-28.5\r
@@ -86996,6 +87297,13 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
+  - uid: 16742\r
+    components:\r
+    - pos: -54.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
   - uid: 16968\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -95177,8 +95485,6 @@ entities:
       pos: -2.5,-3.5\r
       parent: 60\r
       type: Transform\r
-    - joinedGrid: 60\r
-      type: AtmosDevice\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
   - uid: 4953\r
@@ -97779,8 +98085,6 @@ entities:
       pos: -3.5,25.5\r
       parent: 60\r
       type: Transform\r
-    - joinedGrid: 60\r
-      type: AtmosDevice\r
     - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
   - uid: 16634\r
@@ -106510,16 +106814,14 @@ entities:
     - pos: -42.483322,14.749073\r
       parent: 60\r
       type: Transform\r
-  - uid: 19190\r
+  - uid: 16906\r
     components:\r
-    - pos: 24.45261,20.352545\r
+    - pos: 47.477646,-11.308374\r
       parent: 60\r
       type: Transform\r
-- proto: HandheldHealthAnalyzerUnpowered\r
-  entities:\r
-  - uid: 21335\r
+  - uid: 19190\r
     components:\r
-    - pos: 47.51603,-11.423215\r
+    - pos: 24.45261,20.352545\r
       parent: 60\r
       type: Transform\r
 - proto: HandLabeler\r
@@ -112115,6 +112417,11 @@ entities:
     - pos: 56.5,27.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7491\r
+    components:\r
+    - pos: -1.5,-2.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 9006\r
     components:\r
     - pos: 8.5,-52.5\r
@@ -112140,11 +112447,6 @@ entities:
     - pos: 36.5,19.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21500\r
-    components:\r
-    - pos: -1.5,-4.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 21787\r
     components:\r
     - pos: 6.5,11.5\r
@@ -113052,13 +113354,6 @@ entities:
       pos: -12.5,19.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2277\r
-    components:\r
-    - pos: 14.5,-26.5\r
-      parent: 60\r
-      type: Transform\r
-    - powerLoad: 0\r
-      type: ApcPowerReceiver\r
   - uid: 2278\r
     components:\r
     - pos: 18.5,-26.5\r
@@ -114476,6 +114771,11 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
+  - uid: 18095\r
+    components:\r
+    - pos: 11.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 18550\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -116271,18 +116571,6 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
-- proto: PresentRandom\r
-  entities:\r
-  - uid: 21607\r
-    components:\r
-    - pos: 19.39456,-29.163122\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23676\r
-    components:\r
-    - pos: 19.753935,-29.506872\r
-      parent: 60\r
-      type: Transform\r
 - proto: Protolathe\r
   entities:\r
   - uid: 7081\r
@@ -124069,17 +124357,6 @@ entities:
         16973:\r
         - Pressed: Toggle\r
       type: DeviceLinkSource\r
-  - uid: 16543\r
-    components:\r
-    - pos: -4.5,30.5\r
-      parent: 60\r
-      type: Transform\r
-    - linkedPorts:\r
-        16541:\r
-        - Pressed: Toggle\r
-        16542:\r
-        - Pressed: Toggle\r
-      type: DeviceLinkSource\r
   - uid: 17876\r
     components:\r
     - pos: 58.5,13.5\r
@@ -124250,6 +124527,18 @@ entities:
         21334:\r
         - Pressed: Toggle\r
       type: DeviceLinkSource\r
+  - uid: 4260\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -4.5,30.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        16542:\r
+        - Pressed: Toggle\r
+        16541:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 4522\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -124448,6 +124737,17 @@ entities:
         4794:\r
         - Pressed: Toggle\r
       type: DeviceLinkSource\r
+  - uid: 18295\r
+    components:\r
+    - pos: -4.5,30.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        16541:\r
+        - Pressed: Toggle\r
+        16542:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 19130\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -128625,9 +128925,9 @@ entities:
     - pos: 6.5,-29.5\r
       parent: 60\r
       type: Transform\r
-- proto: SpawnMobCrab\r
+- proto: SpawnMobCrabAtmos\r
   entities:\r
-  - uid: 14804\r
+  - uid: 18296\r
     components:\r
     - pos: -36.5,33.5\r
       parent: 60\r
@@ -132854,16 +133154,9 @@ entities:
     - pos: 23.5,-40.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2228\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 19.5,-32.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7491\r
+  - uid: 7493\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 19.5,-33.5\r
+    - pos: 19.5,-29.5\r
       parent: 60\r
       type: Transform\r
   - uid: 13562\r
@@ -132896,15 +133189,24 @@ entities:
     - pos: -9.5,17.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 15673\r
+    components:\r
+    - pos: 19.5,-30.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 16133\r
     components:\r
     - pos: 16.5,-38.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21603\r
+  - uid: 24415\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 19.5,-31.5\r
+    - pos: 19.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24416\r
+    components:\r
+    - pos: 19.5,-28.5\r
       parent: 60\r
       type: Transform\r
 - proto: TableGlass\r
Форк Space Station 14 с переводами на русский