diff --git a/StationMaps/KosmicStation/kosmicstation.dmm b/StationMaps/KosmicStation/kosmicstation.dmm
index 6a413ca..25a7247 100644
--- a/StationMaps/KosmicStation/kosmicstation.dmm
+++ b/StationMaps/KosmicStation/kosmicstation.dmm
@@ -6,7 +6,7 @@
 /obj/machinery/modular_computer/preset/civilian{
 	dir = 8
 	},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron,
 /area/station/engineering/main)
@@ -14,6 +14,12 @@
 /obj/effect/landmark/blobstart,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
+"ae" = (
+/obj/docking_port/stationary/syndicate/northwest{
+	dir = 8
+	},
+/turf/open/space/basic,
+/area/space)
 "ag" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/computer/crew,
@@ -76,7 +82,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "as" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/end{
 	dir = 8
@@ -96,7 +102,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 9
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ax" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -122,12 +128,13 @@
 /obj/machinery/light/small/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/science/ordnance)
 "aB" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer1,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "aC" = (
@@ -144,7 +151,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "aG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -155,7 +162,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "aI" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
@@ -181,15 +188,12 @@
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 4
 	},
-/obj/machinery/camera/directional/west{
-	c_tag = "Prison Cafeteria";
-	network = list("ss13","prison")
-	},
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/vending/sustenance,
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "aU" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
@@ -219,7 +223,7 @@
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "bb" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/newscaster/directional/east,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
@@ -236,7 +240,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "bg" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -251,15 +255,19 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"bj" = (
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/port/aft)
 "bl" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/light/directional/west,
 /obj/machinery/status_display/ai/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "bm" = (
 /turf/open/floor/iron,
 /area/station/commons/storage/tools)
@@ -293,14 +301,14 @@
 /area/station/medical/medbay)
 "bu" = (
 /obj/structure/closet/firecloset/full,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "bv" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "bw" = (
 /obj/structure/chair{
 	dir = 1
@@ -311,12 +319,13 @@
 "bx" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/wood,
 /area/station/service/library)
 "by" = (
 /obj/structure/table,
+/obj/item/tape,
 /turf/open/floor/iron,
 /area/station/command/teleporter)
 "bz" = (
@@ -358,7 +367,7 @@
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/power_store/cell/high,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "bH" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -410,7 +419,7 @@
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "bQ" = (
 /obj/structure/table,
 /obj/machinery/light/directional/north,
@@ -466,7 +475,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
 "cd" = (
@@ -476,7 +485,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "cf" = (
 /obj/structure/sign/departments/court/directional/east,
 /turf/open/floor/iron,
@@ -489,6 +498,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/service/kitchen)
+"ch" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/landmark/blobstart,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/port/aft)
 "ci" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -535,7 +549,7 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "cp" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 1
@@ -543,7 +557,7 @@
 /obj/structure/cable,
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "cq" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -630,7 +644,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 5
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "cG" = (
 /obj/structure/chair{
 	dir = 8
@@ -662,7 +676,7 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
 "cL" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron,
 /area/station/science/ordnance)
@@ -750,15 +764,17 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "dj" = (
 /obj/structure/closet/radiation,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "dk" = (
-/mob/living/simple_animal/bot/secbot/beepsky,
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/iron,
-/area/station/hallway/secondary/command)
+/area/station/cargo/miningoffice)
 "dl" = (
 /obj/machinery/vending/clothing,
 /turf/open/floor/iron,
@@ -793,7 +809,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "dr" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer1{
 	dir = 8
@@ -806,7 +822,7 @@
 	id = "AI"
 	},
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "dt" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks{
@@ -838,7 +854,7 @@
 /turf/open/floor/iron,
 /area/station/service/bar)
 "dz" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "dB" = (
@@ -871,7 +887,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/stool/directional/south,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "dH" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder{
@@ -927,7 +943,10 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"dP" = (
+/turf/closed/wall,
+/area/space)
 "dQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1010,7 +1029,7 @@
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ek" = (
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
@@ -1111,6 +1130,7 @@
 	desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads. It looks like it's been reinforced."
 	},
 /obj/machinery/light/small/directional/north,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/circuit/green,
 /area/station/security/prison)
 "eE" = (
@@ -1140,7 +1160,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"eN" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
 "eO" = (
 /obj/machinery/rnd/production/circuit_imprinter/department/science,
 /turf/open/floor/iron,
@@ -1167,7 +1192,7 @@
 /obj/machinery/computer/dna_console{
 	dir = 1
 	},
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "eT" = (
@@ -1188,8 +1213,10 @@
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
 "eX" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
+/obj/machinery/drone_dispenser/classic{
+	name = "old-model drone shell dispenser";
+	desc = "A hefty machine that, when supplied with iron and glass, will periodically create a classic drone shell. Does not need to be manually operated. The last of its kind."
+	},
 /turf/open/floor/iron,
 /area/station/science)
 "eY" = (
@@ -1277,7 +1304,7 @@
 	},
 /obj/structure/closet/crate/internals,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "fb" = (
 /obj/machinery/power/tracker,
 /obj/structure/cable,
@@ -1287,6 +1314,15 @@
 /obj/machinery/telecomms/processor/preset_three,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
+"fd" = (
+/obj/machinery/conveyor{
+	id = "mining"
+	},
+/obj/machinery/bouldertech/refinery{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "fe" = (
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
@@ -1314,12 +1350,12 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "fp" = (
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
 	dir = 5
 	},
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "fs" = (
@@ -1330,7 +1366,7 @@
 /obj/structure/sign/poster/official/random/directional/west,
 /obj/machinery/light/directional/west,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "fu" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1344,7 +1380,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "fz" = (
 /obj/structure/sign/departments/medbay/alt/directional/west,
 /obj/item/kirbyplants/random,
@@ -1395,11 +1431,20 @@
 "fJ" = (
 /obj/structure/table,
 /obj/machinery/status_display/ai/directional/west,
+/obj/item/ai_module/law/supplied/freeform,
+/obj/item/ai_module/law/supplied/freeform{
+	pixel_y = 5;
+	pixel_x = -2
+	},
+/obj/item/ai_module/law/supplied/freeform{
+	pixel_y = 4;
+	pixel_x = 2
+	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "fK" = (
 /turf/closed/wall,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "fL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1431,10 +1476,10 @@
 "fS" = (
 /obj/machinery/teleport/hub,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "fU" = (
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "fW" = (
 /obj/machinery/power/solar{
 	id = "foresolar";
@@ -1459,7 +1504,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ga" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
 	dir = 6
@@ -1604,7 +1649,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "gH" = (
 /obj/structure/table,
 /turf/open/floor/iron,
@@ -1621,9 +1666,6 @@
 	pixel_y = 7
 	},
 /obj/item/pen,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
-/obj/item/computer_disk/engineering,
 /obj/item/clipboard,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
@@ -1661,7 +1703,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/assistant,
 /obj/machinery/light/small/directional/east,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/west,
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/iron,
@@ -1682,7 +1724,11 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"gY" = (
+/obj/effect/landmark/carpspawn,
+/turf/open/space/basic,
+/area/space)
 "ha" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction{
@@ -1730,7 +1776,7 @@
 "hk" = (
 /obj/machinery/mecha_part_fabricator,
 /obj/machinery/light/small/directional/east,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
 "hl" = (
@@ -1784,6 +1830,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"hE" = (
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/space)
 "hG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1822,15 +1872,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "hM" = (
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "hO" = (
 /obj/effect/landmark/start/cyborg,
 /obj/machinery/status_display/ai/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "hP" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1868,9 +1918,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
 "hY" = (
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/obj/effect/landmark/start/shaft_miner,
+/obj/structure/railing/corner/end{
+	dir = 1
+	},
 /turf/open/floor/iron,
-/area/station/security/brig)
+/area/station/cargo/miningoffice)
 "ia" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
@@ -1906,7 +1959,7 @@
 	},
 /obj/structure/sign/poster/official/random/directional/south,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "if" = (
 /obj/machinery/power/energy_accumulator/tesla_coil/anchored,
 /obj/structure/window/reinforced/plasma/spawner/directional/west,
@@ -1917,7 +1970,7 @@
 /area/station/engineering/supermatter)
 "ig" = (
 /turf/closed/wall/r_wall,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "ih" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
@@ -1947,7 +2000,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 10
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "in" = (
 /obj/structure/cable,
 /obj/machinery/power/smes/full,
@@ -1959,7 +2012,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ir" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 6
@@ -2010,7 +2063,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "iz" = (
 /obj/effect/landmark/start/assistant,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -2034,7 +2087,7 @@
 /obj/structure/easel,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "iI" = (
 /obj/effect/spawner/random/engineering/tracking_beacon,
 /turf/open/floor/iron/airless{
@@ -2079,9 +2132,8 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
 "iR" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/station/solars/starboard)
+/turf/closed/wall/r_wall,
+/area/station/security/prison/safe)
 "iS" = (
 /obj/structure/bed{
 	dir = 4
@@ -2127,7 +2179,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "jc" = (
 /obj/machinery/vending/tool,
 /turf/open/floor/iron,
@@ -2146,6 +2198,7 @@
 	name = "Coffin-Driver"
 	},
 /obj/structure/closet/crate/coffin,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/plating,
 /area/station/service/chapel)
 "jg" = (
@@ -2175,7 +2228,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "jk" = (
 /obj/effect/landmark/start/assistant,
 /obj/machinery/newscaster/directional/north,
@@ -2230,13 +2283,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/obj/machinery/camera/directional/east{
-	c_tag = "Prison Workshop";
-	network = list("ss13","prison")
-	},
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "jB" = (
 /obj/machinery/mecha_part_fabricator,
 /turf/open/floor/iron,
@@ -2284,13 +2334,13 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
 "jN" = (
 /obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/science/ordnance)
 "jO" = (
@@ -2305,7 +2355,13 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"jT" = (
+/obj/machinery/conveyor{
+	id = "mining"
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "jU" = (
 /obj/effect/turf_decal/arrows/red{
 	dir = 8
@@ -2324,10 +2380,10 @@
 /area/station/cargo/miningoffice)
 "jY" = (
 /obj/effect/landmark/start/cyborg,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "jZ" = (
 /obj/effect/landmark/start/assistant,
 /obj/machinery/airalarm/directional/north,
@@ -2357,7 +2413,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "kk" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -2407,12 +2463,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/turretid{
 	control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
-	icon_state = "control_stun";
 	name = "AI Upload Turret Control";
 	pixel_y = 28
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "ky" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -2537,10 +2592,16 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /obj/machinery/status_display/evac/directional/south,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
+"kY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/turf/open/floor/plating,
+/area/station/security/prison)
 "lb" = (
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
@@ -2585,21 +2646,23 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"ll" = (
+/obj/effect/spawner/structure/electrified_grille,
+/turf/open/floor/plating,
+/area/station/ai/upload/chamber)
 "lm" = (
 /obj/effect/landmark/blobstart,
 /turf/open/floor/iron,
 /area/station/commons/dorms)
 "lq" = (
-/obj/machinery/computer/upload/ai{
-	dir = 4
-	},
 /obj/machinery/door/window/right/directional/east{
 	name = "Upload Console Window";
 	req_access = list("ai_upload")
 	},
 /obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/ai_law_rack/base/core,
 /turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "ls" = (
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/machinery/light/directional/east,
@@ -2644,7 +2707,7 @@
 /obj/item/reagent_containers/condiment/flour,
 /obj/item/reagent_containers/condiment/rice,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "lA" = (
 /obj/structure/cable,
 /obj/structure/window/reinforced/spawner/directional/north,
@@ -2663,7 +2726,6 @@
 "lE" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
 /obj/machinery/door/airlock/engineering{
 	name = "Atmospherics Access"
 	},
@@ -2722,6 +2784,14 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
+"lP" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/clothing/under/color/grey/ancient{
+	desc = "In memoriam - Incident M2019";
+	name = "rather old jumpsuit"
+	},
+/turf/open/floor/iron,
+/area/station/commons/dorms)
 "lQ" = (
 /obj/structure/table,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2733,6 +2803,13 @@
 /obj/structure/closet/secure_closet/warden,
 /turf/open/floor/iron,
 /area/station/security/brig)
+"lS" = (
+/obj/machinery/conveyor_switch/oneway{
+	id = "mining";
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "lU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2767,7 +2844,7 @@
 /turf/open/floor/iron,
 /area/station/command/bridge)
 "ma" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
@@ -2807,7 +2884,7 @@
 	dir = 8
 	},
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "ml" = (
 /turf/closed/wall,
 /area/station/service/library)
@@ -2835,7 +2912,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "mv" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -2844,12 +2921,9 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "mx" = (
-/obj/structure/table/glass,
-/obj/item/toy/figure/geneticist,
-/obj/item/storage/pill_bottle/mutadone{
-	pixel_x = -9
-	},
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/experimental_cloner,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "mz" = (
@@ -2898,7 +2972,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "mM" = (
 /obj/structure/table,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2907,6 +2981,14 @@
 /obj/effect/landmark/observer_start,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
+"mO" = (
+/obj/structure/table,
+/obj/item/clothing/head/helmet/monkey_sentience{
+	name = "experimental monkey mind magnification helmet";
+	desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level. You see several warning labels. You might be able to get more of these from cargo."
+	},
+/turf/open/floor/iron,
+/area/station/science)
 "mP" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
 	dir = 5
@@ -2920,13 +3002,13 @@
 	dir = 8
 	},
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "mR" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/medical/surgery_tool,
 /obj/effect/spawner/random/special_lighter,
 /obj/effect/spawner/random/maintenance/no_decals/two,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/storage/tools)
 "mT" = (
@@ -2943,7 +3025,6 @@
 	pixel_y = 7
 	},
 /obj/machinery/turretid{
-	icon_state = "control_stun";
 	name = "AI Chamber turret control";
 	pixel_x = 28;
 	pixel_y = 6
@@ -2968,7 +3049,7 @@
 	pixel_y = 34
 	},
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "mV" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 8
@@ -3002,7 +3083,11 @@
 "nb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
+"nc" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/iron,
+/area/station/science/genetics)
 "nd" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -3025,14 +3110,19 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"nj" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/cable,
+/turf/open/space/basic,
+/area/space/nearstation)
 "nk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "nl" = (
 /obj/machinery/computer/operating{
 	dir = 1
@@ -3042,7 +3132,7 @@
 "nm" = (
 /obj/structure/sign/warning/test_chamber/directional/north,
 /obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/light/small/directional/east,
@@ -3052,6 +3142,15 @@
 /obj/structure/table,
 /turf/open/floor/wood,
 /area/station/security/detectives_office)
+"np" = (
+/obj/machinery/conveyor{
+	id = "mining"
+	},
+/obj/machinery/bouldertech/refinery/smelter{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "nq" = (
 /obj/effect/landmark/start/cargo_technician,
 /obj/structure/cable,
@@ -3065,10 +3164,10 @@
 /area/station/maintenance/solars/starboard)
 "nt" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "nw" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -3080,14 +3179,14 @@
 "nx" = (
 /obj/effect/spawner/structure/electrified_grille,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "nz" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "nA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -3098,7 +3197,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/command/teleporter)
 "nC" = (
@@ -3114,7 +3213,7 @@
 /obj/structure/reagent_dispensers/servingdish,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "nE" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -3173,7 +3272,7 @@
 /turf/open/floor/iron,
 /area/station/security/brig)
 "nT" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/light/directional/west,
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
@@ -3190,7 +3289,7 @@
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "nW" = (
 /obj/machinery/door/poddoor{
 	id = "derelict_gun";
@@ -3206,10 +3305,7 @@
 /area/station/security/detectives_office)
 "nY" = (
 /obj/machinery/hydroponics/soil,
-/obj/machinery/camera/directional/west{
-	c_tag = "Prison Forestry";
-	network = list("ss13","prison")
-	},
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/light/directional/west,
 /turf/open/misc/dirt/jungle,
 /area/station/security/prison/garden)
@@ -3225,7 +3321,7 @@
 	},
 /obj/machinery/light/directional/east,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "oc" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/newscaster/directional/north,
@@ -3241,7 +3337,7 @@
 	dir = 4
 	},
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "og" = (
 /obj/machinery/computer/records/security{
 	dir = 8
@@ -3257,6 +3353,7 @@
 /area/station/engineering/main)
 "oi" = (
 /obj/structure/rack,
+/obj/item/storage/belt/utility/full,
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
 "oj" = (
@@ -3314,7 +3411,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 9
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ow" = (
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron,
@@ -3329,6 +3426,17 @@
 /obj/machinery/vending/wardrobe/bar_wardrobe,
 /turf/open/floor/iron,
 /area/station/service/bar)
+"oB" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 11;
+	height = 24;
+	name = "SS13: Auxiliary Dock, Station-Port";
+	shuttle_id = "whiteship_home";
+	width = 35
+	},
+/turf/open/space/basic,
+/area/space)
 "oC" = (
 /obj/structure/table/wood,
 /obj/item/book/bible,
@@ -3400,7 +3508,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "oR" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/engineering/toolbox,
@@ -3479,7 +3587,7 @@
 /area/station/engineering/main)
 "ph" = (
 /obj/structure/fireaxecabinet/directional/west,
-/obj/structure/table,
+/obj/machinery/suit_storage_unit/atmos,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "pi" = (
@@ -3561,10 +3669,10 @@
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "pw" = (
 /obj/machinery/vending/dinnerware,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/service/kitchen)
 "pz" = (
@@ -3572,13 +3680,13 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "pB" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "pC" = (
 /obj/structure/cable,
 /obj/structure/window/reinforced/spawner/directional/east,
@@ -3599,7 +3707,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
 "pH" = (
@@ -3644,13 +3752,13 @@
 /obj/machinery/light/small/directional/south,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "pQ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/depsec/medical,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/vending/wallmed/directional/north,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
@@ -3717,7 +3825,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "qg" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/end{
 	dir = 8
@@ -3727,7 +3835,7 @@
 "qh" = (
 /obj/machinery/porta_turret/ai,
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "qi" = (
 /obj/structure/cable,
 /obj/structure/closet/secure_closet/personal,
@@ -3735,7 +3843,7 @@
 /area/station/commons/dorms)
 "qj" = (
 /obj/structure/cable,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/newscaster/directional/east,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/aft)
@@ -3814,7 +3922,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "qE" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/iron,
@@ -3837,7 +3945,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "qI" = (
 /obj/structure/cable,
 /turf/open/floor/iron/white,
@@ -3859,7 +3967,7 @@
 	},
 /obj/item/gun/grenadelauncher,
 /obj/effect/spawner/random/armory/riot_shield,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "qL" = (
@@ -3883,7 +3991,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 6
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "qO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -3950,9 +4058,6 @@
 /area/station/maintenance/solars/starboard/aft)
 "rb" = (
 /obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/fore)
@@ -3960,7 +4065,7 @@
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rd" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3993,7 +4098,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rh" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /turf/open/floor/iron,
@@ -4032,7 +4137,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 9
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rt" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4058,7 +4163,7 @@
 /obj/item/stack/license_plates/empty/fifty,
 /obj/item/stack/license_plates/empty/fifty,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rw" = (
 /turf/closed/wall,
 /area/station/service/chapel)
@@ -4085,7 +4190,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rC" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4139,7 +4244,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
 /area/station/engineering/main)
@@ -4154,9 +4259,9 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "rK" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -4168,7 +4273,7 @@
 /obj/structure/table,
 /obj/effect/landmark/blobstart,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rM" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/public/glass{
@@ -4202,7 +4307,7 @@
 /obj/item/food/energybar,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "rQ" = (
 /obj/machinery/biogenerator,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
@@ -4243,7 +4348,7 @@
 	id = "Cell 2";
 	name = "Cell 2"
 	},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "rX" = (
@@ -4274,7 +4379,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/depsec/science,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
@@ -4332,9 +4437,7 @@
 /area/station/commons/lounge)
 "sl" = (
 /obj/machinery/modular_computer/preset/id,
-/obj/machinery/camera/directional/north{
-	c_tag = "Chief Engineer's Office"
-	},
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
@@ -4374,7 +4477,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "su" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
@@ -4451,6 +4554,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
+"sF" = (
+/obj/machinery/power/rtg{
+	power_gen = 1600
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/security/prison)
 "sG" = (
 /obj/machinery/telecomms/receiver/preset_right,
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -4522,7 +4632,7 @@
 	},
 /area/station/security/prison/garden)
 "sY" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "sZ" = (
@@ -4575,7 +4685,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "tn" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -4623,7 +4733,7 @@
 	},
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "tx" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -4641,6 +4751,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
+"tC" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
 "tD" = (
 /obj/machinery/blackbox_recorder,
 /obj/machinery/door/window/brigdoor/security{
@@ -4680,7 +4796,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "tL" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4688,7 +4804,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "tN" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 10
@@ -4778,6 +4894,7 @@
 "ud" = (
 /obj/machinery/door/airlock/external,
 /obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/open/floor/plating,
 /area/station/maintenance/solars/starboard/fore)
 "ue" = (
@@ -4788,10 +4905,9 @@
 /turf/closed/wall/r_wall,
 /area/station/service/chapel)
 "ug" = (
-/obj/structure/table/glass,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/obj/machinery/computer/records/medical/laptop,
+/obj/machinery/experimental_cloner_scanner,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "uh" = (
@@ -4814,7 +4930,7 @@
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /obj/machinery/power/terminal{
 	dir = 1
 	},
@@ -4928,6 +5044,7 @@
 /obj/structure/cable,
 /obj/structure/table/reinforced,
 /obj/structure/railing,
+/obj/item/toy/spinningtoy,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "uG" = (
@@ -4972,10 +5089,10 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "uR" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5011,9 +5128,8 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/mob/living/simple_animal/bot/secbot/pingsky,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "va" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder{
@@ -5081,14 +5197,6 @@
 /area/station/security/prison/garden)
 "vo" = (
 /obj/structure/table,
-/obj/item/computer_disk{
-	pixel_x = 7;
-	pixel_y = 2
-	},
-/obj/item/computer_disk{
-	pixel_x = -5;
-	pixel_y = 8
-	},
 /turf/open/floor/iron,
 /area/station/science/ordnance)
 "vp" = (
@@ -5353,7 +5461,7 @@
 /obj/structure/cable,
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "wp" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/end{
 	dir = 1
@@ -5390,7 +5498,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "wv" = (
 /turf/closed/wall,
 /area/station/commons/storage/primary)
@@ -5403,7 +5511,7 @@
 "wx" = (
 /obj/effect/landmark/start/cargo_technician,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
@@ -5466,7 +5574,7 @@
 /turf/closed/wall,
 /area/station/service/janitor)
 "wI" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
@@ -5510,7 +5618,7 @@
 /obj/machinery/light/directional/west,
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "wU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
 /obj/structure/cable,
@@ -5555,14 +5663,14 @@
 /area/station/science/genetics)
 "xf" = (
 /turf/closed/wall/r_wall,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "xg" = (
 /obj/structure/bed,
 /obj/item/bedsheet/ian,
 /obj/item/binoculars,
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "xh" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5583,7 +5691,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "xk" = (
 /obj/machinery/door/window/right/directional/east{
 	req_access = list("engineering");
@@ -5599,7 +5707,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "xn" = (
 /obj/machinery/chem_master,
 /obj/machinery/vending/wallmed/directional/east,
@@ -5642,7 +5750,7 @@
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "xx" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating/airless,
@@ -5665,7 +5773,7 @@
 /obj/structure/cable,
 /obj/machinery/suit_storage_unit/standard_unit,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "xB" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /turf/open/floor/iron/chapel{
@@ -5683,7 +5791,7 @@
 /obj/structure/table,
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "xD" = (
 /obj/effect/turf_decal/plaque{
 	icon_state = "derelict13"
@@ -5708,6 +5816,7 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "aft-solars"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/aft)
 "xJ" = (
@@ -5731,13 +5840,13 @@
 /obj/effect/spawner/random/aimodule/harmless,
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "xM" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "xN" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/structure/cable,
@@ -5789,7 +5898,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "xW" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
@@ -5813,6 +5922,11 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/ordnance/burnchamber)
+"ya" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/spawner/random/engineering/atmospherics_portable,
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
 "yb" = (
 /obj/structure/mop_bucket,
 /obj/item/mop,
@@ -5828,7 +5942,7 @@
 /turf/open/floor/iron/dark/corner{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "yd" = (
 /obj/structure/chair{
 	dir = 1
@@ -5837,13 +5951,26 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"ye" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "whiteship-dock"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/door/airlock/external{
+	name = "Auxiliary Airlock"
+	},
+/turf/open/floor/plating,
+/area/station/hallway/primary/central/aft)
 "yf" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/gravity_generator)
 "yh" = (
 /obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "yi" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -5904,17 +6031,29 @@
 /obj/machinery/shower/directional/west,
 /obj/structure/sign/poster/official/random/directional/east,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"yw" = (
+/obj/structure/table,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
 "yx" = (
 /obj/item/radio/intercom/directional/east,
 /obj/structure/extinguisher_cabinet/directional/south,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"yy" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/conveyor{
+	id = "mining"
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "yz" = (
 /obj/effect/spawner/structure/electrified_grille,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "yA" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6059,7 +6198,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "yW" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 5
@@ -6083,7 +6222,6 @@
 "za" = (
 /obj/structure/closet/secure_closet/research_director,
 /obj/item/mod/control/pre_equipped/research,
-/obj/item/computer_disk/ordnance,
 /obj/item/circuitboard/aicore,
 /obj/item/pai_card,
 /obj/item/aicard,
@@ -6110,6 +6248,7 @@
 "ze" = (
 /obj/effect/landmark/start/shaft_miner,
 /obj/machinery/light/directional/east,
+/obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "zf" = (
@@ -6173,7 +6312,7 @@
 /obj/structure/cable,
 /obj/machinery/light/directional/south,
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "zq" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6216,9 +6355,7 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter)
 "zw" = (
-/obj/machinery/camera/directional/east{
-	c_tag = "Atmospherics Tank - N2"
-	},
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/engine/n2,
 /area/station/engineering/atmos)
 "zx" = (
@@ -6277,10 +6414,11 @@
 /turf/open/floor/iron/dark/side{
 	dir = 4
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "zH" = (
 /obj/structure/chair/stool/directional/north,
 /obj/structure/cable,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "zL" = (
@@ -6300,7 +6438,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/green/hidden,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "zO" = (
@@ -6328,6 +6466,7 @@
 /area/station/security/detectives_office)
 "zT" = (
 /obj/machinery/vending/wardrobe/science_wardrobe,
+/obj/structure/sign/poster/contraband/free_drone/directional/east,
 /turf/open/floor/iron,
 /area/station/science)
 "zU" = (
@@ -6349,9 +6488,9 @@
 /turf/open/floor/iron,
 /area/station/security/brig)
 "zZ" = (
-/obj/structure/table_frame,
 /obj/effect/spawner/random/maintenance/two,
 /obj/machinery/airalarm/directional/north,
+/obj/structure/table,
 /turf/open/floor/iron,
 /area/station/science)
 "Aa" = (
@@ -6379,9 +6518,8 @@
 /area/station/command/bridge)
 "Af" = (
 /obj/machinery/light/small/directional/south,
-/obj/effect/spawner/random/engineering/tool,
-/obj/structure/table,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
+/obj/structure/closet/secure_closet/atmospherics,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "Ag" = (
@@ -6402,7 +6540,7 @@
 	pixel_y = -3
 	},
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Aj" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
 	dir = 8
@@ -6411,7 +6549,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "Ak" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "Al" = (
@@ -6429,7 +6567,7 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /obj/structure/table,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/command/bridge)
 "Ao" = (
@@ -6441,7 +6579,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Ap" = (
 /obj/effect/landmark/start/depsec/science,
 /turf/open/floor/iron,
@@ -6501,7 +6639,7 @@
 /obj/machinery/fax{
 	name = "Bridge Fax Machine"
 	},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /obj/structure/secure_safe/caps_spare{
 	pixel_y = 29
 	},
@@ -6544,7 +6682,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "AL" = (
 /obj/machinery/component_printer,
 /turf/open/floor/iron,
@@ -6554,7 +6692,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/light/directional/west,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "AO" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/item/radio/intercom/directional/north,
@@ -6683,16 +6821,14 @@
 /turf/open/floor/iron,
 /area/station/maintenance/solars/port/aft)
 "Bu" = (
-/obj/machinery/computer/upload/borg{
-	dir = 4
-	},
 /obj/machinery/door/window/right/directional/east{
-	name = "Cyborg Upload Console Window";
+	name = "Cyborg Storage";
 	req_access = list("ai_upload")
 	},
 /obj/structure/window/reinforced/spawner/directional/south,
+/obj/machinery/recharge_station,
 /turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Bv" = (
 /obj/structure/window/reinforced/unanchored/spawner/directional/north,
 /obj/structure/filingcabinet/chestdrawer,
@@ -6736,7 +6872,7 @@
 /obj/effect/landmark/start/cyborg,
 /obj/machinery/status_display/ai/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "BE" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6764,7 +6900,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "BI" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -6773,7 +6909,7 @@
 /area/station/engineering/supermatter/room)
 "BK" = (
 /turf/closed/wall/r_wall,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "BL" = (
 /obj/machinery/computer/robotics{
 	dir = 1
@@ -6833,7 +6969,7 @@
 /area/station/security/brig)
 "BV" = (
 /obj/effect/landmark/start/geneticist,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "BW" = (
@@ -6905,7 +7041,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 6
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Co" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/machinery/sleeper{
@@ -6968,13 +7104,18 @@
 /area/station/science/robotics/lab)
 "CC" = (
 /obj/machinery/keycard_auth/wall_mounted/directional/east,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "CD" = (
 /obj/machinery/photocopier,
 /turf/open/floor/wood,
 /area/station/security/detectives_office)
+"CE" = (
+/obj/structure/cable,
+/obj/effect/landmark/generic_maintenance_landmark,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/starboard/aft)
 "CF" = (
 /obj/structure/sign/departments/security/directional/south,
 /obj/effect/landmark/start/assistant,
@@ -7029,7 +7170,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "CP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7086,19 +7227,8 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "Dd" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 6;
-	pixel_y = 9
-	},
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 4
-	},
-/obj/item/radio/headset/headset_medsci{
-	pixel_x = -7;
-	pixel_y = 4
-	},
 /obj/machinery/newscaster/directional/north,
+/obj/machinery/computer/experimental_cloner,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "De" = (
@@ -7126,7 +7256,7 @@
 /area/station/engineering/supermatter)
 "Dh" = (
 /obj/structure/chair/stool/directional/west,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/newscaster/directional/east,
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/iron,
@@ -7139,6 +7269,7 @@
 /obj/structure/chair/stool/directional/west,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "Dk" = (
@@ -7177,6 +7308,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"Dp" = (
+/obj/structure/lattice,
+/obj/effect/landmark/carpspawn,
+/turf/open/space/basic,
+/area/space/nearstation)
 "Dq" = (
 /obj/machinery/door/airlock/hydroponics/glass{
 	name = "Hydroponics"
@@ -7187,7 +7323,7 @@
 /area/station/service/hydroponics)
 "Ds" = (
 /obj/structure/closet/crate/bin,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "Dt" = (
@@ -7200,7 +7336,7 @@
 	dir = 8
 	},
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "Dw" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
@@ -7255,7 +7391,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "DG" = (
 /obj/effect/landmark/start/station_engineer,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7307,7 +7443,7 @@
 	uses = 10
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "DO" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7339,7 +7475,7 @@
 "DT" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/techstorage/rnd_all,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron,
 /area/station/engineering/storage/tech)
@@ -7349,7 +7485,7 @@
 "DV" = (
 /obj/machinery/computer/operating,
 /obj/machinery/airalarm/directional/west,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
 "DX" = (
@@ -7358,7 +7494,7 @@
 	dir = 8
 	},
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "DY" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7407,7 +7543,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Ei" = (
 /turf/closed/wall/r_wall,
 /area/station/science/robotics/lab)
@@ -7423,20 +7559,20 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Em" = (
 /obj/machinery/requests_console/directional/west{
 	department = "AI Chamber";
 	name = "AI Chamber Requests Console"
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "En" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Eo" = (
 /obj/machinery/air_sensor/plasma_tank,
 /obj/machinery/light/small/directional/north,
@@ -7474,7 +7610,7 @@
 /area/station/service/library)
 "Ev" = (
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Ey" = (
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
@@ -7508,7 +7644,7 @@
 /turf/open/floor/iron/dark/corner{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "EF" = (
 /obj/effect/spawner/structure/window/hollow/end,
 /turf/open/floor/plating,
@@ -7533,7 +7669,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "EL" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/chaplain,
@@ -7550,7 +7686,7 @@
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "EO" = (
-/obj/effect/spawner/random/engineering/atmospherics_portable,
+/obj/machinery/vending/wardrobe/atmos_wardrobe,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "EP" = (
@@ -7576,14 +7712,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "EU" = (
 /obj/structure/toilet/greyscale{
 	dir = 4
 	},
 /obj/machinery/light_switch/directional/north,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "EV" = (
 /obj/machinery/button/door/directional/south{
 	id = "AI Chamber entrance shutters";
@@ -7615,7 +7751,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "EW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -7715,7 +7851,7 @@
 /obj/effect/turf_decal/trimline/blue/filled/line,
 /obj/structure/cable,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Ft" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -7754,6 +7890,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
+"Fy" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/space)
 "Fz" = (
 /obj/effect/turf_decal/tile/dark_blue/half/contrasted{
 	dir = 1
@@ -7761,7 +7904,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "FA" = (
 /obj/structure/table,
 /obj/item/electronics/airlock,
@@ -7787,7 +7930,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 10
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "FD" = (
 /obj/machinery/rnd/production/protolathe/department/science,
 /turf/open/floor/iron,
@@ -7803,14 +7946,14 @@
 	dir = 4
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark/telecomms,
 /area/station/tcommsat/server)
 "FG" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/hollow/reinforced/directional,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "FH" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -7819,7 +7962,7 @@
 	req_access = list("ai_upload")
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "FI" = (
 /obj/structure/chair{
 	dir = 1
@@ -7832,7 +7975,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "FK" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/command/glass{
@@ -7853,7 +7996,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "FM" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -7864,7 +8007,7 @@
 /obj/item/kitchen/fork/plastic,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "FO" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall/r_wall,
@@ -7998,13 +8141,13 @@
 /turf/open/floor/plating,
 /area/station/engineering/storage/tech)
 "Gs" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 9
 	},
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Gt" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -8075,7 +8218,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "GF" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -8203,11 +8346,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Hg" = (
 /obj/machinery/porta_turret/ai,
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Hj" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -8222,7 +8365,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Hm" = (
 /obj/structure/bed{
 	dir = 4
@@ -8276,7 +8419,7 @@
 "Hw" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Hy" = (
 /obj/structure/cable,
 /obj/machinery/computer/monitor,
@@ -8310,7 +8453,7 @@
 /obj/structure/tank_dispenser/oxygen,
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "HE" = (
 /obj/structure/table,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8389,7 +8532,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "HX" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8400,9 +8543,9 @@
 "HY" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Ia" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
@@ -8428,7 +8571,7 @@
 /obj/item/folder/documents,
 /obj/item/poster/traitor,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "Ie" = (
 /obj/machinery/computer/security{
 	dir = 8
@@ -8494,7 +8637,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Iq" = (
 /obj/structure/chair/stool/directional/west,
 /turf/open/floor/iron,
@@ -8503,7 +8646,7 @@
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Is" = (
 /turf/open/floor/iron,
 /area/station/commons/dorms)
@@ -8512,7 +8655,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Iv" = (
 /obj/structure/chair/stool/directional/north,
 /obj/effect/landmark/start/mime,
@@ -8542,7 +8685,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "ID" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room"
@@ -8573,7 +8716,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "II" = (
 /obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/wood,
@@ -8587,7 +8730,7 @@
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "IM" = (
 /obj/structure/cable,
 /obj/structure/railing,
@@ -8606,7 +8749,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "IP" = (
 /obj/effect/landmark/start/botanist,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -8634,12 +8777,12 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "IW" = (
 /turf/open/floor/plating,
 /area/station/service/chapel)
 "IX" = (
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "IY" = (
@@ -8654,11 +8797,11 @@
 /obj/effect/decal/cleanable/food/flour,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Jb" = (
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/iron/dark,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Jc" = (
 /obj/machinery/keycard_auth/wall_mounted/directional/north,
 /obj/machinery/light/directional/north,
@@ -8729,14 +8872,11 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/mob/living/basic/bot/secbot/pingsky,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Jl" = (
-/obj/structure/table,
-/obj/item/wallframe/firealarm{
-	pixel_y = 7
-	},
-/obj/item/wallframe/firealarm,
+/obj/structure/closet/secure_closet/atmospherics,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "Jm" = (
@@ -8776,6 +8916,13 @@
 	dir = 8
 	},
 /area/station/service/chapel)
+"Ju" = (
+/obj/machinery/conveyor{
+	id = "mining"
+	},
+/obj/machinery/brm,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "Jv" = (
 /obj/machinery/power/emitter{
 	dir = 4
@@ -8789,21 +8936,16 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "Jx" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "Jy" = (
 /obj/structure/rack,
-/obj/item/ai_module/reset{
-	pixel_x = 2;
-	pixel_y = 8
-	},
-/obj/item/ai_module/supplied/freeform,
 /obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "JA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -8813,7 +8955,7 @@
 "JB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/chapel{
 	dir = 1
 	},
@@ -8828,7 +8970,7 @@
 /obj/structure/table,
 /obj/item/stock_parts/power_store/cell/high,
 /obj/machinery/cell_charger,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "JF" = (
@@ -8912,7 +9054,7 @@
 /obj/item/stack/package_wrap,
 /obj/item/radio/intercom/prison/directional/west,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "JQ" = (
 /obj/machinery/power/supermatter_crystal/engine,
 /turf/open/floor/engine,
@@ -8952,6 +9094,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
+/obj/effect/landmark/generic_maintenance_landmark,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
 "JZ" = (
@@ -8992,7 +9135,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Kb" = (
 /turf/closed/wall/r_wall,
 /area/space/nearstation)
@@ -9023,7 +9166,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Kj" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -9035,7 +9178,7 @@
 /obj/effect/decal/cleanable/food/tomato_smudge,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Km" = (
 /obj/machinery/power/emitter{
 	dir = 8
@@ -9049,6 +9192,7 @@
 /area/station/security/brig)
 "Ko" = (
 /obj/structure/chair/stool/directional/west,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "Kp" = (
@@ -9066,7 +9210,7 @@
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /obj/machinery/light/floor,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Ks" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9095,7 +9239,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Kw" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -9110,7 +9254,7 @@
 "Ky" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/wood,
 /area/station/service/chapel/office)
 "KA" = (
@@ -9146,7 +9290,7 @@
 /obj/machinery/porta_turret/ai,
 /obj/machinery/light/directional/north,
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "KH" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible{
 	dir = 4
@@ -9177,10 +9321,14 @@
 /obj/machinery/rnd/production/circuit_imprinter,
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"KN" = (
+/mob/living/basic/bot/secbot/beepsky/officer,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/fore)
 "KO" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "KQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
@@ -9207,7 +9355,7 @@
 /obj/structure/cable,
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "KU" = (
 /obj/machinery/vending/wardrobe/jani_wardrobe,
 /turf/open/floor/iron,
@@ -9234,9 +9382,9 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "Lc" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -9324,7 +9472,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Lq" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
@@ -9346,6 +9494,7 @@
 /obj/effect/turf_decal/plaque{
 	icon_state = "derelict8"
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
 "Lu" = (
@@ -9360,7 +9509,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "Lw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9462,7 +9611,7 @@
 	},
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "LP" = (
 /obj/machinery/door/poddoor/shutters/radiation/preopen{
 	name = "Radiation Chamber Shutters";
@@ -9569,7 +9718,7 @@
 "Mi" = (
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Mj" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating/airless,
@@ -9629,7 +9778,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/satellite/chamber)
 "Ms" = (
 /obj/structure/railing,
 /obj/structure/reagent_dispensers/fueltank/large,
@@ -9647,7 +9796,7 @@
 	dir = 8
 	},
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "My" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -9688,12 +9837,12 @@
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "MF" = (
 /obj/effect/landmark/start/cyborg,
 /obj/machinery/status_display/ai/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "MG" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/open/floor/iron,
@@ -9709,7 +9858,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "MJ" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -9764,13 +9913,14 @@
 "MR" = (
 /obj/effect/landmark/start/cyborg,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "MT" = (
 /obj/structure/table,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "MU" = (
 /obj/structure/chair/stool/directional/east,
+/obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "MV" = (
@@ -9807,13 +9957,13 @@
 	},
 /obj/machinery/holopad,
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Nc" = (
 /turf/open/floor/iron,
 /area/station/command/teleporter)
 "Nd" = (
 /obj/structure/closet/secure_closet/hydroponics,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/status_display/evac/directional/west,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
@@ -9902,7 +10052,7 @@
 "Ns" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/service/bar)
 "Nv" = (
@@ -9979,7 +10129,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "NH" = (
 /turf/closed/wall,
 /area/station/science/robotics/lab)
@@ -10008,7 +10158,7 @@
 "NN" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/requests_console/directional/west{
 	department = "Engineering";
 	name = "Engineering Requests Console"
@@ -10094,6 +10244,10 @@
 /obj/machinery/vending/wardrobe/hydro_wardrobe,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"Oa" = (
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
 "Ob" = (
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
@@ -10163,7 +10317,7 @@
 /obj/item/bedsheet/patriot,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Om" = (
 /obj/machinery/power/smes/engineering{
 	charge = 0
@@ -10172,7 +10326,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Oo" = (
 /obj/effect/spawner/structure/window/hollow/end{
 	dir = 8
@@ -10209,6 +10363,12 @@
 /obj/effect/landmark/start/geneticist,
 /turf/open/floor/iron,
 /area/station/science/genetics)
+"Ov" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central/aft)
 "Ow" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -10270,11 +10430,11 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "OJ" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "OL" = (
@@ -10374,7 +10534,7 @@
 /area/station/cargo/miningoffice)
 "Pb" = (
 /obj/machinery/light/directional/east,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
 "Pc" = (
@@ -10439,7 +10599,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Pn" = (
 /obj/structure/noticeboard/directional/north,
 /obj/structure/cable,
@@ -10450,13 +10610,10 @@
 "Po" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/aimodule/harmful,
-/obj/item/ai_module/reset/purge{
-	pixel_y = 11
-	},
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/machinery/light/directional/east,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Pp" = (
 /obj/structure/cable,
 /obj/machinery/power/smes,
@@ -10557,13 +10714,17 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/storage/tech)
+"PJ" = (
+/obj/structure/closet/wardrobe/miner,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "PK" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "PL" = (
 /obj/structure/cable,
 /obj/machinery/firealarm/directional/east,
@@ -10610,7 +10771,7 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "PX" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -10638,6 +10799,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
 "Qc" = (
+/obj/machinery/cell_charger,
 /obj/structure/table,
 /turf/open/floor/iron,
 /area/station/science)
@@ -10736,7 +10898,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Qu" = (
 /obj/machinery/light/directional/north,
 /obj/item/radio/intercom/directional/north,
@@ -10760,7 +10922,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Qx" = (
 /obj/structure/cable,
 /turf/open/floor/wood,
@@ -10774,7 +10936,7 @@
 /obj/structure/table,
 /obj/machinery/computer/libraryconsole/bookmanagement,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "QA" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 8
@@ -10782,7 +10944,7 @@
 /obj/structure/cable,
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "QB" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Armory"
@@ -10813,7 +10975,7 @@
 	},
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "QG" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/storage/tech)
@@ -10823,7 +10985,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "QK" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/iron,
@@ -10846,7 +11008,7 @@
 	},
 /obj/structure/rack,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "QO" = (
 /obj/effect/landmark/start/assistant,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -10872,7 +11034,7 @@
 	id = "AI"
 	},
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "QU" = (
 /obj/structure/closet/crate/coffin,
 /obj/structure/window/reinforced/spawner/directional/east,
@@ -10948,11 +11110,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Rj" = (
 /obj/machinery/status_display/ai/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Rk" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
@@ -10960,7 +11122,7 @@
 "Rl" = (
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Rm" = (
 /obj/structure/rack,
 /obj/structure/cable,
@@ -10968,7 +11130,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Rn" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
@@ -10985,7 +11147,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Rq" = (
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
@@ -11004,7 +11166,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Rt" = (
 /obj/item/tank/jetpack/carbondioxide{
 	pixel_x = 4;
@@ -11017,7 +11179,7 @@
 	},
 /obj/structure/rack,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Ru" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sink/kitchen/directional/east,
@@ -11028,7 +11190,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Rv" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -11041,7 +11203,7 @@
 /obj/item/clothing/mask/breath,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Rw" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
@@ -11135,6 +11297,7 @@
 "RP" = (
 /obj/item/radio/intercom/directional/west,
 /obj/machinery/light/directional/west,
+/mob/living/basic/bot/secbot/beepsky/armsky,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "RQ" = (
@@ -11203,7 +11366,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Se" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -11224,7 +11387,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Si" = (
 /obj/structure/table,
 /obj/item/assembly/signaler{
@@ -11310,7 +11473,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "SA" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
@@ -11333,7 +11496,7 @@
 	},
 /mob/living/basic/mouse/brown/tom,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "SE" = (
 /obj/machinery/computer/records/security{
 	dir = 1
@@ -11386,7 +11549,7 @@
 "SO" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "SP" = (
 /obj/machinery/door/window/left/directional/south{
 	name = "Cafe"
@@ -11422,7 +11585,7 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "SV" = (
 /obj/structure/cable,
 /obj/structure/transit_tube/horizontal,
@@ -11432,12 +11595,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "SW" = (
 /obj/structure/bodycontainer/morgue{
 	dir = 2
 	},
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "SY" = (
@@ -11457,7 +11620,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Tb" = (
 /obj/machinery/door/window/left/directional/west{
 	name = "Chapel"
@@ -11467,6 +11630,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/service/chapel)
+"Tc" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron,
+/area/station/commons/lounge)
 "Td" = (
 /obj/structure/lattice,
 /turf/open/space/basic,
@@ -11531,7 +11699,7 @@
 /area/station/engineering/main)
 "Tp" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "Tq" = (
@@ -11557,6 +11725,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/mapping_helpers/airlock/access/all/medical/general,
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 8
+	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
 "Ts" = (
@@ -11569,7 +11740,7 @@
 /obj/structure/cable,
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Tv" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /turf/open/floor/plating,
@@ -11580,7 +11751,7 @@
 /obj/item/storage/bag/tray/cafeteria,
 /obj/item/storage/bag/tray/cafeteria,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Tx" = (
 /turf/closed/wall{
 	base_icon_state = "plastitanium_wall";
@@ -11600,7 +11771,7 @@
 	spawn_scatter_radius = 1
 	},
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "TA" = (
 /obj/structure/closet/crate/bin,
 /obj/machinery/vending/wallmed/directional/north,
@@ -11630,9 +11801,9 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "TE" = (
 /obj/structure/displaycase/captain,
 /obj/machinery/light/small/directional/west,
@@ -11647,14 +11818,14 @@
 "TG" = (
 /obj/machinery/ore_silo,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "TH" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood/large,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "TI" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -11701,6 +11872,7 @@
 /obj/structure/rack,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
+/obj/item/storage/belt/utility/full,
 /turf/open/floor/iron,
 /area/station/science/robotics/lab)
 "TT" = (
@@ -11711,14 +11883,14 @@
 	dir = 1
 	},
 /obj/structure/cable,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "TV" = (
 /obj/machinery/recharge_station,
 /obj/effect/landmark/start/cyborg,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "TW" = (
 /obj/docking_port/stationary{
 	dir = 4;
@@ -11747,9 +11919,14 @@
 /turf/open/floor/vault,
 /area/station/maintenance/radshelter/civil)
 "Ub" = (
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
+"Ud" = (
+/obj/structure/cable,
+/obj/effect/landmark/blobstart,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/starboard/aft)
 "Uf" = (
 /obj/machinery/modular_computer/preset/research{
 	dir = 4
@@ -11776,7 +11953,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "Ul" = (
 /obj/structure/cable,
 /obj/machinery/ai_slipper{
@@ -11792,7 +11969,7 @@
 	},
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "Um" = (
 /obj/structure/cable,
 /obj/effect/mapping_helpers/broken_floor,
@@ -11854,7 +12031,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "UB" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/main)
@@ -11893,11 +12070,11 @@
 /obj/machinery/light_switch/directional/north,
 /obj/machinery/shower/directional/west,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "UJ" = (
 /obj/machinery/nuclearbomb/selfdestruct,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "UK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -11938,7 +12115,7 @@
 "UT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/service/library)
 "UU" = (
@@ -11960,7 +12137,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "UW" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/end{
 	dir = 1
@@ -11982,7 +12159,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "UZ" = (
 /obj/structure/sign/warning/electric_shock/directional/north,
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -12014,7 +12191,8 @@
 "Ve" = (
 /obj/machinery/atmospherics/components/binary/valve/digital{
 	dir = 4;
-	name = "Plasmaflood Activation"
+	name = "Plasmaflood Activation";
+	desc = "A digitally controlled valve. Nanotrasen warns that activation of this device without a good reason can and will result in the termination of your employment contract."
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
@@ -12047,7 +12225,7 @@
 	},
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Vj" = (
 /obj/machinery/door/poddoor{
 	id = "toxin_vent"
@@ -12059,11 +12237,11 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Vl" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Vm" = (
 /obj/structure/cable,
 /obj/machinery/door/window/left/directional/south{
@@ -12112,10 +12290,25 @@
 /turf/open/floor/iron,
 /area/station/science/ordnance)
 "Vu" = (
-/obj/structure/closet/crate/bin,
 /obj/machinery/light/small/directional/west,
 /obj/item/radio/intercom/directional/west,
 /obj/machinery/light/directional/north,
+/obj/structure/table/glass,
+/obj/item/storage/pill_bottle/mutadone{
+	pixel_x = -9
+	},
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 4
+	},
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 6;
+	pixel_y = 9
+	},
+/obj/item/radio/headset/headset_medsci{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/item/toy/figure/geneticist,
 /turf/open/floor/iron,
 /area/station/science/genetics)
 "Vv" = (
@@ -12125,14 +12318,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Vw" = (
 /obj/structure/cable,
 /obj/machinery/holopad/secure,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Vx" = (
 /obj/machinery/power/energy_accumulator/tesla_coil/anchored,
 /obj/structure/window/reinforced/plasma/spawner/directional/west,
@@ -12233,6 +12426,12 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
+"VT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/space/nearstation)
 "VU" = (
 /obj/machinery/chem_master/condimaster{
 	desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments.";
@@ -12273,7 +12472,13 @@
 /turf/open/floor/iron/dark/side{
 	dir = 10
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
+"Wa" = (
+/obj/effect/spawner/structure/window/hollow/reinforced/middle{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/space)
 "Wb" = (
 /obj/machinery/door/window/brigdoor/right/directional/east{
 	name = "Primary AI Core Access";
@@ -12287,7 +12492,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Wc" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle{
 	dir = 4
@@ -12304,7 +12509,7 @@
 "Wf" = (
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Wg" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
@@ -12398,7 +12603,7 @@
 /obj/item/mop,
 /obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Wv" = (
 /obj/machinery/power/solar_control{
 	dir = 4;
@@ -12416,16 +12621,14 @@
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Wx" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/middle,
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/station/command/heads_quarters/captain)
 "Wy" = (
-/obj/machinery/camera/directional/east{
-	c_tag = "Atmospherics Tank - O2"
-	},
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/engine/o2,
 /area/station/engineering/atmos)
 "Wz" = (
@@ -12492,6 +12695,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"WM" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "whiteship-dock"
+	},
+/obj/structure/cable,
+/obj/machinery/door/airlock/external{
+	name = "Auxiliary Airlock"
+	},
+/turf/open/floor/plating,
+/area/space)
 "WN" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room"
@@ -12556,7 +12769,7 @@
 	},
 /obj/item/book/manual/chef_recipes,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "WV" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12594,7 +12807,6 @@
 "Xb" = (
 /obj/structure/table,
 /obj/item/aicard,
-/obj/item/ai_module/reset,
 /obj/item/assembly/flash/handheld,
 /obj/item/assembly/flash/handheld,
 /obj/item/flashlight{
@@ -12656,7 +12868,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "Xj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -12682,7 +12894,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Xn" = (
 /obj/item/radio/intercom/directional/west,
 /obj/structure/extinguisher_cabinet/directional/north,
@@ -12693,7 +12905,7 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plastic,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Xr" = (
 /turf/closed/wall,
 /area/station/science/genetics)
@@ -12747,7 +12959,7 @@
 	uses = 10
 	},
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "XE" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
@@ -12768,7 +12980,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "XM" = (
 /turf/open/floor/plating,
 /area/station/science/ordnance)
@@ -12794,6 +13006,13 @@
 /obj/machinery/suit_storage_unit/ce,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
+"XT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/effect/landmark/blobstart,
+/turf/open/floor/iron,
+/area/station/maintenance/solars/starboard/fore)
 "XV" = (
 /obj/machinery/light/small/directional/north,
 /obj/item/kirbyplants/random,
@@ -12818,7 +13037,7 @@
 /turf/open/floor/iron,
 /area/station/command/bridge)
 "Ya" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /obj/item/radio/intercom/command/directional/east,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain)
@@ -12834,7 +13053,7 @@
 /area/station/maintenance/solars/starboard/fore)
 "Yc" = (
 /turf/closed/wall/r_wall,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "Ye" = (
 /obj/item/storage/medkit/emergency,
 /obj/item/storage/box/matches{
@@ -12845,7 +13064,7 @@
 	},
 /obj/structure/table,
 /turf/open/floor/iron/white,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Yf" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -12875,7 +13094,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/side,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Yk" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
 	dir = 1
@@ -12905,7 +13124,7 @@
 /area/station/hallway/primary/central/aft)
 "Yq" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
-/obj/machinery/camera/directional/south,
+/obj/machinery/camera/autoname/directional/south,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "Ys" = (
@@ -12917,7 +13136,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "Yu" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -12972,12 +13191,12 @@
 /obj/item/radio/intercom/prison/directional/north,
 /obj/machinery/computer/arcade/orion_trail,
 /turf/open/floor/iron,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "YC" = (
 /obj/machinery/porta_turret/ai,
 /obj/machinery/light/directional/south,
 /turf/open/floor/circuit/red,
-/area/station/ai_monitored/turret_protected/aisat_interior)
+/area/station/ai/satellite/foyer)
 "YD" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
@@ -13035,7 +13254,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 6
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "YR" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/engine,
@@ -13043,7 +13262,7 @@
 "YS" = (
 /obj/machinery/teleport/station,
 /turf/open/floor/iron,
-/area/station/ai_monitored/turret_protected/ai)
+/area/station/ai/satellite/chamber)
 "YU" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -13053,7 +13272,7 @@
 /area/station/hallway/primary/central/aft)
 "YV" = (
 /obj/machinery/chem_master,
-/obj/machinery/camera/directional/west,
+/obj/machinery/camera/autoname/directional/west,
 /obj/machinery/requests_console/directional/west{
 	department = "Pharmacy";
 	name = "Pharmacy Requests Console"
@@ -13209,11 +13428,15 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark/corner,
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "Zu" = (
 /obj/machinery/vending/wardrobe/det_wardrobe,
 /turf/open/floor/wood,
 /area/station/security/detectives_office)
+"Zv" = (
+/obj/item/stack/cable_coil,
+/turf/open/floor/plating,
+/area/station/maintenance/solars/starboard)
 "Zw" = (
 /obj/machinery/gulag_item_reclaimer{
 	pixel_y = 24
@@ -13236,7 +13459,7 @@
 /turf/open/floor/vault,
 /area/station/maintenance/radshelter/civil)
 "ZB" = (
-/obj/machinery/camera/directional/east,
+/obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "ZC" = (
@@ -13287,11 +13510,11 @@
 /area/station/hallway/primary/central/aft)
 "ZO" = (
 /turf/closed/wall/r_wall,
-/area/station/ai_monitored/turret_protected/ai_upload)
+/area/station/ai/upload/chamber)
 "ZP" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/vault,
-/area/station/ai_monitored/command/nuke_storage)
+/area/station/command/vault)
 "ZS" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -13301,7 +13524,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/station/security/prison)
+/area/station/security/prison/safe)
 "ZT" = (
 /obj/structure/closet/emcloset/anchored,
 /turf/open/floor/plating,
@@ -13309,7 +13532,7 @@
 "ZU" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /turf/open/floor/iron,
-/area/station/ai_monitored/command/storage/eva)
+/area/station/command/eva)
 "ZV" = (
 /obj/machinery/telecomms/receiver/preset_left,
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -24679,7 +24902,7 @@ aa
 aa
 aa
 aa
-aa
+ae
 aa
 aa
 aa
@@ -35837,7 +36060,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -37412,7 +37635,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -39925,7 +40148,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -39966,7 +40189,7 @@ OY
 OY
 Zh
 Qy
-fE
+bj
 Uw
 NW
 aa
@@ -40223,7 +40446,7 @@ xk
 GF
 Bt
 xN
-Bt
+ch
 Uw
 NW
 aa
@@ -42004,7 +42227,7 @@ Mn
 mH
 Jr
 Hm
-Vr
+lP
 Jr
 LJ
 vu
@@ -42982,7 +43205,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -43038,7 +43261,7 @@ Iq
 oT
 Ku
 Rk
-Hz
+Oa
 OC
 xE
 Cq
@@ -43295,7 +43518,7 @@ RM
 EJ
 jI
 Hz
-Hz
+Oa
 qm
 qP
 Cq
@@ -43308,11 +43531,11 @@ lW
 ZK
 lw
 we
-vm
-NW
-aa
-aa
-aa
+ZK
+tC
+Wa
+Wa
+dP
 aa
 aa
 aa
@@ -43552,7 +43775,7 @@ xR
 Qm
 Cs
 Fr
-Fr
+Tc
 Mv
 oS
 Cj
@@ -43564,13 +43787,13 @@ ax
 gO
 vm
 lw
-we
-vm
-NW
-aa
-aa
-aa
-aa
+Ov
+ye
+VT
+Fy
+hE
+WM
+oB
 aa
 aa
 aa
@@ -43822,11 +44045,11 @@ zD
 vm
 lw
 Nm
-vm
-NW
-aa
-aa
-aa
+ZK
+tC
+Wa
+Wa
+dP
 aa
 aa
 aa
@@ -44838,7 +45061,7 @@ ox
 fp
 AV
 pm
-wL
+eN
 lj
 Lq
 vB
@@ -45871,7 +46094,7 @@ lg
 qg
 EO
 CU
-QY
+ya
 QY
 bd
 Jl
@@ -46363,7 +46586,7 @@ GN
 sU
 sU
 rz
-ZF
+nc
 NL
 bW
 Mk
@@ -47446,7 +47669,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -48114,8 +48337,8 @@ aa
 nd
 rk
 nd
-xf
-yz
+ZO
+ll
 ZO
 ix
 ZO
@@ -48373,17 +48596,17 @@ rk
 nd
 xf
 yz
-ZO
+xf
 Mr
-ZO
-ZO
-ZO
-ZO
-ZO
-ZO
-ZO
-ZO
-ZO
+xf
+xf
+xf
+xf
+xf
+xf
+xf
+xf
+xf
 MO
 sG
 iE
@@ -48640,8 +48863,8 @@ XJ
 Ri
 rJ
 xf
-ZO
-ZO
+xf
+xf
 fc
 sj
 bc
@@ -48938,7 +49161,7 @@ Yh
 GU
 NO
 Lz
-Yh
+KN
 Yh
 Qj
 Lz
@@ -49391,7 +49614,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -50230,7 +50453,7 @@ FW
 Vy
 Uu
 QQ
-hY
+zY
 rT
 zY
 uG
@@ -50481,7 +50704,7 @@ Df
 Ap
 PY
 eX
-Qc
+mO
 Qc
 FW
 vW
@@ -50769,7 +50992,7 @@ gi
 ZI
 My
 ZI
-yO
+Ud
 hK
 aa
 aa
@@ -51283,7 +51506,7 @@ WK
 nw
 Ig
 qj
-yO
+CE
 hK
 aa
 aa
@@ -51467,10 +51690,10 @@ Hf
 QF
 ds
 xf
-xf
-xf
-xf
-xf
+ZM
+ZM
+ZM
+ZM
 ZM
 oN
 ZM
@@ -51724,11 +51947,11 @@ FH
 xf
 xf
 xf
-yz
-yz
-yz
-xf
 Il
+Il
+PJ
+jW
+lS
 cV
 xO
 As
@@ -51981,12 +52204,12 @@ Yt
 xf
 xf
 xf
-yz
-yz
-yz
-xf
-Il
-cV
+dk
+dk
+dk
+dk
+dk
+hY
 cV
 Dk
 Wg
@@ -52005,7 +52228,7 @@ jt
 kr
 hd
 Ep
-kW
+yw
 kW
 Iv
 rr
@@ -52238,11 +52461,11 @@ Yt
 Rl
 qh
 xf
-yz
-yz
-yz
-xf
-jW
+Ju
+yy
+fd
+jT
+np
 ze
 cV
 Pa
@@ -52321,6 +52544,20 @@ aa
 aa
 aa
 aa
+gY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -52373,36 +52610,22 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(153,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(153,1,1) = {"
 aa
 aa
 aa
@@ -52495,9 +52718,9 @@ Yt
 fU
 tl
 xf
-yz
-yz
-yz
+xf
+xf
+xf
 ig
 ig
 ig
@@ -52763,7 +52986,7 @@ Hw
 DZ
 FM
 wJ
-dk
+DZ
 DZ
 wJ
 lU
@@ -53507,7 +53730,7 @@ aa
 aa
 xS
 JX
-Qr
+XT
 xS
 UP
 cR
@@ -57247,7 +57470,7 @@ nd
 nd
 nd
 nd
-nd
+Dp
 Tx
 is
 gT
@@ -57356,7 +57579,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -58158,7 +58381,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -59243,7 +59466,7 @@ aa
 aa
 aa
 aa
-aa
+gY
 aa
 aa
 aa
@@ -64333,11 +64556,11 @@ nd
 nd
 nd
 nd
-iR
+Lm
 nd
 nd
 nd
-iR
+Lm
 nd
 nd
 nd
@@ -64847,11 +65070,11 @@ nd
 nd
 nd
 nd
-iR
+Lm
 nd
 nd
 nd
-iR
+Lm
 nd
 nd
 Lm
@@ -65120,7 +65343,7 @@ xG
 gR
 kL
 Gq
-Gq
+sF
 Gq
 zA
 nd
@@ -65375,7 +65598,7 @@ iB
 uW
 xG
 KX
-KX
+kY
 OL
 cq
 ta
@@ -65638,9 +65861,9 @@ Ke
 Ke
 Ke
 xv
-Ke
-Ke
-Ke
+iR
+iR
+iR
 nd
 aa
 aa
@@ -65884,20 +66107,20 @@ Hr
 nd
 Lm
 nd
-Ke
+iR
 Rv
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
 im
 wu
 xv
 Gs
 dO
 co
-Ke
-Ke
+iR
+iR
 nd
 aa
 aa
@@ -66132,7 +66355,7 @@ aa
 aa
 nd
 nd
-nd
+nj
 nd
 nd
 nd
@@ -66141,7 +66364,7 @@ nd
 nd
 Lm
 nd
-Ke
+iR
 Vk
 qH
 nV
@@ -66388,9 +66611,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+nd
+Lm
+nd
 aa
 aa
 nd
@@ -66398,9 +66621,9 @@ Sm
 Sm
 dm
 Sm
-Ke
+iR
 ei
-Ke
+iR
 YB
 dF
 UA
@@ -66410,8 +66633,8 @@ xv
 Ye
 Vi
 xC
-Ke
-Ke
+iR
+iR
 nd
 aa
 aa
@@ -66644,10 +66867,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+nd
+nd
+Lm
+nd
 aa
 nd
 nd
@@ -66655,20 +66878,20 @@ Sm
 Pp
 Nr
 Wv
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
 qN
 Xm
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
 nd
 aa
 aa
@@ -66901,18 +67124,18 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+nd
+Lm
+Lm
+nd
 nd
 nd
 nd
 wz
 nr
 he
-he
-Ke
+Zv
+iR
 aw
 Ru
 Ka
@@ -66920,12 +67143,12 @@ aT
 oP
 FB
 mL
-Ke
+iR
 EU
 fs
 LO
-Ke
-Ke
+iR
+iR
 nd
 aa
 aa
@@ -67158,8 +67381,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 nd
 nd
@@ -67186,15 +67409,15 @@ wo
 nd
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 aa
 aa
 aa
@@ -67415,8 +67638,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 JC
 JC
@@ -67426,7 +67649,7 @@ JC
 JC
 JC
 JC
-Ke
+iR
 gW
 Vl
 Ja
@@ -67434,24 +67657,24 @@ rc
 nD
 di
 mL
-Ke
+iR
 kj
 mQ
 Ol
-Ke
-Ke
+iR
+iR
 nd
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
+nd
 aa
 aa
 aa
@@ -67672,8 +67895,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 JC
 JC
@@ -67683,7 +67906,7 @@ Fd
 Fd
 Fd
 Fd
-Ke
+iR
 rg
 lz
 WU
@@ -67691,24 +67914,24 @@ rL
 Tw
 Nb
 ZS
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
 nd
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
+nd
 aa
 aa
 aa
@@ -67929,8 +68152,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 JC
 JC
@@ -67940,7 +68163,7 @@ JC
 JC
 JC
 JC
-Ke
+iR
 jQ
 MT
 HW
@@ -67948,24 +68171,24 @@ Zt
 pt
 Cl
 mL
-Ke
+iR
 EU
 cd
 tv
-Ke
-Ke
+iR
+iR
 nd
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
+nd
 aa
 aa
 aa
@@ -68186,8 +68409,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 JC
 JC
@@ -68214,15 +68437,15 @@ wo
 nd
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
+nd
 aa
 aa
 aa
@@ -68443,8 +68666,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 hp
 li
@@ -68462,24 +68685,24 @@ Ta
 Rs
 aH
 io
-Ke
+iR
 Qz
 ob
 xg
-Ke
-Ke
+iR
+iR
+nd
+nd
+nd
+nd
+nd
+Lm
+nd
+nd
+nd
+Lm
+nd
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -68700,8 +68923,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 hp
 li
@@ -68719,24 +68942,24 @@ YQ
 xm
 Ah
 io
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
+nd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+nd
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -68957,8 +69180,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 JC
 JC
@@ -68980,20 +69203,20 @@ fZ
 xM
 AM
 Xp
-Ke
-Ke
+iR
+iR
+nd
+Lm
+nd
+nd
+nd
+Lm
+nd
+nd
+nd
+Lm
+nd
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -69214,8 +69437,8 @@ aa
 aa
 aa
 aa
-aa
-aa
+nd
+Lm
 nd
 nd
 JC
@@ -69225,32 +69448,32 @@ YA
 Jj
 Ws
 JC
-Ke
-Ke
+iR
+iR
 Sc
 fK
-Ke
+iR
 fK
 fK
 DF
-Ke
+iR
 DX
 Tz
 Mx
 cp
 wo
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Lm
+nd
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
+nd
 aa
 aa
 aa
@@ -69471,9 +69694,9 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
+nd
+Lm
+Lm
 nd
 nd
 JC
@@ -69486,28 +69709,28 @@ rv
 JP
 IU
 iH
-Ke
+iR
 Wu
 IO
 Qw
-Ke
+iR
 UH
 yt
 ME
-Ke
-Ke
+iR
+iR
+nd
+Lm
+nd
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -69728,10 +69951,10 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+nd
+nd
+Lm
+Lm
 nd
 nd
 JC
@@ -69739,32 +69962,32 @@ JC
 JC
 JC
 JC
-Ke
+iR
 jA
 tK
 ie
-Ke
+iR
 dq
 BH
 KS
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
+nd
+Lm
+nd
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -69986,42 +70209,42 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
+nd
+nd
+Lm
+Lm
 nd
 nd
 JC
 JC
 JC
 JC
-Ke
-Ke
+iR
+iR
 QA
 QA
-Ke
+iR
 QA
 QA
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
-Ke
+iR
+iR
+iR
+iR
+iR
+iR
+iR
+nd
+Lm
+nd
+nd
+Hr
+Lm
+Hr
+nd
+Hr
+Lm
+Hr
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -70244,41 +70467,41 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
 nd
 nd
+Lm
+Lm
 nd
 nd
 nd
-Ke
-Ke
+nd
+nd
+iR
+iR
 Tt
 Tt
-Ke
+iR
 Tt
 Tt
-Ke
-Ke
-Ke
+iR
+iR
+iR
+nd
+nd
+nd
+nd
+nd
+Lm
+nd
+nd
+nd
+nd
+nd
 nd
 nd
 nd
 nd
 nd
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 aa
 aa
 aa
@@ -70502,13 +70725,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+nd
+Lm
+Lm
+Lm
+Lm
+Lm
 nd
 nd
 nd
@@ -70521,12 +70744,12 @@ nd
 nd
 nd
 nd
-aa
-aa
-aa
-aa
-aa
-aa
+Lm
+Lm
+Lm
+Lm
+Lm
+nd
 aa
 aa
 aa
@@ -70760,30 +70983,30 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+nd
+nd
+nd
+nd
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+Lm
+nd
+nd
+nd
+nd
+nd
 aa
 aa
 aa
@@ -71021,22 +71244,22 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
+nd
 aa
 aa
 aa