diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml
index 2f076877f17..cdaab107f63 100644
--- a/Resources/Maps/glacier.yml
+++ b/Resources/Maps/glacier.yml
@@ -12068,7 +12068,7 @@ entities:
   - uid: 22
     components:
     - type: MetaData
-      name: Breakroom
+      name: Restroom
     - type: Transform
       pos: 49.5,-24.5
       parent: 2
@@ -13666,6 +13666,29 @@ entities:
     - type: Transform
       pos: 26.5,-30.5
       parent: 2
+- proto: AirlockRoboticsGlassLocked
+  entities:
+  - uid: 129
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 44.5,-19.5
+      parent: 2
+  - uid: 130
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 43.5,-19.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: MetaData
+      name: Robotics
+    - type: Transform
+      pos: 40.5,-22.5
+      parent: 2
 - proto: AirlockSalvageGlassLocked
   entities:
   - uid: 13374
@@ -13700,29 +13723,6 @@ entities:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
-- proto: AirlockScienceGlassLocked
-  entities:
-  - uid: 129
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 43.5,-19.5
-      parent: 2
-  - uid: 130
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 44.5,-19.5
-      parent: 2
-  - uid: 214
-    components:
-    - type: MetaData
-      name: Robotics
-    - type: Transform
-      pos: 40.5,-22.5
-      parent: 2
 - proto: AirlockScienceLocked
   entities:
   - uid: 211
@@ -14093,8 +14093,6 @@ entities:
     - type: Transform
       pos: -33.5,33.5
       parent: 2
-    - type: Apc
-      hasAccess: True
     - type: PowerNetworkBattery
       canDischarge: False
   - uid: 254
@@ -16712,6 +16710,18 @@ entities:
     - type: Transform
       pos: 1.5,19.5
       parent: 2
+- proto: BlastDoorUnlinkedRobotics
+  entities:
+  - uid: 12146
+    components:
+    - type: Transform
+      pos: 45.5,-19.5
+      parent: 2
+  - uid: 12687
+    components:
+    - type: Transform
+      pos: 46.5,-19.5
+      parent: 2
 - proto: BlockGameArcade
   entities:
   - uid: 735
@@ -29972,6 +29982,16 @@ entities:
     - type: Transform
       pos: 38.5,59.5
       parent: 2
+  - uid: 17990
+    components:
+    - type: Transform
+      pos: -5.5,17.5
+      parent: 2
+  - uid: 17991
+    components:
+    - type: Transform
+      pos: -33.5,33.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 3087
@@ -47850,6 +47870,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,24.5
       parent: 2
+  - uid: 17989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,20.5
+      parent: 2
 - proto: ComputerFrame
   entities:
   - uid: 6301
@@ -76052,6 +76078,13 @@ entities:
     - type: Transform
       pos: -16.5,15.5
       parent: 2
+- proto: GunSafeLaserCarbine
+  entities:
+  - uid: 14378
+    components:
+    - type: Transform
+      pos: -20.5,11.5
+      parent: 2
 - proto: Gyroscope
   entities:
   - uid: 10043
@@ -76766,6 +76799,41 @@ entities:
     - type: Transform
       pos: 37.295227,37.70594
       parent: 2
+- proto: IntercomEngineering
+  entities:
+  - uid: 17999
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,36.5
+      parent: 2
+  - uid: 18001
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 18002
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,55.5
+      parent: 2
+- proto: IntercomMedical
+  entities:
+  - uid: 18000
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,4.5
+      parent: 2
+- proto: IntercomScience
+  entities:
+  - uid: 17997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-20.5
+      parent: 2
 - proto: IntercomSecurity
   entities:
   - uid: 10155
@@ -76778,6 +76846,46 @@ entities:
     - type: Transform
       pos: -14.5,38.5
       parent: 2
+  - uid: 17992
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,24.5
+      parent: 2
+  - uid: 17993
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,25.5
+      parent: 2
+- proto: IntercomService
+  entities:
+  - uid: 17994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,19.5
+      parent: 2
+  - uid: 17995
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,26.5
+      parent: 2
+  - uid: 17998
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,9.5
+      parent: 2
+- proto: IntercomSupply
+  entities:
+  - uid: 17996
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,10.5
+      parent: 2
 - proto: JanitorialTrolley
   entities:
   - uid: 10157
@@ -77230,6 +77338,19 @@ entities:
         - Pressed: Toggle
         730:
         - Pressed: Toggle
+- proto: LockableButtonRobotics
+  entities:
+  - uid: 5814
+    components:
+    - type: Transform
+      pos: 47.5,-19.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        12687:
+        - Pressed: Toggle
+        12146:
+        - Pressed: Toggle
 - proto: LockableButtonSalvage
   entities:
   - uid: 4805
@@ -81076,11 +81197,6 @@ entities:
     - type: Transform
       pos: 50.5,-0.5
       parent: 2
-  - uid: 10865
-    components:
-    - type: Transform
-      pos: 34.5,71.5
-      parent: 2
   - uid: 10866
     components:
     - type: Transform
@@ -81206,11 +81322,6 @@ entities:
     - type: Transform
       pos: 49.5,-19.5
       parent: 2
-  - uid: 10902
-    components:
-    - type: Transform
-      pos: 34.5,72.5
-      parent: 2
   - uid: 10903
     components:
     - type: Transform
@@ -81226,6 +81337,11 @@ entities:
     - type: Transform
       pos: 57.5,-14.5
       parent: 2
+  - uid: 10908
+    components:
+    - type: Transform
+      pos: 37.5,72.5
+      parent: 2
   - uid: 10909
     components:
     - type: Transform
@@ -81781,6 +81897,11 @@ entities:
     - type: Transform
       pos: 32.5,63.5
       parent: 2
+  - uid: 11030
+    components:
+    - type: Transform
+      pos: 38.5,72.5
+      parent: 2
   - uid: 11031
     components:
     - type: Transform
@@ -86316,6 +86437,11 @@ entities:
     - type: Transform
       pos: 40.5,-15.5
       parent: 2
+  - uid: 13982
+    components:
+    - type: Transform
+      pos: 39.5,72.5
+      parent: 2
   - uid: 14615
     components:
     - type: Transform
@@ -88131,6 +88257,13 @@ entities:
     - type: Transform
       pos: 51.5,6.5
       parent: 2
+- proto: PlayerStationAi
+  entities:
+  - uid: 14579
+    components:
+    - type: Transform
+      pos: 38.5,70.5
+      parent: 2
 - proto: PlushieAtmosian
   entities:
   - uid: 12274
@@ -88194,6 +88327,14 @@ entities:
     - type: Transform
       pos: -58.510414,-5.4538803
       parent: 2
+- proto: PlushieRainbowCarp
+  entities:
+  - uid: 17987
+    components:
+    - type: Transform
+      parent: 14550
+    - type: Physics
+      canCollide: False
 - proto: PlushieRatvar
   entities:
   - uid: 12281
@@ -97586,16 +97727,6 @@ entities:
       parent: 2
 - proto: ShuttersWindow
   entities:
-  - uid: 12146
-    components:
-    - type: Transform
-      pos: 45.5,-19.5
-      parent: 2
-  - uid: 14706
-    components:
-    - type: Transform
-      pos: 46.5,-19.5
-      parent: 2
   - uid: 17029
     components:
     - type: Transform
@@ -97933,19 +98064,6 @@ entities:
       linkedPorts:
         10250:
         - Status: Toggle
-  - uid: 13939
-    components:
-    - type: Transform
-      pos: 47.5,-19.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        14706:
-        - On: Open
-        - Off: Close
-        12146:
-        - On: Open
-        - Off: Close
   - uid: 14666
     components:
     - type: Transform
@@ -100217,16 +100335,16 @@ entities:
       parent: 2
 - proto: SpawnPointReporter
   entities:
+  - uid: 10891
+    components:
+    - type: Transform
+      pos: 68.5,-8.5
+      parent: 2
   - uid: 13981
     components:
     - type: Transform
       pos: 67.5,-9.5
       parent: 2
-  - uid: 13982
-    components:
-    - type: Transform
-      pos: 69.5,-8.5
-      parent: 2
   - uid: 14159
     components:
     - type: Transform
@@ -100251,6 +100369,23 @@ entities:
     - type: Transform
       pos: 31.5,42.5
       parent: 2
+- proto: SpawnPointRoboticist
+  entities:
+  - uid: 13939
+    components:
+    - type: Transform
+      pos: 43.5,-21.5
+      parent: 2
+  - uid: 14706
+    components:
+    - type: Transform
+      pos: 46.5,-21.5
+      parent: 2
+  - uid: 17982
+    components:
+    - type: Transform
+      pos: 47.5,-25.5
+      parent: 2
 - proto: SpawnPointSalvageSpecialist
   entities:
   - uid: 4794
@@ -100280,16 +100415,6 @@ entities:
     - type: Transform
       pos: 40.5,-33.5
       parent: 2
-  - uid: 5814
-    components:
-    - type: Transform
-      pos: 43.5,-21.5
-      parent: 2
-  - uid: 12687
-    components:
-    - type: Transform
-      pos: 47.5,-25.5
-      parent: 2
   - uid: 13588
     components:
     - type: Transform
@@ -100340,6 +100465,28 @@ entities:
     - type: Transform
       pos: 30.5,-18.5
       parent: 2
+- proto: SpawnPointSecurityBorg
+  entities:
+  - uid: 17983
+    components:
+    - type: Transform
+      pos: -6.5,21.5
+      parent: 2
+  - uid: 17984
+    components:
+    - type: Transform
+      pos: -23.5,21.5
+      parent: 2
+  - uid: 17985
+    components:
+    - type: Transform
+      pos: -22.5,38.5
+      parent: 2
+  - uid: 17986
+    components:
+    - type: Transform
+      pos: -19.5,41.5
+      parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
   - uid: 13988
@@ -101100,7 +101247,7 @@ entities:
     - type: Transform
       pos: 83.5,6.5
       parent: 2
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 13629
     components:
@@ -101137,7 +101284,7 @@ entities:
   - uid: 10517
     components:
     - type: Transform
-      pos: 37.5,73.5
+      pos: 36.5,73.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
@@ -103275,12 +103422,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-6.5
       parent: 2
-  - uid: 14378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,11.5
-      parent: 2
   - uid: 14379
     components:
     - type: Transform
@@ -104242,6 +104383,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,-26.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        stash: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 17987
+        disposals: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
   - uid: 14551
     components:
     - type: Transform
@@ -104398,16 +104549,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.421833,-15.183031
       parent: 2
-- proto: ToyAi
-  entities:
-  - uid: 14579
-    components:
-    - type: MetaData
-      desc: It's displaying the famous "blue smile of death"
-      name: faulty AI core
-    - type: Transform
-      pos: 38.49569,70.53853
-      parent: 2
 - proto: ToyFigurineClown
   entities:
   - uid: 14580
@@ -105104,6 +105245,11 @@ entities:
     - type: Transform
       pos: 26.5,39.5
       parent: 2
+  - uid: 17981
+    components:
+    - type: Transform
+      pos: 29.5,-21.5
+      parent: 2
 - proto: VendingMachineViroDrobe
   entities:
   - uid: 14681
@@ -105504,13 +105650,18 @@ entities:
   - uid: 10845
     components:
     - type: Transform
-      pos: 39.5,72.5
+      pos: 34.5,72.5
       parent: 2
   - uid: 10863
     components:
     - type: Transform
       pos: -23.5,11.5
       parent: 2
+  - uid: 10865
+    components:
+    - type: Transform
+      pos: 34.5,71.5
+      parent: 2
   - uid: 10868
     components:
     - type: Transform
@@ -105543,26 +105694,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,70.5
       parent: 2
-  - uid: 10891
-    components:
-    - type: Transform
-      pos: 38.5,72.5
-      parent: 2
   - uid: 10900
     components:
     - type: Transform
       pos: 41.5,68.5
       parent: 2
+  - uid: 10902
+    components:
+    - type: Transform
+      pos: 36.5,72.5
+      parent: 2
   - uid: 10907
     components:
     - type: Transform
       pos: 41.5,71.5
       parent: 2
-  - uid: 10908
-    components:
-    - type: Transform
-      pos: 37.5,72.5
-      parent: 2
   - uid: 10914
     components:
     - type: Transform
@@ -105580,11 +105726,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,64.5
       parent: 2
-  - uid: 11030
-    components:
-    - type: Transform
-      pos: 36.5,72.5
-      parent: 2
   - uid: 11043
     components:
     - type: Transform
@@ -113677,6 +113818,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,41.5
       parent: 2
+- proto: WarningO2
+  entities:
+  - uid: 17988
+    components:
+    - type: Transform
+      pos: -11.5,47.5
+      parent: 2
 - proto: WarpPoint
   entities:
   - uid: 16248
@@ -114429,6 +114577,17 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLawyerLocked
   entities:
+  - uid: 6005
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 2
+  - uid: 6408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,25.5
+      parent: 2
   - uid: 16537
     components:
     - type: Transform
@@ -114453,17 +114612,6 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 6005
-    components:
-    - type: Transform
-      pos: -8.5,27.5
-      parent: 2
-  - uid: 6408
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,25.5
-      parent: 2
   - uid: 13193
     components:
     - type: MetaData
@@ -114476,7 +114624,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4307.4097
+      secondsUntilStateChange: -5336.6123
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114492,7 +114640,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4306.8433
+      secondsUntilStateChange: -5336.046
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114514,7 +114662,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4306.3765
+      secondsUntilStateChange: -5335.579
       state: Opening
     - type: Airlock
       autoClose: False
@@ -114530,7 +114678,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -4307.9097
+      secondsUntilStateChange: -5337.1123
       state: Opening
     - type: Airlock
       autoClose: False
diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml
index 59dd9f381dd..1bdd98b3cee 100644
--- a/Resources/Prototypes/Maps/glacier.yml
+++ b/Resources/Prototypes/Maps/glacier.yml
@@ -22,6 +22,7 @@
       - type: StationJobs
         availableJobs:
           Captain: [ 1, 1 ]
+          StationAi: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 2, 2 ]
@@ -57,6 +58,7 @@
           ResearchDirector: [ 1, 1 ]
           Chaplain: [ 1, 1 ]
           ForensicMantis: [ 1, 1 ]
+          Roboticist: [ 1, 2 ]
           Scientist: [ 2, 3 ]
           ResearchAssistant: [ 2, 2 ]
           Borg: [ 2, 3 ]