[map] marathon update (#16464)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index e09bc38e1cf3554668cd111ea386762ee2baca88..13f1bcf8ea2acfd0054707560db104c418124fbb 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -16349,7 +16349,7 @@ entities:
   entities:\r
   - uid: 6730\r
     components:\r
-    - pos: -4.4905396,-8.277424\r
+    - pos: -4.259937,-10.014734\r
       parent: 30\r
       type: Transform\r
 - proto: BoxShotgunIncendiary\r
@@ -66899,6 +66899,12 @@ entities:
       pos: -5.5,-39.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 9047\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -17.5,-36.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 9126\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -66916,12 +66922,6 @@ entities:
     - pos: -23.5,-40.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 9591\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -19.5,-36.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 11304\r
     components:\r
     - pos: -16.5,-43.5\r
@@ -67831,6 +67831,10 @@ entities:
           occludes: True\r
           ents:\r
           - 11365\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 15236\r
     components:\r
@@ -67903,29 +67907,6 @@ entities:
       type: EntityStorage\r
 - proto: ClosetBombFilled\r
   entities:\r
-  - uid: 1983\r
-    components:\r
-    - pos: -40.5,56.5\r
-      parent: 30\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
   - uid: 2072\r
     components:\r
     - pos: -30.5,56.5\r
@@ -70429,28 +70410,6 @@ entities:
     - pos: -17.446564,-106.45651\r
       parent: 30\r
       type: Transform\r
-- proto: ClothingHeadHelmetEVA\r
-  entities:\r
-  - uid: 785\r
-    components:\r
-    - pos: -3.7148914,20.472134\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 786\r
-    components:\r
-    - pos: -3.6992664,21.472134\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 787\r
-    components:\r
-    - pos: 0.34760857,21.519009\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 788\r
-    components:\r
-    - pos: 0.31635857,20.409634\r
-      parent: 30\r
-      type: Transform\r
 - proto: ClothingHeadHelmetHelmet\r
   entities:\r
   - uid: 1986\r
@@ -70805,28 +70764,6 @@ entities:
     - pos: 19.488726,8.340895\r
       parent: 30\r
       type: Transform\r
-- proto: ClothingOuterHardsuitEVA\r
-  entities:\r
-  - uid: 781\r
-    components:\r
-    - pos: -3.4805164,20.597134\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 782\r
-    components:\r
-    - pos: -3.4648914,21.597134\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 783\r
-    components:\r
-    - pos: 0.53510857,20.565884\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 784\r
-    components:\r
-    - pos: 0.58198357,21.581509\r
-      parent: 30\r
-      type: Transform\r
 - proto: ClothingOuterHardsuitEVAPrisoner\r
   entities:\r
   - uid: 2381\r
@@ -70839,32 +70776,6 @@ entities:
     - pos: -44.368538,58.54459\r
       parent: 30\r
       type: Transform\r
-- proto: ClothingOuterHardsuitSecurity\r
-  entities:\r
-  - uid: 1929\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 1928\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-  - uid: 1930\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 1928\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-  - uid: 1931\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 1928\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
 - proto: ClothingOuterNunRobe\r
   entities:\r
   - uid: 17657\r
@@ -71992,11 +71903,6 @@ entities:
     - pos: -42.5,31.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5052\r
-    components:\r
-    - pos: -19.5,32.5\r
-      parent: 30\r
-      type: Transform\r
 - proto: ContainmentFieldGenerator\r
   entities:\r
   - uid: 9413\r
@@ -73027,33 +72933,11 @@ entities:
       type: Transform\r
 - proto: CratePrivateSecure\r
   entities:\r
-  - uid: 12131\r
+  - uid: 9045\r
     components:\r
     - pos: 34.5,-9.5\r
       parent: 30\r
       type: Transform\r
-    - containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
-      type: Construction\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
 - proto: CrateServiceJanitorialSupplies\r
   entities:\r
   - uid: 541\r
@@ -107115,16 +106999,6 @@ entities:
     - pos: -39.5,-5.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 9045\r
-    components:\r
-    - pos: 9.5,-27.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 9047\r
-    components:\r
-    - pos: 9.5,-28.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 9864\r
     components:\r
     - pos: 0.5,-52.5\r
@@ -107139,6 +107013,18 @@ entities:
       type: Transform\r
     - color: '#34E5EBFF'\r
       type: AtmosPipeColor\r
+  - uid: 12038\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 17.5,-33.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 12084\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 17.5,-34.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 12749\r
     components:\r
     - pos: 31.5,12.5\r
@@ -107151,9 +107037,10 @@ entities:
       type: Transform\r
 - proto: GasThermoMachineHeater\r
   entities:\r
-  - uid: 9048\r
+  - uid: 12085\r
     components:\r
-    - pos: 9.5,-29.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 17.5,-35.5\r
       parent: 30\r
       type: Transform\r
 - proto: GasValve\r
@@ -117889,12 +117776,12 @@ entities:
       type: Transform\r
   - uid: 6709\r
     components:\r
-    - pos: -4.524357,-8.44442\r
+    - pos: -4.432647,-10.264734\r
       parent: 30\r
       type: Transform\r
   - uid: 6710\r
     components:\r
-    - pos: -4.383732,-8.53817\r
+    - pos: -4.432647,-10.264734\r
       parent: 30\r
       type: Transform\r
   - uid: 11734\r
@@ -119300,6 +119187,10 @@ entities:
           occludes: True\r
           ents:\r
           - 9329\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
 - proto: LockerChiefMedicalOfficerFilled\r
   entities:\r
@@ -119332,6 +119223,10 @@ entities:
           occludes: True\r
           ents:\r
           - 21256\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
 - proto: LockerDetectiveFilled\r
   entities:\r
@@ -119408,6 +119303,11 @@ entities:
       type: EntityStorage\r
 - proto: LockerEngineerFilled\r
   entities:\r
+  - uid: 9048\r
+    components:\r
+    - pos: 3.5,-42.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 9429\r
     components:\r
     - pos: -25.5,-43.5\r
@@ -119456,50 +119356,9 @@ entities:
       type: EntityStorage\r
   - uid: 9435\r
     components:\r
-    - pos: -22.5,-39.5\r
-      parent: 30\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-  - uid: 9436\r
-    components:\r
-    - pos: -21.5,-39.5\r
+    - pos: 3.5,-41.5\r
       parent: 30\r
       type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
   - uid: 11004\r
     components:\r
     - pos: -25.5,-42.5\r
@@ -119767,6 +119626,10 @@ entities:
           - 763\r
           - 762\r
           - 761\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 759\r
     components:\r
@@ -119797,6 +119660,10 @@ entities:
           occludes: True\r
           ents:\r
           - 760\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 5608\r
     components:\r
@@ -119830,6 +119697,10 @@ entities:
           - 6975\r
           - 5615\r
           - 5616\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 11412\r
     components:\r
@@ -120144,32 +120015,14 @@ entities:
       type: EntityStorage\r
 - proto: LockerSalvageSpecialistFilled\r
   entities:\r
-  - uid: 11194\r
+  - uid: 784\r
     components:\r
-    - pos: 28.5,-9.5\r
+    - pos: 30.5,-9.5\r
       parent: 30\r
       type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-  - uid: 12038\r
+  - uid: 11194\r
     components:\r
-    - pos: 27.5,-9.5\r
+    - pos: 28.5,-9.5\r
       parent: 30\r
       type: Transform\r
     - air:\r
@@ -120472,40 +120325,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerSyndicatePersonal\r
-  entities:\r
-  - uid: 1928\r
-    components:\r
-    - pos: -38.5,56.5\r
-      parent: 30\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 3.4430928\r
-        - 12.952587\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
-          - 1929\r
-          - 1931\r
-          - 1930\r
-      type: ContainerContainer\r
 - proto: LockerWardenFilled\r
   entities:\r
   - uid: 2010\r
@@ -121070,7 +120889,7 @@ entities:
   entities:\r
   - uid: 6997\r
     components:\r
-    - pos: -13.882326,-16.429274\r
+    - pos: -13.735303,-16.220837\r
       parent: 30\r
       type: Transform\r
 - proto: MedkitBruteFilled\r
@@ -121111,7 +120930,7 @@ entities:
   entities:\r
   - uid: 6995\r
     components:\r
-    - pos: -14.458165,-16.433685\r
+    - pos: -13.575727,-16.368786\r
       parent: 30\r
       type: Transform\r
 - proto: MedkitFilled\r
@@ -121737,6 +121556,11 @@ entities:
     - pos: 0.5,23.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1983\r
+    components:\r
+    - pos: 33.5,-14.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 5661\r
     components:\r
     - pos: -24.5,45.5\r
@@ -121807,11 +121631,6 @@ entities:
     - pos: 51.5,29.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 15969\r
-    components:\r
-    - pos: 25.5,-9.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 16983\r
     components:\r
     - pos: -63.5,44.5\r
@@ -122560,21 +122379,6 @@ entities:
     - pos: 38.494118,-52.57902\r
       parent: 30\r
       type: Transform\r
-  - uid: 12084\r
-    components:\r
-    - pos: 30.531298,-9.487532\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 12085\r
-    components:\r
-    - pos: 30.390673,-9.331282\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 12091\r
-    components:\r
-    - pos: 30.505148,-9.264412\r
-      parent: 30\r
-      type: Transform\r
 - proto: PinpointerNuclear\r
   entities:\r
   - uid: 5004\r
@@ -128293,26 +128097,6 @@ entities:
     - pos: -16.5,20.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 773\r
-    components:\r
-    - pos: -3.5,20.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 774\r
-    components:\r
-    - pos: -3.5,21.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 775\r
-    components:\r
-    - pos: 0.5,20.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 776\r
-    components:\r
-    - pos: 0.5,21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 789\r
     components:\r
     - pos: -3.5,22.5\r
@@ -128348,11 +128132,6 @@ entities:
     - pos: -37.5,53.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 2026\r
-    components:\r
-    - pos: -38.5,46.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 6276\r
     components:\r
     - pos: 40.5,19.5\r
@@ -128363,11 +128142,6 @@ entities:
     - pos: 16.5,29.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 6708\r
-    components:\r
-    - pos: -4.5,-8.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 8263\r
     components:\r
     - pos: -10.5,-38.5\r
@@ -128438,11 +128212,6 @@ entities:
     - pos: 23.5,-11.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 12086\r
-    components:\r
-    - pos: 30.5,-9.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 12234\r
     components:\r
     - pos: 17.5,-9.5\r
@@ -139448,6 +139217,138 @@ entities:
     - pos: -58.5,-53.5\r
       parent: 30\r
       type: Transform\r
+- proto: SuitStorageAtmos\r
+  entities:\r
+  - uid: 785\r
+    components:\r
+    - pos: 9.5,-29.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 786\r
+    components:\r
+    - pos: 9.5,-28.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 787\r
+    components:\r
+    - pos: 9.5,-27.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageCaptain\r
+  entities:\r
+  - uid: 783\r
+    components:\r
+    - pos: -19.5,32.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageCE\r
+  entities:\r
+  - uid: 773\r
+    components:\r
+    - pos: -19.5,-36.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageCMO\r
+  entities:\r
+  - uid: 6838\r
+    components:\r
+    - pos: -14.5,-16.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageEngi\r
+  entities:\r
+  - uid: 788\r
+    components:\r
+    - pos: -21.5,-39.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1928\r
+    components:\r
+    - pos: -22.5,-39.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 9436\r
+    components:\r
+    - pos: -8.5,-38.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 9591\r
+    components:\r
+    - pos: -6.5,-38.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageEVA\r
+  entities:\r
+  - uid: 775\r
+    components:\r
+    - pos: 0.5,20.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 781\r
+    components:\r
+    - pos: -3.5,21.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 2026\r
+    components:\r
+    - pos: 0.5,21.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 2027\r
+    components:\r
+    - pos: -3.5,20.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageHOS\r
+  entities:\r
+  - uid: 776\r
+    components:\r
+    - pos: -26.5,52.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageRD\r
+  entities:\r
+  - uid: 12089\r
+    components:\r
+    - pos: 29.5,14.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageSalv\r
+  entities:\r
+  - uid: 1929\r
+    components:\r
+    - pos: 27.5,-9.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1930\r
+    components:\r
+    - pos: 25.5,-9.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1931\r
+    components:\r
+    - pos: 26.5,-9.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageSec\r
+  entities:\r
+  - uid: 774\r
+    components:\r
+    - pos: -38.5,56.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 782\r
+    components:\r
+    - pos: -40.5,56.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: SuitStorageWarden\r
+  entities:\r
+  - uid: 5052\r
+    components:\r
+    - pos: -38.5,46.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: SurveillanceCameraCommand\r
   entities:\r
   - uid: 21172\r
@@ -141065,11 +140966,6 @@ entities:
     - pos: -13.5,-16.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 6838\r
-    components:\r
-    - pos: -14.5,-16.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 6845\r
     components:\r
     - pos: -14.5,-0.5\r
@@ -143617,11 +143513,6 @@ entities:
     - pos: 0.47260857,19.565884\r
       parent: 30\r
       type: Transform\r
-  - uid: 2027\r
-    components:\r
-    - pos: -38.478073,46.599056\r
-      parent: 30\r
-      type: Transform\r
   - uid: 4885\r
     components:\r
     - pos: -28.4642,56.587437\r
@@ -143696,11 +143587,6 @@ entities:
     - pos: -57.478386,27.672016\r
       parent: 30\r
       type: Transform\r
-  - uid: 18058\r
-    components:\r
-    - pos: 30.507761,-9.498787\r
-      parent: 30\r
-      type: Transform\r
   - uid: 18793\r
     components:\r
     - pos: -67.52385,-62.454746\r
@@ -144357,6 +144243,17 @@ entities:
     - pos: -9.5,-12.5\r
       parent: 30\r
       type: Transform\r
+- proto: VendingMachineChemicals\r
+  entities:\r
+  - uid: 6708\r
+    components:\r
+    - flags: SessionSpecific\r
+      type: MetaData\r
+    - pos: -4.5,-8.5\r
+      parent: 30\r
+      type: Transform\r
+    - nextEmpEject: 142.7225791\r
+      type: VendingMachine\r
 - proto: VendingMachineCigs\r
   entities:\r
   - uid: 77\r
@@ -144747,6 +144644,17 @@ entities:
     - pos: 16.5,20.5\r
       parent: 30\r
       type: Transform\r
+- proto: VendingMachineRobotics\r
+  entities:\r
+  - uid: 12086\r
+    components:\r
+    - flags: SessionSpecific\r
+      type: MetaData\r
+    - pos: 17.5,20.5\r
+      parent: 30\r
+      type: Transform\r
+    - nextEmpEject: 152.6817604\r
+      type: VendingMachine\r
 - proto: VendingMachineSalvage\r
   entities:\r
   - uid: 4772\r
@@ -144890,14 +144798,6 @@ entities:
     - pos: 7.5,-27.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 12089\r
-    components:\r
-    - flags: SessionSpecific\r
-      name: tank dispenser\r
-      type: MetaData\r
-    - pos: 26.5,-9.5\r
-      parent: 30\r
-      type: Transform\r
 - proto: VendingMachineTheater\r
   entities:\r
   - uid: 654\r
@@ -159746,6 +159646,10 @@ entities:
           - 19620\r
           - 19619\r
           - 19621\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
 - proto: WardrobeMixedFilled\r
   entities:\r