diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index b5a0b852740..ed0d63ffc84 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -34,6 +34,7 @@ tilemap:
   63: FloorLino
   65: FloorMetalDiamond
   66: FloorMime
+  68: FloorMiningDark
   77: FloorRGlass
   78: FloorReinforced
   79: FloorReinforcedHardened
@@ -177,7 +178,7 @@ entities:
           version: 6
         -2,-4:
           ind: -2,-4
-          tiles: egAAAAAABwAAAAAABwAAAAAJFwAAAAADFwAAAAAGFwAAAAAEFwAAAAAEFwAAAAAGegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAACWgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAADWgAAAAADWgAAAAACegAAAAAAUQAAAAAAUQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAEgAAAAAAcgAAAAACEgAAAAAAegAAAAAAEgAAAAAAEgAAAAAAWgAAAAACWgAAAAADWgAAAAAAWgAAAAAAUQAAAAAAUQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAcgAAAAAAcgAAAAACcgAAAAABEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAeAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAATgAAAAAAcgAAAAACTgAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAACIwAAAAACIwAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAACIwAAAAACIwAAAAAAegAAAAAATgAAAAAATQAAAAADTQAAAAACTQAAAAABTQAAAAAATQAAAAABTQAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAIwAAAAADIwAAAAACIwAAAAACegAAAAAATgAAAAAATQAAAAADIAAAAAADIAAAAAACIAAAAAACIAAAAAACIAAAAAADTQAAAAABTgAAAAAAHgAAAAABHgAAAAAAHgAAAAADIwAAAAAAIwAAAAABIwAAAAACegAAAAAATgAAAAAATQAAAAABIAAAAAABIAAAAAAAIAAAAAACIAAAAAABIAAAAAADTQAAAAACTgAAAAAAHgAAAAADHgAAAAACHgAAAAABIwAAAAABIwAAAAABIwAAAAABHgAAAAABTgAAAAAATQAAAAACTQAAAAABTQAAAAAATQAAAAADTQAAAAABTQAAAAACTQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATQAAAAACTQAAAAAATQAAAAABTQAAAAACTgAAAAAAegAAAAAATgAAAAAAJwAAAAADTgAAAAAAegAAAAAAeAAAAAAA
+          tiles: egAAAAAABwAAAAAABwAAAAAJFwAAAAADFwAAAAAGFwAAAAAEFwAAAAAEFwAAAAAGegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAACWgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAADWgAAAAADWgAAAAACegAAAAAAUQAAAAAAUQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAARAAAAAAARAAAAAAARAAAAAAAegAAAAAAEgAAAAAAEgAAAAAAWgAAAAACWgAAAAADWgAAAAAAWgAAAAAAUQAAAAAAUQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAARAAAAAAARAAAAAAARAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAeAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAATgAAAAAARAAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAACIwAAAAACIwAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAACIwAAAAACIwAAAAAAegAAAAAATgAAAAAATQAAAAADTQAAAAACTQAAAAABTQAAAAAATQAAAAABTQAAAAAATQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAIwAAAAADIwAAAAACIwAAAAACegAAAAAATgAAAAAATQAAAAADIAAAAAADIAAAAAACIAAAAAACIAAAAAACIAAAAAADTQAAAAABTgAAAAAAHgAAAAABHgAAAAAAHgAAAAADIwAAAAAAIwAAAAABIwAAAAACegAAAAAATgAAAAAATQAAAAABIAAAAAABIAAAAAAAIAAAAAACIAAAAAABIAAAAAADTQAAAAACTgAAAAAAHgAAAAADHgAAAAACHgAAAAABIwAAAAABIwAAAAABIwAAAAABHgAAAAABTgAAAAAATQAAAAACTQAAAAABTQAAAAAATQAAAAADTQAAAAABTQAAAAACTQAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATQAAAAACTQAAAAAATQAAAAABTQAAAAACTgAAAAAAegAAAAAATgAAAAAAJwAAAAADTgAAAAAAegAAAAAAeAAAAAAA
           version: 6
         3,-2:
           ind: 3,-2
@@ -9511,7 +9512,8 @@ entities:
           -12,-4:
             0: 65535
           -12,-1:
-            0: 65535
+            0: 62975
+            2: 2560
           -11,-1:
             0: 65535
           -10,-2:
@@ -9688,10 +9690,10 @@ entities:
             0: 61439
           16,-10:
             0: 56831
-            5: 8192
+            3: 8192
           16,-9:
             0: 56797
-            5: 8192
+            3: 8192
           17,-10:
             0: 65535
           17,-9:
@@ -9842,9 +9844,10 @@ entities:
             0: 65535
           -13,1:
             0: 64767
-            5: 768
+            3: 768
           -13,-1:
-            0: 60671
+            0: 58623
+            2: 2048
           12,-13:
             0: 65535
           13,-13:
@@ -10170,9 +10173,9 @@ entities:
           9,9:
             0: 65535
           9,10:
-            2: 273
+            4: 273
             0: 64170
-            3: 1092
+            5: 1092
           9,11:
             0: 29439
           10,8:
@@ -10180,9 +10183,9 @@ entities:
           10,9:
             0: 65535
           10,10:
-            4: 273
+            6: 273
             0: 64170
-            5: 1092
+            3: 1092
           10,11:
             0: 29439
           11,8:
@@ -10190,7 +10193,7 @@ entities:
           11,9:
             0: 65535
           11,10:
-            5: 1365
+            3: 1365
             0: 64170
           11,11:
             0: 65279
@@ -10249,7 +10252,7 @@ entities:
           12,9:
             0: 16383
           12,10:
-            5: 273
+            3: 273
             0: 47650
           12,11:
             0: 40891
@@ -10489,23 +10492,23 @@ entities:
             0: 65535
           -15,2:
             0: 19524
-            5: 32904
+            3: 32904
           -15,3:
             0: 50244
-            5: 2184
+            3: 2184
           -14,0:
             0: 65535
           -14,1:
             0: 65535
           -14,2:
             0: 49151
-            5: 16384
+            3: 16384
           -14,3:
             0: 14751
-            5: 50784
+            3: 50784
           -13,3:
             0: 20479
-            5: 45056
+            3: 45056
           -15,-4:
             0: 17604
           -15,-3:
@@ -10536,10 +10539,10 @@ entities:
             0: 8191
           -12,4:
             0: 3855
-            5: 240
+            3: 240
           -11,4:
             0: 53199
-            5: 16
+            3: 16
           9,-24:
             0: 13243
           10,-24:
@@ -10576,13 +10579,13 @@ entities:
             0: 26487
           -15,4:
             0: 140
-            5: 52288
+            3: 52288
           -14,4:
             0: 3903
-            5: 28864
+            3: 28864
           -13,4:
             0: 3855
-            5: 240
+            3: 240
           8,13:
             0: 65433
           8,14:
@@ -10643,7 +10646,7 @@ entities:
             0: 14335
           -11,3:
             0: 53247
-            5: 4096
+            3: 4096
           14,-9:
             0: 65535
           -16,-11:
@@ -10787,10 +10790,11 @@ entities:
           -12,2:
             0: 65535
           -13,2:
-            0: 65535
+            0: 61439
+            2: 4096
           -12,3:
             0: 4095
-            5: 61440
+            3: 61440
           -12,-2:
             0: 65535
           -13,-2:
@@ -11166,9 +11170,9 @@ entities:
           15,-9:
             0: 65535
           -15,5:
-            5: 12
+            3: 12
           -14,5:
-            5: 7
+            3: 7
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -11200,10 +11204,25 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -11218,7 +11237,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -11230,13 +11248,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
           - 0
+          - 6666.982
           - 0
           - 0
-          - 6666.982
           - 0
           - 0
           - 0
@@ -11251,7 +11270,7 @@ entities:
           - 0
           - 0
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -55971,6 +55990,45 @@ entities:
           showEnts: False
           occludes: True
           ent: null
+  - uid: 21078
+    components:
+    - type: Transform
+      pos: -49.5,11.5
+      parent: 6747
+  - uid: 22085
+    components:
+    - type: Transform
+      pos: -51.5,11.5
+      parent: 6747
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 22172
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: ClosetToolFilled
   entities:
   - uid: 7614
@@ -59602,29 +59660,6 @@ entities:
       parent: 6747
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 21078
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-58.5
-      parent: 6747
-  - uid: 22085
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -51.5,11.5
-      parent: 6747
-  - uid: 22172
-    components:
-    - type: Transform
-      pos: -49.5,11.5
-      parent: 6747
-  - uid: 27386
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-58.5
-      parent: 6747
   - uid: 27543
     components:
     - type: Transform
@@ -59633,41 +59668,36 @@ entities:
       parent: 6747
 - proto: CryogenicSleepUnitSpawnerLateJoin
   entities:
-  - uid: 15419
+  - uid: 441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 67.5,-33.5
+      pos: 67.5,-35.5
       parent: 6747
-  - uid: 16346
+  - uid: 6412
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-35.5
-      parent: 6747
-  - uid: 16347
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-34.5
+      pos: 69.5,-33.5
       parent: 6747
-  - uid: 20645
+  - uid: 6503
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-33.5
+      pos: 69.5,-35.5
       parent: 6747
-  - uid: 22076
+  - uid: 6505
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 67.5,-35.5
+      pos: 67.5,-33.5
       parent: 6747
-  - uid: 27382
+- proto: CryogenicSleepUnitSpawnerPrisoner
+  entities:
+  - uid: 6502
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-34.5
+      pos: -50.5,11.5
       parent: 6747
 - proto: CryoPod
   entities:
@@ -60249,6 +60279,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-1.5
       parent: 6747
+  - uid: 6526
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,20.5
+      parent: 6747
+  - uid: 6527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,20.5
+      parent: 6747
   - uid: 6595
     components:
     - type: Transform
@@ -61240,6 +61282,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 62.5,12.5
       parent: 6747
+  - uid: 27565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,11.5
+      parent: 6747
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 3477
@@ -63818,12 +63866,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,11.5
       parent: 6747
-  - uid: 12010
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,11.5
-      parent: 6747
   - uid: 12011
     components:
     - type: Transform
@@ -68704,6 +68746,118 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,0.5
       parent: 6747
+  - uid: 27545
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,30.5
+      parent: 6747
+  - uid: 27546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,29.5
+      parent: 6747
+  - uid: 27547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,28.5
+      parent: 6747
+  - uid: 27548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,27.5
+      parent: 6747
+  - uid: 27549
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,26.5
+      parent: 6747
+  - uid: 27550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,25.5
+      parent: 6747
+  - uid: 27551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,24.5
+      parent: 6747
+  - uid: 27552
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,23.5
+      parent: 6747
+  - uid: 27553
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,22.5
+      parent: 6747
+  - uid: 27554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,21.5
+      parent: 6747
+  - uid: 27555
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,20.5
+      parent: 6747
+  - uid: 27556
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,20.5
+      parent: 6747
+  - uid: 27557
+    components:
+    - type: Transform
+      pos: 38.5,19.5
+      parent: 6747
+  - uid: 27558
+    components:
+    - type: Transform
+      pos: 38.5,18.5
+      parent: 6747
+  - uid: 27559
+    components:
+    - type: Transform
+      pos: 38.5,17.5
+      parent: 6747
+  - uid: 27560
+    components:
+    - type: Transform
+      pos: 38.5,16.5
+      parent: 6747
+  - uid: 27561
+    components:
+    - type: Transform
+      pos: 38.5,15.5
+      parent: 6747
+  - uid: 27562
+    components:
+    - type: Transform
+      pos: 38.5,14.5
+      parent: 6747
+  - uid: 27563
+    components:
+    - type: Transform
+      pos: 38.5,13.5
+      parent: 6747
+  - uid: 27564
+    components:
+    - type: Transform
+      pos: 38.5,12.5
+      parent: 6747
 - proto: DisposalRouterFlipped
   entities:
   - uid: 23521
@@ -69713,28 +69867,6 @@ entities:
     - type: Transform
       pos: -0.45024967,-65.37455
       parent: 6747
-- proto: DresserFilled
-  entities:
-  - uid: 4272
-    components:
-    - type: Transform
-      pos: 8.5,-55.5
-      parent: 6747
-  - uid: 4382
-    components:
-    - type: Transform
-      pos: 6.5,-60.5
-      parent: 6747
-  - uid: 16713
-    components:
-    - type: Transform
-      pos: -32.5,26.5
-      parent: 6747
-  - uid: 23453
-    components:
-    - type: Transform
-      pos: -66.5,8.5
-      parent: 6747
 - proto: DresserCaptainFilled
   entities:
   - uid: 7518
@@ -69763,6 +69895,16 @@ entities:
     - type: Transform
       pos: -15.5,6.5
       parent: 6747
+  - uid: 4272
+    components:
+    - type: Transform
+      pos: 8.5,-55.5
+      parent: 6747
+  - uid: 4382
+    components:
+    - type: Transform
+      pos: 6.5,-60.5
+      parent: 6747
   - uid: 7531
     components:
     - type: Transform
@@ -69813,6 +69955,16 @@ entities:
     - type: Transform
       pos: 39.5,-7.5
       parent: 6747
+  - uid: 16713
+    components:
+    - type: Transform
+      pos: -32.5,26.5
+      parent: 6747
+  - uid: 23453
+    components:
+    - type: Transform
+      pos: -66.5,8.5
+      parent: 6747
 - proto: DresserHeadOfPersonnelFilled
   entities:
   - uid: 7517
@@ -75207,6 +75359,15 @@ entities:
     - type: Transform
       pos: -23.046295,-50.39061
       parent: 6747
+- proto: FoodBreadMoldySlice
+  entities:
+  - uid: 22172
+    components:
+    - type: Transform
+      parent: 22085
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: FoodBurgerGhost
   entities:
   - uid: 22418
@@ -120604,7 +120765,7 @@ entities:
           name: null
           reagents:
           - data: null
-            ReagentId: Spaceacillin
+            ReagentId: Diphenhydramine
             Quantity: 50
   - uid: 12966
     components:
@@ -121182,6 +121343,11 @@ entities:
     - type: Transform
       pos: 54.5,18.5
       parent: 6747
+  - uid: 27382
+    components:
+    - type: Transform
+      pos: -21.5,-58.5
+      parent: 6747
 - proto: Machete
   entities:
   - uid: 4834
@@ -130536,11 +130702,6 @@ entities:
     - type: Transform
       pos: -5.5,-56.5
       parent: 6747
-  - uid: 6412
-    components:
-    - type: Transform
-      pos: 67.5,-25.5
-      parent: 6747
   - uid: 6415
     components:
     - type: Transform
@@ -130566,6 +130727,11 @@ entities:
     - type: Transform
       pos: 67.5,-44.5
       parent: 6747
+  - uid: 6571
+    components:
+    - type: Transform
+      pos: 57.5,-44.5
+      parent: 6747
   - uid: 6779
     components:
     - type: Transform
@@ -136257,6 +136423,16 @@ entities:
     - type: Transform
       pos: 29.5,-9.5
       parent: 6747
+  - uid: 6529
+    components:
+    - type: Transform
+      pos: 67.5,-39.5
+      parent: 6747
+  - uid: 6570
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 6747
   - uid: 22287
     components:
     - type: Transform
@@ -136797,6 +136973,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-21.5
       parent: 6747
+  - uid: 15419
+    components:
+    - type: Transform
+      pos: 66.5,-39.5
+      parent: 6747
   - uid: 15853
     components:
     - type: Transform
@@ -141345,6 +141526,11 @@ entities:
     - type: Transform
       pos: -0.5,-10.5
       parent: 6747
+  - uid: 22076
+    components:
+    - type: Transform
+      pos: 58.5,-42.5
+      parent: 6747
   - uid: 22642
     components:
     - type: Transform
@@ -141383,6 +141569,11 @@ entities:
       parent: 6747
 - proto: RandomSpawner100
   entities:
+  - uid: 16347
+    components:
+    - type: Transform
+      pos: 70.5,-25.5
+      parent: 6747
   - uid: 27523
     components:
     - type: Transform
@@ -141406,16 +141597,6 @@ entities:
     - type: Transform
       pos: -22.5,-17.5
       parent: 6747
-  - uid: 6505
-    components:
-    - type: Transform
-      pos: 65.5,-39.5
-      parent: 6747
-  - uid: 6529
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 6747
   - uid: 6572
     components:
     - type: Transform
@@ -141426,6 +141607,11 @@ entities:
     - type: Transform
       pos: 26.5,5.5
       parent: 6747
+  - uid: 6575
+    components:
+    - type: Transform
+      pos: 24.5,-40.5
+      parent: 6747
   - uid: 12871
     components:
     - type: Transform
@@ -141458,25 +141644,10 @@ entities:
     - type: Transform
       pos: 0.5,-12.5
       parent: 6747
-  - uid: 6503
-    components:
-    - type: Transform
-      pos: 57.5,-44.5
-      parent: 6747
-  - uid: 6527
-    components:
-    - type: Transform
-      pos: 57.5,-40.5
-      parent: 6747
-  - uid: 6571
-    components:
-    - type: Transform
-      pos: 24.5,-40.5
-      parent: 6747
-  - uid: 6574
+  - uid: 27544
     components:
     - type: Transform
-      pos: 67.5,-20.5
+      pos: 57.5,-43.5
       parent: 6747
 - proto: RandomVendingSnacks
   entities:
@@ -141510,25 +141681,10 @@ entities:
     - type: Transform
       pos: 28.5,-15.5
       parent: 6747
-  - uid: 6502
-    components:
-    - type: Transform
-      pos: 57.5,-43.5
-      parent: 6747
-  - uid: 6526
-    components:
-    - type: Transform
-      pos: 57.5,-41.5
-      parent: 6747
-  - uid: 6570
-    components:
-    - type: Transform
-      pos: 23.5,-40.5
-      parent: 6747
-  - uid: 6575
+  - uid: 6574
     components:
     - type: Transform
-      pos: 70.5,-25.5
+      pos: 57.5,-40.5
       parent: 6747
 - proto: RCD
   entities:
@@ -148010,12 +148166,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,12.5
       parent: 6747
-  - uid: 27388
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-59.5
-      parent: 6747
 - proto: SignDangerMed
   entities:
   - uid: 3680
@@ -152266,16 +152416,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Atmospherics
-  - uid: 12983
-    components:
-    - type: Transform
-      pos: -1.5,32.5
-      parent: 6747
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Salvage Bay
   - uid: 23872
     components:
     - type: Transform
@@ -153065,6 +153205,16 @@ entities:
       id: HOP Exterior
 - proto: SurveillanceCameraSupply
   entities:
+  - uid: 20645
+    components:
+    - type: Transform
+      pos: -1.5,32.5
+      parent: 6747
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage Bay
   - uid: 23881
     components:
     - type: Transform
@@ -154250,6 +154400,11 @@ entities:
     - type: Transform
       pos: 2.5,-65.5
       parent: 6747
+  - uid: 12983
+    components:
+    - type: Transform
+      pos: 66.5,-39.5
+      parent: 6747
   - uid: 13278
     components:
     - type: Transform
@@ -157402,6 +157557,11 @@ entities:
     - type: Transform
       pos: -42.5,-22.5
       parent: 6747
+  - uid: 12010
+    components:
+    - type: Transform
+      pos: 67.5,-25.5
+      parent: 6747
 - proto: VendingMachineClothing
   entities:
   - uid: 2932
@@ -157430,6 +157590,13 @@ entities:
     - type: Transform
       pos: 35.5,13.5
       parent: 6747
+- proto: VendingMachineCuraDrobe
+  entities:
+  - uid: 27386
+    components:
+    - type: Transform
+      pos: 24.5,-58.5
+      parent: 6747
 - proto: VendingMachineDinnerware
   entities:
   - uid: 2713
@@ -157507,10 +157674,10 @@ entities:
       parent: 6747
 - proto: VendingMachineMNKDrobe
   entities:
-  - uid: 441
+  - uid: 16346
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      pos: 23.5,-40.5
       parent: 6747
 - proto: VendingMachineNutri
   entities:
@@ -172927,16 +173094,34 @@ entities:
     - type: Transform
       pos: -48.5,-1.5
       parent: 6747
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
           showEnts: False
           occludes: True
           ents:
-          - 16181
-          - 16182
-          - 16183
           - 16184
+          - 16183
+          - 16182
+          - 16181
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -172946,6 +173131,24 @@ entities:
     - type: Transform
       pos: -46.5,-1.5
       parent: 6747
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -172962,6 +173165,24 @@ entities:
     - type: Transform
       pos: -44.5,-1.5
       parent: 6747
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -173268,6 +173489,11 @@ entities:
     - type: Transform
       pos: 53.5,-51.5
       parent: 6747
+  - uid: 27388
+    components:
+    - type: Transform
+      pos: 57.5,-41.5
+      parent: 6747
 - proto: WatermelonSeeds
   entities:
   - uid: 9373
diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
index ced15c853de..c35c3836d16 100644
--- a/Resources/Maps/hammurabi.yml
+++ b/Resources/Maps/hammurabi.yml
@@ -65,7 +65,6 @@ tilemap:
   106: FloorTechMaint2
   107: FloorTechMaint3
   109: FloorWhite
-  110: FloorWhiteDiagonal
   114: FloorWhiteMono
   119: FloorWood
   120: FloorWoodTile
@@ -193,7 +192,7 @@ entities:
           version: 6
         -5,-2:
           ind: -5,-2
-          tiles: UAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAABbQAAAAADbQAAAAACbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAACbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAACbQAAAAACbQAAAAACbQAAAAAAbQAAAAAAbQAAAAABegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAABbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAAAbQAAAAACbQAAAAADbQAAAAACbQAAAAACegAAAAAAbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAACbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAAAbQAAAAAAbQAAAAADegAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAACbQAAAAAATgAAAAAAUAAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAbQAAAAAAbQAAAAABegAAAAAAegAAAAAAegAAAAAATgAAAAAAbQAAAAABTgAAAAAAegAAAAAAbQAAAAABbQAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAABbQAAAAACbQAAAAABTgAAAAAAbQAAAAACbQAAAAABbQAAAAADbQAAAAAAWgAAAAADbQAAAAADbQAAAAABbQAAAAADbQAAAAACbQAAAAADbQAAAAABbQAAAAACbQAAAAADbQAAAAACbQAAAAACbQAAAAAAbQAAAAABbQAAAAABbQAAAAADbQAAAAABbQAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAAAbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAACTgAAAAAAbQAAAAAAegAAAAAAegAAAAAAbQAAAAABegAAAAAAbQAAAAABbQAAAAABbQAAAAAATgAAAAAAbQAAAAACbQAAAAACbQAAAAACbQAAAAAAegAAAAAAbQAAAAABbQAAAAABbQAAAAAAbQAAAAAAbQAAAAABbQAAAAAAegAAAAAATgAAAAAAbQAAAAADTgAAAAAAegAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAADegAAAAAAbQAAAAADbQAAAAADbQAAAAABegAAAAAAbQAAAAABbQAAAAADegAAAAAAbQAAAAAAbQAAAAACbQAAAAAAegAAAAAATgAAAAAAbQAAAAAAbQAAAAAATgAAAAAAegAAAAAATgAAAAAAbQAAAAABbQAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAADbQAAAAABbQAAAAABbQAAAAADbQAAAAAAbQAAAAADbQAAAAABbQAAAAABbQAAAAACbQAAAAABbQAAAAABbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAABegAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAACbQAAAAABbQAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAbQAAAAADbQAAAAABbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAADWgAAAAADWgAAAAABWgAAAAADWgAAAAAAWgAAAAACegAAAAAATgAAAAAAbQAAAAACbQAAAAACTgAAAAAAbQAAAAAAbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAAC
+          tiles: UAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAABbQAAAAADbQAAAAACbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAACbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAACbQAAAAACbQAAAAACbQAAAAAAbQAAAAAAbQAAAAABegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAABbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAAAbQAAAAACbQAAAAADbQAAAAACbQAAAAACegAAAAAAbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAACbQAAAAADUAAAAAAAUAAAAAAAUAAAAAAAegAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAAAbQAAAAAAbQAAAAADegAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAACbQAAAAAATgAAAAAAUAAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAbQAAAAAAbQAAAAABegAAAAAAegAAAAAAegAAAAAATgAAAAAAbQAAAAABTgAAAAAAegAAAAAAbQAAAAABbQAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAABbQAAAAACbQAAAAABTgAAAAAAbQAAAAACbQAAAAABbQAAAAADbQAAAAAAWgAAAAADbQAAAAADbQAAAAABbQAAAAADbQAAAAACbQAAAAADbQAAAAABbQAAAAACbQAAAAADbQAAAAACbQAAAAACbQAAAAAAbQAAAAABbQAAAAABbQAAAAADbQAAAAABbQAAAAAAbQAAAAACbQAAAAAAbQAAAAABbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAAAbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAACTgAAAAAAbQAAAAAAegAAAAAAegAAAAAAbQAAAAABegAAAAAAbQAAAAABbQAAAAABbQAAAAAATgAAAAAAbQAAAAACbQAAAAACbQAAAAACbQAAAAAAegAAAAAAbQAAAAABbQAAAAABbQAAAAAAegAAAAAAbQAAAAABbQAAAAAAegAAAAAATgAAAAAAbQAAAAADTgAAAAAAegAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAADegAAAAAAbQAAAAADbQAAAAADbQAAAAABegAAAAAAbQAAAAABbQAAAAADegAAAAAAbQAAAAAAbQAAAAACbQAAAAAAegAAAAAATgAAAAAAbQAAAAAAbQAAAAAATgAAAAAAegAAAAAATgAAAAAAbQAAAAABbQAAAAAAbQAAAAADbQAAAAACbQAAAAADbQAAAAADbQAAAAABbQAAAAABbQAAAAADbQAAAAAAbQAAAAADbQAAAAABbQAAAAABbQAAAAACbQAAAAABbQAAAAABbQAAAAABbQAAAAADegAAAAAAbQAAAAACbQAAAAABegAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAACbQAAAAABbQAAAAAAbQAAAAABbQAAAAABbQAAAAACbQAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAbQAAAAADbQAAAAABbQAAAAADbQAAAAADbQAAAAACbQAAAAAAbQAAAAACbQAAAAADbQAAAAADbQAAAAADWgAAAAADWgAAAAABWgAAAAADWgAAAAAAWgAAAAACegAAAAAATgAAAAAAbQAAAAACbQAAAAACTgAAAAAAbQAAAAAAbQAAAAACbQAAAAAAbQAAAAAATgAAAAAAbQAAAAAC
           version: 6
         1,-3:
           ind: 1,-3
@@ -353,7 +352,7 @@ entities:
           version: 6
         -7,0:
           ind: -7,0
-          tiles: dwAAAAAAIwAAAAADIwAAAAADTgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAACdwAAAAACdwAAAAACdwAAAAABTgAAAAAAegAAAAAATgAAAAAAIwAAAAABIwAAAAABIwAAAAACIwAAAAACIwAAAAACIwAAAAABdwAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAAAdwAAAAABdwAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAdwAAAAADdwAAAAACdwAAAAAAdwAAAAAAdwAAAAACdwAAAAACdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAIwAAAAAAIwAAAAADIwAAAAABIwAAAAAAIwAAAAABTgAAAAAAIwAAAAADIwAAAAACIwAAAAACIwAAAAADIwAAAAABIwAAAAACIwAAAAADIwAAAAABTgAAAAAATgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAAATgAAAAAAegAAAAAATgAAAAAAIwAAAAABIwAAAAABIwAAAAAAIwAAAAABIwAAAAAAIwAAAAABIwAAAAACIwAAAAACEgAAAAAAEgAAAAAAEgAAAAAANwAAAAAAIwAAAAADTgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAADegAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAbgAAAAACTQAAAAAAbgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAbgAAAAACTQAAAAAAbgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAANwAAAAAAIwAAAAAATgAAAAAAegAAAAAAegAAAAAAbgAAAAADbgAAAAAAbgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAIwAAAAAAIwAAAAABIwAAAAABIwAAAAACIwAAAAABTgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAA
+          tiles: dwAAAAAAIwAAAAADIwAAAAADTgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAACdwAAAAACdwAAAAACdwAAAAABTgAAAAAAegAAAAAATgAAAAAAIwAAAAABIwAAAAABIwAAAAACIwAAAAACIwAAAAACIwAAAAABdwAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAAAdwAAAAABdwAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAdwAAAAADdwAAAAACdwAAAAAAdwAAAAAAdwAAAAACdwAAAAACdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAIwAAAAAAIwAAAAADIwAAAAABIwAAAAAAIwAAAAABTgAAAAAAIwAAAAADIwAAAAACIwAAAAACIwAAAAADIwAAAAABIwAAAAACIwAAAAADIwAAAAABTgAAAAAATgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAAATgAAAAAAegAAAAAATgAAAAAAIwAAAAABIwAAAAABIwAAAAAAIwAAAAABIwAAAAAAIwAAAAABIwAAAAACIwAAAAACEgAAAAAAEgAAAAAAEgAAAAAANwAAAAAAIwAAAAADTgAAAAAAegAAAAAATgAAAAAATgAAAAAAIwAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAegAAAAAATQAAAAADegAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAHwAAAAAATQAAAAAAHwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAEgAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAHwAAAAAATQAAAAAAHwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAANwAAAAAAIwAAAAAATgAAAAAAegAAAAAAegAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAIwAAAAABTgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAIwAAAAAAIwAAAAABIwAAAAABIwAAAAACIwAAAAABTgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAA
           version: 6
         -8,0:
           ind: -8,0
@@ -20605,6 +20604,11 @@ entities:
       parent: 1
 - proto: AirlockCaptainGlassLocked
   entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: -102.5,8.5
+      parent: 1
   - uid: 5194
     components:
     - type: Transform
@@ -20802,11 +20806,6 @@ entities:
       parent: 1
 - proto: AirlockCommandGlassLocked
   entities:
-  - uid: 306
-    components:
-    - type: Transform
-      pos: -102.5,8.5
-      parent: 1
   - uid: 3788
     components:
     - type: Transform
@@ -31375,10 +31374,10 @@ entities:
       parent: 1
 - proto: BriefcaseBrown
   entities:
-  - uid: 2887
+  - uid: 42169
     components:
     - type: Transform
-      pos: 20.267475,-56.090908
+      pos: 20.725468,-53.955048
       parent: 1
 - proto: BriefcaseBrownFilled
   entities:
@@ -83555,12 +83554,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -95.2549,-40.368137
       parent: 1
-  - uid: 28324
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -114.24886,-2.182319
-      parent: 1
   - uid: 28742
     components:
     - type: Transform
@@ -83942,6 +83935,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.75459,-32.87646
       parent: 1
+  - uid: 42172
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -102.5,10.5
+      parent: 1
 - proto: ChairWood
   entities:
   - uid: 586
@@ -84031,6 +84030,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 14.320562,-54.465137
       parent: 1
+  - uid: 4573
+    components:
+    - type: Transform
+      pos: -113.5,-1.5
+      parent: 1
   - uid: 4763
     components:
     - type: Transform
@@ -86997,12 +87001,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-51.5
       parent: 1
-  - uid: 2641
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-56.5
-      parent: 1
   - uid: 4458
     components:
     - type: Transform
@@ -87216,8 +87214,19 @@ entities:
       rot: 3.141592653589793 rad
       pos: -56.5,-42.5
       parent: 1
+  - uid: 42138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-56.5
+      parent: 1
 - proto: ComputerAlert
   entities:
+  - uid: 5532
+    components:
+    - type: Transform
+      pos: -103.5,11.5
+      parent: 1
   - uid: 8223
     components:
     - type: Transform
@@ -87330,11 +87339,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -100.5,0.5
       parent: 1
-  - uid: 5455
+  - uid: 5533
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -113.5,-1.5
+      pos: -102.5,11.5
       parent: 1
 - proto: ComputerCrewMonitoring
   entities:
@@ -87366,6 +87374,12 @@ entities:
     - type: Transform
       pos: -66.5,23.5
       parent: 1
+  - uid: 42170
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -101.5,9.5
+      parent: 1
 - proto: ComputerCriminalRecords
   entities:
   - uid: 2067
@@ -87445,8 +87459,7 @@ entities:
   - uid: 5454
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -113.5,-2.5
+      pos: -101.5,11.5
       parent: 1
   - uid: 7574
     components:
@@ -87623,6 +87636,12 @@ entities:
       parent: 1
 - proto: ComputerStationRecords
   entities:
+  - uid: 5479
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -103.5,9.5
+      parent: 1
   - uid: 7088
     components:
     - type: Transform
@@ -91436,16 +91455,11 @@ entities:
       parent: 1
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 4573
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -77.5,-21.5
-      parent: 1
   - uid: 5453
     components:
     - type: Transform
-      pos: -101.5,11.5
+      rot: 1.5707963267948966 rad
+      pos: -79.5,-21.5
       parent: 1
   - uid: 5478
     components:
@@ -91453,65 +91467,48 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,9.5
       parent: 1
-  - uid: 5479
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,8.5
-      parent: 1
-  - uid: 5532
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -101.5,9.5
-      parent: 1
-  - uid: 5533
+  - uid: 42136
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -103.5,9.5
+      pos: -1.5,-35.5
       parent: 1
+- proto: CryogenicSleepUnitSpawnerLateJoin
+  entities:
   - uid: 6940
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -103.5,11.5
-      parent: 1
-  - uid: 42135
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -58.5,43.5
       parent: 1
-  - uid: 42136
+  - uid: 22962
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -58.5,42.5
       parent: 1
-  - uid: 42137
+  - uid: 28324
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -58.5,41.5
       parent: 1
-  - uid: 42138
+  - uid: 29386
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -55.5,43.5
       parent: 1
-  - uid: 42139
+  - uid: 41057
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -55.5,42.5
+      pos: -55.5,41.5
       parent: 1
-  - uid: 42140
+  - uid: 42132
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -55.5,41.5
+      pos: -55.5,42.5
       parent: 1
 - proto: CryoPod
   entities:
@@ -104646,28 +104643,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -66.44658,25.622019
       parent: 1
-- proto: DresserFilled
-  entities:
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -34.5,13.5
-      parent: 1
-  - uid: 8564
-    components:
-    - type: Transform
-      pos: -66.5,-0.5
-      parent: 1
-  - uid: 8565
-    components:
-    - type: Transform
-      pos: -65.5,-0.5
-      parent: 1
-  - uid: 10998
-    components:
-    - type: Transform
-      pos: -35.5,-20.5
-      parent: 1
 - proto: DresserCaptainFilled
   entities:
   - uid: 7594
@@ -104691,6 +104666,11 @@ entities:
       parent: 1
 - proto: DresserFilled
   entities:
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -34.5,13.5
+      parent: 1
   - uid: 2640
     components:
     - type: Transform
@@ -104701,6 +104681,21 @@ entities:
     - type: Transform
       pos: -27.5,-49.5
       parent: 1
+  - uid: 8564
+    components:
+    - type: Transform
+      pos: -66.5,-0.5
+      parent: 1
+  - uid: 8565
+    components:
+    - type: Transform
+      pos: -65.5,-0.5
+      parent: 1
+  - uid: 10998
+    components:
+    - type: Transform
+      pos: -35.5,-20.5
+      parent: 1
   - uid: 11493
     components:
     - type: Transform
@@ -210810,7 +210805,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 41057
+      - 42135
   - uid: 41079
     components:
     - type: Transform
@@ -212046,6 +212041,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -41.5,31.5
       parent: 1
+  - uid: 5455
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,8.5
+      parent: 1
   - uid: 5486
     components:
     - type: Transform
@@ -227380,6 +227381,11 @@ entities:
     - type: Transform
       pos: -118.5,-76.5
       parent: 1
+  - uid: 29385
+    components:
+    - type: Transform
+      pos: -54.5,42.5
+      parent: 1
   - uid: 29467
     components:
     - type: Transform
@@ -229030,11 +229036,6 @@ entities:
     - type: Transform
       pos: -54.5,43.5
       parent: 1
-  - uid: 42132
-    components:
-    - type: Transform
-      pos: -54.5,42.5
-      parent: 1
   - uid: 42133
     components:
     - type: Transform
@@ -233469,16 +233470,6 @@ entities:
       linkedPorts:
         41021:
         - Status: Toggle
-  - uid: 41057
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-56.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        41056:
-        - Status: Toggle
   - uid: 41807
     components:
     - type: Transform
@@ -233514,6 +233505,16 @@ entities:
       linkedPorts:
         42061:
         - Status: Toggle
+  - uid: 42135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-57.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        41056:
+        - Status: Toggle
 - proto: SignAnomaly
   entities:
   - uid: 20875
@@ -235345,12 +235346,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -110.5,-17.5
       parent: 1
-  - uid: 22962
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-35.5
-      parent: 1
   - uid: 41998
     components:
     - type: Transform
@@ -235423,6 +235418,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -93.5,-16.5
       parent: 1
+  - uid: 42140
+    components:
+    - type: Transform
+      pos: -2.5,-34.5
+      parent: 1
 - proto: SinkWide
   entities:
   - uid: 6042
@@ -236867,20 +236867,16 @@ entities:
       parent: 1
 - proto: SpawnPointLibrarian
   entities:
-  - uid: 6948
-    components:
-    - type: Transform
-      pos: -20.5,-33.5
-      parent: 1
-  - uid: 29385
+  - uid: 2641
     components:
     - type: Transform
-      pos: 20.5,-54.5
+      rot: 3.141592653589793 rad
+      pos: 19.5,-56.5
       parent: 1
-  - uid: 29386
+  - uid: 6948
     components:
     - type: Transform
-      pos: 20.5,-56.5
+      pos: -20.5,-33.5
       parent: 1
   - uid: 29387
     components:
@@ -236892,6 +236888,12 @@ entities:
     - type: Transform
       pos: 14.5,-54.5
       parent: 1
+  - uid: 42137
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-54.5
+      parent: 1
 - proto: SpawnPointLocationMidRoundAntag
   entities:
   - uid: 9980
@@ -239555,7 +239557,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: Command Cryosleep
+      id: Captain's Office
   - uid: 29268
     components:
     - type: Transform
@@ -242828,6 +242830,11 @@ entities:
       parent: 1
 - proto: TablePlasmaGlass
   entities:
+  - uid: 4307
+    components:
+    - type: Transform
+      pos: -113.5,-2.5
+      parent: 1
   - uid: 6740
     components:
     - type: Transform
@@ -246397,6 +246404,13 @@ entities:
     - type: Transform
       pos: -43.5,38.5
       parent: 1
+- proto: VendingMachineCuraDrobe
+  entities:
+  - uid: 2887
+    components:
+    - type: Transform
+      pos: 20.5,-56.5
+      parent: 1
 - proto: VendingMachineDinnerware
   entities:
   - uid: 9614
@@ -246839,6 +246853,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -112.5,-1.5
       parent: 1
+  - uid: 42171
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -104.5,10.5
+      parent: 1
 - proto: WallmountTelevision
   entities:
   - uid: 590
@@ -263611,6 +263631,11 @@ entities:
     - type: Transform
       pos: -22.5,-52.5
       parent: 1
+  - uid: 42139
+    components:
+    - type: Transform
+      pos: -77.5,-21.5
+      parent: 1
 - proto: WallSolid
   entities:
   - uid: 301
@@ -271449,12 +271474,6 @@ entities:
       parent: 1
 - proto: WindoorSecureMedicalLocked
   entities:
-  - uid: 4307
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -77.5,-21.5
-      parent: 1
   - uid: 4551
     components:
     - type: Transform
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index 195d8f47790..add04654610 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -19183,11 +19183,6 @@ entities:
     - type: Transform
       pos: 5.5,-7.5
       parent: 1
-  - uid: 5608
-    components:
-    - type: Transform
-      pos: 32.5,-11.5
-      parent: 1
   - uid: 5661
     components:
     - type: Transform
@@ -19544,128 +19539,6 @@ entities:
     - type: Transform
       pos: 80.57869,11.566902
       parent: 1
-- proto: FolderSpawner
-  entities:
-  - uid: 2853
-    components:
-    - type: Transform
-      pos: 37.459705,-11.450374
-      parent: 1
-  - uid: 2854
-    components:
-    - type: Transform
-      pos: 42.563873,-11.38783
-      parent: 1
-  - uid: 2855
-    components:
-    - type: Transform
-      pos: 42.303455,-11.356559
-      parent: 1
-  - uid: 3999
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.206955,20.67427
-      parent: 1
-  - uid: 4000
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.27987,20.53876
-      parent: 1
-  - uid: 6685
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -56.639526,-22.34478
-      parent: 1
-  - uid: 6770
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -57.556194,-21.896553
-      parent: 1
-  - uid: 7543
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.022625,10.682436
-      parent: 1
-  - uid: 7544
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 42.064293,10.557348
-      parent: 1
-  - uid: 7545
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.658043,8.420448
-      parent: 1
-  - uid: 7546
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.626793,8.649775
-      parent: 1
-  - uid: 10054
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.6318922,-33.31431
-      parent: 1
-  - uid: 16540
-    components:
-    - type: Transform
-      pos: 53.112316,38.584885
-      parent: 1
-  - uid: 16541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.6019,37.605034
-      parent: 1
-  - uid: 16542
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.403984,37.615456
-      parent: 1
-  - uid: 16543
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5394,36.5001
-      parent: 1
-  - uid: 16544
-    components:
-    - type: Transform
-      pos: 58.00815,43.567505
-      parent: 1
-  - uid: 16545
-    components:
-    - type: Transform
-      pos: 58.153984,43.567505
-      parent: 1
-  - uid: 22632
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 114.435295,9.704651
-      parent: 1
-  - uid: 22633
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 114.51862,9.589987
-      parent: 1
-  - uid: 22634
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 114.372795,9.193879
-      parent: 1
 - proto: BoxFolderBlack
   entities:
   - uid: 10000
@@ -59173,28 +59046,30 @@ entities:
       parent: 1
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 4065
+  - uid: 5280
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-41.5
+      pos: 82.5,29.5
       parent: 1
-  - uid: 16686
+  - uid: 21499
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-8.5
       parent: 1
-  - uid: 18835
+- proto: CryogenicSleepUnitSpawnerLateJoin
+  entities:
+  - uid: 5277
     components:
     - type: Transform
-      pos: 111.5,10.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-44.5
       parent: 1
-  - uid: 21499
+  - uid: 5278
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-41.5
       parent: 1
 - proto: d6Dice
   entities:
@@ -73520,6 +73395,128 @@ entities:
     - type: Transform
       pos: -15.213456,-17.149166
       parent: 1
+- proto: FolderSpawner
+  entities:
+  - uid: 2853
+    components:
+    - type: Transform
+      pos: 37.459705,-11.450374
+      parent: 1
+  - uid: 2854
+    components:
+    - type: Transform
+      pos: 42.563873,-11.38783
+      parent: 1
+  - uid: 2855
+    components:
+    - type: Transform
+      pos: 42.303455,-11.356559
+      parent: 1
+  - uid: 3999
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.206955,20.67427
+      parent: 1
+  - uid: 4000
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.27987,20.53876
+      parent: 1
+  - uid: 6685
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -56.639526,-22.34478
+      parent: 1
+  - uid: 6770
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -57.556194,-21.896553
+      parent: 1
+  - uid: 7543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.022625,10.682436
+      parent: 1
+  - uid: 7544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.064293,10.557348
+      parent: 1
+  - uid: 7545
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.658043,8.420448
+      parent: 1
+  - uid: 7546
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.626793,8.649775
+      parent: 1
+  - uid: 10054
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.6318922,-33.31431
+      parent: 1
+  - uid: 16540
+    components:
+    - type: Transform
+      pos: 53.112316,38.584885
+      parent: 1
+  - uid: 16541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.6019,37.605034
+      parent: 1
+  - uid: 16542
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.403984,37.615456
+      parent: 1
+  - uid: 16543
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5394,36.5001
+      parent: 1
+  - uid: 16544
+    components:
+    - type: Transform
+      pos: 58.00815,43.567505
+      parent: 1
+  - uid: 16545
+    components:
+    - type: Transform
+      pos: 58.153984,43.567505
+      parent: 1
+  - uid: 22632
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 114.435295,9.704651
+      parent: 1
+  - uid: 22633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 114.51862,9.589987
+      parent: 1
+  - uid: 22634
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 114.372795,9.193879
+      parent: 1
 - proto: FoodApple
   entities:
   - uid: 16795
@@ -127815,6 +127812,11 @@ entities:
     - type: Transform
       pos: 35.5,26.5
       parent: 1
+  - uid: 5279
+    components:
+    - type: Transform
+      pos: 111.5,10.5
+      parent: 1
   - uid: 5325
     components:
     - type: Transform
@@ -135359,10 +135361,10 @@ entities:
       parent: 1
 - proto: SheetRPGlass
   entities:
-  - uid: 25908
+  - uid: 25909
     components:
     - type: Transform
-      pos: 112.44123,10.52249
+      pos: 111.53943,10.579783
       parent: 1
 - proto: SheetSteel
   entities:
@@ -146953,6 +146955,13 @@ entities:
     - type: Transform
       pos: -13.5,-5.5
       parent: 1
+- proto: VendingMachineCuraDrobe
+  entities:
+  - uid: 4065
+    components:
+    - type: Transform
+      pos: 32.5,-11.5
+      parent: 1
 - proto: VendingMachineDinnerware
   entities:
   - uid: 993
@@ -166330,12 +166339,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 71.5,4.5
       parent: 1
+  - uid: 5315
+    components:
+    - type: Transform
+      pos: 64.5,26.5
+      parent: 1
   - uid: 5424
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 81.5,28.5
       parent: 1
+  - uid: 5608
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,27.5
+      parent: 1
   - uid: 5616
     components:
     - type: Transform
@@ -166456,6 +166476,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 51.5,-9.5
       parent: 1
+  - uid: 16686
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,27.5
+      parent: 1
+  - uid: 18835
+    components:
+    - type: Transform
+      pos: 67.5,26.5
+      parent: 1
   - uid: 22651
     components:
     - type: Transform
@@ -166506,6 +166537,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 71.5,24.5
       parent: 1
+  - uid: 25908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,27.5
+      parent: 1
 - proto: WindoorSecureArmoryLocked
   entities:
   - uid: 4778
@@ -166743,34 +166780,6 @@ entities:
     - type: Transform
       pos: -22.5,-4.5
       parent: 1
-  - uid: 5277
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,27.5
-      parent: 1
-  - uid: 5278
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 67.5,27.5
-      parent: 1
-  - uid: 5279
-    components:
-    - type: Transform
-      pos: 67.5,26.5
-      parent: 1
-  - uid: 5280
-    components:
-    - type: Transform
-      pos: 64.5,26.5
-      parent: 1
-  - uid: 5315
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,27.5
-      parent: 1
   - uid: 5498
     components:
     - type: Transform
diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
index fd5a67a7723..9dc8be669fc 100644
--- a/Resources/Maps/tortuga.yml
+++ b/Resources/Maps/tortuga.yml
@@ -175,7 +175,7 @@ entities:
           version: 6
         -5,1:
           ind: -5,1
-          tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAABTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAcgAAAAAAcgAAAAAAegAAAAAAdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAABdwAAAAADdwAAAAABegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAdwAAAAACdwAAAAACdwAAAAAAdwAAAAADdwAAAAABdwAAAAABdwAAAAABegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAADdwAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAABdwAAAAACdwAAAAACdwAAAAADdwAAAAACdwAAAAABdwAAAAABegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAACdwAAAAADdwAAAAAAdwAAAAABdwAAAAADdwAAAAABdwAAAAADegAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAAAdwAAAAACdwAAAAABdwAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAABdwAAAAABdwAAAAACdwAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAACdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAAC
+          tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAABTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAABdwAAAAADdwAAAAABegAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAeQAAAAAAeQAAAAAAegAAAAAAdwAAAAACdwAAAAACdwAAAAAAdwAAAAADdwAAAAABdwAAAAABdwAAAAABegAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAADdwAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAABdwAAAAACdwAAAAACdwAAAAADdwAAAAACdwAAAAABdwAAAAABegAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAACdwAAAAADdwAAAAAAdwAAAAABdwAAAAADdwAAAAABdwAAAAADegAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAdwAAAAAAdwAAAAADdwAAAAAAdwAAAAADdwAAAAAAdwAAAAACdwAAAAABdwAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAdwAAAAABdwAAAAABdwAAAAACdwAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABdwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAACdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAATgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAADdwAAAAAC
           version: 6
         -4,1:
           ind: -4,1
@@ -7986,22 +7986,22 @@ entities:
             color: '#D69949C9'
             id: MiniTileWhiteCornerNe
           decals:
-            7082: -46,65
+            7078: -46,65
         - node:
             color: '#D69949C9'
             id: MiniTileWhiteCornerNw
           decals:
-            7075: -49,65
+            7071: -49,65
         - node:
             color: '#D69949C9'
             id: MiniTileWhiteCornerSe
           decals:
-            7079: -46,64
+            7075: -46,64
         - node:
             color: '#D69949C9'
             id: MiniTileWhiteCornerSw
           decals:
-            7076: -49,64
+            7072: -49,64
         - node:
             color: '#D381C996'
             id: MiniTileWhiteEndN
@@ -8024,29 +8024,20 @@ entities:
             color: '#D69949C9'
             id: MiniTileWhiteLineN
           decals:
-            7080: -48,65
-            7081: -47,65
+            7076: -48,65
+            7077: -47,65
         - node:
             color: '#D69949C9'
             id: MiniTileWhiteLineS
           decals:
-            7077: -48,64
-            7078: -47,64
+            7073: -48,64
+            7074: -47,64
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineW
           decals:
             6531: -67,-16
             6607: -64,-16
-        - node:
-            color: '#4B709C76'
-            id: MonoOverlay
-          decals:
-            7083: -76,22
-            7084: -75,21
-            7085: -75,22
-            7086: -76,21
-            7087: -74,22
         - node:
             color: '#52B4E996'
             id: MonoOverlay
@@ -9916,11 +9907,11 @@ entities:
           -20,4:
             0: 65535
           -20,5:
-            0: 4095
+            0: 36863
           -19,4:
             0: 65535
           -19,5:
-            0: 61167
+            0: 65535
           -19,6:
             0: 61166
           -19,7:
@@ -10086,8 +10077,7 @@ entities:
           -13,19:
             0: 65535
           -13,16:
-            0: 52416
-            5: 12812
+            0: 65228
           -13,20:
             0: 3276
           -12,20:
@@ -10099,8 +10089,7 @@ entities:
           -9,22:
             0: 13119
           -12,16:
-            0: 65528
-            5: 7
+            0: 65535
           -12,17:
             0: 65535
           -12,18:
@@ -12420,8 +12409,7 @@ entities:
           -11,16:
             0: 65535
           -12,15:
-            0: 34952
-            5: 30464
+            0: 65416
           -11,14:
             0: 65535
           -11,15:
@@ -12745,7 +12733,7 @@ entities:
           14,-5:
             0: 6007
           -13,15:
-            5: 52224
+            0: 52224
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -15789,11 +15777,6 @@ entities:
     - type: Transform
       pos: -54.5,26.5
       parent: 33
-  - uid: 12737
-    components:
-    - type: Transform
-      pos: -73.5,22.5
-      parent: 33
 - proto: AirlockCommandLocked
   entities:
   - uid: 276
@@ -61593,11 +61576,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-  - uid: 8148
-    components:
-    - type: Transform
-      pos: -46.5,64.5
-      parent: 33
   - uid: 8151
     components:
     - type: Transform
@@ -66290,73 +66268,57 @@ entities:
       parent: 33
 - proto: CryogenicSleepUnit
   entities:
-  - uid: 6390
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -48.5,64.5
-      parent: 33
-  - uid: 8152
+  - uid: 30737
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -48.5,65.5
-      parent: 33
-  - uid: 12739
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -75.5,21.5
-      parent: 33
-  - uid: 15999
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -74.5,21.5
+      pos: -68.5,12.5
       parent: 33
-  - uid: 30737
+- proto: CryogenicSleepUnitSpawnerLateJoin
+  entities:
+  - uid: 3507
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -71.5,12.5
+      pos: -19.5,-13.5
       parent: 33
-- proto: CryogenicSleepUnitSpawnerLateJoin
-  entities:
-  - uid: 3492
+  - uid: 3508
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-15.5
       parent: 33
-  - uid: 3493
+  - uid: 5687
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-13.5
       parent: 33
-  - uid: 3502
+  - uid: 6389
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -19.5,-13.5
+      pos: -19.5,-15.5
       parent: 33
-  - uid: 3503
+  - uid: 6390
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -22.5,-13.5
+      pos: -22.5,-14.5
       parent: 33
-  - uid: 3507
+  - uid: 6641
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -19.5,-14.5
       parent: 33
-  - uid: 3508
+- proto: CryogenicSleepUnitSpawnerPrisoner
+  entities:
+  - uid: 3502
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: -47.5,64.5
       parent: 33
 - proto: CryoPod
   entities:
@@ -74960,6 +74922,27 @@ entities:
     - type: Transform
       pos: -1.4501972,90.583885
       parent: 33
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 4635
+    components:
+    - type: Transform
+      pos: -61.5,35.5
+      parent: 33
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 10432
+    components:
+    - type: Transform
+      pos: 46.5,19.5
+      parent: 33
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 5499
+    components:
+    - type: Transform
+      pos: -88.5,3.5
+      parent: 33
 - proto: DresserFilled
   entities:
   - uid: 71
@@ -74997,6 +74980,11 @@ entities:
     - type: Transform
       pos: -17.5,6.5
       parent: 33
+  - uid: 9692
+    components:
+    - type: Transform
+      pos: -27.5,97.5
+      parent: 33
   - uid: 10367
     components:
     - type: Transform
@@ -75017,34 +75005,6 @@ entities:
     - type: Transform
       pos: -44.5,-20.5
       parent: 33
-- proto: DresserCaptainFilled
-  entities:
-  - uid: 4635
-    components:
-    - type: Transform
-      pos: -61.5,35.5
-      parent: 33
-- proto: DresserChiefEngineerFilled
-  entities:
-  - uid: 10432
-    components:
-    - type: Transform
-      pos: 46.5,19.5
-      parent: 33
-- proto: DresserChiefMedicalOfficerFilled
-  entities:
-  - uid: 5499
-    components:
-    - type: Transform
-      pos: -88.5,3.5
-      parent: 33
-- proto: DresserFilled
-  entities:
-  - uid: 9692
-    components:
-    - type: Transform
-      pos: -27.5,97.5
-      parent: 33
   - uid: 30216
     components:
     - type: Transform
@@ -77704,6 +77664,11 @@ entities:
       parent: 33
 - proto: filingCabinetRandom
   entities:
+  - uid: 3493
+    components:
+    - type: Transform
+      pos: -69.5,-35.5
+      parent: 33
   - uid: 5218
     components:
     - type: Transform
@@ -77719,11 +77684,6 @@ entities:
     - type: Transform
       pos: 15.5,-2.5
       parent: 33
-  - uid: 16590
-    components:
-    - type: Transform
-      pos: -74.5,-36.5
-      parent: 33
   - uid: 28870
     components:
     - type: Transform
@@ -77743,6 +77703,11 @@ entities:
       parent: 33
 - proto: filingCabinetTallRandom
   entities:
+  - uid: 3498
+    components:
+    - type: Transform
+      pos: -69.5,-34.5
+      parent: 33
   - uid: 4625
     components:
     - type: Transform
@@ -129090,6 +129055,11 @@ entities:
     - type: Transform
       pos: 38.5,35.5
       parent: 33
+  - uid: 8152
+    components:
+    - type: Transform
+      pos: -73.5,22.5
+      parent: 33
   - uid: 8169
     components:
     - type: Transform
@@ -130135,6 +130105,11 @@ entities:
     - type: Transform
       pos: 65.5,58.5
       parent: 33
+  - uid: 12739
+    components:
+    - type: Transform
+      pos: -73.5,23.5
+      parent: 33
   - uid: 12750
     components:
     - type: Transform
@@ -149281,6 +149256,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -35.5,15.5
       parent: 33
+  - uid: 3492
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -71.5,21.5
+      parent: 33
   - uid: 3766
     components:
     - type: Transform
@@ -149354,12 +149335,6 @@ entities:
       parent: 33
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 6641
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -65.5,26.5
-      parent: 33
   - uid: 6682
     components:
     - type: Transform
@@ -149368,6 +149343,17 @@ entities:
       parent: 33
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 7153
+    components:
+    - type: Transform
+      pos: -68.5,27.5
+      parent: 33
+  - uid: 7178
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -45.5,65.5
+      parent: 33
   - uid: 7491
     components:
     - type: Transform
@@ -149382,6 +149368,12 @@ entities:
       parent: 33
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 8148
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -66.5,23.5
+      parent: 33
   - uid: 8675
     components:
     - type: Transform
@@ -151250,12 +151242,6 @@ entities:
       parent: 33
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 24552
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -72.5,23.5
-      parent: 33
   - uid: 25230
     components:
     - type: Transform
@@ -151565,12 +151551,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -76.5,10.5
       parent: 33
-  - uid: 30740
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -66.5,23.5
-      parent: 33
 - proto: PoweredLightBlueInterior
   entities:
   - uid: 273
@@ -151861,11 +151841,6 @@ entities:
       powerLoad: 0
 - proto: PoweredLightColoredFrostyBlue
   entities:
-  - uid: 6648
-    components:
-    - type: Transform
-      pos: -75.5,22.5
-      parent: 33
   - uid: 12461
     components:
     - type: Transform
@@ -161400,6 +161375,11 @@ entities:
     - type: Transform
       pos: -99.5,-31.5
       parent: 33
+  - uid: 12737
+    components:
+    - type: Transform
+      pos: -73.5,22.5
+      parent: 33
   - uid: 12794
     components:
     - type: Transform
@@ -161455,6 +161435,11 @@ entities:
     - type: Transform
       pos: -25.5,-31.5
       parent: 33
+  - uid: 15999
+    components:
+    - type: Transform
+      pos: -73.5,23.5
+      parent: 33
   - uid: 16368
     components:
     - type: Transform
@@ -165884,6 +165869,11 @@ entities:
     - type: Transform
       pos: -23.5,-11.5
       parent: 33
+  - uid: 3503
+    components:
+    - type: Transform
+      pos: -68.5,13.5
+      parent: 33
   - uid: 6636
     components:
     - type: Transform
@@ -165896,12 +165886,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-16.5
       parent: 33
-  - uid: 7153
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -73.5,23.5
-      parent: 33
   - uid: 28810
     components:
     - type: Transform
@@ -177995,6 +177979,13 @@ entities:
     - type: Transform
       pos: 7.5,-23.5
       parent: 33
+- proto: VendingMachineCuraDrobe
+  entities:
+  - uid: 6648
+    components:
+    - type: Transform
+      pos: -74.5,-36.5
+      parent: 33
 - proto: VendingMachineDinnerware
   entities:
   - uid: 3073
@@ -182307,11 +182298,6 @@ entities:
     - type: Transform
       pos: -73.5,27.5
       parent: 33
-  - uid: 3498
-    components:
-    - type: Transform
-      pos: -73.5,21.5
-      parent: 33
   - uid: 3535
     components:
     - type: Transform
@@ -184177,11 +184163,6 @@ entities:
     - type: Transform
       pos: -49.5,63.5
       parent: 33
-  - uid: 5687
-    components:
-    - type: Transform
-      pos: -73.5,23.5
-      parent: 33
   - uid: 5688
     components:
     - type: Transform
@@ -184817,11 +184798,6 @@ entities:
     - type: Transform
       pos: -49.5,65.5
       parent: 33
-  - uid: 6389
-    components:
-    - type: Transform
-      pos: -75.5,23.5
-      parent: 33
   - uid: 6391
     components:
     - type: Transform
@@ -185342,11 +185318,6 @@ entities:
     - type: Transform
       pos: 5.5,48.5
       parent: 33
-  - uid: 7178
-    components:
-    - type: Transform
-      pos: -74.5,23.5
-      parent: 33
   - uid: 7220
     components:
     - type: Transform
@@ -187402,11 +187373,6 @@ entities:
     - type: Transform
       pos: -97.5,-73.5
       parent: 33
-  - uid: 12736
-    components:
-    - type: Transform
-      pos: -76.5,23.5
-      parent: 33
   - uid: 12931
     components:
     - type: Transform
@@ -187642,6 +187608,11 @@ entities:
     - type: Transform
       pos: -56.5,-15.5
       parent: 33
+  - uid: 16590
+    components:
+    - type: Transform
+      pos: -73.5,21.5
+      parent: 33
   - uid: 16591
     components:
     - type: Transform
@@ -199900,6 +199871,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,8.5
       parent: 33
+  - uid: 12736
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -74.5,22.5
+      parent: 33
   - uid: 12748
     components:
     - type: Transform
@@ -200015,6 +199992,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,88.5
       parent: 33
+  - uid: 24552
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -74.5,23.5
+      parent: 33
   - uid: 27245
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml
index 465e5eaa6f3..31df751ea5c 100644
--- a/Resources/Prototypes/Maps/arena.yml
+++ b/Resources/Prototypes/Maps/arena.yml
@@ -3,6 +3,7 @@
   mapName: 'Arena'
   mapPath: /Maps/arena.yml
   minPlayers: 30
+  maxPlayers: 80
   stations:
     Arena:
       stationProto: StandardNanotrasenStation
diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml
index 37e3ce5c0a8..32c55b08590 100644
--- a/Resources/Prototypes/Maps/submarine.yml
+++ b/Resources/Prototypes/Maps/submarine.yml
@@ -2,8 +2,7 @@
   id: Submarine
   mapName: 'Submarine'
   mapPath: /Maps/submarine.yml
-  minPlayers: 35
-  maxPlayers: 100
+  minPlayers: 40
   stations:
     Submarine:
       stationProto: StandardNanotrasenStation