marathon update (#22772)

* marathon update

* light

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 806dba4a8f7ea93cce4be7b9ff14d87468f53207..11e59e5acdf8fa98c6cd44e6efefe65310713023 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -113,7 +113,7 @@ entities:
           version: 6\r
         -4,0:\r
           ind: -4,0\r
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAaQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAABAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAACAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAACWQAAAAACWQAAAAACMAAAAAAAWQAAAAABMgAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAABWQAAAAABWQAAAAACWQAAAAAAWQAAAAADWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAAC\r
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAaQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAABAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAACAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAACWQAAAAACWQAAAAACMAAAAAAAWQAAAAABMgAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAASwAAAAABWQAAAAABWQAAAAACWQAAAAAAWQAAAAADWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAAC\r
           version: 6\r
         -3,-1:\r
           ind: -3,-1\r
@@ -5915,8 +5915,7 @@ entities:
           -9,-4:\r
             0: 65535\r
           -9,-3:\r
-            0: 65531\r
-            2: 4\r
+            0: 65535\r
           -9,-2:\r
             0: 65535\r
           -8,-4:\r
@@ -6177,15 +6176,15 @@ entities:
             0: 65535\r
           6,-8:\r
             0: 7967\r
-            3: 224\r
-            4: 57344\r
+            2: 224\r
+            3: 57344\r
           6,-7:\r
             0: 7967\r
-            4: 224\r
-            5: 57344\r
+            3: 224\r
+            4: 57344\r
           6,-6:\r
             0: 65311\r
-            6: 224\r
+            5: 224\r
           6,-5:\r
             0: 65535\r
           7,-8:\r
@@ -6234,7 +6233,7 @@ entities:
             0: 65535\r
           6,-9:\r
             0: 7967\r
-            4: 57568\r
+            3: 57568\r
           7,-9:\r
             0: 13107\r
           -4,-12:\r
@@ -6825,7 +6824,7 @@ entities:
             0: 65280\r
           -16,14:\r
             0: 52862\r
-            3: 128\r
+            2: 128\r
           -16,15:\r
             0: 3976\r
           -16,13:\r
@@ -7557,21 +7556,6 @@ entities:
           - 0\r
           - 0\r
           - 0\r
-        - volume: 2500\r
-          temperature: 293.15\r
-          moles:\r
-          - 21.803423\r
-          - 82.02241\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
-          - 0\r
         - volume: 2500\r
           temperature: 293.15\r
           moles:\r
@@ -10112,6 +10096,11 @@ entities:
       type: DeviceLinkSource\r
 - proto: AirlockExternalGlassShuttleArrivals\r
   entities:\r
+  - uid: 891\r
+    components:\r
+    - pos: -52.5,4.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1299\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -10124,14 +10113,9 @@ entities:
       pos: -59.5,-7.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 3188\r
-    components:\r
-    - pos: -52.5,3.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 3189\r
+  - uid: 1755\r
     components:\r
-    - pos: -59.5,3.5\r
+    - pos: -59.5,4.5\r
       parent: 30\r
       type: Transform\r
 - proto: AirlockExternalGlassShuttleEmergencyLocked\r
@@ -13046,19 +13030,19 @@ entities:
     - pos: -59.5,-10.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1290\r
+  - uid: 886\r
     components:\r
-    - pos: -52.5,3.5\r
+    - pos: -52.5,4.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 3707\r
+  - uid: 919\r
     components:\r
-    - pos: 25.5,43.5\r
+    - pos: -59.5,4.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 3712\r
+  - uid: 3707\r
     components:\r
-    - pos: -59.5,3.5\r
+    - pos: 25.5,43.5\r
       parent: 30\r
       type: Transform\r
   - uid: 4353\r
@@ -14934,11 +14918,6 @@ entities:
     - pos: -59.5,5.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 961\r
-    components:\r
-    - pos: -59.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 988\r
     components:\r
     - pos: -39.5,-13.5\r
@@ -21849,11 +21828,6 @@ entities:
     - pos: -10.5,-55.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 9802\r
-    components:\r
-    - pos: -52.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 9821\r
     components:\r
     - pos: -3.5,-58.5\r
@@ -44468,11 +44442,6 @@ entities:
     - pos: -52.5,5.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1077\r
-    components:\r
-    - pos: -59.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 1079\r
     components:\r
     - pos: -51.5,-8.5\r
@@ -44483,11 +44452,6 @@ entities:
     - pos: -49.5,-8.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 3115\r
-    components:\r
-    - pos: -52.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 4852\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -48277,12 +48241,6 @@ entities:
       pos: 23.5,12.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 21733\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 15.5,16.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 21734\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -48321,9 +48279,10 @@ entities:
       pos: -40.5,11.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1397\r
+  - uid: 1077\r
     components:\r
-    - pos: -30.5,39.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -31.5,39.5\r
       parent: 30\r
       type: Transform\r
   - uid: 1514\r
@@ -48343,12 +48302,6 @@ entities:
     - pos: -52.5,30.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1758\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -32.5,39.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 2018\r
     components:\r
     - pos: -42.5,46.5\r
@@ -53437,11 +53390,6 @@ entities:
       pos: -53.5,30.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 1757\r
-    components:\r
-    - pos: -32.5,40.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 2017\r
     components:\r
     - pos: -42.5,49.5\r
@@ -53657,6 +53605,12 @@ entities:
       type: Transform\r
 - proto: ComputerStationRecords\r
   entities:\r
+  - uid: 1397\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -30.5,40.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1448\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -53694,6 +53648,12 @@ entities:
       pos: -42.5,10.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1290\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -30.5,39.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 2121\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -60663,6 +60623,13 @@ entities:
     - pos: -48.41462,63.788986\r
       parent: 30\r
       type: Transform\r
+  - uid: 21336\r
+    components:\r
+    - pos: -0.68636847,-9.05644\r
+      parent: 30\r
+      type: Transform\r
+    - tags: []\r
+      type: Tag\r
 - proto: DrinkMug\r
   entities:\r
   - uid: 10991\r
@@ -60706,6 +60673,15 @@ entities:
     - pos: -11.5122795,35.330956\r
       parent: 30\r
       type: Transform\r
+- proto: DrinkOatMilkCarton\r
+  entities:\r
+  - uid: 21335\r
+    components:\r
+    - pos: -0.70199347,-9.447065\r
+      parent: 30\r
+      type: Transform\r
+    - tags: []\r
+      type: Tag\r
 - proto: DrinkShaker\r
   entities:\r
   - uid: 702\r
@@ -60723,6 +60699,15 @@ entities:
     - pos: 15.511198,62.487156\r
       parent: 30\r
       type: Transform\r
+- proto: DrinkSoyMilkCarton\r
+  entities:\r
+  - uid: 21334\r
+    components:\r
+    - pos: -0.68636847,-9.259565\r
+      parent: 30\r
+      type: Transform\r
+    - tags: []\r
+      type: Tag\r
 - proto: DrinkWaterCup\r
   entities:\r
   - uid: 7678\r
@@ -89836,11 +89821,6 @@ entities:
     - pos: 5.5,24.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 871\r
-    components:\r
-    - pos: -46.5,0.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 879\r
     components:\r
     - pos: -59.5,9.5\r
@@ -90350,6 +90330,11 @@ entities:
     - pos: -29.5,44.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1751\r
+    components:\r
+    - pos: -46.5,-0.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1821\r
     components:\r
     - pos: -20.5,48.5\r
@@ -90695,6 +90680,11 @@ entities:
     - pos: -33.5,66.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 3712\r
+    components:\r
+    - pos: -46.5,3.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 4241\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -91048,11 +91038,6 @@ entities:
     - pos: -56.5,5.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5693\r
-    components:\r
-    - pos: -60.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5694\r
     components:\r
     - pos: -49.5,4.5\r
@@ -98294,6 +98279,52 @@ entities:
       pos: -30.5,7.5\r
       parent: 30\r
       type: Transform\r
+- proto: JanitorServiceLight\r
+  entities:\r
+  - uid: 844\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 2.5,-30.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 3598\r
+      type: DeviceLinkSink\r
+  - uid: 864\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 15.5,-7.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 3189\r
+      type: DeviceLinkSink\r
+  - uid: 871\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -8.5,-0.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 3188\r
+      type: DeviceLinkSink\r
+  - uid: 961\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 15.5,16.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 3115\r
+      type: DeviceLinkSink\r
+  - uid: 1753\r
+    components:\r
+    - pos: -33.5,37.5\r
+      parent: 30\r
+      type: Transform\r
+    - links:\r
+      - 5417\r
+      type: DeviceLinkSink\r
 - proto: JetpackBlueFilled\r
   entities:\r
   - uid: 8311\r
@@ -103732,11 +103763,10 @@ entities:
       type: ApcPowerReceiver\r
   - uid: 4385\r
     components:\r
-    - pos: -33.5,37.5\r
+    - rot: 3.141592653589793 rad\r
+      pos: -31.5,35.5\r
       parent: 30\r
       type: Transform\r
-    - powerLoad: 0\r
-      type: ApcPowerReceiver\r
   - uid: 4387\r
     components:\r
     - pos: -41.5,37.5\r
@@ -108667,33 +108697,6 @@ entities:
       type: Transform\r
     - tags: []\r
       type: Tag\r
-- proto: ReagentContainerMilk\r
-  entities:\r
-  - uid: 21336\r
-    components:\r
-    - pos: -0.68636847,-9.05644\r
-      parent: 30\r
-      type: Transform\r
-    - tags: []\r
-      type: Tag\r
-- proto: ReagentContainerMilkOat\r
-  entities:\r
-  - uid: 21335\r
-    components:\r
-    - pos: -0.70199347,-9.447065\r
-      parent: 30\r
-      type: Transform\r
-    - tags: []\r
-      type: Tag\r
-- proto: ReagentContainerMilkSoy\r
-  entities:\r
-  - uid: 21334\r
-    components:\r
-    - pos: -0.68636847,-9.259565\r
-      parent: 30\r
-      type: Transform\r
-    - tags: []\r
-      type: Tag\r
 - proto: Recycler\r
   entities:\r
   - uid: 14530\r
@@ -108987,11 +108990,6 @@ entities:
     - pos: -46.5,-1.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 864\r
-    components:\r
-    - pos: -46.5,0.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 872\r
     components:\r
     - pos: -54.5,5.5\r
@@ -109032,6 +109030,11 @@ entities:
     - pos: -46.5,-2.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 920\r
+    components:\r
+    - pos: -46.5,3.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 930\r
     components:\r
     - pos: -46.5,-4.5\r
@@ -109487,6 +109490,11 @@ entities:
     - pos: -29.5,44.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1758\r
+    components:\r
+    - pos: -46.5,-0.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1772\r
     components:\r
     - pos: 3.5,38.5\r
@@ -109918,11 +109926,6 @@ entities:
     - pos: 0.5,38.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 5417\r
-    components:\r
-    - pos: -60.5,4.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5423\r
     components:\r
     - pos: 12.5,29.5\r
@@ -113696,6 +113699,18 @@ entities:
     - pos: -39.5,9.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 3598\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: 1.5707963267948966 rad\r
+      pos: -0.5,-38.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        844:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 8570\r
     components:\r
     - pos: 13.5,-38.5\r
@@ -113925,6 +113940,8 @@ entities:
       type: DeviceLinkSource\r
   - uid: 20399\r
     components:\r
+    - name: Shutters\r
+      type: MetaData\r
     - pos: 16.5,13.5\r
       parent: 30\r
       type: Transform\r
@@ -113970,6 +113987,17 @@ entities:
       type: DeviceLinkSource\r
 - proto: SignalButtonDirectional\r
   entities:\r
+  - uid: 3115\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - pos: 12.5,13.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        961:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 3180\r
     components:\r
     - pos: -37.5,45.5\r
@@ -113995,6 +114023,42 @@ entities:
         3181:\r
         - Pressed: Toggle\r
       type: DeviceLinkSource\r
+  - uid: 3188\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: 3.141592653589793 rad\r
+      pos: -14.5,-11.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        871:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 3189\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 22.5,-5.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        864:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
+  - uid: 5417\r
+    components:\r
+    - name: Janitorial Service Light\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -29.5,40.5\r
+      parent: 30\r
+      type: Transform\r
+    - linkedPorts:\r
+        1753:\r
+        - Pressed: Toggle\r
+      type: DeviceLinkSource\r
   - uid: 7673\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -117640,9 +117704,9 @@ entities:
       type: Transform\r
 - proto: SpawnVehicleSecway\r
   entities:\r
-  - uid: 20465\r
+  - uid: 1757\r
     components:\r
-    - pos: -30.5,40.5\r
+    - pos: -34.5,54.5\r
       parent: 30\r
       type: Transform\r
   - uid: 20466\r
@@ -124077,11 +124141,6 @@ entities:
     - pos: -47.5,-7.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 844\r
-    components:\r
-    - pos: -46.5,3.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 846\r
     components:\r
     - pos: -53.5,11.5\r
@@ -124177,16 +124236,6 @@ entities:
     - pos: -65.5,24.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 886\r
-    components:\r
-    - pos: -51.5,3.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 891\r
-    components:\r
-    - pos: -60.5,3.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 900\r
     components:\r
     - pos: -65.5,12.5\r
@@ -124197,16 +124246,6 @@ entities:
     - pos: -46.5,-3.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 919\r
-    components:\r
-    - pos: -58.5,3.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 920\r
-    components:\r
-    - pos: -53.5,3.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 926\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -124773,6 +124812,16 @@ entities:
     - pos: -29.5,45.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 1752\r
+    components:\r
+    - pos: -60.5,4.5\r
+      parent: 30\r
+      type: Transform\r
+  - uid: 1754\r
+    components:\r
+    - pos: -46.5,0.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 1775\r
     components:\r
     - pos: -30.5,45.5\r
@@ -125538,11 +125587,6 @@ entities:
     - pos: -58.5,5.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 3598\r
-    components:\r
-    - pos: -46.5,-0.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 3620\r
     components:\r
     - pos: -53.5,4.5\r
@@ -139514,33 +139558,6 @@ entities:
       type: Transform\r
 - proto: WindoorSecure\r
   entities:\r
-  - uid: 1751\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -33.5,39.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1752\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -33.5,40.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1753\r
-    components:\r
-    - pos: -32.5,38.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1754\r
-    components:\r
-    - pos: -31.5,38.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 1755\r
-    components:\r
-    - pos: -30.5,38.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 15983\r
     components:\r
     - rot: 3.141592653589793 rad\r