Bagel (#16007)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index ddbe89003e35c9a846c3f38647ac62847d6ebb45..c71be6a8588b427d80f4347282c401642718101f 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -8712,7 +8712,7 @@ entities:
       type: GridAtmosphere\r
     - type: OccluderTree\r
     - type: Shuttle\r
-    - nextUpdate: 1208.4511172\r
+    - nextUpdate: 1737.6590658\r
       type: GridPathfinding\r
     - nextUpdate: 1\r
       type: SpreaderGrid\r
@@ -8980,7 +8980,7 @@ entities:
   entities:\r
   - uid: 2133\r
     components:\r
-    - pos: -25.453274,-10.973929\r
+    - pos: -25.315247,-10.432565\r
       parent: 60\r
       type: Transform\r
   - uid: 6610\r
@@ -9045,6 +9045,9 @@ entities:
       - 4823\r
       - 7484\r
       - 4971\r
+      - 21169\r
+      - 21166\r
+      - 21088\r
       type: DeviceList\r
   - uid: 5105\r
     components:\r
@@ -9108,6 +9111,9 @@ entities:
       - 6417\r
       - 6418\r
       - 6474\r
+      - 21029\r
+      - 21084\r
+      - 21087\r
       type: DeviceList\r
   - uid: 7479\r
     components:\r
@@ -12955,13 +12961,6 @@ entities:
       type: Transform\r
 - proto: AirlockMedicalLocked\r
   entities:\r
-  - uid: 241\r
-    components:\r
-    - name: Brig Med\r
-      type: MetaData\r
-    - pos: -17.5,-4.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 633\r
     components:\r
     - name: morgue\r
@@ -13229,6 +13228,13 @@ entities:
       type: Transform\r
 - proto: AirlockSecurityLocked\r
   entities:\r
+  - uid: 54\r
+    components:\r
+    - name: Brig Medical\r
+      type: MetaData\r
+    - pos: -17.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 1615\r
     components:\r
     - name: Sec Maint\r
@@ -15978,7 +15984,7 @@ entities:
       type: Transform\r
   - uid: 7793\r
     components:\r
-    - pos: -25.348616,-10.845438\r
+    - pos: -25.315247,-11.16694\r
       parent: 60\r
       type: Transform\r
 - proto: BoxFolderBlack\r
@@ -16111,11 +16117,6 @@ entities:
     - pos: 35.527073,-13.400456\r
       parent: 60\r
       type: Transform\r
-  - uid: 11127\r
-    components:\r
-    - pos: 49.50579,-17.589312\r
-      parent: 60\r
-      type: Transform\r
 - proto: BoxFolderYellow\r
   entities:\r
   - uid: 13122\r
@@ -16270,7 +16271,7 @@ entities:
       type: Transform\r
   - uid: 19869\r
     components:\r
-    - pos: -27.52049,-10.939188\r
+    - pos: -25.596497,-10.963815\r
       parent: 60\r
       type: Transform\r
 - proto: BrbSign\r
@@ -63694,18 +63695,6 @@ entities:
     - pos: 9.436119,21.599794\r
       parent: 60\r
       type: Transform\r
-- proto: ClothingEyesHudMedical\r
-  entities:\r
-  - uid: 134\r
-    components:\r
-    - pos: 49.589993,-17.822021\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 139\r
-    components:\r
-    - pos: 49.558743,-17.662226\r
-      parent: 60\r
-      type: Transform\r
 - proto: ClothingHandsGlovesBoxingBlue\r
   entities:\r
   - uid: 19920\r
@@ -64555,6 +64544,15 @@ entities:
     - pos: 48.664055,-46.466763\r
       parent: 60\r
       type: Transform\r
+- proto: ClothingOuterApronChef\r
+  entities:\r
+  - uid: 20425\r
+    components:\r
+    - pos: -11.417416,-50.455223\r
+      parent: 60\r
+      type: Transform\r
+    - nextSound: 988.7793572\r
+      type: EmitSoundOnCollide\r
 - proto: ClothingOuterArmorReflective\r
   entities:\r
   - uid: 24113\r
@@ -67051,6 +67049,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
+  - uid: 19878\r
+    components:\r
+    - pos: 28.5,-39.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CrateHydroponicsSeedsMedicinal\r
   entities:\r
   - uid: 13775\r
@@ -67335,7 +67338,7 @@ entities:
   entities:\r
   - uid: 6041\r
     components:\r
-    - pos: -27.436413,-11.161429\r
+    - pos: -27.518372,-11.01069\r
       parent: 60\r
       type: Transform\r
   - uid: 7673\r
@@ -72482,7 +72485,7 @@ entities:
   entities:\r
   - uid: 1632\r
     components:\r
-    - pos: -25.315727,-7.4930058\r
+    - pos: -25.238888,-7.514381\r
       parent: 60\r
       type: Transform\r
 - proto: DrinkShotGlass\r
@@ -73021,6 +73024,15 @@ entities:
     - pos: 36.402073,-14.447331\r
       parent: 60\r
       type: Transform\r
+- proto: EmergencyRollerBedSpawnFolded\r
+  entities:\r
+  - uid: 19877\r
+    components:\r
+    - pos: 48.465664,-16.502686\r
+      parent: 60\r
+      type: Transform\r
+    - nextSound: 256.9484891\r
+      type: EmitSoundOnCollide\r
 - proto: Emitter\r
   entities:\r
   - uid: 15585\r
@@ -73588,11 +73600,11 @@ entities:
     - pos: -22.5,-29.5\r
       parent: 60\r
       type: Transform\r
-- proto: filingCabinetTall\r
+- proto: filingCabinetTallRandom\r
   entities:\r
-  - uid: 11129\r
+  - uid: 134\r
     components:\r
-    - pos: 48.5,-16.5\r
+    - pos: 49.5,-17.5\r
       parent: 60\r
       type: Transform\r
 - proto: FireAlarm\r
@@ -73612,6 +73624,9 @@ entities:
       - 5089\r
       - 4822\r
       - 4821\r
+      - 21015\r
+      - 21023\r
+      - 21022\r
       type: DeviceList\r
   - uid: 4831\r
     components:\r
@@ -74961,6 +74976,60 @@ entities:
       pos: 41.5,18.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21015\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 1.5,-75.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21022\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 0.5,-75.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21023\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -0.5,-75.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21029\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 1.5,-60.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21084\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 0.5,-60.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21087\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -0.5,-60.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21088\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 1.5,-53.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21166\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 0.5,-53.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21169\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -0.5,-53.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: FirelockElectronics\r
   entities:\r
   - uid: 18748\r
@@ -77237,14 +77306,14 @@ entities:
   entities:\r
   - uid: 8412\r
     components:\r
-    - pos: -12.53384,-50.273567\r
+    - pos: -12.823592,-50.327145\r
       parent: 60\r
       type: Transform\r
 - proto: FoodRiceEgg\r
   entities:\r
   - uid: 8400\r
     components:\r
-    - pos: -12.063588,-50.214176\r
+    - pos: -12.198592,-50.327145\r
       parent: 60\r
       type: Transform\r
 - proto: FoodSnackChips\r
@@ -119100,13 +119169,6 @@ entities:
       type: Transform\r
     - bodyType: Static\r
       type: Physics\r
-- proto: HandheldCrewMonitor\r
-  entities:\r
-  - uid: 24094\r
-    components:\r
-    - pos: 46.58981,-17.349377\r
-      parent: 60\r
-      type: Transform\r
 - proto: HandheldGPSBasic\r
   entities:\r
   - uid: 3712\r
@@ -121482,9 +121544,21 @@ entities:
       type: EntityStorage\r
 - proto: LockerMedicalFilled\r
   entities:\r
-  - uid: 147\r
+  - uid: 241\r
+    components:\r
+    - pos: 48.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 19867\r
     components:\r
-    - pos: 50.5,-9.5\r
+    - pos: 49.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+- proto: LockerMedicineFilled\r
+  entities:\r
+  - uid: 4109\r
+    components:\r
+    - pos: 32.5,-14.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121505,11 +121579,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerMedicineFilled\r
-  entities:\r
-  - uid: 4109\r
+  - uid: 9216\r
     components:\r
-    - pos: 32.5,-14.5\r
+    - pos: 32.5,-10.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121530,9 +121602,18 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 9216\r
+- proto: LockerParamedicFilled\r
+  entities:\r
+  - uid: 185\r
     components:\r
-    - pos: 32.5,-10.5\r
+    - pos: 49.5,-16.5\r
+      parent: 60\r
+      type: Transform\r
+- proto: LockerQuarterMasterFilled\r
+  entities:\r
+  - uid: 13099\r
+    components:\r
+    - pos: 43.5,15.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121553,9 +121634,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 10857\r
+- proto: LockerResearchDirectorFilled\r
+  entities:\r
+  - uid: 5542\r
     components:\r
-    - pos: 49.5,-16.5\r
+    - pos: -44.5,7.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121576,11 +121659,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerQuarterMasterFilled\r
+- proto: LockerSalvageSpecialistFilled\r
   entities:\r
-  - uid: 13099\r
+  - uid: 12197\r
     components:\r
-    - pos: 43.5,15.5\r
+    - pos: 36.5,-0.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121601,11 +121684,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerResearchDirectorFilled\r
-  entities:\r
-  - uid: 5542\r
+  - uid: 12893\r
     components:\r
-    - pos: -44.5,7.5\r
+    - pos: 36.5,0.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121626,11 +121707,34 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerSalvageSpecialistFilled\r
+  - uid: 12909\r
+    components:\r
+    - pos: 36.5,1.5\r
+      parent: 60\r
+      type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.6495836\r
+        - 6.2055764\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+- proto: LockerScienceFilled\r
   entities:\r
-  - uid: 12197\r
+  - uid: 9572\r
     components:\r
-    - pos: 36.5,-0.5\r
+    - pos: -56.5,12.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121651,9 +121755,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 12893\r
+  - uid: 9573\r
     components:\r
-    - pos: 36.5,0.5\r
+    - pos: -56.5,11.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121674,9 +121778,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 12909\r
+  - uid: 9574\r
     components:\r
-    - pos: 36.5,1.5\r
+    - pos: -56.5,10.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121697,11 +121801,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerScienceFilled\r
+- proto: LockerSecurityFilled\r
   entities:\r
-  - uid: 9572\r
+  - uid: 191\r
     components:\r
-    - pos: -56.5,12.5\r
+    - pos: -34.5,-17.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121722,9 +121826,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 9573\r
+  - uid: 1640\r
     components:\r
-    - pos: -56.5,11.5\r
+    - pos: -34.5,-16.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121745,9 +121849,9 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 9574\r
+  - uid: 7041\r
     components:\r
-    - pos: -56.5,10.5\r
+    - pos: -34.5,-18.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -121768,150 +121872,79 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerSecurityFilled\r
+- proto: LockerSyndicatePersonal\r
   entities:\r
-  - uid: 191\r
+  - uid: 1865\r
     components:\r
-    - pos: -34.5,-17.5\r
-      parent: 60\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-  - uid: 1640\r
-    components:\r
-    - pos: -34.5,-16.5\r
-      parent: 60\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-  - uid: 7041\r
-    components:\r
-    - pos: -34.5,-18.5\r
-      parent: 60\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-- proto: LockerSyndicatePersonal\r
-  entities:\r
-  - uid: 1865\r
-    components:\r
-    - pos: -27.5,2.5\r
-      parent: 60\r
-      type: Transform\r
-    - locked: False\r
-      type: Lock\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1496\r
-        moles:\r
-        - 1.6495836\r
-        - 6.2055764\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-    - containers:\r
-        entity_storage: !type:Container\r
-          showEnts: False\r
-          occludes: True\r
-          ents:\r
-          - 1885\r
-          - 1886\r
-      type: ContainerContainer\r
-  - uid: 8064\r
-    components:\r
-    - pos: -3.5,-1.5\r
-      parent: 7536\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1493\r
-        moles:\r
-        - 0.934759\r
-        - 3.5164742\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-    - containers:\r
-        entity_storage: !type:Container\r
-          showEnts: False\r
-          occludes: True\r
-          ents:\r
-          - 8069\r
-          - 8065\r
-          - 8070\r
-          - 8071\r
-      type: ContainerContainer\r
-- proto: LockerWallMedicalFilled\r
-  entities:\r
-  - uid: 17298\r
-    components:\r
-    - pos: 39.5,-15.5\r
+    - pos: -27.5,2.5\r
+      parent: 60\r
+      type: Transform\r
+    - locked: False\r
+      type: Lock\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1496\r
+        moles:\r
+        - 1.6495836\r
+        - 6.2055764\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 1885\r
+          - 1886\r
+      type: ContainerContainer\r
+  - uid: 8064\r
+    components:\r
+    - pos: -3.5,-1.5\r
+      parent: 7536\r
+      type: Transform\r
+    - air:\r
+        volume: 200\r
+        immutable: False\r
+        temperature: 293.1493\r
+        moles:\r
+        - 0.934759\r
+        - 3.5164742\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+        - 0\r
+      type: EntityStorage\r
+    - containers:\r
+        entity_storage: !type:Container\r
+          showEnts: False\r
+          occludes: True\r
+          ents:\r
+          - 8069\r
+          - 8065\r
+          - 8070\r
+          - 8071\r
+      type: ContainerContainer\r
+- proto: LockerWallMedicalFilled\r
+  entities:\r
+  - uid: 17298\r
+    components:\r
+    - pos: 39.5,-15.5\r
       parent: 60\r
       type: Transform\r
     - air:\r
@@ -122253,6 +122286,16 @@ entities:
       type: Transform\r
 - proto: MaintenanceFluffSpawner\r
   entities:\r
+  - uid: 846\r
+    components:\r
+    - pos: 55.5,-15.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 1463\r
+    components:\r
+    - pos: 32.5,14.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 4521\r
     components:\r
     - pos: 54.5,-35.5\r
@@ -122278,11 +122321,6 @@ entities:
     - pos: -64.5,2.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9091\r
-    components:\r
-    - pos: 56.5,-15.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 10884\r
     components:\r
     - pos: 55.5,-44.5\r
@@ -122303,9 +122341,9 @@ entities:
     - pos: -20.5,5.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 19730\r
+  - uid: 19886\r
     components:\r
-    - pos: 31.5,14.5\r
+    - pos: 29.5,-1.5\r
       parent: 60\r
       type: Transform\r
   - uid: 20076\r
@@ -122362,6 +122400,11 @@ entities:
       type: Transform\r
 - proto: MaintenanceWeaponSpawner\r
   entities:\r
+  - uid: 1741\r
+    components:\r
+    - pos: 56.5,-15.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 3622\r
     components:\r
     - pos: -50.5,-34.5\r
@@ -122382,11 +122425,6 @@ entities:
     - pos: 46.5,-47.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9093\r
-    components:\r
-    - pos: 55.5,-15.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 10882\r
     components:\r
     - pos: 54.5,-44.5\r
@@ -123083,7 +123121,7 @@ entities:
       type: Transform\r
   - uid: 5567\r
     components:\r
-    - pos: -27.675102,-7.45018\r
+    - pos: -27.720106,-7.4140253\r
       parent: 60\r
       type: Transform\r
   - uid: 6318\r
@@ -124283,18 +124321,22 @@ entities:
     - pos: 55.62253,-8.328542\r
       parent: 60\r
       type: Transform\r
-  - uid: 2149\r
+  - uid: 147\r
     components:\r
-    - pos: 30.651426,-14.7669\r
+    - pos: 46.568913,-16.48706\r
       parent: 60\r
       type: Transform\r
-    - nextAttack: 280.3558487\r
+    - nextAttack: 176.1781845\r
       type: MeleeWeapon\r
-  - uid: 11098\r
+    - nextSound: 176.3781845\r
+      type: EmitSoundOnCollide\r
+  - uid: 2149\r
     components:\r
-    - pos: 46.554035,-16.454565\r
+    - pos: 30.651426,-14.7669\r
       parent: 60\r
       type: Transform\r
+    - nextAttack: 280.3558487\r
+      type: MeleeWeapon\r
 - proto: PlushieNar\r
   entities:\r
   - uid: 14514\r
@@ -125636,6 +125678,11 @@ entities:
     - pos: 4.5,13.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 3207\r
+    components:\r
+    - pos: 13.5,-20.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 4698\r
     components:\r
     - pos: 3.5,-39.5\r
@@ -125703,6 +125750,21 @@ entities:
       type: Physics\r
     - fixtures: []\r
       type: Fixtures\r
+  - uid: 19863\r
+    components:\r
+    - pos: 35.5,-37.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 19866\r
+    components:\r
+    - pos: 24.5,-0.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 19884\r
+    components:\r
+    - pos: -46.5,11.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 20031\r
     components:\r
     - pos: 29.5,-0.5\r
@@ -130339,6 +130401,11 @@ entities:
     - pos: 13.5,-17.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 1471\r
+    components:\r
+    - pos: 56.5,-15.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 1677\r
     components:\r
     - pos: -31.5,-30.5\r
@@ -130539,11 +130606,6 @@ entities:
     - pos: 35.5,-51.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9089\r
-    components:\r
-    - pos: 56.5,-15.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 9090\r
     components:\r
     - pos: 55.5,-15.5\r
@@ -131549,11 +131611,6 @@ entities:
     - pos: -2.5,-24.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 661\r
-    components:\r
-    - pos: 13.5,-20.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 707\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -131861,6 +131918,11 @@ entities:
     - pos: 37.5,20.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 19887\r
+    components:\r
+    - pos: 15.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 19922\r
     components:\r
     - pos: 25.5,-5.5\r
@@ -132075,6 +132137,17 @@ entities:
       type: Transform\r
     - tags: []\r
       type: Tag\r
+- proto: ReagentContainerRice\r
+  entities:\r
+  - uid: 20979\r
+    components:\r
+    - pos: -11.292416,-50.236473\r
+      parent: 60\r
+      type: Transform\r
+    - nextAttack: 996.6566437\r
+      type: MeleeWeapon\r
+    - nextSound: 996.8566437\r
+      type: EmitSoundOnCollide\r
 - proto: Recycler\r
   entities:\r
   - uid: 4073\r
@@ -136333,7 +136406,7 @@ entities:
       type: SignalTransmitter\r
   - uid: 19870\r
     components:\r
-    - pos: -27.27049,-7.363508\r
+    - pos: -27.266981,-7.436256\r
       parent: 60\r
       type: Transform\r
 - proto: ResearchAndDevelopmentServer\r
@@ -136419,13 +136492,15 @@ entities:
       type: Transform\r
 - proto: SawAdvanced\r
   entities:\r
-  - uid: 3207\r
+  - uid: 6042\r
     components:\r
-    - pos: 38.653675,-14.181274\r
+    - pos: 38.567745,-14.272392\r
       parent: 60\r
       type: Transform\r
-    - nextAttack: 2893.4892888\r
+    - nextAttack: 1650.4441488\r
       type: MeleeWeapon\r
+    - nextSound: 1650.6441488\r
+      type: EmitSoundOnCollide\r
 - proto: SawImprov\r
   entities:\r
   - uid: 10908\r
@@ -136924,19 +136999,6 @@ entities:
       type: SignalReceiver\r
 - proto: ShuttersNormalOpen\r
   entities:\r
-  - uid: 123\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: -17.5,-9.5\r
-      parent: 60\r
-      type: Transform\r
-    - inputs:\r
-        Open: []\r
-        Close: []\r
-        Toggle:\r
-        - port: Pressed\r
-          uid: 1471\r
-      type: SignalReceiver\r
   - uid: 135\r
     components:\r
     - pos: 39.5,-21.5\r
@@ -136960,19 +137022,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 1489\r
-      type: SignalReceiver\r
-  - uid: 185\r
-    components:\r
-    - pos: -17.5,-10.5\r
-      parent: 60\r
-      type: Transform\r
-    - inputs:\r
-        Open: []\r
-        Close: []\r
-        Toggle:\r
-        - port: Pressed\r
-          uid: 1471\r
+          uid: 11129\r
       type: SignalReceiver\r
   - uid: 188\r
     components:\r
@@ -136984,7 +137034,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 1489\r
+          uid: 11129\r
       type: SignalReceiver\r
   - uid: 552\r
     components:\r
@@ -137238,7 +137288,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 6467\r
+          uid: 13787\r
       type: SignalReceiver\r
   - uid: 6206\r
     components:\r
@@ -137251,7 +137301,19 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 846\r
+          uid: 11098\r
+      type: SignalReceiver\r
+  - uid: 6467\r
+    components:\r
+    - pos: -17.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+    - inputs:\r
+        Open: []\r
+        Close: []\r
+        Toggle:\r
+        - port: Pressed\r
+          uid: 9091\r
       type: SignalReceiver\r
   - uid: 6522\r
     components:\r
@@ -137314,7 +137376,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 846\r
+          uid: 11098\r
       type: SignalReceiver\r
   - uid: 6746\r
     components:\r
@@ -137327,7 +137389,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 6467\r
+          uid: 13787\r
       type: SignalReceiver\r
   - uid: 6772\r
     components:\r
@@ -137392,7 +137454,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 7032\r
+          uid: 19730\r
       type: SignalReceiver\r
   - uid: 6813\r
     components:\r
@@ -137407,6 +137469,19 @@ entities:
         - port: Pressed\r
           uid: 2881\r
       type: SignalReceiver\r
+  - uid: 7032\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -17.5,-9.5\r
+      parent: 60\r
+      type: Transform\r
+    - inputs:\r
+        Open: []\r
+        Close: []\r
+        Toggle:\r
+        - port: Pressed\r
+          uid: 9091\r
+      type: SignalReceiver\r
   - uid: 7045\r
     components:\r
     - pos: -35.5,-10.5\r
@@ -137417,7 +137492,7 @@ entities:
         Close: []\r
         Toggle:\r
         - port: Pressed\r
-          uid: 7032\r
+          uid: 19730\r
       type: SignalReceiver\r
   - uid: 7086\r
     components:\r
@@ -138276,48 +138351,6 @@ entities:
     - pos: -15.5,-51.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 846\r
-    components:\r
-    - name: Cell 5 Shutters\r
-      type: MetaData\r
-    - pos: -27.5,-11.5\r
-      parent: 60\r
-      type: Transform\r
-    - outputs:\r
-        Pressed:\r
-        - port: Toggle\r
-          uid: 6206\r
-        - port: Toggle\r
-          uid: 6733\r
-      type: SignalTransmitter\r
-  - uid: 1471\r
-    components:\r
-    - name: Cell 1 Shutters\r
-      type: MetaData\r
-    - pos: -25.5,-10.5\r
-      parent: 60\r
-      type: Transform\r
-    - outputs:\r
-        Pressed:\r
-        - port: Toggle\r
-          uid: 123\r
-        - port: Toggle\r
-          uid: 185\r
-      type: SignalTransmitter\r
-  - uid: 1489\r
-    components:\r
-    - name: Med Cell Shutters\r
-      type: MetaData\r
-    - pos: -25.5,-7.5\r
-      parent: 60\r
-      type: Transform\r
-    - outputs:\r
-        Pressed:\r
-        - port: Toggle\r
-          uid: 188\r
-        - port: Toggle\r
-          uid: 148\r
-      type: SignalTransmitter\r
   - uid: 2313\r
     components:\r
     - pos: 24.5,-29.5\r
@@ -138426,34 +138459,6 @@ entities:
         - port: Toggle\r
           uid: 5345\r
       type: SignalTransmitter\r
-  - uid: 6467\r
-    components:\r
-    - name: Cell 3 Shutters\r
-      type: MetaData\r
-    - pos: -27.5,-7.5\r
-      parent: 60\r
-      type: Transform\r
-    - outputs:\r
-        Pressed:\r
-        - port: Toggle\r
-          uid: 6203\r
-        - port: Toggle\r
-          uid: 6746\r
-      type: SignalTransmitter\r
-  - uid: 7032\r
-    components:\r
-    - name: Cell 4 Shutters\r
-      type: MetaData\r
-    - pos: -27.5,-10.5\r
-      parent: 60\r
-      type: Transform\r
-    - outputs:\r
-        Pressed:\r
-        - port: Toggle\r
-          uid: 7045\r
-        - port: Toggle\r
-          uid: 6796\r
-      type: SignalTransmitter\r
   - uid: 7070\r
     components:\r
     - pos: 37.5,-18.5\r
@@ -138509,10 +138514,24 @@ entities:
       type: Transform\r
     - outputs:\r
         Pressed:\r
+        - port: Toggle\r
+          uid: 552\r
         - port: Toggle\r
           uid: 8002\r
+      type: SignalTransmitter\r
+  - uid: 9091\r
+    components:\r
+    - name: Cell 1 Shutters\r
+      type: MetaData\r
+    - pos: -25.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+    - outputs:\r
+        Pressed:\r
         - port: Toggle\r
-          uid: 552\r
+          uid: 6467\r
+        - port: Toggle\r
+          uid: 7032\r
       type: SignalTransmitter\r
   - uid: 9165\r
     components:\r
@@ -138551,6 +138570,34 @@ entities:
         - port: Toggle\r
           uid: 21026\r
       type: SignalTransmitter\r
+  - uid: 11098\r
+    components:\r
+    - name: Cell 5 Shutters\r
+      type: MetaData\r
+    - pos: -27.5,-11.5\r
+      parent: 60\r
+      type: Transform\r
+    - outputs:\r
+        Pressed:\r
+        - port: Toggle\r
+          uid: 6733\r
+        - port: Toggle\r
+          uid: 6206\r
+      type: SignalTransmitter\r
+  - uid: 11129\r
+    components:\r
+    - name: Med Cell Shutters\r
+      type: MetaData\r
+    - pos: -25.5,-7.5\r
+      parent: 60\r
+      type: Transform\r
+    - outputs:\r
+        Pressed:\r
+        - port: Toggle\r
+          uid: 188\r
+        - port: Toggle\r
+          uid: 148\r
+      type: SignalTransmitter\r
   - uid: 11511\r
     components:\r
     - pos: -52.5,28.5\r
@@ -138601,6 +138648,20 @@ entities:
         - port: Toggle\r
           uid: 12598\r
       type: SignalTransmitter\r
+  - uid: 13787\r
+    components:\r
+    - name: Cell 3 Shutters\r
+      type: MetaData\r
+    - pos: -27.5,-7.5\r
+      parent: 60\r
+      type: Transform\r
+    - outputs:\r
+        Pressed:\r
+        - port: Toggle\r
+          uid: 6203\r
+        - port: Toggle\r
+          uid: 6746\r
+      type: SignalTransmitter\r
   - uid: 13815\r
     components:\r
     - pos: 11.5,18.5\r
@@ -138747,6 +138808,20 @@ entities:
         - port: Toggle\r
           uid: 11697\r
       type: SignalTransmitter\r
+  - uid: 19730\r
+    components:\r
+    - name: Cell 4 Shutters\r
+      type: MetaData\r
+    - pos: -27.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+    - outputs:\r
+        Pressed:\r
+        - port: Toggle\r
+          uid: 7045\r
+        - port: Toggle\r
+          uid: 6796\r
+      type: SignalTransmitter\r
   - uid: 21339\r
     components:\r
     - pos: 6.5,-30.5\r
@@ -142815,6 +142890,13 @@ entities:
       pos: 9.5,-71.5\r
       parent: 60\r
       type: Transform\r
+- proto: SpawnMobAdultSlimesBlue\r
+  entities:\r
+  - uid: 19885\r
+    components:\r
+    - pos: -50.5,13.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: SpawnMobAlexander\r
   entities:\r
   - uid: 23769\r
@@ -142824,9 +142906,9 @@ entities:
       type: Transform\r
 - proto: SpawnMobBandito\r
   entities:\r
-  - uid: 24170\r
+  - uid: 10857\r
     components:\r
-    - pos: -43.5,-5.5\r
+    - pos: -43.5,3.5\r
       parent: 60\r
       type: Transform\r
 - proto: SpawnMobCat\r
@@ -143248,6 +143330,13 @@ entities:
     - pos: 0.5,-23.5\r
       parent: 60\r
       type: Transform\r
+- proto: SpawnPointParamedic\r
+  entities:\r
+  - uid: 661\r
+    components:\r
+    - pos: 48.5,-17.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: SpawnPointQuartermaster\r
   entities:\r
   - uid: 13101\r
@@ -143431,6 +143520,13 @@ entities:
     - pos: -33.5,-20.5\r
       parent: 60\r
       type: Transform\r
+- proto: SpawnVendingMachineRestockFoodDrink\r
+  entities:\r
+  - uid: 19888\r
+    components:\r
+    - pos: -8.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: SpeedLoaderMagnum\r
   entities:\r
   - uid: 24109\r
@@ -145797,12 +145893,6 @@ entities:
     - pos: 38.5,-12.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 1463\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -25.5,-7.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 1478\r
     components:\r
     - pos: -32.5,-15.5\r
@@ -145823,12 +145913,6 @@ entities:
     - pos: 9.5,-51.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 1741\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -25.5,-10.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 1858\r
     components:\r
     - pos: -20.5,-16.5\r
@@ -146055,12 +146139,6 @@ entities:
     - pos: -27.5,-13.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 6042\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -27.5,-7.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 6145\r
     components:\r
     - pos: 51.5,6.5\r
@@ -146688,24 +146766,6 @@ entities:
     - pos: 26.5,12.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 19863\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -27.5,-11.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 19866\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -27.5,-10.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 19867\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -25.5,-11.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 19918\r
     components:\r
     - pos: 26.5,-6.5\r
@@ -146861,6 +146921,21 @@ entities:
       type: Transform\r
 - proto: TableGlass\r
   entities:\r
+  - uid: 123\r
+    components:\r
+    - pos: 46.5,-17.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 139\r
+    components:\r
+    - pos: 46.5,-16.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 1489\r
+    components:\r
+    - pos: 49.5,-18.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2089\r
     components:\r
     - pos: -18.5,-2.5\r
@@ -147305,6 +147380,26 @@ entities:
     - pos: -67.5,9.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 9015\r
+    components:\r
+    - pos: -25.5,-11.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9018\r
+    components:\r
+    - pos: -25.5,-7.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9089\r
+    components:\r
+    - pos: -27.5,-11.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 9093\r
+    components:\r
+    - pos: -27.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 9132\r
     components:\r
     - pos: -1.5,-2.5\r
@@ -147365,6 +147460,16 @@ entities:
     - pos: -40.5,5.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 11097\r
+    components:\r
+    - pos: -25.5,-10.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 11127\r
+    components:\r
+    - pos: -27.5,-7.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 13951\r
     components:\r
     - pos: -16.5,26.5\r
@@ -147675,11 +147780,6 @@ entities:
       type: Transform\r
 - proto: TableWood\r
   entities:\r
-  - uid: 54\r
-    components:\r
-    - pos: 49.5,-18.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 271\r
     components:\r
     - pos: 25.5,-15.5\r
@@ -147914,26 +148014,11 @@ entities:
     - pos: -10.5,-28.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9015\r
-    components:\r
-    - pos: 46.5,-16.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 9018\r
-    components:\r
-    - pos: 46.5,-17.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 9040\r
     components:\r
     - pos: -12.5,19.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 11097\r
-    components:\r
-    - pos: 49.5,-17.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 11692\r
     components:\r
     - pos: -40.5,-17.5\r
@@ -148751,18 +148836,6 @@ entities:
     - pos: 10.5,-69.5\r
       parent: 60\r
       type: Transform\r
-- proto: TrackingImplanter\r
-  entities:\r
-  - uid: 19877\r
-    components:\r
-    - pos: -25.516588,-10.33648\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 19878\r
-    components:\r
-    - pos: -25.516588,-10.33648\r
-      parent: 60\r
-      type: Transform\r
 - proto: TransmitterSubspaceStockPart\r
   entities:\r
   - uid: 1201\r
@@ -165955,6 +166028,24 @@ entities:
       pos: -23.5,-9.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 20984\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -28.5,1.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 20989\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -28.5,2.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21010\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -19.5,-0.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 24115\r
     components:\r
     - pos: -24.5,2.5\r
@@ -166220,6 +166311,12 @@ entities:
       pos: 39.5,-46.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 19883\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -8.5,-15.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: WindoorSecureCargoLocked\r
   entities:\r
   - uid: 7702\r
@@ -166386,12 +166483,6 @@ entities:
       pos: -2.5,-45.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 13787\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -8.5,-15.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 24149\r
     components:\r
     - pos: -18.5,-5.5\r
@@ -166827,6 +166918,12 @@ entities:
     - pos: 50.5,23.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 19882\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 29.5,-39.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 21347\r
     components:\r
     - pos: -67.5,9.5\r
@@ -167747,6 +167844,17 @@ entities:
     - pos: -47.5,5.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 20983\r
+    components:\r
+    - pos: -28.5,1.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 20991\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: -19.5,-0.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 21144\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -170714,7 +170822,7 @@ entities:
       type: MeleeWeapon\r
   - uid: 1556\r
     components:\r
-    - pos: -27.514538,-11.083304\r
+    - pos: -27.518372,-11.01069\r
       parent: 60\r
       type: Transform\r
   - uid: 4004\r

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
index 390e9b4225e0d6ad928c3054511c505ea973fb9a..7a0712790457c8bf0ec2dfdbbd4ba3891b4b45e6 100644 (file)
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -49,3 +49,4 @@
         Detective: [ 1, 1 ]
         ResearchAssistant: [ 2, 2 ]
         Brigmedic: [ 1, 1 ]
+        Paramedic: [ 1, 1 ]