diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm
index 0ed56094825e..c74bb6a8c29d 100644
--- a/_maps/map_files220/MetaStation/MetaStation.dmm
+++ b/_maps/map_files220/MetaStation/MetaStation.dmm
@@ -818,6 +818,11 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -3167,13 +3172,8 @@
 /turf/space,
 /area/space/nearstation)
 "auq" = (
-/obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/break_room)
+/turf/simulated/wall/r_wall,
+/area/station/engineering/ai_transit_tube)
 "aus" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -8903,10 +8903,11 @@
 "aPw" = (
 /obj/structure/table,
 /obj/machinery/requests_console{
-	department = "Cargo Bay";
-	departmentType = 2;
-	name = "Cargo Requests Console";
-	pixel_y = 30
+	department = "Quartermaster's Desk";
+	departmentType = 5;
+	name = "Quartermaster Requests Console";
+	pixel_y = 30;
+	announcementConsole = 1
 	},
 /obj/machinery/photocopier/faxmachine/longrange{
 	pixel_y = 4;
@@ -15320,7 +15321,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "bik" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -16544,7 +16545,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "blA" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple,
 /turf/simulated/floor/plating,
@@ -17059,9 +17060,7 @@
 /obj/item/storage/photo_album{
 	pixel_y = -4
 	},
-/obj/item/camera{
-	pixel_y = 4
-	},
+/obj/item/camera,
 /obj/item/radio/intercom/private{
 	pixel_x = -28
 	},
@@ -19119,7 +19118,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "bsE" = (
 /obj/machinery/light/small/directional/south,
 /obj/vehicle/janicart,
@@ -19164,7 +19163,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "bsK" = (
 /turf/simulated/wall/mineral/titanium,
 /area/shuttle/pod_4)
@@ -20924,7 +20923,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "bxy" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable/yellow{
@@ -45612,7 +45611,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "dJx" = (
 /obj/structure/filingcabinet,
 /turf/simulated/floor/plasteel{
@@ -49096,7 +49095,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "fqX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -51241,7 +51240,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "gpV" = (
 /obj/machinery/door/window/classic/normal{
 	name = "Mass Driver Door";
@@ -53212,7 +53211,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "hkF" = (
 /turf/simulated/wall/mineral/titanium,
 /area/shuttle/pod_2)
@@ -54184,7 +54183,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "hED" = (
 /obj/effect/landmark/start/doctor,
 /turf/simulated/floor/plasteel{
@@ -55935,10 +55934,7 @@
 /obj/structure/table/reinforced,
 /obj/item/scalpel,
 /obj/item/autopsy_scanner,
-/obj/item/camera/autopsy{
-	pixel_x = -2;
-	pixel_y = -2
-	},
+/obj/item/camera/autopsy,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -61619,6 +61615,16 @@
 	dir = 10
 	},
 /obj/effect/turf_decal/stripes/line,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
 	},
@@ -63581,11 +63587,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /obj/structure/cable/yellow{
 	d1 = 4;
 	d2 = 8;
@@ -65025,7 +65026,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "mBn" = (
 /turf/simulated/floor/plating/airless,
 /area/station/engineering/solar/starboard)
@@ -65929,9 +65930,9 @@
 	dir = 4
 	},
 /obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
@@ -66256,7 +66257,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "ncC" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/classic/normal{
@@ -69503,11 +69504,16 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "oMn" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -71578,11 +71584,6 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 5
 	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "pKs" = (
@@ -72797,7 +72798,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "qkD" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -74400,7 +74401,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "rab" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -77015,7 +77016,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "slT" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -79528,12 +79529,7 @@
 /obj/structure/rack,
 /obj/item/hand_labeler,
 /obj/item/folder/red,
-/obj/item/camera{
-	desc = "A one use - polaroid camera. 30 photos left.";
-	name = "detective's camera";
-	pixel_x = -2;
-	pixel_y = 3
-	},
+/obj/item/camera/detective,
 /obj/item/taperecorder{
 	pixel_x = -1
 	},
@@ -80202,7 +80198,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "tOF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -82244,10 +82240,15 @@
 	id_tag = "transittube";
 	name = "Transit Tube Blast Door"
 	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "uRO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
@@ -87289,7 +87290,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "xrS" = (
 /obj/structure/chair/office/light{
 	dir = 8
@@ -87526,11 +87527,13 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/power/apc/directional/west,
+/obj/structure/cable/yellow,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/break_room)
+/area/station/engineering/ai_transit_tube)
 "xyc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -132061,7 +132064,7 @@ bjN
 bjN
 bnt
 xrx
-auq
+bpn
 lQJ
 gYM
 hHE
@@ -132320,12 +132323,12 @@ nmh
 aLw
 pKi
 aiE
-bnt
-bnt
-bnt
-bnt
-bnt
-bnt
+auq
+auq
+auq
+auq
+auq
+auq
 iRu
 mpP
 skc
@@ -132834,7 +132837,7 @@ bnt
 xYR
 nCm
 tyW
-bnt
+auq
 hkm
 tNQ
 mAZ
@@ -133095,7 +133098,7 @@ wUa
 bsI
 bxx
 bly
-bnt
+auq
 qZz
 iRu
 fmo
@@ -133352,7 +133355,7 @@ wUa
 dIn
 sls
 hEA
-bnt
+auq
 ncA
 iRu
 yif
@@ -133609,7 +133612,7 @@ sTM
 jKS
 aXO
 aXO
-bnt
+auq
 qkC
 iRu
 ciD
diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm
index f0951bdc144f..a2bb6ee16d4a 100644
--- a/_maps/map_files220/cyberiad/cyberiad.dmm
+++ b/_maps/map_files220/cyberiad/cyberiad.dmm
@@ -3100,10 +3100,7 @@
 /area/station/security/lobby)
 "anZ" = (
 /obj/structure/table,
-/obj/item/camera{
-	pixel_x = 3;
-	pixel_y = -4
-	},
+/obj/item/camera,
 /obj/item/taperecorder{
 	pixel_x = -4;
 	pixel_y = 2
@@ -3395,10 +3392,7 @@
 /area/station/security/prison/cell_block/A)
 "apa" = (
 /obj/structure/table,
-/obj/item/camera{
-	desc = "A one use - polaroid camera. 30 photos left.";
-	name = "Camera"
-	},
+/obj/item/camera,
 /turf/simulated/floor/plasteel,
 /area/station/security/processing)
 "apc" = (
@@ -6081,11 +6075,7 @@
 /obj/item/camera_film{
 	pixel_y = 7
 	},
-/obj/item/camera{
-	desc = "A one use - polaroid camera. 30 photos left.";
-	name = "detectives camera";
-	pixel_y = 2
-	},
+/obj/item/camera/detective,
 /turf/simulated/floor/wood/oak,
 /area/station/security/detective)
 "ayB" = (
@@ -7616,10 +7606,7 @@
 /area/station/hallway/primary/fore)
 "aDb" = (
 /obj/structure/table,
-/obj/item/camera{
-	pixel_x = 3;
-	pixel_y = -4
-	},
+/obj/item/camera,
 /obj/machinery/door_control/shutter/north{
 	id = "brig_courtroom";
 	name = "Brig Courtroom Shutter Control";
@@ -12852,7 +12839,7 @@
 	dir = 9;
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "aWh" = (
 /obj/machinery/requests_console{
 	department = "Security";
@@ -23589,9 +23576,10 @@
 /obj/machinery/computer/security/mining,
 /obj/machinery/firealarm/directional/north,
 /obj/machinery/requests_console{
-	department = "Cargo Bay";
-	departmentType = 2;
-	name = "Cargo Requests Console";
+	department = "Quartermaster's Desk";
+	departmentType = 5;
+	name = "Quartermaster Requests Console";
+	announcementConsole = 1;
 	pixel_x = -30
 	},
 /turf/simulated/floor/carpet,
@@ -29420,11 +29408,7 @@
 /area/station/security/range)
 "cnW" = (
 /obj/structure/table,
-/obj/item/camera{
-	name = "Autopsy Camera";
-	pixel_x = 4;
-	pixel_y = 8
-	},
+/obj/item/camera/autopsy,
 /obj/item/scalpel{
 	pixel_y = 2
 	},
@@ -29993,7 +29977,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "cqK" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/mouse,
@@ -33025,7 +33009,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "cCq" = (
 /turf/simulated/floor/engine,
 /area/station/maintenance/incinerator)
@@ -36152,7 +36136,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "cOf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -38575,7 +38559,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "cVI" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
@@ -38767,7 +38751,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "cWz" = (
 /obj/machinery/light/small/directional/south,
 /obj/item/radio/intercom/directional/south,
@@ -39860,7 +39844,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "dah" = (
@@ -40230,7 +40213,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dbI" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/public{
@@ -41764,7 +41747,7 @@
 	dir = 5;
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dgU" = (
 /obj/structure/closet/wardrobe/white,
 /obj/effect/turf_decal/stripes/line{
@@ -41828,7 +41811,7 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/transit_tube/crossing/horizontal,
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dhp" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/condiment/peppermill{
@@ -43169,7 +43152,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dmz" = (
 /turf/simulated/wall/r_wall,
 /area/station/engineering/supermatter_room)
@@ -43607,10 +43590,7 @@
 "dnM" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder,
-/obj/item/camera{
-	desc = "A one use - polaroid camera. 30 photos left.";
-	name = "Camera"
-	},
+/obj/item/camera,
 /obj/item/book/codex_gigas,
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -44232,7 +44212,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dqD" = (
 /obj/machinery/atmospherics/binary/valve{
 	dir = 4
@@ -46256,7 +46236,7 @@
 /turf/simulated/floor/plasteel/stairs/right{
 	dir = 8
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "dTI" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 5
@@ -46686,7 +46666,7 @@
 /area/station/hallway/primary/aft)
 "ecH" = (
 /turf/simulated/wall,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ecI" = (
 /obj/machinery/light/small/directional/south,
 /obj/structure/chair/office/dark{
@@ -47155,7 +47135,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "eic" = (
 /obj/machinery/computer/security/telescreen/entertainment/directional/west,
 /obj/effect/decal/cleanable/dirt,
@@ -53582,9 +53562,6 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 9
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "gDJ" = (
@@ -54906,7 +54883,7 @@
 	dir = 10;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "gYO" = (
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -55218,9 +55195,6 @@
 	dir = 1;
 	name = "Space Loop Out"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "hft" = (
@@ -58826,7 +58800,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluefull"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ivY" = (
 /obj/structure/sink/directional/west,
 /obj/machinery/camera{
@@ -58958,7 +58932,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ixM" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -61481,7 +61455,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluefull"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "jxs" = (
 /turf/simulated/floor/plating,
 /area/station/engineering/utility)
@@ -62889,12 +62863,10 @@
 	},
 /area/station/hallway/secondary/exit)
 "kak" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple,
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/station/engineering/atmos)
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/turf/space,
+/area/space/nearstation)
 "kaB" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 6
@@ -64861,7 +64833,7 @@
 	vent_link_id = "eng_sm_vent"
 	},
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "kLR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -67211,6 +67183,13 @@
 	icon_state = "darkyellowcorners"
 	},
 /area/station/engineering/atmos/control)
+"lGD" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 6
+	},
+/turf/space,
+/area/space/nearstation)
 "lGP" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -67626,7 +67605,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 6
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
@@ -71382,7 +71361,6 @@
 "ngQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "ngS" = (
@@ -72304,7 +72282,7 @@
 /area/station/security/brig)
 "nvN" = (
 /turf/simulated/wall/r_wall,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "nvO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/south,
@@ -74123,7 +74101,7 @@
 "ogH" = (
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
 /turf/simulated/wall,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ogI" = (
 /turf/simulated/wall/r_wall,
 /area/station/medical/chemistry)
@@ -74336,7 +74314,7 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ojz" = (
 /obj/structure/sign/poster/contraband/random/west,
 /obj/effect/decal/cleanable/dirt,
@@ -74413,7 +74391,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "okB" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -75367,7 +75345,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "floorgrime"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "oDE" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -82132,7 +82110,7 @@
 /obj/structure/disposalpipe/segment/corner,
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 4
+	dir = 9
 	},
 /turf/space,
 /area/space/nearstation)
@@ -83377,7 +83355,7 @@
 "rxp" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "rxK" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -84728,7 +84706,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "rZF" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -85804,7 +85782,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "stp" = (
 /obj/structure/chair/comfy/brown{
 	dir = 8
@@ -88395,7 +88373,7 @@
 /turf/simulated/floor/plasteel/stairs/left{
 	dir = 8
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "tmS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -89948,7 +89926,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "tSx" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -90923,7 +90901,7 @@
 	dir = 10;
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ujX" = (
 /obj/effect/spawner/random_spawners/fungus_maybe,
 /obj/machinery/atmospherics/pipe/simple/visible{
@@ -95430,7 +95408,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "vQT" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
@@ -95559,7 +95537,7 @@
 	dir = 8;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "vSH" = (
 /obj/structure/closet/crate/can,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -98310,6 +98288,16 @@
 	icon_state = "green"
 	},
 /area/station/service/hydroponics)
+"wXK" = (
+/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "yellow"
+	},
+/area/station/engineering/atmos)
 "wYg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -98803,7 +98791,7 @@
 	dir = 4;
 	icon_state = "darkbluecorners"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "xgn" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -101931,7 +101919,7 @@
 	dir = 6;
 	icon_state = "darkblue"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ykt" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -127696,9 +127684,9 @@ dar
 dev
 sLy
 dcq
-aab
-aab
-aab
+lGD
+kak
+kak
 qVf
 ucU
 xxh
@@ -127953,10 +127941,10 @@ dar
 wzQ
 jPX
 dcq
-aab
+rMi
 cZS
 cZS
-kmr
+dij
 fEE
 dij
 dij
@@ -128210,7 +128198,7 @@ dar
 iyc
 dcq
 dcq
-dij
+kmr
 cZS
 sRi
 hfb
@@ -128467,10 +128455,10 @@ dar
 yme
 tIg
 snV
-cde
+wXK
 cde
 dbt
-kak
+daM
 daM
 xsl
 dop
diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
index b18bf92a105e..049d07c1088a 100644
--- a/_maps/map_files220/delta/delta.dmm
+++ b/_maps/map_files220/delta/delta.dmm
@@ -12423,7 +12423,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "bcq" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -18221,7 +18221,7 @@
 "bAF" = (
 /obj/machinery/light/small/directional/east,
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "bAI" = (
 /obj/machinery/alarm/directional/south,
 /obj/machinery/light/small/directional/south,
@@ -21737,8 +21737,12 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bLU" = (
@@ -21751,6 +21755,12 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bLV" = (
@@ -21764,6 +21774,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bLZ" = (
@@ -23012,19 +23028,22 @@
 /turf/simulated/wall,
 /area/space/nearstation)
 "bPU" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/curved/flipped{
 	dir = 4
 	},
 /turf/space,
 /area/space/nearstation)
 "bPV" = (
-/obj/structure/lattice,
-/obj/structure/transit_tube/horizontal,
-/turf/space,
-/area/space/nearstation)
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/aisat)
 "bPW" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/curved{
 	dir = 8
 	},
@@ -23600,7 +23619,7 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bRQ" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/diagonal/topleft,
 /turf/space,
 /area/space/nearstation)
@@ -24352,10 +24371,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bTR" = (
@@ -24365,12 +24386,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
@@ -24396,12 +24411,6 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bTU" = (
@@ -24412,12 +24421,6 @@
 	dir = 8
 	},
 /obj/structure/transit_tube_pod,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bTV" = (
@@ -24568,6 +24571,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/space,
 /area/space/nearstation)
 "bUL" = (
@@ -24746,6 +24755,12 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/space,
 /area/space/nearstation)
 "bVj" = (
@@ -24796,6 +24811,12 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/space,
 /area/space/nearstation)
 "bVy" = (
@@ -24971,19 +24992,13 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
 "bWb" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/diagonal,
 /turf/space,
 /area/space/nearstation)
 "bWd" = (
 /obj/structure/transit_tube/horizontal,
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/space,
 /area/space/nearstation)
 "bWl" = (
@@ -25302,6 +25317,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/space,
 /area/space/nearstation)
 "bXH" = (
@@ -25385,14 +25402,14 @@
 	},
 /area/station/turret_protected/aisat)
 "bXR" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/curved{
 	dir = 4
 	},
 /turf/space,
 /area/space/nearstation)
 "bXS" = (
-/obj/structure/lattice,
+/obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/curved/flipped{
 	dir = 8
 	},
@@ -25495,6 +25512,12 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /turf/space,
 /area/space/nearstation)
 "bYn" = (
@@ -25612,6 +25635,12 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/space,
 /area/space/nearstation)
 "bYK" = (
@@ -25795,19 +25824,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/control)
-"bZw" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/space,
-/area/space/nearstation)
 "bZx" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28015,12 +28031,17 @@
 /area/station/command/teleporter)
 "chw" = (
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/space,
 /area/space/nearstation)
 "chy" = (
@@ -29544,12 +29565,6 @@
 /area/station/command/teleporter)
 "cnH" = (
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/structure/transit_tube/junction{
 	dir = 4
 	},
@@ -29677,12 +29692,6 @@
 /area/station/engineering/control)
 "coi" = (
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/structure/transit_tube/crossing{
 	dir = 8
 	},
@@ -30649,12 +30658,6 @@
 /area/station/engineering/control)
 "csr" = (
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/structure/transit_tube/horizontal,
 /turf/space,
 /area/space/nearstation)
@@ -30708,19 +30711,6 @@
 /obj/machinery/power/emitter,
 /turf/simulated/floor/plating,
 /area/station/engineering/equipmentstorage)
-"csy" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/transit_tube/curved{
-	dir = 8
-	},
-/turf/space,
-/area/space/nearstation)
 "csz" = (
 /obj/structure/closet/crate{
 	name = "solar pack crate"
@@ -30953,19 +30943,6 @@
 /obj/machinery/alarm/directional/south,
 /turf/simulated/floor/carpet,
 /area/station/service/library)
-"ctI" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/space,
-/area/space/nearstation)
 "ctJ" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/transit_tube/curved{
@@ -41932,9 +41909,7 @@
 /area/station/medical/cryo)
 "drZ" = (
 /obj/structure/table/reinforced,
-/obj/item/camera{
-	pixel_y = 2
-	},
+/obj/item/camera,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
@@ -49582,7 +49557,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "esw" = (
 /obj/machinery/access_button{
 	autolink_id = "enginen_btn_ext";
@@ -50582,7 +50557,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "eJJ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -50598,7 +50573,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "eJO" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -50879,7 +50854,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "eNt" = (
 /turf/simulated/wall,
 /area/station/maintenance/fsmaint)
@@ -52765,7 +52740,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ftD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -53552,8 +53527,14 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "fGU" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -55923,7 +55904,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore2)
 "gtR" = (
-/obj/item/seeds/coffee,
+/obj/machinery/economy/vending/coffee,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurplecorner"
@@ -57564,7 +57545,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "gVw" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -58201,14 +58182,11 @@
 /obj/structure/transit_tube/station{
 	dir = 1
 	},
-/obj/structure/transit_tube_pod{
-	dir = 8
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "hgs" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -60796,7 +60774,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "hVT" = (
 /obj/effect/turf_decal/stripes/white/line{
 	color = "lightblue"
@@ -65262,7 +65240,7 @@
 "jof" = (
 /obj/structure/transit_tube/horizontal,
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "jog" = (
 /obj/effect/turf_decal/delivery/hollow,
 /obj/structure/closet/secure_closet/engineering_electrical,
@@ -69365,14 +69343,8 @@
 	},
 /area/station/security/permabrig)
 "kFr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "kFG" = (
 /obj/effect/mapping_helpers/airlock/polarized{
 	id = "HoS"
@@ -70001,11 +69973,7 @@
 /area/station/maintenance/fore2)
 "kOr" = (
 /obj/structure/table,
-/obj/item/camera{
-	name = "Autopsy Camera";
-	pixel_x = 4;
-	pixel_y = 8
-	},
+/obj/item/camera/autopsy,
 /obj/item/autopsy_scanner{
 	pixel_x = -2;
 	pixel_y = 4
@@ -75201,7 +75169,7 @@
 	},
 /area/station/hallway/primary/fore)
 "myi" = (
-/obj/item/vending_refill/cola,
+/obj/machinery/economy/vending/cola,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple"
 	},
@@ -83449,15 +83417,6 @@
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood/fancy/oak,
 /area/station/legal/magistrate)
-"pbJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
 "pbQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -84755,8 +84714,14 @@
 	name = "exterior access button";
 	req_access_txt = "10;13"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "ptU" = (
 /obj/effect/spawner/random_spawners/blood_maybe,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -86060,7 +86025,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "pQa" = (
 /obj/effect/spawner/window/reinforced/polarized/grilled{
 	id = "HoS"
@@ -87950,7 +87915,7 @@
 /area/station/legal/courtroom)
 "qwS" = (
 /turf/simulated/wall/r_wall,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "qxd" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -91920,7 +91885,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "rJi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -92087,7 +92052,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "rMi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/glass,
@@ -92261,7 +92226,7 @@
 	icon_state = "0-2"
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "rPk" = (
 /obj/machinery/door/airlock{
 	name = "Toilet";
@@ -94165,17 +94130,22 @@
 	req_access_txt = "10;13";
 	vent_link_id = "stationai_vent"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	autolink_id = "stationai_vent";
-	dir = 4
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "suE" = (
 /obj/machinery/firealarm/directional/south,
 /obj/machinery/light/directional/south,
@@ -94247,13 +94217,14 @@
 /area/station/hallway/primary/central/sw)
 "swm" = (
 /obj/machinery/computer/card/minor/qm,
+/obj/effect/turf_decal/delivery/hollow,
 /obj/machinery/requests_console{
-	department = "Cargo Bay";
-	departmentType = 2;
-	name = "Cargo Requests Console";
-	pixel_y = 30
+	department = "Quartermaster's Desk";
+	departmentType = 5;
+	name = "Quartermaster Requests Console";
+	pixel_y = 30;
+	announcementConsole = 1
 	},
-/obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -95009,7 +94980,7 @@
 	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "sEI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -95585,7 +95556,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "sPz" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/vacuum{
@@ -95620,14 +95591,14 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/execution)
 "sPW" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "sQa" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -96116,10 +96087,7 @@
 /area/station/public/locker)
 "sYQ" = (
 /obj/structure/closet/secure_closet/detective,
-/obj/item/camera{
-	desc = "A one use - polaroid camera. 30 photos left.";
-	name = "detectives camera"
-	},
+/obj/item/camera/detective,
 /obj/item/restraints/handcuffs,
 /obj/item/storage/lockbox/spy_kit,
 /obj/item/storage/box/bodybags,
@@ -100082,7 +100050,7 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "unT" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/delivery/hollow,
@@ -100814,15 +100782,19 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "uBg" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan,
 /obj/effect/decal/cleanable/dirt,
@@ -101828,8 +101800,14 @@
 	name = "interior access button";
 	req_access_txt = "10;13"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "uQP" = (
 /obj/structure/chair/sofa/right{
 	dir = 8
@@ -103100,11 +103078,15 @@
 /obj/structure/sign/vacuum{
 	pixel_x = -32
 	},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1;
+	autolink_id = "stationai_vent"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "vkw" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable{
@@ -105836,7 +105818,7 @@
 /area/space/nearstation)
 "wdu" = (
 /turf/simulated/wall,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "wdz" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -106948,14 +106930,8 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel/dark,
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "wxg" = (
 /obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/delivery/hollow,
@@ -108452,7 +108428,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "wWY" = (
 /obj/effect/spawner/window/reinforced/polarized/grilled{
 	id = "Interrogation"
@@ -112458,7 +112434,7 @@
 	dir = 8;
 	icon_state = "vault"
 	},
-/area/station/engineering/aitransit)
+/area/station/engineering/ai_transit_tube)
 "yiO" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -123000,7 +122976,7 @@ bUJ
 aaa
 bku
 bmq
-bTS
+bPV
 bpq
 brr
 aaa
@@ -123771,7 +123747,7 @@ bUJ
 aaa
 bPU
 bms
-bZw
+oMO
 bms
 bXR
 aaa
@@ -124026,11 +124002,11 @@ aaa
 aaa
 bUJ
 abj
-bPV
+csr
 abj
-chw
 abj
-bPV
+abj
+csr
 aaa
 aaa
 aaa
@@ -124285,7 +124261,7 @@ bUJ
 aaa
 bPW
 wXe
-chw
+abj
 wXe
 bXS
 aaa
@@ -124542,7 +124518,7 @@ bUJ
 aaa
 abj
 bRQ
-chw
+abj
 bWb
 abj
 aaa
@@ -130706,7 +130682,7 @@ bge
 bGu
 bwN
 abj
-bUJ
+chw
 abj
 abj
 abj
@@ -130967,7 +130943,7 @@ ptq
 qwS
 qwS
 abj
-csy
+bPW
 abj
 bXU
 bZl
@@ -131224,7 +131200,7 @@ suC
 vkv
 qwS
 bZf
-ctI
+bZf
 ctJ
 bXU
 bZm
@@ -131738,7 +131714,7 @@ fGI
 eNr
 pPZ
 rJg
-pbJ
+kFr
 jof
 bXU
 bXU
diff --git a/modular_ss220/maps220/code/Areas/station.dm b/modular_ss220/maps220/code/Areas/station.dm
index 6e8a0b954ff8..3e05c9d310bf 100644
--- a/modular_ss220/maps220/code/Areas/station.dm
+++ b/modular_ss220/maps220/code/Areas/station.dm
@@ -15,10 +15,6 @@
 /area/station/bridge/checkpoint/south
 	name = "\improper South Command Checkpoint"
 
-/area/station/engineering/aitransit
-	name = "\improper AI Satellite Transfer Point"
-	icon_state = "engi"
-
 /area/station/engineering/hallway
 	name = "\improper Engineering Hallway"
 	icon_state = "engine_hallway"
diff --git a/modular_ss220/maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm
index 08c6e77375e0..dd466504e669 100644
--- a/modular_ss220/maps220/code/spawners.dm
+++ b/modular_ss220/maps220/code/spawners.dm
@@ -97,11 +97,11 @@
 /obj/effect/spawner/random_spawners/syndicate/loot/stetchkin
 	icon_state = "stetchkin"
 
-/obj/item/reagent_containers/food/pill/random_drugs
+/obj/item/reagent_containers/pill/random_drugs
 	icon = 'modular_ss220/maps220/icons/spawner_icons.dmi'
 	icon_state = "pills"
 
-/obj/item/reagent_containers/food/pill/random_drugs/Initialize(mapload)
+/obj/item/reagent_containers/pill/random_drugs/Initialize(mapload)
 	icon = 'icons/obj/chemical.dmi'
 	. = ..()
 
diff --git a/modular_ss220/silicons/code/items/gripper.dm b/modular_ss220/silicons/code/items/gripper.dm
index c1ea891b30c4..ab8d2a8de3cf 100644
--- a/modular_ss220/silicons/code/items/gripper.dm
+++ b/modular_ss220/silicons/code/items/gripper.dm
@@ -53,7 +53,7 @@
 					/obj/item/robot_parts,
 					/obj/item/stack/sheet/mineral/plasma, // for repair plasmamans
 					/obj/item/mmi,
-					/obj/item/reagent_containers/food/pill,
+					/obj/item/reagent_containers/pill,
 					/obj/item/reagent_containers/food/drinks,
 					/obj/item/reagent_containers/glass,
 					/obj/item/reagent_containers/syringe,