diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm
index a17f185b4e68..af8e5efdb638 100644
--- a/_maps/map_files/Theseus/Theseus.dmm
+++ b/_maps/map_files/Theseus/Theseus.dmm
@@ -479,8 +479,10 @@
 /area/station/science/robotics/mechbay)
 "aho" = (
 /obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/porta_turret/ai,
 /obj/structure/cable,
+/obj/machinery/porta_turret/ai{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "ahp" = (
@@ -3093,9 +3095,11 @@
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
 "aWg" = (
-/obj/machinery/porta_turret/ai,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/porta_turret/ai{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "aWo" = (
@@ -5172,7 +5176,7 @@
 /area/station/engineering/atmos)
 "bCQ" = (
 /obj/machinery/door/airlock/mining/glass{
-	name = "Drone Bay"
+	name = "Deliveries"
 	},
 /obj/effect/landmark/navigate_destination,
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
@@ -8747,7 +8751,8 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
-	dir = 4
+	dir = 4;
+	filter_type = list(/datum/gas/nitrogen)
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
@@ -9391,6 +9396,12 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/machinery/turretid{
+	control_area = "/area/station/ai_monitored/turret_protected/ai_upload";
+	name = "AI Upload Turret Control";
+	pixel_y = -25;
+	pixel_x = 2
+	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
 "cPz" = (
@@ -11088,7 +11099,7 @@
 	pixel_x = -27;
 	name = "Cargo Lockdown";
 	id = "Cargo Conveyors";
-	req_access = list("atmospherics")
+	req_access = list("cargo")
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
@@ -18749,6 +18760,11 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/button/curtain{
+	pixel_y = 23;
+	pixel_x = -55;
+	id = "librarysolo"
+	},
 /turf/open/floor/carpet,
 /area/station/service/chapel)
 "fHX" = (
@@ -28286,8 +28302,7 @@
 /area/station/science/ordnance)
 "iyZ" = (
 /obj/machinery/door/morgue{
-	name = "Private Study";
-	req_access = list("library")
+	name = "Private Study"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -28493,6 +28508,11 @@
 /obj/structure/sign/poster/random/directional/north,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/upper)
+"iCo" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/marker_beacon/yellow,
+/turf/open/space/basic,
+/area/station/solars/port/fore)
 "iCr" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/hazardvest,
@@ -37999,6 +38019,8 @@
 	},
 /obj/effect/turf_decal/tile/neutral/full,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/effect/mapping_helpers/airlock/access/any/security/court,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "lpo" = (
@@ -43902,16 +43924,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/turretid{
-	control_area = "/area/station/ai_monitored/turret_protected/aisat_interior";
-	name = "Antechamber Turret Control";
-	req_access = list("minisat");
-	pixel_y = 34;
-	pixel_x = 1
-	},
 /obj/machinery/flasher/directional/west{
 	pixel_y = 24;
-	pixel_x = -8
+	pixel_x = 0
 	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
@@ -44961,6 +44976,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/nuke_storage)
+"ntu" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/station/solars/port/fore)
 "ntw" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -45842,7 +45861,6 @@
 /turf/closed/wall,
 /area/station/science/lower)
 "nIs" = (
-/obj/machinery/light/directional/north,
 /obj/effect/turf_decal/tile/neutral/half{
 	dir = 1
 	},
@@ -46881,6 +46899,11 @@
 /obj/structure/bookcase/random/religion,
 /turf/open/floor/wood,
 /area/station/service/chapel)
+"nZd" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/marker_beacon/yellow,
+/turf/open/space/basic,
+/area/station/solars/starboard/fore)
 "nZk" = (
 /obj/structure/transit_tube/curved{
 	dir = 4
@@ -51469,7 +51492,7 @@
 	pixel_x = 27;
 	name = "Cargo Lockdown";
 	id = "Cargo Conveyors";
-	req_access = list("atmospherics");
+	req_access = list("cargo");
 	pixel_y = -6
 	},
 /obj/machinery/light_switch/directional/east{
@@ -54144,6 +54167,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/security/general,
+/obj/effect/mapping_helpers/airlock/access/any/security/court,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "qiB" = (
@@ -57862,6 +57887,7 @@
 /obj/effect/turf_decal/tile/yellow/anticorner{
 	dir = 4
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "rmk" = (
@@ -58869,6 +58895,13 @@
 /obj/structure/cable,
 /turf/open/floor/carpet/green,
 /area/station/medical/psychology)
+"rAG" = (
+/obj/machinery/door/morgue{
+	name = "Private Study";
+	req_access = list("library")
+	},
+/turf/open/space/basic,
+/area/space)
 "rAH" = (
 /obj/effect/turf_decal/tile/dark{
 	dir = 1
@@ -61476,10 +61509,10 @@
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "spY" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction{
 	dir = 1
 	},
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/tcommsat/computer)
 "sqg" = (
@@ -66059,7 +66092,6 @@
 /obj/structure/chair/pew{
 	dir = 8
 	},
-/obj/machinery/status_display/evac/directional/east,
 /obj/effect/landmark/start/assistant,
 /obj/effect/turf_decal/tile/yellow/half{
 	dir = 4
@@ -66668,6 +66700,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/yellow/anticorner,
+/obj/machinery/status_display/evac/directional/east,
 /turf/open/floor/iron,
 /area/station/security/courtroom)
 "tOy" = (
@@ -71509,7 +71542,7 @@
 /obj/structure/cable,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/foyer)
+/area/station/ai_monitored/turret_protected/ai_upload)
 "vif" = (
 /obj/structure/reagent_dispensers/plumbed{
 	name = "virology water reservoir"
@@ -72393,8 +72426,10 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "vvF" = (
-/obj/machinery/porta_turret/ai,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/porta_turret/ai{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "vvG" = (
@@ -79143,9 +79178,6 @@
 "xuw" = (
 /obj/machinery/portable_atmospherics/canister/water_vapor,
 /obj/effect/mob_spawn/corpse/human/clown,
-/obj/effect/spawner/liquids_spawner{
-	reagent_list = list(/datum/reagent/ammonia/urine = 400)
-	},
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
 "xuM" = (
@@ -95701,7 +95733,7 @@ lXw
 lXw
 lXw
 nhC
-npG
+rNX
 nhC
 lXw
 lXw
@@ -98437,7 +98469,7 @@ tgK
 hmB
 nhC
 dJY
-hMZ
+ntu
 dJY
 nhC
 nhC
@@ -98699,7 +98731,7 @@ dJY
 nhC
 nhC
 dJY
-hMZ
+ntu
 dJY
 nhC
 nhC
@@ -99475,7 +99507,7 @@ dJY
 nhC
 nhC
 dJY
-hMZ
+ntu
 dJY
 nhC
 lXw
@@ -99732,7 +99764,7 @@ dJY
 nhC
 nhC
 dJY
-hMZ
+ntu
 dJY
 nhC
 lXw
@@ -99984,12 +100016,12 @@ lXw
 lXw
 lXw
 lXw
-hMZ
+ntu
 lXw
 lXw
 lXw
 lXw
-hMZ
+ntu
 lXw
 nhC
 lXw
@@ -100241,9 +100273,9 @@ hMZ
 hMZ
 hMZ
 ljp
-vtG
+iCo
 wKS
-hMZ
+ntu
 hMZ
 hMZ
 vtG
@@ -113662,7 +113694,7 @@ wpT
 pfJ
 wmS
 pfJ
-pfJ
+jgm
 jgm
 jgm
 jgm
@@ -113919,7 +113951,7 @@ ven
 pfJ
 mNY
 pfJ
-pfJ
+jgm
 jki
 rHk
 gTP
@@ -114176,7 +114208,7 @@ ven
 qpL
 eID
 cPt
-pfJ
+jgm
 nec
 nEy
 dNl
@@ -114690,7 +114722,7 @@ ven
 vGi
 qjh
 fhB
-pfJ
+jgm
 pmE
 hfU
 hAi
@@ -114947,7 +114979,7 @@ jYh
 jgY
 dcR
 eID
-pfJ
+jgm
 xrW
 lZm
 gfO
@@ -115204,7 +115236,7 @@ ven
 mMO
 qib
 nlP
-pfJ
+jgm
 aWg
 vnr
 vvF
@@ -115461,7 +115493,7 @@ ven
 pfJ
 vsq
 pfJ
-pfJ
+jgm
 tYq
 wVz
 uTu
@@ -115718,7 +115750,7 @@ ven
 pSm
 dcR
 xoA
-pfJ
+jgm
 rwB
 vHf
 wOl
@@ -115975,7 +116007,7 @@ ven
 dSi
 vGU
 rXR
-pfJ
+jgm
 bhc
 udM
 mZj
@@ -116232,7 +116264,7 @@ ven
 pfJ
 dMi
 pfJ
-pfJ
+jgm
 jgm
 jgm
 jgm
@@ -123091,8 +123123,8 @@ lXw
 lXw
 lXw
 lXw
-tVI
-jmp
+nZd
+uqN
 jmp
 jhY
 vZB
@@ -123348,7 +123380,7 @@ nhC
 lXw
 nhC
 lXw
-jmp
+uqN
 lXw
 iCs
 diN
@@ -125136,14 +125168,14 @@ pxt
 jmp
 jmp
 jmp
-tVI
+nZd
 jmp
 jmp
 jmp
 tVI
+uqN
 jmp
-jmp
-jmp
+uqN
 tVI
 jmp
 jmp
@@ -125397,7 +125429,7 @@ jmp
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 nhC
 aHG
@@ -125650,7 +125682,7 @@ nhC
 lXw
 nhC
 aHG
-jmp
+uqN
 aHG
 nhC
 aHG
@@ -125658,7 +125690,7 @@ jmp
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 lXw
 lXw
@@ -126168,7 +126200,7 @@ jmp
 aHG
 cSf
 aHG
-jmp
+uqN
 aHG
 cSf
 aHG
@@ -126429,7 +126461,7 @@ jmp
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 lXw
 nhC
@@ -126682,11 +126714,11 @@ jmp
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 lXw
 nhC
@@ -126939,7 +126971,7 @@ jmp
 aHG
 nhC
 aHG
-jmp
+uqN
 aHG
 nhC
 aHG
@@ -131862,7 +131894,7 @@ vJO
 lXw
 lXw
 nhC
-nhC
+rAG
 nhC
 nhC
 nhC
@@ -132119,7 +132151,7 @@ lXw
 lXw
 nhC
 nhC
-nhC
+rAG
 nhC
 nhC
 nhC