bagel update (#22740)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 0065be3e039b718db0717691ec11e19fe72f6e24..34d4329e0b98ad2f18b15541f32d0c019abbf87d 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -85,7 +85,7 @@ entities:
           version: 6\r
         0,-2:\r
           ind: 0,-2\r
-          tiles: WQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACdgAAAAABdgAAAAADdgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAWQAAAAAAWQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAATAAAAAADeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABHQAAAAABHQAAAAABeQAAAAAADgAAAAADdgAAAAABdgAAAAADdgAAAAABdgAAAAAAdgAAAAAAWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAABHQAAAAAAHQAAAAABeQAAAAAADgAAAAABdgAAAAADdgAAAAAAdgAAAAAAdgAAAAABdgAAAAACWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAAAWQAAAAAAWQAAAAADeQAAAAAASwAAAAADSwAAAAAASwAAAAABSwAAAAAASwAAAAAASwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAABeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADSwAAAAAAWQAAAAACWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAADSwAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAASwAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAADHQAAAAADHQAAAAACHQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAABeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAD\r
+          tiles: WQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACdgAAAAABdgAAAAADdgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAWQAAAAAAWQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAATAAAAAADeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABHQAAAAABHQAAAAABeQAAAAAADgAAAAADdgAAAAABdgAAAAADdgAAAAABdgAAAAAAdgAAAAAAWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAABHQAAAAAAHQAAAAABeQAAAAAADgAAAAABdgAAAAADdgAAAAAAdgAAAAAAdgAAAAABdgAAAAACWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAAAWQAAAAAAWQAAAAADeQAAAAAASwAAAAADSwAAAAAASwAAAAABSwAAAAAASwAAAAAASwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADSwAAAAAAWQAAAAACWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAADSwAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAASwAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAADHQAAAAADHQAAAAACHQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAABeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAD\r
           version: 6\r
         -1,-2:\r
           ind: -1,-2\r
@@ -2079,7 +2079,6 @@ entities:
             id: CheckerNESW\r
           decals:\r
             3820: 16,-26\r
-            3821: 13,-26\r
         - node:\r
             color: '#5E7C167F'\r
             id: CheckerNESW\r
@@ -10199,7 +10198,6 @@ entities:
       - 2880\r
       - 21565\r
       - 2770\r
-      - 2771\r
       - 2706\r
       - 5822\r
       - 629\r
@@ -12362,11 +12360,6 @@ entities:
     - pos: 18.5,7.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 736\r
-    components:\r
-    - pos: 13.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 859\r
     components:\r
     - pos: -12.5,-22.5\r
@@ -41874,6 +41867,11 @@ entities:
     - pos: 36.5,-19.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2571\r
+    components:\r
+    - pos: 13.5,-27.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2598\r
     components:\r
     - pos: 49.5,-3.5\r
@@ -44034,11 +44032,6 @@ entities:
     - pos: 11.5,-28.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 11167\r
-    components:\r
-    - pos: 13.5,-24.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 11168\r
     components:\r
     - pos: 13.5,-23.5\r
@@ -44081,17 +44074,7 @@ entities:
       type: Transform\r
   - uid: 11180\r
     components:\r
-    - pos: 13.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 11181\r
-    components:\r
-    - pos: 13.5,-26.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 11182\r
-    components:\r
-    - pos: 13.5,-27.5\r
+    - pos: 14.5,-27.5\r
       parent: 60\r
       type: Transform\r
   - uid: 11213\r
@@ -47174,6 +47157,46 @@ entities:
     - pos: 45.5,2.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24339\r
+    components:\r
+    - pos: 15.5,-27.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24340\r
+    components:\r
+    - pos: 16.5,-27.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24341\r
+    components:\r
+    - pos: 16.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24342\r
+    components:\r
+    - pos: 16.5,-25.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24343\r
+    components:\r
+    - pos: 16.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24344\r
+    components:\r
+    - pos: 16.5,-23.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24345\r
+    components:\r
+    - pos: 15.5,-23.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24346\r
+    components:\r
+    - pos: 14.5,-23.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CableMVStack\r
   entities:\r
   - uid: 6605\r
@@ -59765,6 +59788,12 @@ entities:
       pos: 24.5,-5.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24349\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 13.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: ComputerAlert\r
   entities:\r
   - uid: 16555\r
@@ -61684,6 +61713,12 @@ entities:
       pos: -4.5,-26.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 997\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 13.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 1324\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -61696,6 +61731,23 @@ entities:
       pos: -37.5,-23.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2187\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 16.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 2265\r
+    components:\r
+    - pos: 16.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 2266\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 13.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2272\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -62225,12 +62277,6 @@ entities:
     - pos: -15.5,-9.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 997\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 13.5,-23.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 1208\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -62247,6 +62293,12 @@ entities:
     - pos: 0.5,-23.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2192\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 13.5,-23.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2301\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -63323,28 +63375,27 @@ entities:
     - pos: 0.5,-21.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2264\r
+  - uid: 2188\r
     components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 11.5,-23.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 14.5,-26.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2265\r
+  - uid: 2189\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 13.5,-24.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 15.5,-26.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2266\r
+  - uid: 2264\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 13.5,-25.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 11.5,-23.5\r
       parent: 60\r
       type: Transform\r
   - uid: 2267\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 13.5,-26.5\r
+    - pos: 16.5,-25.5\r
       parent: 60\r
       type: Transform\r
   - uid: 2269\r
@@ -63597,6 +63648,12 @@ entities:
       pos: 29.5,-29.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2567\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 15.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2609\r
     components:\r
     - pos: 23.5,-37.5\r
@@ -63608,6 +63665,12 @@ entities:
       pos: 36.5,-22.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2771\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 14.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 2781\r
     components:\r
     - pos: 0.5,-16.5\r
@@ -68126,7 +68189,6 @@ entities:
       - 2880\r
       - 21565\r
       - 2770\r
-      - 2771\r
       type: DeviceList\r
   - uid: 21566\r
     components:\r
@@ -69264,11 +69326,6 @@ entities:
     - pos: 16.5,-25.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2771\r
-    components:\r
-    - pos: 13.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2891\r
     components:\r
     - pos: 15.5,-34.5\r
@@ -97806,16 +97863,6 @@ entities:
     - pos: 38.5,-21.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2187\r
-    components:\r
-    - pos: 10.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 2188\r
-    components:\r
-    - pos: 11.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2190\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -97849,11 +97896,6 @@ entities:
     - pos: 21.5,-25.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2567\r
-    components:\r
-    - pos: 12.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2579\r
     components:\r
     - pos: -32.5,-13.5\r
@@ -106076,6 +106118,68 @@ entities:
       pos: -3.5,-28.5\r
       parent: 60\r
       type: Transform\r
+- proto: JanitorServiceLight\r
+  entities:\r
+  - uid: 11167\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 13.5,-24.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24347\r
+      type: DeviceLinkSink\r
+  - uid: 24333\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -38.5,-2.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24334\r
+      type: DeviceLinkSink\r
+  - uid: 24335\r
+    components:\r
+    - pos: -17.5,-18.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24336\r
+      type: DeviceLinkSink\r
+  - uid: 24337\r
+    components:\r
+    - pos: 35.5,-22.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24338\r
+      type: DeviceLinkSink\r
+  - uid: 24350\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 1.5,-9.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24351\r
+      type: DeviceLinkSink\r
+  - uid: 24352\r
+    components:\r
+    - pos: 2.5,11.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24353\r
+      type: DeviceLinkSink\r
+  - uid: 24355\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 41.5,7.5\r
+      parent: 60\r
+      type: Transform\r
+    - links:\r
+      - 24354\r
+      type: DeviceLinkSink\r
 - proto: JetpackBlueFilled\r
   entities:\r
   - uid: 4705\r
@@ -122582,6 +122686,8 @@ entities:
   entities:\r
   - uid: 2881\r
     components:\r
+    - name: Bar Shutters\r
+      type: MetaData\r
     - pos: 12.5,-33.5\r
       parent: 60\r
       type: Transform\r
@@ -123207,6 +123313,90 @@ entities:
         17448:\r
         - Pressed: DoorBolt\r
       type: DeviceLinkSource\r
+  - uid: 24334\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -43.5,-1.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24333:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24336\r
+    components:\r
+    - name: Janitorial Service Button\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -21.5,-14.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24335:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24338\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 42.5,-19.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24337:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24347\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: 3.141592653589793 rad\r
+      pos: 12.5,-33.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        11167:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24351\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 5.5,-0.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24350:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24353\r
+    components:\r
+    - name: Janitorial Service Button\r
+      type: MetaData\r
+    - rot: 3.141592653589793 rad\r
+      pos: 3.5,16.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24352:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 24354\r
+    components:\r
+    - name: Janitorial Service Button\r
+      type: MetaData\r
+    - rot: 3.141592653589793 rad\r
+      pos: 43.5,4.5\r
+      parent: 60\r
+      type: Transform\r
+    - linkedPorts:\r
+        24355:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
 - proto: SignalButtonExt2\r
   entities:\r
   - uid: 21778\r
@@ -132746,6 +132936,12 @@ entities:
     - pos: -24.5,19.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24348\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 12.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: TargetSyndicate\r
   entities:\r
   - uid: 10824\r
@@ -133963,14 +134159,6 @@ entities:
     - pos: 2.5,-44.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7161\r
-    components:\r
-    - flags: SessionSpecific\r
-      name: Hot drinks machine\r
-      type: MetaData\r
-    - pos: 14.5,-26.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 7176\r
     components:\r
     - flags: SessionSpecific\r
@@ -134002,6 +134190,11 @@ entities:
     - pos: 3.5,21.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24356\r
+    components:\r
+    - pos: 14.5,-26.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: VendingMachineCola\r
   entities:\r
   - uid: 2773\r
@@ -144754,6 +144947,11 @@ entities:
     - pos: 2.5,-25.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 736\r
+    components:\r
+    - pos: 10.5,-25.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 737\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -146874,6 +147072,11 @@ entities:
     - pos: -39.5,-13.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7161\r
+    components:\r
+    - pos: 11.5,-25.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 7172\r
     components:\r
     - pos: 43.5,1.5\r
@@ -147401,6 +147604,16 @@ entities:
     - pos: 47.5,19.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 11181\r
+    components:\r
+    - pos: 13.5,-25.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 11182\r
+    components:\r
+    - pos: 12.5,-25.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 11240\r
     components:\r
     - pos: 21.5,-39.5\r
@@ -150909,16 +151122,6 @@ entities:
     - pos: -60.5,-8.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2189\r
-    components:\r
-    - pos: 10.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 2192\r
-    components:\r
-    - pos: 11.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2386\r
     components:\r
     - pos: 19.5,-25.5\r
@@ -150939,11 +151142,6 @@ entities:
     - pos: 17.5,-25.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2571\r
-    components:\r
-    - pos: 12.5,-25.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2597\r
     components:\r
     - pos: 15.5,-25.5\r