Bagel Update (#20896)

* bagel update

* bagel update

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index f9f593407d413fa4d404aef8ea7a07d182f11dbc..72ee490cc13dba68cc8fed8cd8132444491183f2 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -6413,7 +6413,8 @@ entities:
           -2,-2:\r
             0: 65535\r
           -2,-1:\r
-            0: 61439\r
+            0: 61407\r
+            1: 32\r
           2,-3:\r
             0: 63280\r
           2,-2:\r
@@ -6567,7 +6568,8 @@ entities:
           -5,-1:\r
             0: 65535\r
           -5,0:\r
-            0: 65535\r
+            0: 65279\r
+            1: 256\r
           -5,1:\r
             0: 65535\r
           -5,2:\r
@@ -6587,7 +6589,8 @@ entities:
           1,-5:\r
             0: 3311\r
           2,-8:\r
-            0: 65535\r
+            2: 1\r
+            0: 65534\r
           2,-5:\r
             0: 65535\r
           3,-8:\r
@@ -6638,19 +6641,19 @@ entities:
             0: 65535\r
           5,-8:\r
             0: 32767\r
-            1: 32768\r
+            3: 32768\r
           5,-7:\r
             0: 65399\r
-            1: 136\r
+            3: 136\r
           5,-6:\r
             0: 65535\r
           5,-5:\r
             0: 65535\r
           6,-8:\r
             0: 36863\r
-            1: 28672\r
+            3: 28672\r
           6,-7:\r
-            1: 119\r
+            3: 119\r
             0: 65416\r
           6,-6:\r
             0: 65535\r
@@ -6679,7 +6682,8 @@ entities:
           6,-2:\r
             0: 65535\r
           7,-4:\r
-            0: 65535\r
+            0: 65503\r
+            1: 32\r
           7,-3:\r
             0: 65535\r
           7,-2:\r
@@ -7251,7 +7255,8 @@ entities:
           4,-12:\r
             0: 65535\r
           -12,1:\r
-            0: 65535\r
+            0: 32767\r
+            1: 32768\r
           -12,2:\r
             0: 65535\r
           -10,3:\r
@@ -7534,10 +7539,10 @@ entities:
             0: 34944\r
           -7,-13:\r
             0: 2184\r
-            2: 9984\r
+            4: 9984\r
           -6,-13:\r
             0: 36232\r
-            2: 512\r
+            4: 512\r
           -5,-13:\r
             0: 36744\r
           -2,-20:\r
@@ -7574,7 +7579,7 @@ entities:
             0: 65535\r
           -8,11:\r
             0: 64719\r
-            2: 816\r
+            4: 816\r
           -7,8:\r
             0: 65535\r
           -7,9:\r
@@ -7594,7 +7599,8 @@ entities:
           2,4:\r
             0: 65535\r
           3,4:\r
-            0: 65535\r
+            0: 65519\r
+            1: 16\r
           3,5:\r
             0: 61439\r
           0,-21:\r
@@ -7607,15 +7613,15 @@ entities:
             0: 65535\r
           -12,10:\r
             0: 62451\r
-            2: 3072\r
-            3: 12\r
+            4: 3072\r
+            5: 12\r
           -11,10:\r
-            2: 256\r
+            4: 256\r
             0: 65278\r
-            3: 1\r
+            5: 1\r
           -11,11:\r
             0: 52478\r
-            2: 1\r
+            4: 1\r
           -10,10:\r
             0: 65535\r
           -10,8:\r
@@ -7632,7 +7638,7 @@ entities:
             0: 65535\r
           -9,11:\r
             0: 63359\r
-            2: 2176\r
+            4: 2176\r
           -8,12:\r
             0: 48063\r
           -7,12:\r
@@ -7802,7 +7808,8 @@ entities:
           9,3:\r
             0: 65535\r
           10,3:\r
-            0: 65535\r
+            0: 32767\r
+            6: 32768\r
           11,3:\r
             0: 65535\r
           13,2:\r
@@ -7834,7 +7841,7 @@ entities:
           -1,11:\r
             0: 65535\r
           -5,12:\r
-            2: 30515\r
+            4: 30515\r
             0: 35020\r
           -5,13:\r
             0: 65535\r
@@ -7852,7 +7859,7 @@ entities:
             0: 65535\r
           -4,12:\r
             0: 17\r
-            2: 65518\r
+            4: 65518\r
           -4,13:\r
             0: 65535\r
           -4,14:\r
@@ -7860,7 +7867,7 @@ entities:
           -4,15:\r
             0: 61951\r
           -3,12:\r
-            2: 13107\r
+            4: 13107\r
             0: 52428\r
           -3,13:\r
             0: 65535\r
@@ -7892,13 +7899,13 @@ entities:
             0: 65535\r
           -7,14:\r
             0: 8191\r
-            2: 57344\r
+            4: 57344\r
           -7,15:\r
-            2: 238\r
+            4: 238\r
             0: 65297\r
           -6,12:\r
             0: 4369\r
-            2: 61166\r
+            4: 61166\r
           -6,13:\r
             0: 65535\r
           -6,14:\r
@@ -8185,7 +8192,7 @@ entities:
             0: 65535\r
           -7,-12:\r
             0: 44544\r
-            2: 34\r
+            4: 34\r
           -6,-10:\r
             0: 39144\r
           13,-14:\r
@@ -8211,7 +8218,7 @@ entities:
           17,-8:\r
             0: 29457\r
           17,-7:\r
-            3: 1\r
+            5: 1\r
             0: 4990\r
           17,-6:\r
             0: 4593\r
@@ -8339,14 +8346,14 @@ entities:
             0: 35771\r
           -12,8:\r
             0: 62451\r
-            4: 12\r
-            5: 3072\r
+            7: 12\r
+            8: 3072\r
           -12,9:\r
             0: 62451\r
-            2: 3084\r
+            4: 3084\r
           -12,11:\r
             0: 8947\r
-            2: 12\r
+            4: 12\r
           -12,12:\r
             0: 8751\r
           -12,13:\r
@@ -8540,11 +8547,11 @@ entities:
           -13,7:\r
             0: 39327\r
           -11,8:\r
-            4: 1\r
+            7: 1\r
             0: 65278\r
-            5: 256\r
+            8: 256\r
           -11,9:\r
-            2: 257\r
+            4: 257\r
             0: 65278\r
           1,12:\r
             0: 63897\r
@@ -8566,8 +8573,8 @@ entities:
             0: 65497\r
           -13,12:\r
             0: 53199\r
-            5: 48\r
-            4: 12288\r
+            8: 48\r
+            7: 12288\r
           -13,13:\r
             0: 61727\r
           -18,4:\r
@@ -9060,8 +9067,8 @@ entities:
             0: 255\r
           -14,12:\r
             0: 32639\r
-            5: 128\r
-            4: 32768\r
+            8: 128\r
+            7: 32768\r
           -14,13:\r
             0: 31\r
           -17,12:\r
@@ -9077,9 +9084,9 @@ entities:
           -3,-20:\r
             0: 28672\r
           -8,-13:\r
-            2: 3840\r
+            4: 3840\r
           -9,-13:\r
-            2: 3584\r
+            4: 3584\r
         uniqueMixes:\r
         - volume: 2500\r
           temperature: 293.15\r
@@ -9096,6 +9103,36 @@ entities:
           - 0\r
           - 0\r
           - 0\r
+        - volume: 2500\r
+          temperature: 293.14996\r
+          moles:\r
+          - 20.078888\r
+          - 75.53487\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+        - volume: 2500\r
+          temperature: 293.15\r
+          moles:\r
+          - 21.596506\r
+          - 81.243996\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
         - volume: 2500\r
           temperature: 235\r
           moles:\r
@@ -9141,6 +9178,21 @@ entities:
           - 0\r
           - 0\r
           - 0\r
+        - volume: 2500\r
+          temperature: 293.15\r
+          moles:\r
+          - 21.806608\r
+          - 82.03439\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
         - volume: 2500\r
           temperature: 293.15\r
           moles:\r
@@ -13977,6 +14029,23 @@ entities:
     - pos: 5.5,23.5\r
       parent: 60\r
       type: Transform\r
+- proto: AmePart\r
+  entities:\r
+  - uid: 16550\r
+    components:\r
+    - pos: 8.452343,23.559658\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 17676\r
+    components:\r
+    - pos: 8.561718,23.497158\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 18546\r
+    components:\r
+    - pos: 8.671093,23.403408\r
+      parent: 60\r
+      type: Transform\r
 - proto: AnalysisComputerCircuitboard\r
   entities:\r
   - uid: 9455\r
@@ -57815,15 +57884,6 @@ entities:
     - pos: 31.52947,14.40356\r
       parent: 60\r
       type: Transform\r
-  - uid: 17299\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingBackpackSatchelLeather\r
   entities:\r
   - uid: 4702\r
@@ -57854,17 +57914,6 @@ entities:
     - pos: 19.497345,-45.396423\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingBeltMercWebbing\r
-  entities:\r
-  - uid: 18546\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingBeltMilitaryWebbing\r
   entities:\r
   - uid: 9121\r
@@ -57947,17 +57996,6 @@ entities:
     - pos: 14.470102,-43.56056\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingEyesGlassesMercenary\r
-  entities:\r
-  - uid: 17676\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingEyesGlassesSunglasses\r
   entities:\r
   - uid: 2252\r
@@ -58107,17 +58145,6 @@ entities:
     - pos: 35.520084,-27.379148\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingHandsGlovesMercFingerless\r
-  entities:\r
-  - uid: 17674\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingHandsGlovesNitrile\r
   entities:\r
   - uid: 4119\r
@@ -58153,17 +58180,6 @@ entities:
     - pos: -56.55667,-23.491457\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingHeadBandMerc\r
-  entities:\r
-  - uid: 17463\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingHeadBandRed\r
   entities:\r
   - uid: 1405\r
@@ -58216,17 +58232,6 @@ entities:
     - pos: -38.320274,19.65635\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingHeadHatBeretMerc\r
-  entities:\r
-  - uid: 19043\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingHeadHatBowlerHat\r
   entities:\r
   - uid: 8020\r
@@ -58514,17 +58519,6 @@ entities:
     - pos: 29.516983,-1.2031906\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingHeadHelmetMerc\r
-  entities:\r
-  - uid: 19162\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingHeadHelmetRiot\r
   entities:\r
   - uid: 1866\r
@@ -58689,17 +58683,6 @@ entities:
     - pos: 46.643196,3.6000824\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingMaskGasMerc\r
-  entities:\r
-  - uid: 19163\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingMaskNeckGaiter\r
   entities:\r
   - uid: 927\r
@@ -58766,6 +58749,13 @@ entities:
     - pos: -47.5,-26.5\r
       parent: 60\r
       type: Transform\r
+- proto: ClothingNeckCloakTrans\r
+  entities:\r
+  - uid: 7082\r
+    components:\r
+    - pos: -40.498245,-36.02266\r
+      parent: 60\r
+      type: Transform\r
 - proto: ClothingNeckHeadphones\r
   entities:\r
   - uid: 7861\r
@@ -58799,6 +58789,83 @@ entities:
     - pos: -11.221505,22.789167\r
       parent: 60\r
       type: Transform\r
+- proto: ClothingNeckMantleCap\r
+  entities:\r
+  - uid: 16678\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 1964\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleCE\r
+  entities:\r
+  - uid: 17299\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 15403\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleCMO\r
+  entities:\r
+  - uid: 17463\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 7044\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleHOP\r
+  entities:\r
+  - uid: 5207\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 6235\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleHOS\r
+  entities:\r
+  - uid: 17672\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 5933\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleQM\r
+  entities:\r
+  - uid: 16058\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 13099\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
+- proto: ClothingNeckMantleRD\r
+  entities:\r
+  - uid: 17673\r
+    components:\r
+    - flags: InContainer\r
+      type: MetaData\r
+    - parent: 8197\r
+      type: Transform\r
+    - canCollide: False\r
+      type: Physics\r
+    - type: InsideEntityStorage\r
 - proto: ClothingNeckNonBinaryPin\r
   entities:\r
   - uid: 13569\r
@@ -59053,17 +59120,6 @@ entities:
     - canCollide: False\r
       type: Physics\r
     - type: InsideEntityStorage\r
-- proto: ClothingOuterHardsuitSalvage\r
-  entities:\r
-  - uid: 5207\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 13099\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingOuterHardsuitSyndicate\r
   entities:\r
   - uid: 8071\r
@@ -59122,17 +59178,6 @@ entities:
     - pos: 59.42158,-46.288704\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingOuterVestWebMerc\r
-  entities:\r
-  - uid: 17672\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingShoesBootsJack\r
   entities:\r
   - uid: 846\r
@@ -59169,17 +59214,6 @@ entities:
     - pos: -22.454462,29.447395\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingShoesBootsMercFilled\r
-  entities:\r
-  - uid: 17673\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingShoesBootsWork\r
   entities:\r
   - uid: 23663\r
@@ -59376,17 +59410,6 @@ entities:
     - pos: 37.53859,15.558934\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingUniformJumpsuitMercenary\r
-  entities:\r
-  - uid: 16678\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 16058\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingUniformJumpsuitOperative\r
   entities:\r
   - uid: 8069\r
@@ -60594,11 +60617,6 @@ entities:
       type: Transform\r
 - proto: CrateEngineeringAMEJar\r
   entities:\r
-  - uid: 7082\r
-    components:\r
-    - pos: -3.5,33.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 16061\r
     components:\r
     - pos: 6.5,23.5\r
@@ -61301,54 +61319,6 @@ entities:
     - pos: -4.5,-28.5\r
       parent: 60\r
       type: Transform\r
-- proto: CrateWeaponSecure\r
-  entities:\r
-  - uid: 16058\r
-    components:\r
-    - name: mercenary's stash\r
-      type: MetaData\r
-    - pos: 56.5,-17.5\r
-      parent: 60\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.14957\r
-        moles:\r
-        - 1.8856695\r
-        - 7.0937095\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-    - containers:\r
-        entity_storage: !type:Container\r
-          showEnts: False\r
-          occludes: True\r
-          ents:\r
-          - 18546\r
-          - 17676\r
-          - 17674\r
-          - 17673\r
-          - 17672\r
-          - 17463\r
-          - 17299\r
-          - 16678\r
-          - 19043\r
-          - 19162\r
-          - 19163\r
-        paper_label: !type:ContainerSlot\r
-          showEnts: False\r
-          occludes: True\r
-          ent: null\r
-      type: ContainerContainer\r
 - proto: CrayonBox\r
   entities:\r
   - uid: 6700\r
@@ -106478,6 +106448,35 @@ entities:
     - pos: -6.5,-2.5\r
       parent: 60\r
       type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.7459903\r
+        - 6.568249\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 16678\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
+      type: ContainerContainer\r
 - proto: LockerChemistryFilled\r
   entities:\r
   - uid: 2529\r
@@ -106533,6 +106532,35 @@ entities:
     - pos: 12.5,17.5\r
       parent: 60\r
       type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.7459903\r
+        - 6.568249\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 17299\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
+      type: ContainerContainer\r
 - proto: LockerChiefMedicalOfficerFilledHardsuit\r
   entities:\r
   - uid: 7044\r
@@ -106540,6 +106568,35 @@ entities:
     - pos: 29.5,-14.5\r
       parent: 60\r
       type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.7459903\r
+        - 6.568249\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 17463\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
+      type: ContainerContainer\r
 - proto: LockerDetectiveFilled\r
   entities:\r
   - uid: 7640\r
@@ -107079,8 +107136,8 @@ entities:
         immutable: False\r
         temperature: 293.1496\r
         moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
+        - 1.877957\r
+        - 7.0646954\r
         - 0\r
         - 0\r
         - 0\r
@@ -107097,6 +107154,7 @@ entities:
           showEnts: False\r
           occludes: True\r
           ents:\r
+          - 5207\r
           - 4641\r
         paper_label: !type:ContainerSlot\r
           showEnts: False\r
@@ -107110,6 +107168,35 @@ entities:
     - pos: -19.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.7459903\r
+        - 6.568249\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 17672\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
+      type: ContainerContainer\r
 - proto: LockerMedicalFilled\r
   entities:\r
   - uid: 241\r
@@ -107168,8 +107255,8 @@ entities:
         immutable: False\r
         temperature: 293.1496\r
         moles:\r
-        - 1.877957\r
-        - 7.0646954\r
+        - 1.8962268\r
+        - 7.133425\r
         - 0\r
         - 0\r
         - 0\r
@@ -107186,7 +107273,7 @@ entities:
           showEnts: False\r
           occludes: True\r
           ents:\r
-          - 5207\r
+          - 16058\r
         paper_label: !type:ContainerSlot\r
           showEnts: False\r
           occludes: True\r
@@ -107199,6 +107286,35 @@ entities:
     - pos: -44.5,7.5\r
       parent: 60\r
       type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.7459903\r
+        - 6.568249\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 17673\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
+      type: ContainerContainer\r
 - proto: LockerSalvageSpecialistFilled\r
   entities:\r
   - uid: 215\r
@@ -107853,7 +107969,7 @@ entities:
   entities:\r
   - uid: 7003\r
     components:\r
-    - pos: 44.487556,-48.458042\r
+    - pos: 56.487034,-17.432411\r
       parent: 60\r
       type: Transform\r
 - proto: MaterialReclaimer\r
@@ -115167,6 +115283,11 @@ entities:
     - pos: -20.5,5.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 19043\r
+    components:\r
+    - pos: 8.5,23.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 19131\r
     components:\r
     - pos: 20.5,19.5\r
@@ -124427,7 +124548,7 @@ entities:
     - pos: 0.5,47.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 16550\r
+  - uid: 19162\r
     components:\r
     - pos: -5.5,33.5\r
       parent: 60\r
@@ -124599,6 +124720,11 @@ entities:
     - pos: 4.5,34.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 17674\r
+    components:\r
+    - pos: -3.5,33.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 17946\r
     components:\r
     - name: GravGenSMES\r