cluster update (#24108)

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index 92882f4feb2f1b4280793b6e92095170917530e3..adcdac92732cb69e7fbb7ad28bf937ea6a1cf210 100644 (file)
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -108,7 +108,7 @@ entities:
           version: 6\r
         -1,-2:\r
           ind: -1,-2\r
-          tiles: AAAAAAAAeQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAIgAAAAACHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAADeQAAAAAAdgAAAAACdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAdgAAAAABdgAAAAACdgAAAAACeQAAAAAAdgAAAAADdgAAAAABdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAABYAAAAAAAWQAAAAABWQAAAAADUAAAAAAAeQAAAAAAWQAAAAACWQAAAAADYAAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAAAYAAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXgAAAAABXgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAXgAAAAADXgAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXgAAAAADXgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAA\r
+          tiles: AAAAAAAAeQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAIgAAAAACHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAADeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAdgAAAAABdgAAAAACdgAAAAACeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAUAAAAAAAUAAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAABYAAAAAAAWQAAAAABWQAAAAADUAAAAAAAeQAAAAAAWQAAAAACWQAAAAADYAAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAAAYAAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXgAAAAABXgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAXgAAAAADXgAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXgAAAAADXgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAA\r
           version: 6\r
         -2,-2:\r
           ind: -2,-2\r
@@ -3013,6 +3013,8 @@ entities:
             1228: -40,22\r
             1229: -40,23\r
             1266: -6,52\r
+            1480: -4,-30\r
+            1481: -4,-29\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnLineN\r
@@ -3069,6 +3071,8 @@ entities:
             1264: -8,52\r
             1404: -12,-53\r
             1405: -12,-54\r
+            1478: -2,-30\r
+            1479: -2,-29\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WarnLineW\r
@@ -3131,7 +3135,6 @@ entities:
             252: -4,8\r
             253: 3,12\r
             1239: -8,-27\r
-            1240: -4,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinInnerSw\r
@@ -3140,7 +3143,6 @@ entities:
             249: -1,12\r
             250: 3,12\r
             1237: -6,-27\r
-            1238: -2,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineE\r
@@ -3187,7 +3189,6 @@ entities:
             228: 1,12\r
             229: 2,12\r
             1235: -7,-27\r
-            1236: -3,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineW\r
@@ -5524,14 +5525,6 @@ entities:
       rot: 3.141592653589793 rad\r
       pos: -6.5,-27.5\r
       parent: 1\r
-  - uid: 3577\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -2.5,-27.5\r
-      parent: 1\r
   - uid: 3600\r
     components:\r
     - type: MetaData\r
@@ -6436,6 +6429,11 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: 6.5,9.5\r
       parent: 1\r
+  - uid: 7713\r
+    components:\r
+    - type: Transform\r
+      pos: -2.5,-27.5\r
+      parent: 1\r
 - proto: AirlockHeadOfPersonnelLocked\r
   entities:\r
   - uid: 3287\r
@@ -8036,11 +8034,6 @@ entities:
     - type: Transform\r
       pos: -5.5,-29.5\r
       parent: 1\r
-  - uid: 7715\r
-    components:\r
-    - type: Transform\r
-      pos: -1.5,-29.5\r
-      parent: 1\r
   - uid: 8261\r
     components:\r
     - type: Transform\r
@@ -8223,11 +8216,6 @@ entities:
     - type: Transform\r
       pos: -5.5,-29.5\r
       parent: 1\r
-  - uid: 7717\r
-    components:\r
-    - type: Transform\r
-      pos: -1.5,-29.5\r
-      parent: 1\r
   - uid: 9018\r
     components:\r
     - type: Transform\r
@@ -8566,6 +8554,11 @@ entities:
     - type: Transform\r
       pos: -4.5,-11.5\r
       parent: 1\r
+  - uid: 7717\r
+    components:\r
+    - type: Transform\r
+      pos: -19.5,-27.5\r
+      parent: 1\r
 - proto: BoxBeaker\r
   entities:\r
   - uid: 6050\r
@@ -26522,6 +26515,13 @@ entities:
     - type: Transform\r
       pos: -40.481712,-24.251455\r
       parent: 1\r
+- proto: ChairGreyscale\r
+  entities:\r
+  - uid: 8007\r
+    components:\r
+    - type: Transform\r
+      pos: -25.5,7.5\r
+      parent: 1\r
 - proto: ChairOfficeDark\r
   entities:\r
   - uid: 778\r
@@ -28044,7 +28044,7 @@ entities:
   - uid: 7807\r
     components:\r
     - type: Transform\r
-      pos: -3.4980807,-28.439547\r
+      pos: -7.419932,-28.49488\r
       parent: 1\r
 - proto: ClothingOuterCoatInspector\r
   entities:\r
@@ -28362,12 +28362,6 @@ entities:
       rot: 3.141592653589793 rad\r
       pos: -7.5,-29.5\r
       parent: 1\r
-  - uid: 8232\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -3.5,-29.5\r
-      parent: 1\r
 - proto: ComputerAnalysisConsole\r
   entities:\r
   - uid: 6123\r
@@ -29138,6 +29132,34 @@ entities:
     - type: Transform\r
       pos: -21.430874,-29.30484\r
       parent: 1\r
+- proto: CryogenicSleepUnit\r
+  entities:\r
+  - uid: 4134\r
+    components:\r
+    - type: Transform\r
+      pos: -1.5,-28.5\r
+      parent: 1\r
+  - uid: 6403\r
+    components:\r
+    - type: Transform\r
+      pos: -1.5,-29.5\r
+      parent: 1\r
+- proto: CryogenicSleepUnitSpawner\r
+  entities:\r
+  - uid: 1646\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: -3.5,-28.5\r
+      parent: 1\r
+- proto: CryogenicSleepUnitSpawnerLateJoin\r
+  entities:\r
+  - uid: 3577\r
+    components:\r
+    - type: Transform\r
+      rot: 3.141592653589793 rad\r
+      pos: -3.5,-29.5\r
+      parent: 1\r
 - proto: CryoPodMachineCircuitboard\r
   entities:\r
   - uid: 12611\r
@@ -53094,6 +53116,11 @@ entities:
     - type: Transform\r
       pos: -5.5,-23.5\r
       parent: 1\r
+  - uid: 1645\r
+    components:\r
+    - type: Transform\r
+      pos: -1.5,-27.5\r
+      parent: 1\r
   - uid: 1686\r
     components:\r
     - type: Transform\r
@@ -54358,6 +54385,11 @@ entities:
       rot: -1.5707963267948966 rad\r
       pos: -42.5,-1.5\r
       parent: 1\r
+  - uid: 7719\r
+    components:\r
+    - type: Transform\r
+      pos: -3.5,-27.5\r
+      parent: 1\r
   - uid: 8258\r
     components:\r
     - type: Transform\r
@@ -56261,11 +56293,6 @@ entities:
     - type: Transform\r
       pos: -5.5,-29.5\r
       parent: 1\r
-  - uid: 7719\r
-    components:\r
-    - type: Transform\r
-      pos: -1.5,-29.5\r
-      parent: 1\r
   - uid: 9638\r
     components:\r
     - type: Transform\r
@@ -59585,13 +59612,6 @@ entities:
     - type: Transform\r
       pos: 20.648407,-20.490913\r
       parent: 1\r
-- proto: PinpointerNuclear\r
-  entities:\r
-  - uid: 4134\r
-    components:\r
-    - type: Transform\r
-      pos: -2.6820543,23.560793\r
-      parent: 1\r
 - proto: PlasmaCanister\r
   entities:\r
   - uid: 6320\r
@@ -59841,6 +59861,13 @@ entities:
     - type: Transform\r
       pos: -19.5,12.5\r
       parent: 1\r
+- proto: PosterLegitHelpOthers\r
+  entities:\r
+  - uid: 7715\r
+    components:\r
+    - type: Transform\r
+      pos: -2.5,-30.5\r
+      parent: 1\r
 - proto: PosterLegitIan\r
   entities:\r
   - uid: 11961\r
@@ -61653,16 +61680,6 @@ entities:
       parent: 1\r
     - type: ApcPowerReceiver\r
       powerLoad: 0\r
-  - uid: 8007\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -3.5,-26.5\r
-      parent: 1\r
-    - type: ApcPowerReceiver\r
-      powerLoad: 0\r
   - uid: 8008\r
     components:\r
     - type: MetaData\r
@@ -62231,15 +62248,15 @@ entities:
     - type: Transform\r
       pos: 20.5,-20.5\r
       parent: 1\r
-  - uid: 7713\r
+  - uid: 7806\r
     components:\r
     - type: Transform\r
-      pos: -1.5,-28.5\r
+      pos: -5.5,-28.5\r
       parent: 1\r
-  - uid: 7806\r
+  - uid: 8232\r
     components:\r
     - type: Transform\r
-      pos: -5.5,-28.5\r
+      pos: -26.5,7.5\r
       parent: 1\r
   - uid: 8240\r
     components:\r
@@ -63043,11 +63060,6 @@ entities:
       parent: 1\r
 - proto: RandomSoap\r
   entities:\r
-  - uid: 12498\r
-    components:\r
-    - type: Transform\r
-      pos: -19.5,-27.5\r
-      parent: 1\r
   - uid: 12499\r
     components:\r
     - type: Transform\r
@@ -66127,6 +66139,16 @@ entities:
     - type: Transform\r
       pos: 22.5,-24.5\r
       parent: 1\r
+  - uid: 7711\r
+    components:\r
+    - type: Transform\r
+      pos: -1.5,-27.5\r
+      parent: 1\r
+  - uid: 7809\r
+    components:\r
+    - type: Transform\r
+      pos: -3.5,-27.5\r
+      parent: 1\r
   - uid: 8319\r
     components:\r
     - type: Transform\r
@@ -71631,12 +71653,6 @@ entities:
       rot: 1.5707963267948966 rad\r
       pos: -7.5,-28.5\r
       parent: 1\r
-  - uid: 7711\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -3.5,-28.5\r
-      parent: 1\r
   - uid: 8288\r
     components:\r
     - type: Transform\r
@@ -71979,12 +71995,6 @@ entities:
       parent: 1\r
 - proto: ToiletEmpty\r
   entities:\r
-  - uid: 6403\r
-    components:\r
-    - type: Transform\r
-      rot: 3.141592653589793 rad\r
-      pos: -19.5,-27.5\r
-      parent: 1\r
   - uid: 6404\r
     components:\r
     - type: Transform\r
@@ -72136,13 +72146,6 @@ entities:
     - type: Transform\r
       pos: -1.0943661,19.21257\r
       parent: 1\r
-- proto: ToySpawner\r
-  entities:\r
-  - uid: 7809\r
-    components:\r
-    - type: Transform\r
-      pos: -1.5,-28.5\r
-      parent: 1\r
 - proto: TrashBananaPeel\r
   entities:\r
   - uid: 7799\r
@@ -82565,20 +82568,6 @@ entities:
     - type: Transform\r
       pos: -4.5,-29.5\r
       parent: 1\r
-  - uid: 1645\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      pos: -3.5,-27.5\r
-      parent: 1\r
-  - uid: 1646\r
-    components:\r
-    - type: MetaData\r
-      flags: PvsPriority\r
-    - type: Transform\r
-      pos: -1.5,-27.5\r
-      parent: 1\r
   - uid: 1647\r
     components:\r
     - type: MetaData\r
@@ -84778,25 +84767,6 @@ entities:
       parent: 1\r
     - type: WarpPoint\r
       location: arrivals\r
-  - uid: 12056\r
-    components:\r
-    - type: Transform\r
-      rot: 1.5707963267948966 rad\r
-      pos: 15.5,-25.5\r
-      parent: 1\r
-    - type: WarpPoint\r
-      location: cargo\r
-    - type: NavMapBeacon\r
-      color: '#A46106FF'\r
-      text: Cargo\r
-  - uid: 12057\r
-    components:\r
-    - type: Transform\r
-      rot: 1.5707963267948966 rad\r
-      pos: -8.5,-25.5\r
-      parent: 1\r
-    - type: WarpPoint\r
-      location: dorms\r
   - uid: 12058\r
     components:\r
     - type: Transform\r