marathon update (#23361)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 8cad63d1da91f6f870ce45c9b05cc5c93ef3a528..092622ab35f67adcae225753f29df1bfe6a75519 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -7519,6 +7519,7 @@ entities:
             0: 17\r
           -16,0:\r
             0: 32768\r
+            3: 2048\r
           -16,-3:\r
             0: 52416\r
           -15,-3:\r
@@ -62185,16 +62186,6 @@ entities:
     - pos: 3.5,15.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 4989\r
-    components:\r
-    - pos: -17.5,30.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 5715\r
-    components:\r
-    - pos: -1.5,35.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 6427\r
     components:\r
     - pos: 16.5,39.5\r
@@ -62220,6 +62211,55 @@ entities:
     - pos: -29.5,-45.5\r
       parent: 30\r
       type: Transform\r
+- proto: DresserCaptainFilled\r
+  entities:\r
+  - uid: 4989\r
+    components:\r
+    - pos: -17.5,30.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserChiefEngineerFilled\r
+  entities:\r
+  - uid: 11614\r
+    components:\r
+    - pos: -15.5,-36.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserChiefMedicalOfficerFilled\r
+  entities:\r
+  - uid: 20613\r
+    components:\r
+    - pos: -12.5,-16.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserFilled\r
+  entities:\r
+  - uid: 20615\r
+    components:\r
+    - pos: 29.5,15.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserHeadOfPersonnelFilled\r
+  entities:\r
+  - uid: 5715\r
+    components:\r
+    - pos: -1.5,35.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserHeadOfSecurityFilled\r
+  entities:\r
+  - uid: 20616\r
+    components:\r
+    - pos: -26.5,48.5\r
+      parent: 30\r
+      type: Transform\r
+- proto: DresserQuarterMasterFilled\r
+  entities:\r
+  - uid: 20614\r
+    components:\r
+    - pos: 23.5,2.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: DrinkBeepskySmashGlass\r
   entities:\r
   - uid: 21365\r
@@ -121334,38 +121374,6 @@ entities:
     - pos: -8.5,-9.5\r
       parent: 30\r
       type: Transform\r
-- proto: SpawnPointAssistant\r
-  entities:\r
-  - uid: 16883\r
-    components:\r
-    - pos: -29.5,31.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 16884\r
-    components:\r
-    - pos: -28.5,31.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 16885\r
-    components:\r
-    - pos: -27.5,31.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 16886\r
-    components:\r
-    - pos: -27.5,30.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 16887\r
-    components:\r
-    - pos: -28.5,30.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 16888\r
-    components:\r
-    - pos: -30.5,32.5\r
-      parent: 30\r
-      type: Transform\r
 - proto: SpawnPointAtmos\r
   entities:\r
   - uid: 20345\r
@@ -121641,6 +121649,38 @@ entities:
     - pos: -22.5,-22.5\r
       parent: 30\r
       type: Transform\r
+- proto: SpawnPointPassenger\r
+  entities:\r
+  - uid: 16883\r
+    components:\r
+    - pos: -29.5,31.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 16884\r
+    components:\r
+    - pos: -28.5,31.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 16885\r
+    components:\r
+    - pos: -27.5,31.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 16886\r
+    components:\r
+    - pos: -27.5,30.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 16887\r
+    components:\r
+    - pos: -28.5,30.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 16888\r
+    components:\r
+    - pos: -30.5,32.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: SpawnPointPsychologist\r
   entities:\r
   - uid: 9695\r
@@ -123395,11 +123435,6 @@ entities:
       type: Transform\r
 - proto: SurveillanceCameraRouterEngineering\r
   entities:\r
-  - uid: 11614\r
-    components:\r
-    - pos: -15.5,-36.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 22807\r
     components:\r
     - pos: -38.5,-57.5\r
@@ -123419,11 +123454,6 @@ entities:
       type: Transform\r
 - proto: SurveillanceCameraRouterMedical\r
   entities:\r
-  - uid: 21194\r
-    components:\r
-    - pos: -12.5,-16.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 22809\r
     components:\r
     - pos: -38.5,-62.5\r
@@ -123467,11 +123497,6 @@ entities:
       type: Transform\r
 - proto: SurveillanceCameraRouterSupply\r
   entities:\r
-  - uid: 21201\r
-    components:\r
-    - pos: 23.5,2.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 22808\r
     components:\r
     - pos: -38.5,-58.5\r