From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Wed, 10 Jan 2024 07:49:31 +0000 (-0700)
Subject: marathon update (#23845)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1018fc36b8c73e1744642b136e1a6dac0621e2a3;p=space-station-14.git

marathon update (#23845)
---

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