bagel update (#23842)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 79159e01a3d72dce806ab996ed12ea0754780f05..d749be32ed4cfaa8240a3be17a7b42f1f94e9f44 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -9545,18 +9545,6 @@ entities:
       parent: 19193\r
     - type: InstantAction\r
       container: 19193\r
-- proto: AdvancedCapacitorStockPart\r
-  entities:\r
-  - uid: 19183\r
-    components:\r
-    - type: Transform\r
-      pos: 23.618336,21.636284\r
-      parent: 60\r
-  - uid: 19184\r
-    components:\r
-    - type: Transform\r
-      pos: 23.743336,21.526909\r
-      parent: 60\r
 - proto: AirAlarm\r
   entities:\r
   - uid: 249\r
@@ -14431,6 +14419,13 @@ entities:
     - type: Transform\r
       pos: 5.5,23.5\r
       parent: 60\r
+- proto: AmeJar\r
+  entities:\r
+  - uid: 16530\r
+    components:\r
+    - type: Transform\r
+      pos: 8.465609,23.526558\r
+      parent: 60\r
 - proto: AnalysisComputerCircuitboard\r
   entities:\r
   - uid: 9455\r
@@ -48261,6 +48256,16 @@ entities:
     - type: Transform\r
       pos: -67.61676,9.687263\r
       parent: 60\r
+  - uid: 19183\r
+    components:\r
+    - type: Transform\r
+      pos: 23.618336,21.636284\r
+      parent: 60\r
+  - uid: 19184\r
+    components:\r
+    - type: Transform\r
+      pos: 23.743336,21.526909\r
+      parent: 60\r
 - proto: CarbonDioxideCanister\r
   entities:\r
   - uid: 15245\r
@@ -59181,10 +59186,10 @@ entities:
       parent: 60\r
 - proto: ClothingHeadHatBeretWarden\r
   entities:\r
-  - uid: 6611\r
+  - uid: 11556\r
     components:\r
     - type: Transform\r
-      pos: -27.719076,-10.520552\r
+      pos: -27.758022,-9.545581\r
       parent: 60\r
 - proto: ClothingHeadHatBowlerHat\r
   entities:\r
@@ -59368,6 +59373,13 @@ entities:
     - type: Transform\r
       pos: -39.62937,16.44374\r
       parent: 60\r
+- proto: ClothingHeadHatWarden\r
+  entities:\r
+  - uid: 16450\r
+    components:\r
+    - type: Transform\r
+      pos: -27.336147,-11.701831\r
+      parent: 60\r
 - proto: ClothingHeadHatWelding\r
   entities:\r
   - uid: 9612\r
@@ -60713,10 +60725,11 @@ entities:
       parent: 60\r
 - proto: ComputerCriminalRecords\r
   entities:\r
-  - uid: 1732\r
+  - uid: 1796\r
     components:\r
     - type: Transform\r
-      pos: -27.5,-8.5\r
+      rot: 1.5707963267948966 rad\r
+      pos: -27.5,-10.5\r
       parent: 60\r
   - uid: 1868\r
     components:\r
@@ -60927,10 +60940,11 @@ entities:
       parent: 60\r
 - proto: ComputerStationRecords\r
   entities:\r
-  - uid: 1796\r
+  - uid: 6611\r
     components:\r
     - type: Transform\r
-      pos: -25.5,-8.5\r
+      rot: -1.5707963267948966 rad\r
+      pos: -25.5,-10.5\r
       parent: 60\r
   - uid: 10938\r
     components:\r
@@ -61942,13 +61956,6 @@ entities:
       containers:\r
       - EntityStorageComponent\r
       - entity_storage\r
-- proto: CrateMindShieldImplants\r
-  entities:\r
-  - uid: 11097\r
-    components:\r
-    - type: Transform\r
-      pos: -25.5,-10.5\r
-      parent: 60\r
 - proto: CrateNPCChicken\r
   entities:\r
   - uid: 5597\r
@@ -62040,6 +62047,13 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+- proto: CrateSecurityTrackingMindshieldImplants\r
+  entities:\r
+  - uid: 11097\r
+    components:\r
+    - type: Transform\r
+      pos: -27.5,-8.5\r
+      parent: 60\r
 - proto: CrateServiceJanitorialSupplies\r
   entities:\r
   - uid: 734\r
@@ -67425,6 +67439,11 @@ entities:
       parent: 60\r
 - proto: DogBed\r
   entities:\r
+  - uid: 1201\r
+    components:\r
+    - type: Transform\r
+      pos: -27.5,-9.5\r
+      parent: 60\r
   - uid: 2036\r
     components:\r
     - type: MetaData\r
@@ -67447,11 +67466,6 @@ entities:
     - type: Transform\r
       pos: 6.5,-29.5\r
       parent: 60\r
-  - uid: 11556\r
-    components:\r
-    - type: Transform\r
-      pos: -27.5,-10.5\r
-      parent: 60\r
   - uid: 11557\r
     components:\r
     - type: Transform\r
@@ -67623,6 +67637,13 @@ entities:
     - type: Transform\r
       pos: -8.356498,-5.569201\r
       parent: 60\r
+- proto: DrinkGildlagerBottleFull\r
+  entities:\r
+  - uid: 13012\r
+    components:\r
+    - type: Transform\r
+      pos: 6.371938,-6.0707817\r
+      parent: 60\r
 - proto: DrinkGlass\r
   entities:\r
   - uid: 23627\r
@@ -67647,13 +67668,6 @@ entities:
     - type: Transform\r
       pos: 6.6877446,-6.3988457\r
       parent: 60\r
-- proto: DrinkGoldschlagerBottleFull\r
-  entities:\r
-  - uid: 13012\r
-    components:\r
-    - type: Transform\r
-      pos: 6.371938,-6.0707817\r
-      parent: 60\r
 - proto: DrinkHotCoffee\r
   entities:\r
   - uid: 16135\r
@@ -107437,6 +107451,13 @@ entities:
     - type: Transform\r
       pos: 35.629635,-51.39923\r
       parent: 60\r
+- proto: GunSafeDisabler\r
+  entities:\r
+  - uid: 1732\r
+    components:\r
+    - type: Transform\r
+      pos: -25.5,-8.5\r
+      parent: 60\r
 - proto: GunSafeRifleLecter\r
   entities:\r
   - uid: 4109\r
@@ -110278,11 +110299,26 @@ entities:
     - type: Transform\r
       pos: -45.496006,-9.58335\r
       parent: 60\r
+  - uid: 9474\r
+    components:\r
+    - type: Transform\r
+      pos: -66.53229,9.621169\r
+      parent: 60\r
   - uid: 13014\r
     components:\r
     - type: Transform\r
       pos: -45.404285,-9.838601\r
       parent: 60\r
+  - uid: 19181\r
+    components:\r
+    - type: Transform\r
+      pos: 23.305836,21.651909\r
+      parent: 60\r
+  - uid: 19182\r
+    components:\r
+    - type: Transform\r
+      pos: 23.430836,21.558159\r
+      parent: 60\r
 - proto: MicrophoneInstrument\r
   entities:\r
   - uid: 17203\r
@@ -110729,23 +110765,6 @@ entities:
     - type: Transform\r
       pos: -8.327919,25.771437\r
       parent: 60\r
-- proto: NanoManipulatorStockPart\r
-  entities:\r
-  - uid: 9474\r
-    components:\r
-    - type: Transform\r
-      pos: -66.53229,9.621169\r
-      parent: 60\r
-  - uid: 19181\r
-    components:\r
-    - type: Transform\r
-      pos: 23.305836,21.651909\r
-      parent: 60\r
-  - uid: 19182\r
-    components:\r
-    - type: Transform\r
-      pos: 23.430836,21.558159\r
-      parent: 60\r
 - proto: NitrogenCanister\r
   entities:\r
   - uid: 2736\r
@@ -123754,20 +123773,20 @@ entities:
     - type: Transform\r
       pos: 43.534462,13.459317\r
       parent: 60\r
-- proto: SalvageMagnet\r
+- proto: SalvageLootSpawner\r
   entities:\r
-  - uid: 19030\r
+  - uid: 5030\r
     components:\r
     - type: Transform\r
-      rot: 1.5707963267948966 rad\r
-      pos: 49.5,1.5\r
+      pos: -64.5,9.5\r
       parent: 60\r
-- proto: SalvagePartsT2Spawner\r
+- proto: SalvageMagnet\r
   entities:\r
-  - uid: 5030\r
+  - uid: 19030\r
     components:\r
     - type: Transform\r
-      pos: -64.5,9.5\r
+      rot: 1.5707963267948966 rad\r
+      pos: 49.5,1.5\r
       parent: 60\r
 - proto: Saw\r
   entities:\r
@@ -124140,6 +124159,11 @@ entities:
     - type: Transform\r
       pos: -53.46743,13.76821\r
       parent: 60\r
+  - uid: 16456\r
+    components:\r
+    - type: Transform\r
+      pos: -24.476772,1.5819757\r
+      parent: 60\r
 - proto: SheetSteel\r
   entities:\r
   - uid: 2314\r
@@ -136444,13 +136468,6 @@ entities:
     - type: Transform\r
       pos: 10.5,-69.5\r
       parent: 60\r
-- proto: TransmitterSubspaceStockPart\r
-  entities:\r
-  - uid: 1201\r
-    components:\r
-    - type: Transform\r
-      pos: -63.585518,9.577888\r
-      parent: 60\r
 - proto: TrashBag\r
   entities:\r
   - uid: 926\r