marathon update (#23845)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 6fb94d24b624091b2231423a61543e6a13a99ccd..efe50d802820bbc05879a2e06f8ee080627224b3 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -7663,13 +7663,6 @@ entities:
       parent: 5704\r
     - type: InstantAction\r
       container: 5704\r
-- proto: AdvancedCapacitorStockPart\r
-  entities:\r
-  - uid: 20974\r
-    components:\r
-    - type: Transform\r
-      pos: 2.2878256,21.230333\r
-      parent: 30\r
 - proto: AirAlarm\r
   entities:\r
   - uid: 6224\r
@@ -12543,12 +12536,12 @@ entities:
     - type: Transform\r
       pos: -11.5,-27.5\r
       parent: 30\r
-- proto: AmplifierSubspaceStockPart\r
+- proto: AmeJar\r
   entities:\r
   - uid: 801\r
     components:\r
     - type: Transform\r
-      pos: 2.874536,20.634825\r
+      pos: -17.490644,-32.439728\r
       parent: 30\r
 - proto: AnomalyScanner\r
   entities:\r
@@ -15636,7 +15629,7 @@ entities:
   - uid: 2002\r
     components:\r
     - type: Transform\r
-      pos: -41.658577,55.804134\r
+      pos: -37.719124,55.411057\r
       parent: 30\r
   - uid: 2110\r
     components:\r
@@ -44128,6 +44121,11 @@ entities:
     - type: Transform\r
       pos: 2.4657774,20.884964\r
       parent: 30\r
+  - uid: 20974\r
+    components:\r
+    - type: Transform\r
+      pos: 2.2878256,21.230333\r
+      parent: 30\r
   - uid: 20982\r
     components:\r
     - type: Transform\r
@@ -53055,7 +53053,7 @@ entities:
   - uid: 2033\r
     components:\r
     - type: Transform\r
-      pos: -44.48352,46.8257\r
+      pos: -44.77555,47.437355\r
       parent: 30\r
 - proto: ClothingHeadHatBowlerHat\r
   entities:\r
@@ -53266,6 +53264,13 @@ entities:
     - type: Transform\r
       pos: -21.586058,-27.491894\r
       parent: 30\r
+- proto: ClothingHeadHatWarden\r
+  entities:\r
+  - uid: 865\r
+    components:\r
+    - type: Transform\r
+      pos: -44.478676,46.781105\r
+      parent: 30\r
 - proto: ClothingHeadHatWelding\r
   entities:\r
   - uid: 1632\r
@@ -55770,13 +55775,6 @@ entities:
     - type: Transform\r
       pos: 17.5,18.5\r
       parent: 30\r
-- proto: CrateMindShieldImplants\r
-  entities:\r
-  - uid: 8278\r
-    components:\r
-    - type: Transform\r
-      pos: -41.5,56.5\r
-      parent: 30\r
 - proto: CrateNPCCow\r
   entities:\r
   - uid: 494\r
@@ -55816,6 +55814,13 @@ entities:
     - type: Transform\r
       pos: 34.5,-9.5\r
       parent: 30\r
+- proto: CrateSecurityTrackingMindshieldImplants\r
+  entities:\r
+  - uid: 682\r
+    components:\r
+    - type: Transform\r
+      pos: -41.5,56.5\r
+      parent: 30\r
 - proto: CrateServiceJanitorialSupplies\r
   entities:\r
   - uid: 541\r
@@ -62261,6 +62266,13 @@ entities:
     - type: Transform\r
       pos: -0.6569953,-8.6031685\r
       parent: 30\r
+- proto: DrinkGildlagerBottleFull\r
+  entities:\r
+  - uid: 22265\r
+    components:\r
+    - type: Transform\r
+      pos: 7.564439,42.814713\r
+      parent: 30\r
 - proto: DrinkGlass\r
   entities:\r
   - uid: 703\r
@@ -62300,13 +62312,6 @@ entities:
     - type: Transform\r
       pos: 7.5231714,44.698692\r
       parent: 30\r
-- proto: DrinkGoldschlagerBottleFull\r
-  entities:\r
-  - uid: 22265\r
-    components:\r
-    - type: Transform\r
-      pos: 7.564439,42.814713\r
-      parent: 30\r
 - proto: DrinkGrapeCan\r
   entities:\r
   - uid: 19761\r
@@ -98834,6 +98839,13 @@ entities:
     - type: Transform\r
       pos: -34.5,-46.5\r
       parent: 30\r
+- proto: GunSafeDisabler\r
+  entities:\r
+  - uid: 726\r
+    components:\r
+    - type: Transform\r
+      pos: -41.5,55.5\r
+      parent: 30\r
 - proto: GunSafeLaserCarbine\r
   entities:\r
   - uid: 1942\r
@@ -103835,6 +103847,18 @@ entities:
     - type: Transform\r
       pos: -22.465681,-16.499807\r
       parent: 30\r
+- proto: MicroManipulatorStockPart\r
+  entities:\r
+  - uid: 20970\r
+    components:\r
+    - type: Transform\r
+      pos: 2.559926,21.402208\r
+      parent: 30\r
+  - uid: 22099\r
+    components:\r
+    - type: Transform\r
+      pos: 2.731801,21.495958\r
+      parent: 30\r
 - proto: MinimoogInstrument\r
   entities:\r
   - uid: 19793\r
@@ -104265,18 +104289,6 @@ entities:
     - type: Transform\r
       pos: -75.24839,-66.594925\r
       parent: 30\r
-- proto: NanoManipulatorStockPart\r
-  entities:\r
-  - uid: 20970\r
-    components:\r
-    - type: Transform\r
-      pos: 2.559926,21.402208\r
-      parent: 30\r
-  - uid: 22099\r
-    components:\r
-    - type: Transform\r
-      pos: 2.731801,21.495958\r
-      parent: 30\r
 - proto: NitrogenCanister\r
   entities:\r
   - uid: 690\r
@@ -111480,11 +111492,6 @@ entities:
     - type: Transform\r
       pos: -32.5,29.5\r
       parent: 30\r
-  - uid: 1938\r
-    components:\r
-    - type: Transform\r
-      pos: -41.5,55.5\r
-      parent: 30\r
   - uid: 1939\r
     components:\r
     - type: Transform\r
@@ -127066,13 +127073,6 @@ entities:
     - type: Transform\r
       pos: 13.5,6.5\r
       parent: 30\r
-- proto: TransmitterSubspaceStockPart\r
-  entities:\r
-  - uid: 20979\r
-    components:\r
-    - type: Transform\r
-      pos: 3.468286,20.58795\r
-      parent: 30\r
 - proto: TrashBag\r
   entities:\r
   - uid: 10248\r
@@ -127119,13 +127119,6 @@ entities:
     - type: Transform\r
       pos: 6.5776615,21.697325\r
       parent: 30\r
-- proto: TreatmentSubspaceStockPart\r
-  entities:\r
-  - uid: 21164\r
-    components:\r
-    - type: Transform\r
-      pos: 3.483911,20.71295\r
-      parent: 30\r
 - proto: TwoWayLever\r
   entities:\r
   - uid: 10289\r
@@ -149130,16 +149123,6 @@ entities:
       canCollide: False\r
 - proto: WeaponDisabler\r
   entities:\r
-  - uid: 682\r
-    components:\r
-    - type: Transform\r
-      pos: -41.44297,55.4585\r
-      parent: 30\r
-  - uid: 726\r
-    components:\r
-    - type: Transform\r
-      pos: -41.427345,55.317875\r
-      parent: 30\r
   - uid: 1563\r
     components:\r
     - type: Transform\r