marathon update (#23076)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index eba425c49c08d9cc4f6eefd290ba685ca73e33d7..147cc601bfbcf5ea8588549b3ceae21f3c7e497a 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -9442,59 +9442,31 @@ entities:
       type: Transform\r
 - proto: AirlockBrigGlassLocked\r
   entities:\r
-  - uid: 1488\r
+  - uid: 556\r
     components:\r
-    - pos: -49.5,34.5\r
+    - pos: -34.5,38.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1656\r
+  - uid: 571\r
     components:\r
-    - pos: -36.5,38.5\r
+    - pos: -34.5,41.5\r
       parent: 30\r
       type: Transform\r
-    - links:\r
-      - 1695\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        1695:\r
-        - DoorStatus: Close\r
-      type: DeviceLinkSource\r
-  - uid: 1657\r
+  - uid: 839\r
     components:\r
-    - pos: -34.5,38.5\r
+    - pos: -36.5,38.5\r
       parent: 30\r
       type: Transform\r
-    - links:\r
-      - 1696\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        1696:\r
-        - DoorStatus: Close\r
-      type: DeviceLinkSource\r
-  - uid: 1695\r
+  - uid: 1488\r
     components:\r
-    - pos: -36.5,41.5\r
+    - pos: -49.5,34.5\r
       parent: 30\r
       type: Transform\r
-    - links:\r
-      - 1656\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        1656:\r
-        - DoorStatus: Close\r
-      type: DeviceLinkSource\r
-  - uid: 1696\r
+  - uid: 1656\r
     components:\r
-    - pos: -34.5,41.5\r
+    - pos: -36.5,41.5\r
       parent: 30\r
       type: Transform\r
-    - links:\r
-      - 1657\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        1657:\r
-        - DoorStatus: Close\r
-      type: DeviceLinkSource\r
   - uid: 1740\r
     components:\r
     - pos: -29.5,43.5\r
@@ -9718,11 +9690,6 @@ entities:
     - pos: -14.5,28.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5067\r
-    components:\r
-    - pos: -21.5,46.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5276\r
     components:\r
     - pos: -3.5,34.5\r
@@ -9987,6 +9954,16 @@ entities:
       type: DeviceLinkSource\r
 - proto: AirlockExternalEngineeringLocked\r
   entities:\r
+  - uid: 1695\r
+    components:\r
+    - pos: 15.5,30.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1826\r
+    components:\r
+    - pos: 17.5,30.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 22631\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -10197,18 +10174,6 @@ entities:
         5390:\r
         - DoorStatus: DoorBolt\r
       type: DeviceLinkSource\r
-  - uid: 5822\r
-    components:\r
-    - pos: 15.5,30.5\r
-      parent: 30\r
-      type: Transform\r
-    - links:\r
-      - 6299\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        6299:\r
-        - DoorStatus: DoorBolt\r
-      type: DeviceLinkSource\r
   - uid: 15334\r
     components:\r
     - pos: 54.5,30.5\r
@@ -10375,9 +10340,10 @@ entities:
       type: Transform\r
 - proto: AirlockExternalLocked\r
   entities:\r
-  - uid: 5069\r
+  - uid: 5070\r
     components:\r
-    - pos: -18.5,46.5\r
+    - rot: 3.141592653589793 rad\r
+      pos: -18.5,46.5\r
       parent: 30\r
       type: Transform\r
   - uid: 5390\r
@@ -10392,18 +10358,6 @@ entities:
         5391:\r
         - DoorStatus: DoorBolt\r
       type: DeviceLinkSource\r
-  - uid: 6299\r
-    components:\r
-    - pos: 17.5,30.5\r
-      parent: 30\r
-      type: Transform\r
-    - links:\r
-      - 5822\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        5822:\r
-        - DoorStatus: DoorBolt\r
-      type: DeviceLinkSource\r
   - uid: 15829\r
     components:\r
     - pos: 45.5,16.5\r
@@ -11526,18 +11480,6 @@ entities:
         840:\r
         - DoorStatus: DoorBolt\r
       type: DeviceLinkSource\r
-  - uid: 2313\r
-    components:\r
-    - pos: -46.5,62.5\r
-      parent: 30\r
-      type: Transform\r
-    - links:\r
-      - 839\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        839:\r
-        - DoorStatus: DoorBolt\r
-      type: DeviceLinkSource\r
 - proto: AirlockSecurityGlassLocked\r
   entities:\r
   - uid: 325\r
@@ -11545,6 +11487,12 @@ entities:
     - pos: -18.5,0.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1696\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -21.5,46.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1756\r
     components:\r
     - pos: -31.5,41.5\r
@@ -11555,14 +11503,14 @@ entities:
     - pos: -32.5,45.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1873\r
+  - uid: 1829\r
     components:\r
-    - pos: -35.5,55.5\r
+    - pos: -46.5,62.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1878\r
+  - uid: 1873\r
     components:\r
-    - pos: -29.5,55.5\r
+    - pos: -35.5,55.5\r
       parent: 30\r
       type: Transform\r
   - uid: 2218\r
@@ -11619,18 +11567,6 @@ entities:
       type: Transform\r
 - proto: AirlockSecurityLocked\r
   entities:\r
-  - uid: 839\r
-    components:\r
-    - pos: -46.5,59.5\r
-      parent: 30\r
-      type: Transform\r
-    - links:\r
-      - 2313\r
-      type: DeviceLinkSink\r
-    - linkedPorts:\r
-        2313:\r
-        - DoorStatus: DoorBolt\r
-      type: DeviceLinkSource\r
   - uid: 840\r
     components:\r
     - pos: -50.5,59.5\r
@@ -11653,6 +11589,16 @@ entities:
     - pos: -28.5,46.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1827\r
+    components:\r
+    - pos: -46.5,59.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1828\r
+    components:\r
+    - pos: -29.5,55.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 13548\r
     components:\r
     - pos: 44.5,41.5\r
@@ -12363,6 +12309,14 @@ entities:
       pos: -33.5,32.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1830\r
+    components:\r
+    - name: HOS Office APC\r
+      type: MetaData\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -27.5,51.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 3119\r
     components:\r
     - name: Arrivals South APC\r
@@ -14483,6 +14437,54 @@ entities:
       type: DeviceLinkSink\r
 - proto: BlastDoorOpen\r
   entities:\r
+  - uid: 2189\r
+    components:\r
+    - pos: -37.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 2313\r
+    components:\r
+    - pos: -26.5,58.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 5078\r
+    components:\r
+    - pos: -20.5,52.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 4731\r
+      type: DeviceLinkSink\r
+  - uid: 5079\r
+    components:\r
+    - pos: -20.5,51.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 4731\r
+      type: DeviceLinkSink\r
+  - uid: 5822\r
+    components:\r
+    - pos: -20.5,50.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 4731\r
+      type: DeviceLinkSink\r
+  - uid: 6299\r
+    components:\r
+    - pos: -20.5,49.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 4731\r
+      type: DeviceLinkSink\r
   - uid: 9188\r
     components:\r
     - pos: 5.5,-21.5\r
@@ -14507,6 +14509,84 @@ entities:
     - links:\r
       - 9184\r
       type: DeviceLinkSink\r
+  - uid: 15174\r
+    components:\r
+    - pos: -20.5,48.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 4731\r
+      type: DeviceLinkSink\r
+  - uid: 17473\r
+    components:\r
+    - pos: -26.5,59.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 18838\r
+    components:\r
+    - pos: -26.5,60.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 18840\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -30.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 20360\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -29.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 20389\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -28.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 20391\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -34.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 20401\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -33.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
+  - uid: 20402\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -32.5,61.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 20432\r
+      type: DeviceLinkSink\r
 - proto: BlockGameArcade\r
   entities:\r
   - uid: 901\r
@@ -15288,6 +15368,11 @@ entities:
     - pos: 32.5,43.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1878\r
+    components:\r
+    - pos: -27.5,51.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1909\r
     components:\r
     - pos: -37.5,59.5\r
@@ -18888,16 +18973,6 @@ entities:
     - pos: -29.5,50.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 4730\r
-    components:\r
-    - pos: -28.5,50.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 4731\r
-    components:\r
-    - pos: -27.5,50.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 4732\r
     components:\r
     - pos: -26.5,50.5\r
@@ -38236,6 +38311,26 @@ entities:
     - pos: -45.5,10.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 2170\r
+    components:\r
+    - pos: -30.5,51.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 2188\r
+    components:\r
+    - pos: -27.5,51.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 2190\r
+    components:\r
+    - pos: -28.5,51.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 2191\r
+    components:\r
+    - pos: -29.5,51.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 3564\r
     components:\r
     - pos: -42.5,19.5\r
@@ -39501,6 +39596,11 @@ entities:
     - pos: -24.5,41.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 5069\r
+    components:\r
+    - pos: -31.5,51.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 5182\r
     components:\r
     - pos: -24.5,42.5\r
@@ -43885,11 +43985,6 @@ entities:
     - pos: -79.5,-49.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 18838\r
-    components:\r
-    - pos: -6.5,38.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 19401\r
     components:\r
     - pos: -59.5,-68.5\r
@@ -44477,11 +44572,6 @@ entities:
       type: Transform\r
 - proto: CarpetGreen\r
   entities:\r
-  - uid: 571\r
-    components:\r
-    - pos: 1.5,6.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 638\r
     components:\r
     - pos: 5.5,9.5\r
@@ -44613,11 +44703,6 @@ entities:
     - pos: -10.5,17.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 15174\r
-    components:\r
-    - pos: 0.5,6.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 15266\r
     components:\r
     - pos: 46.5,44.5\r
@@ -54177,6 +54262,11 @@ entities:
       pos: 0.5,31.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 5074\r
+    components:\r
+    - pos: -30.5,49.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 22805\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -55325,16 +55415,6 @@ entities:
     - pos: -40.5,2.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 17473\r
-    components:\r
-    - pos: 14.5,-5.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 18840\r
-    components:\r
-    - pos: -6.5,39.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 18844\r
     components:\r
     - pos: -59.5,-45.5\r
@@ -65068,13 +65148,6 @@ entities:
     - pos: -72.29823,-43.406895\r
       parent: 30\r
       type: Transform\r
-- proto: FloraTreeChristmas02\r
-  entities:\r
-  - uid: 556\r
-    components:\r
-    - pos: 0.9794576,6.3615136\r
-      parent: 30\r
-      type: Transform\r
 - proto: FloraTreeLarge03\r
   entities:\r
   - uid: 22215\r
@@ -88992,6 +89065,8 @@ entities:
     - pos: 20.5,44.5\r
       parent: 30\r
       type: Transform\r
+    - joinedGrid: 30\r
+      type: AtmosDevice\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
   - uid: 13593\r
@@ -92340,16 +92415,6 @@ entities:
     - pos: -18.5,45.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5078\r
-    components:\r
-    - pos: -19.5,47.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 5079\r
-    components:\r
-    - pos: -18.5,47.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5081\r
     components:\r
     - pos: -21.5,45.5\r
@@ -103032,21 +103097,6 @@ entities:
     - pos: -42.49312,45.48978\r
       parent: 30\r
       type: Transform\r
-  - uid: 2188\r
-    components:\r
-    - pos: -30.546207,49.590214\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 2189\r
-    components:\r
-    - pos: -30.499332,49.558964\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 2190\r
-    components:\r
-    - pos: -30.374332,49.527714\r
-      parent: 30\r
-      type: Transform\r
   - uid: 2335\r
     components:\r
     - pos: -51.484833,60.54501\r
@@ -103358,11 +103408,6 @@ entities:
     - pos: -23.279898,51.686687\r
       parent: 30\r
       type: Transform\r
-  - uid: 2191\r
-    components:\r
-    - pos: -30.905582,49.60584\r
-      parent: 30\r
-      type: Transform\r
   - uid: 2192\r
     components:\r
     - pos: -33.264957,49.79334\r
@@ -105841,6 +105886,12 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
+  - uid: 5067\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -36.5,33.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 5411\r
     components:\r
     - pos: -13.5,27.5\r
@@ -111412,11 +111463,6 @@ entities:
       pos: -7.5,28.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5070\r
-    components:\r
-    - pos: -18.5,47.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5071\r
     components:\r
     - pos: -18.5,45.5\r
@@ -111432,11 +111478,6 @@ entities:
     - pos: -20.5,45.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5074\r
-    components:\r
-    - pos: -19.5,47.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5080\r
     components:\r
     - pos: -21.5,45.5\r
@@ -115664,6 +115705,24 @@ entities:
         864:\r
         - Pressed: Toggle\r
       type: DeviceLinkSource\r
+  - uid: 4731\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -22.5,47.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        15174:\r
+        - Pressed: Toggle\r
+        6299:\r
+        - Pressed: Toggle\r
+        5822:\r
+        - Pressed: Toggle\r
+        5079:\r
+        - Pressed: Toggle\r
+        5078:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 5417\r
     components:\r
     - name: Janitorial Service Light\r
@@ -115800,6 +115859,34 @@ entities:
         6415:\r
         - Pressed: DoorBolt\r
       type: DeviceLinkSource\r
+  - uid: 20432\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -36.5,56.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        2189:\r
+        - Pressed: Toggle\r
+        20391:\r
+        - Pressed: Toggle\r
+        20401:\r
+        - Pressed: Toggle\r
+        20402:\r
+        - Pressed: Toggle\r
+        18840:\r
+        - Pressed: Toggle\r
+        20360:\r
+        - Pressed: Toggle\r
+        20389:\r
+        - Pressed: Toggle\r
+        18838:\r
+        - Pressed: Toggle\r
+        17473:\r
+        - Pressed: Toggle\r
+        2313:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
 - proto: SignArmory\r
   entities:\r
   - uid: 1927\r
@@ -123516,11 +123603,6 @@ entities:
     - pos: -23.5,51.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 2170\r
-    components:\r
-    - pos: -30.5,49.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 2171\r
     components:\r
     - pos: -31.5,49.5\r
@@ -126319,6 +126401,11 @@ entities:
     - pos: -28.5,38.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1657\r
+    components:\r
+    - pos: -18.5,47.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1658\r
     components:\r
     - pos: -33.5,38.5\r
@@ -127264,6 +127351,11 @@ entities:
     - pos: 41.5,20.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 4730\r
+    components:\r
+    - pos: -19.5,47.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 4834\r
     components:\r
     - pos: -53.5,6.5\r
@@ -142098,36 +142190,6 @@ entities:
       pos: -52.5,19.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1826\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -19.5,48.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1827\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -19.5,49.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1828\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -19.5,50.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1829\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -19.5,51.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1830\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -19.5,52.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 1911\r
     components:\r
     - rot: -1.5707963267948966 rad\r