From ddfc4f8b9ef90d26b4cba5badccc9dad24554af9 Mon Sep 17 00:00:00 2001
From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com>
Date: Fri, 5 May 2023 22:10:37 -0700
Subject: [PATCH] Cluster 2.5.8 (#16132)

---
 Resources/Maps/cluster.yml | 467 ++++++++++++++++++++++++++++---------
 1 file changed, 360 insertions(+), 107 deletions(-)

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index c8907badb5..0da9611563 100644
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -7651,11 +7651,6 @@ entities:
       pos: 10.5,-2.5
       parent: 1
       type: Transform
-  - uid: 8329
-    components:
-    - pos: -32.5,-14.5
-      parent: 1
-      type: Transform
   - uid: 8330
     components:
     - rot: -1.5707963267948966 rad
@@ -7686,6 +7681,11 @@ entities:
       pos: -30.5,24.5
       parent: 1
       type: Transform
+  - uid: 12568
+    components:
+    - pos: -33.5,-14.5
+      parent: 1
+      type: Transform
 - proto: APCElectronics
   entities:
   - uid: 9513
@@ -8165,13 +8165,6 @@ entities:
     - pos: -13.5,-30.5
       parent: 1
       type: Transform
-- proto: BedsheetBrigmedic
-  entities:
-  - uid: 5346
-    components:
-    - pos: 23.5,6.5
-      parent: 1
-      type: Transform
 - proto: BedsheetCaptain
   entities:
   - uid: 4099
@@ -9003,18 +8996,18 @@ entities:
     - pos: 12.611424,-0.37101722
       parent: 1
       type: Transform
-- proto: BoxMagazineMagnumSubMachineGun
+- proto: BoxMagazinePistol
   entities:
-  - uid: 5421
+  - uid: 5423
     components:
-    - pos: 36.5625,13.600595
+    - pos: 37.484375,13.569345
       parent: 1
       type: Transform
-- proto: BoxMagazinePistol
+- proto: BoxMagazinePistolSubMachineGun
   entities:
-  - uid: 5423
+  - uid: 5421
     components:
-    - pos: 37.484375,13.569345
+    - pos: 36.5625,13.600595
       parent: 1
       type: Transform
 - proto: BoxMouthSwab
@@ -10688,6 +10681,13 @@ entities:
     - pos: 33.5,23.5
       parent: 1
       type: Transform
+  - uid: 5323
+    components:
+    - pos: -33.5,-15.5
+      parent: 1
+      type: Transform
+    - enabled: True
+      type: AmbientSound
   - uid: 5744
     components:
     - pos: -24.5,12.5
@@ -15460,18 +15460,6 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
-  - uid: 8372
-    components:
-    - pos: -32.5,-14.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-  - uid: 8373
-    components:
-    - pos: -32.5,-15.5
-      parent: 1
-      type: Transform
   - uid: 8374
     components:
     - pos: -32.5,-16.5
@@ -16356,6 +16344,13 @@ entities:
     - pos: -25.5,2.5
       parent: 1
       type: Transform
+  - uid: 12564
+    components:
+    - pos: -33.5,-14.5
+      parent: 1
+      type: Transform
+    - enabled: True
+      type: AmbientSound
 - proto: CableApcStack
   entities:
   - uid: 3981
@@ -23820,18 +23815,6 @@ entities:
     - pos: -32.5,-16.5
       parent: 1
       type: Transform
-  - uid: 8343
-    components:
-    - pos: -32.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 8344
-    components:
-    - pos: -32.5,-14.5
-      parent: 1
-      type: Transform
-    - enabled: True
-      type: AmbientSound
   - uid: 8345
     components:
     - pos: -31.5,-20.5
@@ -24171,6 +24154,25 @@ entities:
     - pos: 45.5,28.5
       parent: 1
       type: Transform
+  - uid: 12565
+    components:
+    - pos: -33.5,-16.5
+      parent: 1
+      type: Transform
+  - uid: 12566
+    components:
+    - pos: -33.5,-15.5
+      parent: 1
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+  - uid: 12567
+    components:
+    - pos: -33.5,-14.5
+      parent: 1
+      type: Transform
+    - enabled: True
+      type: AmbientSound
 - proto: CableMVStack
   entities:
   - uid: 3982
@@ -31305,9 +31307,9 @@ entities:
     - pos: -3.5,30.5
       parent: 1
       type: Transform
-- proto: CrateSecurityArmor
+- proto: CrateSecurityRiot
   entities:
-  - uid: 5323
+  - uid: 8344
     components:
     - pos: 23.5,14.5
       parent: 1
@@ -31427,19 +31429,46 @@ entities:
       type: Transform
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 12551
+  - uid: 328
     components:
-    - pos: -17.5,16.5
+    - rot: 1.5707963267948966 rad
+      pos: -17.5,16.5
       parent: 1
       type: Transform
-  - uid: 12552
+  - uid: 8372
     components:
-    - pos: -12.5,17.5
+    - rot: 3.141592653589793 rad
+      pos: -12.5,17.5
       parent: 1
       type: Transform
-  - uid: 12553
+  - uid: 8373
     components:
-    - pos: -22.5,5.5
+    - rot: -1.5707963267948966 rad
+      pos: -22.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 9831
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 6.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 12543
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -38.5,8.5
+      parent: 1
+      type: Transform
+  - uid: 12551
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+      type: Transform
+  - uid: 12552
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -9.5,-27.5
       parent: 1
       type: Transform
   - uid: 12554
@@ -31449,7 +31478,8 @@ entities:
       type: Transform
   - uid: 12555
     components:
-    - pos: 6.5,4.5
+    - rot: -1.5707963267948966 rad
+      pos: 24.5,6.5
       parent: 1
       type: Transform
   - uid: 12556
@@ -31469,27 +31499,20 @@ entities:
       type: Transform
   - uid: 12559
     components:
-    - pos: -38.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 12560
-    components:
-    - pos: -0.5,-17.5
+    - rot: -1.5707963267948966 rad
+      pos: 47.5,23.5
       parent: 1
       type: Transform
   - uid: 12561
     components:
-    - pos: -9.5,-27.5
-      parent: 1
-      type: Transform
-  - uid: 12562
-    components:
-    - pos: -0.5,25.5
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,25.5
       parent: 1
       type: Transform
-  - uid: 12564
+  - uid: 12607
     components:
-    - pos: 24.5,6.5
+    - rot: -1.5707963267948966 rad
+      pos: -21.5,23.5
       parent: 1
       type: Transform
 - proto: DeployableBarrier
@@ -31899,6 +31922,53 @@ entities:
       pos: -5.5,15.5
       parent: 1
       type: Transform
+  - uid: 12599
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -30.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 12600
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -33.5,-13.5
+      parent: 1
+      type: Transform
+  - uid: 12601
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -30.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12602
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -37.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12603
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -32.5,-17.5
+      parent: 1
+      type: Transform
+  - uid: 12604
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -37.5,-13.5
+      parent: 1
+      type: Transform
+  - uid: 12605
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -33.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 12606
+    components:
+    - pos: -30.5,-17.5
+      parent: 1
+      type: Transform
 - proto: DisposalJunction
   entities:
   - uid: 4042
@@ -31982,6 +32052,12 @@ entities:
       pos: 13.5,-7.5
       parent: 1
       type: Transform
+  - uid: 12560
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -30.5,2.5
+      parent: 1
+      type: Transform
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 6173
@@ -32044,6 +32120,12 @@ entities:
       type: Transform
 - proto: DisposalPipe
   entities:
+  - uid: 2203
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -30.5,-18.5
+      parent: 1
+      type: Transform
   - uid: 2252
     components:
     - rot: 1.5707963267948966 rad
@@ -32387,6 +32469,11 @@ entities:
     - pos: 4.5,16.5
       parent: 1
       type: Transform
+  - uid: 5346
+    components:
+    - pos: -32.5,-16.5
+      parent: 1
+      type: Transform
   - uid: 6132
     components:
     - pos: -16.5,17.5
@@ -32793,6 +32880,12 @@ entities:
       pos: 9.5,-7.5
       parent: 1
       type: Transform
+  - uid: 8329
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -31.5,-17.5
+      parent: 1
+      type: Transform
   - uid: 9809
     components:
     - rot: 3.141592653589793 rad
@@ -32925,12 +33018,6 @@ entities:
       pos: -31.5,2.5
       parent: 1
       type: Transform
-  - uid: 9831
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -30.5,2.5
-      parent: 1
-      type: Transform
   - uid: 9832
     components:
     - rot: 1.5707963267948966 rad
@@ -34182,6 +34269,177 @@ entities:
       pos: -18.5,-32.5
       parent: 1
       type: Transform
+  - uid: 12569
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -31.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12570
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -32.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12571
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -33.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12572
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -34.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12573
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -35.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12574
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -36.5,-19.5
+      parent: 1
+      type: Transform
+  - uid: 12575
+    components:
+    - pos: -37.5,-18.5
+      parent: 1
+      type: Transform
+  - uid: 12576
+    components:
+    - pos: -37.5,-17.5
+      parent: 1
+      type: Transform
+  - uid: 12577
+    components:
+    - pos: -37.5,-16.5
+      parent: 1
+      type: Transform
+  - uid: 12578
+    components:
+    - pos: -37.5,-15.5
+      parent: 1
+      type: Transform
+  - uid: 12579
+    components:
+    - pos: -37.5,-14.5
+      parent: 1
+      type: Transform
+  - uid: 12580
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -36.5,-13.5
+      parent: 1
+      type: Transform
+  - uid: 12581
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -35.5,-13.5
+      parent: 1
+      type: Transform
+  - uid: 12582
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -34.5,-13.5
+      parent: 1
+      type: Transform
+  - uid: 12583
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-12.5
+      parent: 1
+      type: Transform
+  - uid: 12584
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-11.5
+      parent: 1
+      type: Transform
+  - uid: 12585
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-10.5
+      parent: 1
+      type: Transform
+  - uid: 12586
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-9.5
+      parent: 1
+      type: Transform
+  - uid: 12587
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-8.5
+      parent: 1
+      type: Transform
+  - uid: 12588
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-7.5
+      parent: 1
+      type: Transform
+  - uid: 12589
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 12590
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-5.5
+      parent: 1
+      type: Transform
+  - uid: 12591
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 12592
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -33.5,-3.5
+      parent: 1
+      type: Transform
+  - uid: 12593
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -32.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 12594
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -31.5,-2.5
+      parent: 1
+      type: Transform
+  - uid: 12595
+    components:
+    - pos: -30.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 12596
+    components:
+    - pos: -30.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 12597
+    components:
+    - pos: -30.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 12598
+    components:
+    - pos: -30.5,1.5
+      parent: 1
+      type: Transform
 - proto: DisposalTrunk
   entities:
   - uid: 2953
@@ -34353,6 +34611,11 @@ entities:
     - pos: 13.5,-4.5
       parent: 1
       type: Transform
+  - uid: 12562
+    components:
+    - pos: -32.5,-15.5
+      parent: 1
+      type: Transform
 - proto: DisposalUnit
   entities:
   - uid: 1007
@@ -34505,6 +34768,11 @@ entities:
     - pos: 21.5,-3.5
       parent: 1
       type: Transform
+  - uid: 8343
+    components:
+    - pos: -32.5,-15.5
+      parent: 1
+      type: Transform
 - proto: DisposalYJunction
   entities:
   - uid: 9808
@@ -62330,13 +62598,6 @@ entities:
     - pos: -0.5,-1.5
       parent: 1
       type: Transform
-- proto: LockerBrigmedicFilled
-  entities:
-  - uid: 5345
-    components:
-    - pos: 21.5,5.5
-      parent: 1
-      type: Transform
 - proto: LockerCaptainFilled
   entities:
   - uid: 4090
@@ -62931,7 +63192,14 @@ entities:
       pos: -20.5,-13.5
       parent: 1
       type: Transform
-- proto: MagazineMagnumSubMachineGunRubber
+- proto: MagazinePistol
+  entities:
+  - uid: 5403
+    components:
+    - pos: 29.556211,16.447828
+      parent: 1
+      type: Transform
+- proto: MagazinePistolSubMachineGunRubber
   entities:
   - uid: 5311
     components:
@@ -62943,13 +63211,6 @@ entities:
     - pos: 18.77011,15.612514
       parent: 1
       type: Transform
-- proto: MagazinePistol
-  entities:
-  - uid: 5403
-    components:
-    - pos: 29.556211,16.447828
-      parent: 1
-      type: Transform
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
   - uid: 5386
@@ -74000,13 +74261,6 @@ entities:
     - pos: 3.5,-3.5
       parent: 1
       type: Transform
-- proto: SpawnPointBrigmedic
-  entities:
-  - uid: 12543
-    components:
-    - pos: 22.5,6.5
-      parent: 1
-      type: Transform
 - proto: SpawnPointCaptain
   entities:
   - uid: 6046
@@ -78390,12 +78644,6 @@ entities:
       pos: -0.5,26.5
       parent: 1
       type: Transform
-  - uid: 328
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,25.5
-      parent: 1
-      type: Transform
   - uid: 329
     components:
     - rot: -1.5707963267948966 rad
@@ -83511,6 +83759,12 @@ entities:
       pos: 0.5,66.5
       parent: 1
       type: Transform
+  - uid: 12553
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -0.5,25.5
+      parent: 1
+      type: Transform
 - proto: WallSolid
   entities:
   - uid: 2
@@ -85958,12 +86212,6 @@ entities:
       pos: -35.5,-14.5
       parent: 1
       type: Transform
-  - uid: 2203
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,-14.5
-      parent: 1
-      type: Transform
   - uid: 2204
     components:
     - rot: 1.5707963267948966 rad
@@ -86406,6 +86654,11 @@ entities:
       pos: -30.5,-11.5
       parent: 1
       type: Transform
+  - uid: 5345
+    components:
+    - pos: -32.5,-14.5
+      parent: 1
+      type: Transform
   - uid: 6616
     components:
     - pos: 16.5,-2.5
@@ -87007,14 +87260,14 @@ entities:
     - pos: 38.54903,12.330601
       parent: 1
       type: Transform
-- proto: WeaponSubMachineGunVector
+- proto: WeaponSubMachineGunDrozd
   entities:
   - uid: 5418
     components:
     - pos: 36.546875,13.694345
       parent: 1
       type: Transform
-- proto: WeaponSubMachineGunVectorRubber
+- proto: WeaponSubMachineGunDrozdRubber
   entities:
   - uid: 5310
     components:
-- 
2.51.2