From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Mon, 15 Jan 2024 07:42:51 +0000 (-0700)
Subject: cluster update (#24108)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=686a0ba8f53c05beb71623e933d38d2d18528939;p=space-station-14.git

cluster update (#24108)
---

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