diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
index 090cb7fcf2a..0c7ca2f2988 100644
--- a/Resources/Maps/arena.yml
+++ b/Resources/Maps/arena.yml
@@ -607,9 +607,6 @@ entities:
             1: 27,-2
             2: 32,-4
             3: 33,-4
-            6: -18,-51
-            7: -17,-51
-            8: -16,-51
             9: 22,-60
             10: 22,-61
             12: 49,-32
@@ -669,6 +666,9 @@ entities:
             4904: 61,25
             5231: 43,7
             5232: 43,6
+            5874: -14,-52
+            5875: -14,-55
+            5876: -17,-56
         - node:
             color: '#FFFFFFFF'
             id: Box
@@ -17125,6 +17125,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-64.5
       parent: 6747
+  - uid: 825
+    components:
+    - type: MetaData
+      name: APC (arena bleachers)
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,-26.5
+      parent: 6747
   - uid: 6275
     components:
     - type: MetaData
@@ -17161,14 +17169,6 @@ entities:
     - type: Transform
       pos: -17.5,-7.5
       parent: 6747
-  - uid: 16255
-    components:
-    - type: MetaData
-      name: APC (arena bleachers)
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-26.5
-      parent: 6747
   - uid: 16476
     components:
     - type: MetaData
@@ -18529,6 +18529,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-19.5
       parent: 6747
+  - uid: 3922
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,36.5
+      parent: 6747
+  - uid: 3925
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,36.5
+      parent: 6747
   - uid: 5675
     components:
     - type: Transform
@@ -18589,16 +18601,6 @@ entities:
       parent: 6747
 - proto: AtmosDeviceFanTiny
   entities:
-  - uid: 825
-    components:
-    - type: Transform
-      pos: 18.5,36.5
-      parent: 6747
-  - uid: 6406
-    components:
-    - type: Transform
-      pos: 22.5,36.5
-      parent: 6747
   - uid: 23657
     components:
     - type: Transform
@@ -58388,6 +58390,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -67.49232,-72.32874
       parent: 6747
+  - uid: 29448
+    components:
+    - type: Transform
+      pos: -16.651665,-50.44433
+      parent: 6747
 - proto: ChairPilotSeat
   entities:
   - uid: 3951
@@ -60305,6 +60312,13 @@ entities:
     - type: Transform
       pos: 30.735046,7.834367
       parent: 6747
+- proto: ClothingHeadHatFlowerWreath
+  entities:
+  - uid: 29718
+    components:
+    - type: Transform
+      pos: -16.285336,-51.59434
+      parent: 6747
 - proto: ClothingHeadHatHardhatWhite
   entities:
   - uid: 4362
@@ -60958,11 +60972,6 @@ entities:
     - type: Transform
       pos: 5.519886,-6.465665
       parent: 6747
-  - uid: 29448
-    components:
-    - type: Transform
-      pos: -17.455547,-50.42443
-      parent: 6747
   - uid: 29449
     components:
     - type: Transform
@@ -60978,6 +60987,11 @@ entities:
     - type: Transform
       pos: 5.519886,-4.4642754
       parent: 6747
+  - uid: 29637
+    components:
+    - type: Transform
+      pos: -16.513405,-55.518414
+      parent: 6747
 - proto: ClothingShoesSlippers
   entities:
   - uid: 8350
@@ -64319,15 +64333,15 @@ entities:
     - type: Transform
       pos: -32.5,-9.5
       parent: 6747
-  - uid: 3922
+  - uid: 29560
     components:
     - type: Transform
-      pos: -15.5,-50.5
+      pos: -13.5,-51.5
       parent: 6747
-  - uid: 3925
+  - uid: 29562
     components:
     - type: Transform
-      pos: -16.5,-50.5
+      pos: -13.5,-54.5
       parent: 6747
 - proto: DeskBell
   entities:
@@ -75282,6 +75296,11 @@ entities:
     - type: Transform
       pos: 12.5,-66.5
       parent: 6747
+  - uid: 29720
+    components:
+    - type: Transform
+      pos: 32.5,13.5
+      parent: 6747
 - proto: DonkpocketBoxSpawner
   entities:
   - uid: 2490
@@ -77049,14 +77068,6 @@ entities:
     - type: Transform
       pos: -1.5,-70.5
       parent: 6747
-- proto: ExtendedEmergencyOxygenTankFilled
-  entities:
-  - uid: 4114
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.366966,-55.397507
-      parent: 6747
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 2691
@@ -80896,6 +80907,13 @@ entities:
       parent: 6747
     - type: Fixtures
       fixtures: {}
+  - uid: 29722
+    components:
+    - type: Transform
+      pos: 13.5,-32.5
+      parent: 6747
+    - type: Fixtures
+      fixtures: {}
 - proto: FloorTileItemBrassFilled
   entities:
   - uid: 18131
@@ -126343,28 +126361,6 @@ entities:
       parent: 6747
 - proto: Holopad
   entities:
-  - uid: 29560
-    components:
-    - type: MetaData
-      name: holopad (General - Barber Shop)
-    - type: Transform
-      pos: 60.5,-32.5
-      parent: 6747
-    - type: Label
-      currentLabel: General - Barber Shop
-    - type: NameModifier
-      baseName: holopad
-  - uid: 29562
-    components:
-    - type: MetaData
-      name: holopad (Security - Arena)
-    - type: Transform
-      pos: -31.5,-24.5
-      parent: 6747
-    - type: Label
-      currentLabel: Security - Arena
-    - type: NameModifier
-      baseName: holopad
   - uid: 29563
     components:
     - type: MetaData
@@ -126387,13 +126383,6 @@ entities:
       currentLabel: Command - Camera Routers
     - type: NameModifier
       baseName: holopad
-  - uid: 29637
-    components:
-    - type: Transform
-      pos: 61.5,-24.5
-      parent: 6747
-    - type: Label
-      currentLabel: Nitrogen Lounge
 - proto: HolopadAiBackupPower
   entities:
   - uid: 29485
@@ -126674,6 +126663,13 @@ entities:
     - type: Transform
       pos: -13.5,-33.5
       parent: 6747
+- proto: HolopadGeneralVoxNitrogenLounge
+  entities:
+  - uid: 16255
+    components:
+    - type: Transform
+      pos: 61.5,-24.5
+      parent: 6747
 - proto: HolopadJusticeCJ
   entities:
   - uid: 29509
@@ -126737,6 +126733,20 @@ entities:
     - type: Transform
       pos: 13.5,-37.5
       parent: 6747
+- proto: HolopadMedicalOutpost
+  entities:
+  - uid: 29723
+    components:
+    - type: Transform
+      pos: 49.5,-42.5
+      parent: 6747
+- proto: HolopadMedicalParamed
+  entities:
+  - uid: 29725
+    components:
+    - type: Transform
+      pos: -21.5,-9.5
+      parent: 6747
 - proto: HolopadMedicalSurgery
   entities:
   - uid: 29546
@@ -126795,6 +126805,13 @@ entities:
     - type: Transform
       pos: 0.5,-68.5
       parent: 6747
+- proto: HolopadSecurityArena
+  entities:
+  - uid: 6406
+    components:
+    - type: Transform
+      pos: -31.5,-24.5
+      parent: 6747
 - proto: HolopadSecurityArmory
   entities:
   - uid: 29493
@@ -126844,6 +126861,13 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 6747
+- proto: HolopadSecurityGladiatorLounge
+  entities:
+  - uid: 29716
+    components:
+    - type: Transform
+      pos: -35.5,-37.5
+      parent: 6747
 - proto: HolopadSecurityInterrogation
   entities:
   - uid: 29524
@@ -126851,6 +126875,13 @@ entities:
     - type: Transform
       pos: -7.5,-5.5
       parent: 6747
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 29724
+    components:
+    - type: Transform
+      pos: -10.5,-62.5
+      parent: 6747
 - proto: HolopadSecurityPerma
   entities:
   - uid: 29541
@@ -126872,6 +126903,13 @@ entities:
     - type: Transform
       pos: -20.5,-29.5
       parent: 6747
+- proto: HolopadServiceBarberShop
+  entities:
+  - uid: 4114
+    components:
+    - type: Transform
+      pos: 60.5,-32.5
+      parent: 6747
 - proto: HolopadServiceBotany
   entities:
   - uid: 29498
@@ -126921,6 +126959,13 @@ entities:
     - type: Transform
       pos: 39.5,-51.5
       parent: 6747
+- proto: HolopadServiceToolroom
+  entities:
+  - uid: 29726
+    components:
+    - type: Transform
+      pos: 18.5,-2.5
+      parent: 6747
 - proto: HoloprojectorSecurity
   entities:
   - uid: 25517
@@ -128965,6 +129010,13 @@ entities:
     - type: Transform
       pos: -31.5,10.5
       parent: 6747
+- proto: LunchboxCommandFilledRandom
+  entities:
+  - uid: 4113
+    components:
+    - type: Transform
+      pos: -16.766249,-51.351208
+      parent: 6747
 - proto: Machete
   entities:
   - uid: 4834
@@ -132343,12 +132395,6 @@ entities:
     - type: Transform
       pos: -36.408516,0.5454552
       parent: 6747
-  - uid: 4113
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.564882,-55.449627
-      parent: 6747
   - uid: 5309
     components:
     - type: Transform
@@ -137015,6 +137061,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -69.5,-57.5
       parent: 6747
+  - uid: 29717
+    components:
+    - type: Transform
+      pos: -17.5,-51.5
+      parent: 6747
 - proto: PaperBin5
   entities:
   - uid: 12909
@@ -138853,16 +138904,6 @@ entities:
     - type: Transform
       pos: -11.5,-51.5
       parent: 6747
-  - uid: 3927
-    components:
-    - type: Transform
-      pos: -13.5,-51.5
-      parent: 6747
-  - uid: 3928
-    components:
-    - type: Transform
-      pos: -13.5,-54.5
-      parent: 6747
   - uid: 3929
     components:
     - type: Transform
@@ -144732,11 +144773,6 @@ entities:
     - type: Transform
       pos: -17.5,-55.5
       parent: 6747
-  - uid: 3939
-    components:
-    - type: Transform
-      pos: -16.5,-55.5
-      parent: 6747
   - uid: 4115
     components:
     - type: Transform
@@ -147180,6 +147216,11 @@ entities:
     - type: Transform
       pos: -43.5,2.5
       parent: 6747
+  - uid: 29719
+    components:
+    - type: Transform
+      pos: -17.5,-49.5
+      parent: 6747
 - proto: RandomPosterAny
   entities:
   - uid: 1770
@@ -156516,6 +156557,13 @@ entities:
     - type: Transform
       pos: 23.5,-38.5
       parent: 6747
+- proto: SecureCabinetCommand
+  entities:
+  - uid: 3927
+    components:
+    - type: Transform
+      pos: -17.5,-50.5
+      parent: 6747
 - proto: SecureCabinetDetective
   entities:
   - uid: 22922
@@ -161135,6 +161183,13 @@ entities:
     - type: Transform
       pos: 51.5,-6.5
       parent: 6747
+- proto: SpawnMobCatClippy
+  entities:
+  - uid: 29721
+    components:
+    - type: Transform
+      pos: 32.5,13.5
+      parent: 6747
 - proto: SpawnMobCatGeneric
   entities:
   - uid: 7225
@@ -161317,6 +161372,11 @@ entities:
     - type: Transform
       pos: -26.5,-50.5
       parent: 6747
+  - uid: 29715
+    components:
+    - type: Transform
+      pos: -16.5,-50.5
+      parent: 6747
 - proto: SpawnPointAtmos
   entities:
   - uid: 17076
@@ -165919,6 +165979,16 @@ entities:
     - type: Transform
       pos: 20.5,-5.5
       parent: 6747
+  - uid: 3928
+    components:
+    - type: Transform
+      pos: -17.5,-51.5
+      parent: 6747
+  - uid: 3939
+    components:
+    - type: Transform
+      pos: -16.5,-51.5
+      parent: 6747
   - uid: 4900
     components:
     - type: Transform
diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
index 76cf066c4e4..2f4232185d4 100644
--- a/Resources/Maps/hive.yml
+++ b/Resources/Maps/hive.yml
@@ -15615,11 +15615,6 @@ entities:
     - type: Transform
       pos: 29.5,-17.5
       parent: 1
-  - uid: 21205
-    components:
-    - type: Transform
-      pos: 24.5,-14.5
-      parent: 1
 - proto: AirlockFreezerLocked
   entities:
   - uid: 1434
@@ -16453,6 +16448,13 @@ entities:
     - type: Transform
       pos: 96.5,13.5
       parent: 1
+- proto: AirlockMaintKitchenHydroLocked
+  entities:
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 24.5,-14.5
+      parent: 1
 - proto: AirlockMaintLawyerLocked
   entities:
   - uid: 526
@@ -39734,6 +39736,21 @@ entities:
     - type: Transform
       pos: -2.5,13.5
       parent: 1
+  - uid: 29782
+    components:
+    - type: Transform
+      pos: 28.5,3.5
+      parent: 1
+  - uid: 29783
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1
+  - uid: 29784
+    components:
+    - type: Transform
+      pos: 26.5,3.5
+      parent: 1
 - proto: CableApcStack
   entities:
   - uid: 4721
@@ -64148,6 +64165,12 @@ entities:
     - type: Transform
       pos: 5.5,-3.5
       parent: 1
+  - uid: 2001
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,48.5
+      parent: 1
   - uid: 4751
     components:
     - type: Transform
@@ -64160,12 +64183,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -55.5,-20.5
       parent: 1
-  - uid: 11672
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,48.5
-      parent: 1
   - uid: 13348
     components:
     - type: Transform
@@ -64376,10 +64393,9 @@ entities:
       parent: 1
 - proto: ComputerSurveillanceCameraMonitor
   entities:
-  - uid: 3675
+  - uid: 2850
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: 59.5,22.5
       parent: 1
   - uid: 5495
@@ -65708,16 +65724,15 @@ entities:
     - type: Transform
       pos: -18.497072,7.5828466
       parent: 1
-  - uid: 7296
+  - uid: 22742
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.395557,39.488533
+      pos: -12.739433,36.82119
       parent: 1
-  - uid: 22742
+  - uid: 29796
     components:
     - type: Transform
-      pos: -12.739433,36.82119
+      pos: 18.555685,39.664207
       parent: 1
 - proto: CrowbarRed
   entities:
@@ -78686,14 +78701,6 @@ entities:
     - type: Transform
       pos: -13.006062,36.40738
       parent: 1
-- proto: EncryptionKeyRobo
-  entities:
-  - uid: 6537
-    components:
-    - type: Transform
-      parent: 6536
-    - type: Physics
-      canCollide: False
 - proto: ExosuitFabricator
   entities:
   - uid: 7339
@@ -79088,21 +79095,6 @@ entities:
       parent: 1
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 536
-    components:
-    - type: Transform
-      pos: -11.5,48.5
-      parent: 1
-  - uid: 2001
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 2850
-    components:
-    - type: Transform
-      pos: 41.5,-14.5
-      parent: 1
   - uid: 3111
     components:
     - type: Transform
@@ -79118,36 +79110,16 @@ entities:
     - type: Transform
       pos: 72.5,-4.5
       parent: 1
-  - uid: 5809
-    components:
-    - type: Transform
-      pos: -46.5,-35.5
-      parent: 1
   - uid: 6668
     components:
     - type: Transform
       pos: -57.5,-24.5
       parent: 1
-  - uid: 7323
-    components:
-    - type: Transform
-      pos: -5.5,41.5
-      parent: 1
-  - uid: 9883
-    components:
-    - type: Transform
-      pos: 101.311455,9.789877
-      parent: 1
   - uid: 9892
     components:
     - type: Transform
       pos: 101.842705,9.800301
       parent: 1
-  - uid: 14709
-    components:
-    - type: Transform
-      pos: 78.5,-8.5
-      parent: 1
   - uid: 15788
     components:
     - type: Transform
@@ -79163,11 +79135,6 @@ entities:
     - type: Transform
       pos: -61.5,10.5
       parent: 1
-  - uid: 23919
-    components:
-    - type: Transform
-      pos: 74.5,18.5
-      parent: 1
   - uid: 28513
     components:
     - type: Transform
@@ -79190,31 +79157,11 @@ entities:
     - type: Transform
       pos: 73.5,-6.5
       parent: 1
-  - uid: 6598
-    components:
-    - type: Transform
-      pos: -53.5,0.5
-      parent: 1
   - uid: 6994
     components:
     - type: Transform
       pos: 47.5,8.5
       parent: 1
-  - uid: 6995
-    components:
-    - type: Transform
-      pos: 47.5,7.5
-      parent: 1
-  - uid: 23923
-    components:
-    - type: Transform
-      pos: 74.5,12.5
-      parent: 1
-  - uid: 28084
-    components:
-    - type: Transform
-      pos: 103.17996,15.455734
-      parent: 1
 - proto: filingCabinetTallRandom
   entities:
   - uid: 1203
@@ -79222,20 +79169,10 @@ entities:
     - type: Transform
       pos: 27.659313,-22.492584
       parent: 1
-  - uid: 4403
-    components:
-    - type: Transform
-      pos: 42.5,12.5
-      parent: 1
-  - uid: 5735
-    components:
-    - type: Transform
-      pos: 73.5,-5.5
-      parent: 1
-  - uid: 28086
+  - uid: 13763
     components:
     - type: Transform
-      pos: 103.690384,15.466158
+      pos: 103.73396,15.437514
       parent: 1
 - proto: FireAlarm
   entities:
@@ -133289,20 +133226,6 @@ entities:
       parent: 1
     - type: Label
       currentLabel: General - Pet Store
-  - uid: 29520
-    components:
-    - type: Transform
-      pos: 22.5,4.5
-      parent: 1
-    - type: Label
-      currentLabel: General - Park
-  - uid: 29709
-    components:
-    - type: Transform
-      pos: 6.5,14.5
-      parent: 1
-    - type: Label
-      currentLabel: General - Barber Shop
 - proto: HolopadAiBackupPower
   entities:
   - uid: 29455
@@ -133485,6 +133408,13 @@ entities:
     - type: Transform
       pos: -41.5,4.5
       parent: 1
+- proto: HolopadEngineeringParticleAccelerator
+  entities:
+  - uid: 29797
+    components:
+    - type: Transform
+      pos: -74.5,2.5
+      parent: 1
 - proto: HolopadEpistemicsMantis
   entities:
   - uid: 29500
@@ -133541,6 +133471,13 @@ entities:
     - type: Transform
       pos: 17.5,-16.5
       parent: 1
+- proto: HolopadGeneralPark
+  entities:
+  - uid: 21205
+    components:
+    - type: Transform
+      pos: 23.5,3.5
+      parent: 1
 - proto: HolopadGeneralTheater
   entities:
   - uid: 29514
@@ -133618,6 +133555,13 @@ entities:
     - type: Transform
       pos: 62.5,-22.5
       parent: 1
+- proto: HolopadMedicalOutpost
+  entities:
+  - uid: 3675
+    components:
+    - type: Transform
+      pos: -22.5,8.5
+      parent: 1
 - proto: HolopadMedicalSurgery
   entities:
   - uid: 29513
@@ -133716,6 +133660,13 @@ entities:
     - type: Transform
       pos: 76.5,26.5
       parent: 1
+- proto: HolopadSecurityPermaWorkshop
+  entities:
+  - uid: 29798
+    components:
+    - type: Transform
+      pos: 74.5,35.5
+      parent: 1
 - proto: HolopadSecurityWarden
   entities:
   - uid: 29518
@@ -133730,6 +133681,13 @@ entities:
     - type: Transform
       pos: 37.5,18.5
       parent: 1
+- proto: HolopadServiceBarberShop
+  entities:
+  - uid: 23525
+    components:
+    - type: Transform
+      pos: 6.5,14.5
+      parent: 1
 - proto: HolopadServiceBotany
   entities:
   - uid: 1045
@@ -133786,6 +133744,13 @@ entities:
     - type: Transform
       pos: 40.5,-10.5
       parent: 1
+- proto: HolopadServiceToolroom
+  entities:
+  - uid: 29799
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
 - proto: HoloprojectorSecurity
   entities:
   - uid: 7401
@@ -141191,15 +141156,15 @@ entities:
     - type: Transform
       pos: 85.5,-17.5
       parent: 1
-  - uid: 20537
+  - uid: 20676
     components:
     - type: Transform
-      pos: 128.5,-3.5
+      pos: 104.5,13.5
       parent: 1
-  - uid: 20676
+  - uid: 29788
     components:
     - type: Transform
-      pos: 104.5,13.5
+      pos: 126.49917,-3.7744036
       parent: 1
 - proto: PottedPlantRandom
   entities:
@@ -146035,11 +146000,6 @@ entities:
     - type: Transform
       pos: 18.5,39.5
       parent: 1
-  - uid: 7289
-    components:
-    - type: Transform
-      pos: 17.5,39.5
-      parent: 1
   - uid: 7444
     components:
     - type: Transform
@@ -155252,6 +155212,171 @@ entities:
     - type: Transform
       pos: 84.52116,17.583738
       parent: 1
+- proto: SecureCabinet
+  entities:
+  - uid: 29793
+    components:
+    - type: Transform
+      pos: 59.5,40.5
+      parent: 1
+- proto: SecureCabinetAttorney
+  entities:
+  - uid: 9883
+    components:
+    - type: Transform
+      pos: 47.5,7.5
+      parent: 1
+  - uid: 13772
+    components:
+    - type: Transform
+      pos: 42.5,12.5
+      parent: 1
+- proto: SecureCabinetCaptain
+  entities:
+  - uid: 23526
+    components:
+    - type: Transform
+      pos: 128.72833,-3.3365998
+      parent: 1
+- proto: SecureCabinetCE
+  entities:
+  - uid: 7323
+    components:
+    - type: Transform
+      pos: -53.5,0.5
+      parent: 1
+- proto: SecureCabinetCJ
+  entities:
+  - uid: 29795
+    components:
+    - type: Transform
+      pos: 107.245705,10.443604
+      parent: 1
+- proto: SecureCabinetClerk
+  entities:
+  - uid: 6995
+    components:
+    - type: Transform
+      pos: 101.29022,9.778407
+      parent: 1
+- proto: SecureCabinetCMO
+  entities:
+  - uid: 7289
+    components:
+    - type: Transform
+      pos: 78.45868,-8.418583
+      parent: 1
+- proto: SecureCabinetCommand
+  entities:
+  - uid: 4403
+    components:
+    - type: Transform
+      pos: 123.5,5.5
+      parent: 1
+  - uid: 29786
+    components:
+    - type: Transform
+      pos: 118.5,-7.5
+      parent: 1
+- proto: SecureCabinetDetective
+  entities:
+  - uid: 29792
+    components:
+    - type: Transform
+      pos: 60.842125,22.607807
+      parent: 1
+- proto: SecureCabinetEpistemics
+  entities:
+  - uid: 5735
+    components:
+    - type: Transform
+      pos: -11.5,48.5
+      parent: 1
+  - uid: 6598
+    components:
+    - type: Transform
+      pos: -5.5,41.5
+      parent: 1
+- proto: SecureCabinetHoP
+  entities:
+  - uid: 5809
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+- proto: SecureCabinetLogistics
+  entities:
+  - uid: 6537
+    components:
+    - type: Transform
+      pos: -46.5,-35.5
+      parent: 1
+  - uid: 29789
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+- proto: SecureCabinetMantis
+  entities:
+  - uid: 23919
+    components:
+    - type: Transform
+      pos: 17.5,39.5
+      parent: 1
+- proto: SecureCabinetMedical
+  entities:
+  - uid: 23923
+    components:
+    - type: Transform
+      pos: 65.5,-4.5
+      parent: 1
+- proto: SecureCabinetMG
+  entities:
+  - uid: 29794
+    components:
+    - type: Transform
+      pos: 8.5,48.5
+      parent: 1
+- proto: SecureCabinetProsecutor
+  entities:
+  - uid: 20537
+    components:
+    - type: Transform
+      pos: 103.24051,15.436655
+      parent: 1
+- proto: SecureCabinetPsychologist
+  entities:
+  - uid: 14709
+    components:
+    - type: Transform
+      pos: 73.5,-5.5
+      parent: 1
+- proto: SecureCabinetReporter
+  entities:
+  - uid: 6536
+    components:
+    - type: Transform
+      pos: 41.5,-14.5
+      parent: 1
+- proto: SecureCabinetSecurity
+  entities:
+  - uid: 7296
+    components:
+    - type: Transform
+      pos: 74.5,18.5
+      parent: 1
+  - uid: 11672
+    components:
+    - type: Transform
+      pos: 74.5,12.5
+      parent: 1
+- proto: SecureCabinetService
+  entities:
+  - uid: 29791
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
 - proto: SecurityTechFab
   entities:
   - uid: 4904
@@ -159968,6 +160093,13 @@ entities:
     - type: Transform
       pos: -38.5,14.5
       parent: 1
+- proto: SpawnMobCatClippy
+  entities:
+  - uid: 29709
+    components:
+    - type: Transform
+      pos: -17.5,-1.5
+      parent: 1
 - proto: SpawnMobCatGeneric
   entities:
   - uid: 4320
@@ -160095,10 +160227,10 @@ entities:
       parent: 1
 - proto: SpawnMobMedibot
   entities:
-  - uid: 25764
+  - uid: 29790
     components:
     - type: Transform
-      pos: 65.5,-4.5
+      pos: 66.5,-4.5
       parent: 1
 - proto: SpawnMobMonkeyPunpun
   entities:
@@ -160166,6 +160298,13 @@ entities:
     - type: Transform
       pos: 73.5,-11.5
       parent: 1
+- proto: SpawnPointAdminAssistant
+  entities:
+  - uid: 29785
+    components:
+    - type: Transform
+      pos: 122.5,9.5
+      parent: 1
 - proto: SpawnPointAtmos
   entities:
   - uid: 6404
@@ -167661,26 +167800,11 @@ entities:
       parent: 1
 - proto: TelecomServerFilled
   entities:
-  - uid: 6536
+  - uid: 29787
     components:
     - type: Transform
-      pos: 123.5,5.5
+      pos: 142.5,-2.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 6537
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: ThermomachineHeaterMachineCircuitBoard
   entities:
   - uid: 6499
@@ -190932,7 +191056,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -166932.84
+      secondsUntilStateChange: -169016.36
       state: Opening
   - uid: 5096
     components:
@@ -190954,7 +191078,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -166932.84
+      secondsUntilStateChange: -169016.36
       state: Opening
   - uid: 5498
     components:
@@ -190970,7 +191094,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -166656.47
+      secondsUntilStateChange: -168739.98
       state: Opening
   - uid: 8696
     components:
@@ -191003,7 +191127,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -166654.58
+      secondsUntilStateChange: -168738.1
       state: Opening
   - uid: 18835
     components:
@@ -191015,7 +191139,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -166651.58
+      secondsUntilStateChange: -168735.1
       state: Opening
   - uid: 23917
     components:
@@ -192754,18 +192878,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 70.5,-16.5
       parent: 1
-  - uid: 13763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 83.5,33.5
-      parent: 1
-  - uid: 13772
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 83.5,31.5
-      parent: 1
   - uid: 16660
     components:
     - type: Transform
@@ -192795,14 +192907,28 @@ entities:
       parent: 1
 - proto: WindowTintedReinforcedDirectional
   entities:
-  - uid: 23525
+  - uid: 25764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,33.5
+      parent: 1
+  - uid: 28084
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,31.5
+      parent: 1
+  - uid: 28086
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 65.5,22.5
       parent: 1
-  - uid: 23526
+  - uid: 29520
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 65.5,19.5
       parent: 1
 - proto: Wirecutter
diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml
index cca0d4cb695..036d57069ca 100644
--- a/Resources/Prototypes/Maps/hive.yml
+++ b/Resources/Prototypes/Maps/hive.yml
@@ -21,6 +21,7 @@
             Passenger: [ -1, -1 ]
             Librarian: [ 1, 1 ]
           #command
+            AdministrativeAssistant: [ 1, 1 ]
             Captain: [ 1, 1 ]
             StationAi: [ 1, 1 ]
           #engineering