marathon update (#24111)

* marathon update

* light

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index b2c199df9a31f15bd88abe552f6ed9ef6cae2f07..df89029dd1a39b439db5a04107b39bf24b0b8b62 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -187,7 +187,7 @@ entities:
           version: 6\r
         2,2:\r
           ind: 2,2\r
-          tiles: eQAAAAAATQAAAAAAeQAAAAAAHQAAAAACJAAAAAAAJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAABJAAAAAACHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAAAJAAAAAADHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAACJAAAAAACJAAAAAAAeQAAAAAAWQAAAAADHQAAAAAAeQAAAAAAYwAAAAABYwAAAAADeQAAAAAAJAAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAABJAAAAAAAHQAAAAACHQAAAAADWQAAAAADeQAAAAAAWQAAAAACWQAAAAABWQAAAAACJAAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAADHQAAAAACHQAAAAAAHQAAAAABJAAAAAADeQAAAAAAWQAAAAADHQAAAAABeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADWQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAABdgAAAAAAdgAAAAADdgAAAAADeQAAAAAAWQAAAAABHQAAAAACeQAAAAAAWQAAAAACWQAAAAABHQAAAAADHQAAAAACdgAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAACdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAWQAAAAADeQAAAAAAYwAAAAADYwAAAAADeQAAAAAAHQAAAAAAdgAAAAABdgAAAAABdgAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAADdgAAAAADeQAAAAAAWQAAAAABHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAABdgAAAAABdgAAAAABdgAAAAADdgAAAAABdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAADdgAAAAACdgAAAAAAdgAAAAACdgAAAAACdgAAAAACdgAAAAADHQAAAAABWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAACeQAAAAAAdgAAAAAAdgAAAAABdgAAAAABeQAAAAAAdgAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAABeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAeQAAAAAAdgAAAAABeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA\r
+          tiles: eQAAAAAATQAAAAAAeQAAAAAAHQAAAAACJAAAAAAAJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAABJAAAAAACHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAAAJAAAAAADHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAACJAAAAAACJAAAAAAAeQAAAAAAWQAAAAADHQAAAAAAeQAAAAAAYwAAAAABYwAAAAADeQAAAAAAJAAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAABJAAAAAAAHQAAAAACHQAAAAADWQAAAAADeQAAAAAAWQAAAAACWQAAAAABWQAAAAACJAAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAADHQAAAAACHQAAAAAAHQAAAAABJAAAAAADeQAAAAAAWQAAAAADHQAAAAABeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADWQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAABdgAAAAAAdgAAAAADdgAAAAADeQAAAAAAWQAAAAABHQAAAAACeQAAAAAAWQAAAAACWQAAAAABHQAAAAADHQAAAAACdgAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAACdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAWQAAAAADeQAAAAAAYwAAAAADYwAAAAADeQAAAAAAHQAAAAAAdgAAAAABdgAAAAABdgAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAADdgAAAAADeQAAAAAAWQAAAAABHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAABdgAAAAABdgAAAAABdgAAAAADdgAAAAABdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAADdgAAAAACdgAAAAAAdgAAAAACdgAAAAACdgAAAAACdgAAAAADHQAAAAABWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAACeQAAAAAAdgAAAAAAdgAAAAABdgAAAAABeQAAAAAAdgAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAABeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAeQAAAAAAdgAAAAABeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA\r
           version: 6\r
         2,1:\r
           ind: 2,1\r
@@ -11325,13 +11325,6 @@ entities:
     - type: Transform\r
       pos: 19.5,51.5\r
       parent: 30\r
-  - uid: 13665\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      pos: 32.5,42.5\r
-      parent: 30\r
   - uid: 13667\r
     components:\r
     - type: MetaData\r
@@ -14395,16 +14388,6 @@ entities:
       parent: 30\r
 - proto: Bed\r
   entities:\r
-  - uid: 1334\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,42.5\r
-      parent: 30\r
-  - uid: 1371\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,41.5\r
-      parent: 30\r
   - uid: 1765\r
     components:\r
     - type: Transform\r
@@ -14695,16 +14678,6 @@ entities:
       parent: 30\r
 - proto: BedsheetSpawner\r
   entities:\r
-  - uid: 1723\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,42.5\r
-      parent: 30\r
-  - uid: 5482\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,41.5\r
-      parent: 30\r
   - uid: 6438\r
     components:\r
     - type: Transform\r
@@ -16046,11 +16019,26 @@ entities:
     - type: Transform\r
       pos: -43.5,-0.5\r
       parent: 30\r
+  - uid: 1334\r
+    components:\r
+    - type: Transform\r
+      pos: 30.5,39.5\r
+      parent: 30\r
+  - uid: 1371\r
+    components:\r
+    - type: Transform\r
+      pos: 30.5,41.5\r
+      parent: 30\r
   - uid: 1393\r
     components:\r
     - type: Transform\r
       pos: 32.5,43.5\r
       parent: 30\r
+  - uid: 1723\r
+    components:\r
+    - type: Transform\r
+      pos: 30.5,40.5\r
+      parent: 30\r
   - uid: 1878\r
     components:\r
     - type: Transform\r
@@ -28021,31 +28009,6 @@ entities:
     - type: Transform\r
       pos: 33.5,43.5\r
       parent: 30\r
-  - uid: 14842\r
-    components:\r
-    - type: Transform\r
-      pos: 33.5,42.5\r
-      parent: 30\r
-  - uid: 14843\r
-    components:\r
-    - type: Transform\r
-      pos: 32.5,42.5\r
-      parent: 30\r
-  - uid: 14844\r
-    components:\r
-    - type: Transform\r
-      pos: 31.5,42.5\r
-      parent: 30\r
-  - uid: 14845\r
-    components:\r
-    - type: Transform\r
-      pos: 31.5,42.5\r
-      parent: 30\r
-  - uid: 14846\r
-    components:\r
-    - type: Transform\r
-      pos: 30.5,42.5\r
-      parent: 30\r
   - uid: 14849\r
     components:\r
     - type: Transform\r
@@ -55435,10 +55398,6 @@ entities:
     - type: Transform\r
       pos: -43.5,19.5\r
       parent: 30\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -55457,15 +55416,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 9578\r
     components:\r
     - type: Transform\r
       pos: -22.5,-44.5\r
       parent: 30\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -55484,15 +55443,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 16813\r
     components:\r
     - type: Transform\r
       pos: -54.5,41.5\r
       parent: 30\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -55511,15 +55470,15 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 20467\r
     components:\r
     - type: Transform\r
       pos: 3.5,-44.5\r
       parent: 30\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -55538,6 +55497,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
   - uid: 22442\r
     components:\r
     - type: Transform\r
@@ -55575,10 +55538,6 @@ entities:
     - type: Transform\r
       pos: -31.5,-38.5\r
       parent: 30\r
-    - type: Construction\r
-      containers:\r
-      - EntityStorageComponent\r
-      - entity_storage\r
     - type: EntityStorage\r
       air:\r
         volume: 200\r
@@ -55597,6 +55556,10 @@ entities:
         - 0\r
         - 0\r
         - 0\r
+    - type: Construction\r
+      containers:\r
+      - EntityStorageComponent\r
+      - entity_storage\r
 - proto: CrateEngineeringCableMV\r
   entities:\r
   - uid: 10220\r
@@ -56073,6 +56036,34 @@ entities:
     - type: Transform\r
       pos: -5.497734,64.51515\r
       parent: 30\r
+- proto: CryogenicSleepUnit\r
+  entities:\r
+  - uid: 1771\r
+    components:\r
+    - type: Transform\r
+      pos: 31.5,41.5\r
+      parent: 30\r
+  - uid: 5490\r
+    components:\r
+    - type: Transform\r
+      pos: 31.5,42.5\r
+      parent: 30\r
+- proto: CryogenicSleepUnitSpawner\r
+  entities:\r
+  - uid: 13665\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: 29.5,42.5\r
+      parent: 30\r
+- proto: CryogenicSleepUnitSpawnerLateJoin\r
+  entities:\r
+  - uid: 9041\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: 29.5,41.5\r
+      parent: 30\r
 - proto: CryoPod\r
   entities:\r
   - uid: 784\r
@@ -90202,8 +90193,6 @@ entities:
     - type: Transform\r
       pos: 30.5,42.5\r
       parent: 30\r
-    - type: AtmosDevice\r
-      joinedGrid: 30\r
     - type: AtmosPipeColor\r
       color: '#0335FCFF'\r
   - uid: 15441\r
@@ -91968,8 +91957,6 @@ entities:
     - type: Transform\r
       pos: 29.5,42.5\r
       parent: 30\r
-    - type: AtmosDevice\r
-      joinedGrid: 30\r
     - type: AtmosPipeColor\r
       color: '#FF1212FF'\r
   - uid: 13799\r
@@ -99053,21 +99040,11 @@ entities:
       parent: 30\r
 - proto: HospitalCurtainsOpen\r
   entities:\r
-  - uid: 1771\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,42.5\r
-      parent: 30\r
   - uid: 5030\r
     components:\r
     - type: Transform\r
       pos: -28.5,39.5\r
       parent: 30\r
-  - uid: 5490\r
-    components:\r
-    - type: Transform\r
-      pos: 29.5,41.5\r
-      parent: 30\r
   - uid: 7740\r
     components:\r
     - type: Transform\r
@@ -109523,6 +109500,13 @@ entities:
       parent: 30\r
     - type: ApcPowerReceiver\r
       powerLoad: 0\r
+  - uid: 14842\r
+    components:\r
+    - type: MetaData\r
+      flags: PvsPriority\r
+    - type: Transform\r
+      pos: 30.5,42.5\r
+      parent: 30\r
   - uid: 14948\r
     components:\r
     - type: MetaData\r
@@ -143499,6 +143483,13 @@ entities:
     - type: Transform\r
       pos: 7.5,31.5\r
       parent: 30\r
+  - uid: 5482\r
+    components:\r
+    - type: MetaData\r
+      flags: PvsPriority\r
+    - type: Transform\r
+      pos: 32.5,42.5\r
+      parent: 30\r
   - uid: 5500\r
     components:\r
     - type: MetaData\r