diff --git a/_maps/map_files/tramstation/tramstation_skyrat.dmm b/_maps/map_files/tramstation/tramstation_skyrat.dmm
index ce900cbc588..35bb59c39fd 100644
--- a/_maps/map_files/tramstation/tramstation_skyrat.dmm
+++ b/_maps/map_files/tramstation/tramstation_skyrat.dmm
@@ -65,10 +65,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/engineering/engine_smes)
-"aaO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/white,
-/area/security/execution/education)
 "aaP" = (
 /obj/structure/bed,
 /obj/item/bedsheet/dorms,
@@ -628,12 +624,9 @@
 /turf/open/floor/engine/cult,
 /area/service/library)
 "aeG" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 4;
-	name = "Air to Distro"
-	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/plating,
 /area/medical/virology)
 "aeK" = (
@@ -676,6 +669,16 @@
 	dir = 1
 	},
 /area/service/chapel)
+"afa" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/junction{
+	dir = 1
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/central/secondary)
 "afe" = (
 /obj/machinery/airalarm/directional/west,
 /obj/machinery/button/crematorium{
@@ -1290,6 +1293,8 @@
 	pixel_y = 4
 	},
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
 "aiF" = (
@@ -2979,8 +2984,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/medical/medbay/central)
@@ -4194,15 +4197,6 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/iron,
 /area/service/bar)
-"ayM" = (
-/obj/machinery/airalarm/directional/north,
-/obj/structure/table/glass,
-/obj/item/reagent_containers/spray/pepper,
-/obj/item/assembly/flash/handheld{
-	pixel_x = -6
-	},
-/turf/open/floor/iron/white,
-/area/security/execution/education)
 "ayR" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 4
@@ -4355,12 +4349,16 @@
 /area/commons/dorms)
 "azN" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/left)
 "azP" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/center)
 "azQ" = (
@@ -4497,7 +4495,9 @@
 /area/hallway/primary/tram/center)
 "aAJ" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/right)
 "aAK" = (
@@ -5916,7 +5916,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/medical/virology)
@@ -7871,7 +7870,6 @@
 /turf/open/floor/iron/dark,
 /area/security/courtroom)
 "baV" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -7880,9 +7878,9 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 8
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Isolation Cell B";
-	req_access_txt = "2"
+/obj/machinery/door/window/brigdoor/security/cell{
+	id = "Cell 4";
+	name = "Cell 4"
 	},
 /turf/open/floor/iron,
 /area/security/prison)
@@ -8526,8 +8524,10 @@
 /area/cargo/miningdock)
 "bnl" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/effect/landmark/event_spawn,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/right)
 "bnm" = (
@@ -8814,13 +8814,21 @@
 /turf/open/floor/iron,
 /area/security/prison)
 "btd" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
-	dir = 1;
-	name = "sorting disposal pipe (Robotics)";
-	sortType = 14
+/obj/machinery/light/small/directional/west,
+/obj/item/radio/intercom/prison/directional/north,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 9
 	},
-/turf/open/floor/iron/white,
-/area/science/research)
+/obj/structure/closet/secure_closet/brig{
+	id = "Cell 2";
+	name = "Cell 2 Locker"
+	},
+/obj/machinery/flasher/directional/west{
+	id = "Cell 2";
+	pixel_y = 22
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "bto" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 4
@@ -10958,8 +10966,10 @@
 /obj/effect/spawner/random/trash/cigbutt,
 /obj/structure/cable,
 /obj/machinery/light/small/directional/east,
-/obj/structure/disposalpipe/junction{
-	dir = 2
+/obj/structure/disposalpipe/sorting/mail/flip{
+	dir = 1;
+	name = "sorting disposal pipe (Janitor)";
+	sortType = 22
 	},
 /turf/open/floor/catwalk_floor,
 /area/maintenance/central)
@@ -12206,9 +12216,6 @@
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
@@ -12639,7 +12646,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Hallway - Upper Mid-Right Service";
-	dir = 10
+	dir = 8
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/central)
@@ -13203,6 +13210,7 @@
 	req_one_access_txt = "47"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
 /turf/open/floor/iron/smooth,
 /area/maintenance/department/science)
 "daq" = (
@@ -13259,7 +13267,6 @@
 /turf/open/floor/circuit,
 /area/ai_monitored/turret_protected/ai)
 "dca" = (
-/obj/structure/cable,
 /obj/effect/turf_decal/trimline/red/filled/corner{
 	dir = 1
 	},
@@ -13332,6 +13339,9 @@
 /obj/structure/window/reinforced/tinted{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
 "dcY" = (
@@ -13555,7 +13565,6 @@
 	pixel_x = 5;
 	pixel_y = -1
 	},
-/obj/structure/cable,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -14040,8 +14049,10 @@
 /area/cargo/miningdock)
 "dsc" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/right)
 "dse" = (
@@ -14067,23 +14078,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "dsD" = (
-/obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/sec/surgery{
-	pixel_y = 5
-	},
-/obj/item/clothing/mask/balaclava,
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = 5
-	},
-/obj/structure/sign/poster/official/do_not_question{
-	pixel_y = 32
-	},
-/obj/machinery/button/flasher{
-	id = "reeducation";
-	pixel_x = -24;
-	pixel_y = -8;
-	req_access_txt = "2"
-	},
+/obj/structure/bed/roller,
 /turf/open/floor/iron/white,
 /area/security/execution/education)
 "dsL" = (
@@ -14133,9 +14128,25 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/entry)
 "dtB" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/space/basic,
-/area/space)
+/obj/structure/table/glass,
+/obj/item/storage/backpack/duffelbag/sec/surgery{
+	pixel_y = 5
+	},
+/obj/item/clothing/mask/balaclava,
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = 5
+	},
+/obj/structure/sign/poster/official/do_not_question{
+	pixel_y = 32
+	},
+/obj/machinery/button/flasher{
+	id = "reeducation";
+	pixel_x = -24;
+	pixel_y = -8;
+	req_access_txt = "2"
+	},
+/turf/open/floor/iron/white,
+/area/security/execution/education)
 "dtL" = (
 /turf/open/floor/iron/dark,
 /area/ai_monitored/turret_protected/ai)
@@ -14152,7 +14163,6 @@
 "dul" = (
 /obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /turf/open/floor/wood,
@@ -15411,7 +15421,7 @@
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/camera{
 	c_tag = "Hallway - Mid-Right Service";
-	dir = 10
+	dir = 8
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/central)
@@ -15808,6 +15818,15 @@
 	},
 /turf/open/floor/iron,
 /area/cargo/miningdock)
+"dYS" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/door_timer{
+	id = "Cell 3";
+	name = "Cell 3";
+	pixel_y = -32
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "dYV" = (
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating,
@@ -16084,8 +16103,6 @@
 /area/maintenance/tram/right)
 "ecC" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/white,
 /area/command/heads_quarters/captain/private)
 "ecF" = (
@@ -16652,8 +16669,16 @@
 /turf/open/floor/iron,
 /area/security/brig)
 "ele" = (
-/turf/closed/wall,
-/area/security/execution/education)
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/machinery/door_timer{
+	id = "Cell 1";
+	name = "Cell 1";
+	pixel_y = 32
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "elh" = (
 /obj/machinery/door/airlock/research{
 	id_tag = "ResearchExt";
@@ -16787,6 +16812,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/maintenance/port/central)
 "emU" = (
@@ -17236,6 +17262,8 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "etK" = (
@@ -17677,7 +17705,6 @@
 	name = "Mining Maintenance Access";
 	req_access_txt = "48"
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
@@ -17919,6 +17946,9 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "eFB" = (
@@ -18152,15 +18182,10 @@
 /turf/open/floor/iron/dark,
 /area/engineering/atmospherics_engine)
 "eLS" = (
-/obj/structure/table/glass,
-/obj/item/folder/red{
-	pixel_x = 3
-	},
-/obj/item/taperecorder{
-	pixel_x = -3
-	},
-/obj/structure/sign/poster/official/obey{
-	pixel_y = -32
+/obj/structure/cable,
+/obj/structure/closet/secure_closet/injection{
+	name = "educational injections";
+	pixel_x = 2
 	},
 /turf/open/floor/iron/white,
 /area/security/execution/education)
@@ -18200,11 +18225,8 @@
 	desc = "A photo frame to commemorate Nanotrasen's Employee of the Month - an entirely unbiased decision made by the NT Representative.";
 	pixel_y = 32
 	},
-/obj/effect/decal/cleanable/ash{
-	desc = "Well, that's the end of that.";
-	name = "burnt employment contract"
-	},
-/obj/item/lighter,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
 "eME" = (
@@ -18911,7 +18933,6 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/airlock/external{
@@ -19287,7 +19308,6 @@
 "fgr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/railing,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/caution{
 	dir = 1
 	},
@@ -19542,7 +19562,6 @@
 /area/maintenance/starboard/central)
 "fkL" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -19585,6 +19604,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/security/office)
 "flP" = (
@@ -19716,6 +19736,11 @@
 	},
 /turf/open/floor/plating,
 /area/ai_monitored/command/nuke_storage)
+"fnz" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/security/prison)
 "fnK" = (
 /obj/structure/ladder,
 /obj/effect/decal/cleanable/dirt,
@@ -19954,6 +19979,12 @@
 /obj/machinery/vending/cigarette,
 /turf/open/floor/iron,
 /area/commons/storage/tools)
+"frb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/maintenance/port/central)
 "frk" = (
 /obj/structure/railing,
 /obj/structure/chair/sofa/left{
@@ -20047,8 +20078,10 @@
 /area/security/brig)
 "fsL" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/center)
 "fth" = (
@@ -20362,7 +20395,10 @@
 /obj/effect/turf_decal/trimline/neutral/corner{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/structure/disposalpipe/junction,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "fxm" = (
@@ -20860,6 +20896,7 @@
 	name = "Perma Officer";
 	req_access_txt = "2"
 	},
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/brigofficer)
 "fFO" = (
@@ -21122,7 +21159,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Hallway - Central Tram Platform North";
-	dir = 10
+	dir = 8
 	},
 /obj/effect/turf_decal/caution{
 	dir = 1
@@ -21350,6 +21387,9 @@
 "fOK" = (
 /obj/structure/bed,
 /obj/item/bedsheet/captain,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "fOO" = (
@@ -22653,7 +22693,6 @@
 /turf/open/floor/iron,
 /area/security/prison)
 "gmM" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -22662,9 +22701,10 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Isolation Cell C";
-	req_access_txt = "2"
+/obj/machinery/door/window/brigdoor/security/cell{
+	dir = 1;
+	id = "Cell 1";
+	name = "Cell 1"
 	},
 /turf/open/floor/iron,
 /area/security/prison)
@@ -23000,17 +23040,14 @@
 /turf/open/floor/iron,
 /area/commons/dorms)
 "grV" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/red/filled/corner{
-	dir = 1
+/obj/machinery/airalarm/directional/north,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/assembly/flash/handheld{
+	pixel_x = -6
 	},
-/obj/effect/turf_decal/trimline/red/filled/corner{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/security/prison)
+/turf/open/floor/iron/white,
+/area/security/execution/education)
 "gsa" = (
 /obj/machinery/exodrone_launcher,
 /turf/open/floor/plating,
@@ -24169,7 +24206,6 @@
 /turf/open/floor/iron,
 /area/commons/storage/primary)
 "gPp" = (
-/obj/structure/chair/stool/bar/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
@@ -24177,7 +24213,7 @@
 	dir = 10
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Isolation Chamber A";
+	c_tag = "Security - Holding Cell 2";
 	dir = 8;
 	network = list("ss13","Security","prison")
 	},
@@ -24372,13 +24408,10 @@
 /turf/open/floor/iron,
 /area/security/checkpoint/medical)
 "gTj" = (
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/obj/machinery/light_switch/directional/east{
-	pixel_x = 22;
-	pixel_y = -9
+/obj/machinery/flasher/directional/north{
+	id = "reeducation"
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/textured_large,
 /area/security/execution/education)
 "gTo" = (
 /obj/structure/bed,
@@ -24618,7 +24651,6 @@
 /turf/open/floor/catwalk_floor,
 /area/hallway/primary/tram/center)
 "gYp" = (
-/obj/structure/chair/stool/bar/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
@@ -24626,7 +24658,7 @@
 	dir = 10
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Isolation Chamber C";
+	c_tag = "Security - Holding Cell 1";
 	dir = 8;
 	network = list("ss13","Security","prison")
 	},
@@ -24768,6 +24800,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ai_monitored/security/armory)
 "haX" = (
@@ -25533,8 +25566,10 @@
 /area/ai_monitored/turret_protected/aisat/hallway)
 "hnh" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/effect/landmark/event_spawn,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/center)
 "hnF" = (
@@ -25821,7 +25856,6 @@
 	name = "Permabrig Showers"
 	},
 /obj/machinery/door/firedoor,
-/obj/structure/cable,
 /obj/machinery/duct,
 /turf/open/floor/iron/freezer,
 /area/security/prison)
@@ -25835,8 +25869,11 @@
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/carpet/executive,
-/area/command/gateway)
+/area/command/heads_quarters/captain/private/nt_rep)
 "htX" = (
 /obj/structure/ladder,
 /obj/machinery/door/window/westleft{
@@ -26029,8 +26066,6 @@
 /obj/machinery/door/airlock/maintenance_hatch{
 	req_one_access_txt = "12"
 	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/structure/cable,
@@ -26214,7 +26249,6 @@
 /area/cargo/storage)
 "hBq" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/holopad/secure,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
@@ -26325,7 +26359,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/yellow/warning,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
@@ -26678,6 +26711,8 @@
 "hKW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/smooth,
 /area/maintenance/department/medical)
 "hLi" = (
@@ -27014,7 +27049,7 @@
 /turf/open/floor/iron,
 /area/cargo/storage)
 "hRG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/closed/wall,
 /area/medical/treatment_center)
 "hRI" = (
@@ -28168,10 +28203,12 @@
 /area/maintenance/tram/left)
 "ioT" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/machinery/camera/directional/south{
 	c_tag = "Hallway - North-East Tram Bridge"
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/center)
 "ipi" = (
@@ -29564,6 +29601,15 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/tram/center)
+"iMU" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/hallway/secondary/command)
 "iMV" = (
 /obj/machinery/computer/department_orders/science{
 	dir = 4
@@ -29723,6 +29769,7 @@
 "iPj" = (
 /obj/structure/table/wood,
 /obj/item/toy/figure/captain,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "iPv" = (
@@ -29951,7 +29998,6 @@
 /turf/open/floor/circuit/green,
 /area/ai_monitored/command/nuke_storage)
 "iUO" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -29960,9 +30006,9 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 8
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Isolation Cell D";
-	req_access_txt = "2"
+/obj/machinery/door/window/brigdoor/security/cell{
+	id = "Cell 3";
+	name = "Cell 3"
 	},
 /turf/open/floor/iron,
 /area/security/prison)
@@ -30156,6 +30202,10 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron,
 /area/hallway/secondary/construction/engineering)
+"iXX" = (
+/obj/machinery/suit_storage_unit/captain,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private)
 "iYg" = (
 /obj/machinery/door/airlock/hatch,
 /obj/effect/decal/cleanable/dirt,
@@ -31023,10 +31073,8 @@
 /turf/open/floor/iron,
 /area/engineering/engine_smes)
 "joQ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron/textured_large,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/white,
 /area/security/execution/education)
 "joT" = (
 /obj/structure/closet/emcloset,
@@ -32330,6 +32378,16 @@
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
+"jNp" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/starboard/central)
 "jND" = (
 /turf/open/floor/glass/reinforced,
 /area/security/brig)
@@ -32854,6 +32912,15 @@
 /obj/structure/sign/poster/official/random{
 	pixel_y = -32
 	},
+/obj/item/stamp{
+	pixel_x = -5
+	},
+/obj/item/stamp/centcom{
+	pixel_y = 9
+	},
+/obj/item/stamp/denied{
+	pixel_x = 5
+	},
 /turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
 "jXg" = (
@@ -33006,6 +33073,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
 /turf/open/floor/iron,
 /area/engineering/atmos)
+"jZI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/maintenance/department/medical)
 "jZP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -33189,7 +33261,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/hallway/secondary/entry)
 "kcc" = (
@@ -33560,7 +33634,9 @@
 	dir = 1
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "kiH" = (
@@ -34155,8 +34231,14 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
 /area/command/heads_quarters/ce)
-"kuX" = (
+"kuG" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/maintenance/port/central)
+"kuX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/duct,
 /obj/structure/cable,
@@ -34428,6 +34510,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/security/prison/safe)
+"kBA" = (
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private)
 "kBI" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/status_display/evac/directional/north,
@@ -34634,6 +34719,15 @@
 	},
 /turf/open/floor/iron,
 /area/engineering/atmos)
+"kGV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/wood/parquet,
+/area/command/heads_quarters/captain/private/nt_rep)
 "kGW" = (
 /obj/effect/turf_decal/trimline/purple/filled/corner{
 	dir = 4
@@ -35104,11 +35198,11 @@
 "kPu" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/junction/flip{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/catwalk_floor,
 /area/maintenance/starboard/central)
 "kPK" = (
@@ -35174,7 +35268,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Civilian - Aux Base Construction";
-	dir = 9
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/construction/mining/aux_base)
@@ -35197,6 +35291,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/catwalk_floor,
 /area/maintenance/starboard/central)
 "kRF" = (
@@ -35881,6 +35978,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ai_monitored/security/armory)
 "lbS" = (
@@ -36042,8 +36140,11 @@
 /turf/open/floor/iron/smooth,
 /area/maintenance/tram/left)
 "leM" = (
-/turf/closed/wall/r_wall,
-/area/space)
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/iron/textured_large,
+/area/security/execution/education)
 "leY" = (
 /turf/open/floor/iron,
 /area/security/checkpoint/escape)
@@ -36434,7 +36535,6 @@
 	req_one_access_txt = "12"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/maintenance/starboard/secondary)
 "lnR" = (
@@ -36586,7 +36686,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Security - Isolation Chambers";
-	dir = 6;
+	dir = 4;
 	network = list("ss13","Security","prison")
 	},
 /turf/open/floor/iron,
@@ -36822,7 +36922,6 @@
 /turf/closed/wall,
 /area/mine/explored)
 "lvI" = (
-/obj/structure/chair/stool/bar/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
@@ -36830,7 +36929,7 @@
 	dir = 9
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Isolation Chamber D";
+	c_tag = "Security - Holding Cell 3";
 	dir = 8;
 	network = list("ss13","Security","prison")
 	},
@@ -36958,6 +37057,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/security/prison/workout)
+"lyW" = (
+/obj/structure/table/glass,
+/obj/item/folder/red{
+	pixel_x = 3
+	},
+/obj/item/taperecorder{
+	pixel_x = -3
+	},
+/obj/structure/sign/poster/official/obey{
+	pixel_y = -32
+	},
+/turf/open/floor/iron/white,
+/area/security/execution/education)
 "lzb" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
@@ -36978,11 +37090,10 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/structure/chair/office{
-	dir = 4
-	},
 /obj/machinery/light/directional/west,
-/obj/effect/landmark/start/nanotrasen_representative,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
 "lAf" = (
@@ -37219,11 +37330,19 @@
 /turf/open/floor/iron/white,
 /area/science/xenobiology)
 "lFw" = (
+/obj/machinery/door/firedoor,
+/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/white/smooth_edge{
-	dir = 8
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
 	},
+/obj/machinery/door/airlock/security{
+	name = "Reeducation Center";
+	req_access_txt = "2"
+	},
+/turf/open/floor/iron/white,
 /area/security/execution/education)
 "lFD" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
@@ -37331,7 +37450,6 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/external{
 	autoclose = 0;
 	frequency = 1449;
@@ -37567,6 +37685,14 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/secondary/entry)
+"lKK" = (
+/obj/structure/disposalpipe/sorting/mail/flip{
+	dir = 1;
+	name = "sorting disposal pipe (Robotics)";
+	sortType = 14
+	},
+/turf/open/floor/iron/white,
+/area/science/research)
 "lKM" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -38083,12 +38209,12 @@
 "lUD" = (
 /obj/docking_port/stationary{
 	dir = 8;
-	dwidth = 3;
-	height = 15;
+	dwidth = 1;
+	height = 13;
 	id = "arrivals_stationary";
 	name = "arrivals";
-	roundstart_template = /datum/map_template/shuttle/arrival/box;
-	width = 7
+	roundstart_template = null;
+	width = 5
 	},
 /turf/open/space/openspace,
 /area/space)
@@ -38277,6 +38403,9 @@
 /turf/open/floor/iron/white,
 /area/science/cytology)
 "lYa" = (
+/obj/item/toy/plush/moth{
+	desc = "The moth wonders why you are out this far..."
+	},
 /turf/closed/mineral/random/stationside/asteroid/porus,
 /area/space)
 "lYr" = (
@@ -38417,6 +38546,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/maintenance/tram/left)
+"mbm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth,
+/area/maintenance/department/science)
 "mbt" = (
 /obj/machinery/conveyor{
 	id = "packageSort2"
@@ -38716,8 +38851,10 @@
 /area/maintenance/starboard/central)
 "mjd" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/effect/landmark/event_spawn,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/left)
 "mjf" = (
@@ -38885,6 +39022,7 @@
 	dir = 1
 	},
 /obj/vehicle/ridden/secway,
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/ai_monitored/security/armory)
 "mlV" = (
@@ -39981,9 +40119,6 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/science/research)
@@ -40632,6 +40767,9 @@
 	name = "Nanotrasen Representative's Office";
 	req_access_txt = "101"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/command/heads_quarters/captain/private/nt_rep)
 "mVq" = (
@@ -40789,6 +40927,15 @@
 /obj/structure/disposalpipe/junction/flip,
 /turf/open/floor/iron,
 /area/hallway/primary/central)
+"mXM" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Tunnel Access";
+	req_one_access_txt = "12"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor,
+/area/maintenance/starboard/central)
 "mXQ" = (
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -40964,7 +41111,6 @@
 /area/hallway/secondary/exit/departure_lounge)
 "naT" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/crate{
 	icon_state = "crateopen"
@@ -41455,10 +41601,10 @@
 /turf/open/floor/grass,
 /area/science/genetics)
 "nnQ" = (
-/obj/machinery/flasher/directional/north{
-	id = "reeducation"
+/obj/structure/window/reinforced/spawner/west,
+/turf/open/floor/iron/white/smooth_corner{
+	dir = 4
 	},
-/turf/open/floor/iron/textured_large,
 /area/security/execution/education)
 "nnT" = (
 /obj/effect/turf_decal/bot,
@@ -41507,6 +41653,8 @@
 /area/cargo/office)
 "nom" = (
 /obj/structure/closet/secure_closet/blueshield,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "nos" = (
@@ -42283,6 +42431,11 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 1
 	},
+/obj/machinery/door_timer{
+	id = "Cell 2";
+	name = "Cell 2";
+	pixel_y = 32
+	},
 /turf/open/floor/iron,
 /area/security/prison)
 "nDb" = (
@@ -42472,6 +42625,8 @@
 "nFO" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "nGf" = (
@@ -42906,10 +43061,12 @@
 /area/science/mixing)
 "nNK" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor{
 	dir = 1
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/left)
 "nNP" = (
@@ -43738,6 +43895,10 @@
 /area/ai_monitored/turret_protected/aisat/hallway)
 "odD" = (
 /obj/effect/landmark/start/blueshield,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "odK" = (
@@ -43805,7 +43966,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/disposalpipe/segment,
-/turf/open/space/basic,
+/turf/open/floor/iron,
 /area/service/janitor)
 "ofp" = (
 /obj/structure/cable,
@@ -43934,10 +44095,12 @@
 /area/service/lawoffice)
 "ohl" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor{
 	dir = 1
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/center)
 "ohu" = (
@@ -43956,7 +44119,14 @@
 /turf/open/floor/iron/dark,
 /area/security/interrogation)
 "ohx" = (
-/turf/open/floor/iron/textured_large,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/turf/open/floor/iron/white,
 /area/security/execution/education)
 "ohz" = (
 /obj/effect/spawner/structure/window,
@@ -44552,6 +44722,7 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 8
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/security/prison)
 "otN" = (
@@ -44659,6 +44830,16 @@
 	},
 /turf/open/floor/iron,
 /area/cargo/miningdock)
+"owk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/central/secondary)
 "owr" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
@@ -44838,6 +45019,7 @@
 	dir = 1
 	},
 /obj/structure/closet/secure_closet/brigoff,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron/dark,
 /area/brigofficer)
 "ozF" = (
@@ -45376,6 +45558,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/brigoff,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/brigofficer)
 "oIh" = (
@@ -45403,6 +45586,9 @@
 	network = list("ss13","Security")
 	},
 /obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/open/floor/iron,
 /area/security/brig)
 "oIo" = (
@@ -46688,10 +46874,12 @@
 /area/engineering/main)
 "peH" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/machinery/camera/directional/south{
 	c_tag = "Hallway - North-East Tram Bridge"
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/left)
 "peT" = (
@@ -46803,7 +46991,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Hallway - Upper Mid-Left Service";
-	dir = 6
+	dir = 4
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/central)
@@ -46870,7 +47058,6 @@
 /area/science/xenobiology)
 "piH" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/crate{
 	icon_state = "crateopen"
@@ -47203,16 +47390,11 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/table/wood,
-/obj/item/stamp/centcom{
-	pixel_y = 9
-	},
-/obj/item/stamp{
-	pixel_x = -5
-	},
-/obj/item/stamp/denied{
-	pixel_x = 5
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
+/obj/structure/chair/office,
+/obj/effect/landmark/start/nanotrasen_representative,
 /turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
 "pov" = (
@@ -47424,6 +47606,16 @@
 	},
 /turf/open/floor/iron,
 /area/service/kitchen)
+"ptC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/central/secondary)
 "ptQ" = (
 /obj/effect/turf_decal/trimline/yellow/filled/corner{
 	dir = 4
@@ -48239,7 +48431,6 @@
 /turf/open/floor/iron,
 /area/security/prison/work)
 "pGT" = (
-/obj/structure/cable,
 /obj/machinery/duct,
 /turf/open/floor/iron/freezer,
 /area/security/prison)
@@ -48502,6 +48693,7 @@
 /obj/effect/turf_decal/delivery,
 /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/dark,
 /area/ai_monitored/security/armory)
 "pLK" = (
@@ -49083,6 +49275,8 @@
 	name = "Brig Officer's Locker";
 	req_one_access_txt = list(2)
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/brigofficer)
 "pWI" = (
@@ -50337,7 +50531,6 @@
 /area/maintenance/central)
 "qvh" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
 "qvl" = (
@@ -51195,6 +51388,7 @@
 	dir = 5
 	},
 /obj/machinery/status_display/ai/directional/north,
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/iron,
 /area/security/prison)
 "qME" = (
@@ -51385,10 +51579,12 @@
 /area/medical/pharmacy)
 "qQJ" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/machinery/camera/directional/south{
 	c_tag = "Hallway - North-East Tram Bridge"
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/right)
 "qQK" = (
@@ -51764,6 +51960,16 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/mine/explored)
+"qXW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/port/aft)
 "qYa" = (
 /obj/structure/table,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -52042,7 +52248,7 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Hallway - Lower Mid-Right Service";
-	dir = 10
+	dir = 8
 	},
 /turf/open/floor/iron,
 /area/hallway/primary/central)
@@ -52488,7 +52694,7 @@
 /turf/open/floor/engine,
 /area/science/cytology)
 "rkL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
+/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
@@ -52518,9 +52724,12 @@
 /turf/open/floor/iron,
 /area/commons/storage/primary)
 "rlg" = (
-/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/structure/cable,
 /turf/open/floor/iron,
-/area/hallway/primary/tram/center)
+/area/security/prison)
 "rlq" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -52905,6 +53114,9 @@
 "rtC" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/landmark/start/nanotrasen_representative,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
 "rtH" = (
@@ -53760,12 +53972,9 @@
 /turf/open/floor/iron,
 /area/commons/dorms)
 "rMf" = (
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/trimline/red/filled/corner{
-	dir = 4
-	},
-/turf/open/floor/iron/white,
+/obj/machinery/light/directional/west,
+/obj/structure/bed,
+/turf/open/floor/iron/textured_large,
 /area/security/execution/education)
 "rMG" = (
 /obj/effect/turf_decal/sand/plating,
@@ -53872,6 +54081,9 @@
 /area/security/brig)
 "rON" = (
 /obj/machinery/light_switch/directional/north,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "rOO" = (
@@ -54240,6 +54452,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/trimline/red/filled/line,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/security/prison)
 "rVq" = (
@@ -54804,6 +55017,16 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron,
 /area/hallway/secondary/exit)
+"seo" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/central/secondary)
 "seE" = (
 /obj/structure/closet,
 /obj/effect/spawner/random/maintenance/four,
@@ -55217,7 +55440,6 @@
 	},
 /obj/effect/turf_decal/bot,
 /obj/item/stack/sheet/plasteel/fifty,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/hfr_box/body/fuel_input,
 /obj/item/hfr_box/body/interface,
 /obj/item/hfr_box/body/moderator_input,
@@ -55515,9 +55737,7 @@
 /obj/structure/sign/nanotrasen{
 	pixel_x = -32
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "ssV" = (
@@ -56216,7 +56436,8 @@
 /turf/open/floor/iron,
 /area/service/salon)
 "sFC" = (
-/obj/machinery/suit_storage_unit/captain,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain/private)
 "sFL" = (
@@ -56346,6 +56567,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance/three,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/smooth,
 /area/maintenance/central/secondary)
 "sIA" = (
@@ -57385,6 +57608,8 @@
 /area/commons/locker)
 "taq" = (
 /obj/machinery/light/small/directional/north,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
 /turf/open/floor/carpet/executive,
 /area/blueshield)
 "tat" = (
@@ -57670,19 +57895,11 @@
 /turf/open/floor/plating,
 /area/service/janitor)
 "tfA" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
+/turf/open/floor/iron/white/smooth_edge{
+	dir = 8
 	},
-/obj/machinery/door/airlock/security{
-	name = "Reeducation Center";
-	req_access_txt = "2"
-	},
-/turf/open/floor/iron/white,
 /area/security/execution/education)
 "tfB" = (
 /turf/open/openspace/airless/planetary,
@@ -57762,8 +57979,6 @@
 /turf/open/floor/iron/dark,
 /area/command/bridge)
 "thh" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
 /obj/structure/sink{
 	pixel_y = 15
 	},
@@ -58717,6 +58932,7 @@
 	network = list("ss13","Security")
 	},
 /obj/structure/cable,
+/obj/machinery/light/directional/north,
 /turf/open/floor/iron/grimy,
 /area/security/detectives_office)
 "tuA" = (
@@ -58773,12 +58989,12 @@
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 1
 	},
-/obj/structure/disposalpipe/junction/flip{
-	dir = 8
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/hallway/primary/tram/center)
 "twg" = (
@@ -58862,6 +59078,15 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
+"tyF" = (
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/machinery/door_timer{
+	id = "Cell 4";
+	name = "Cell 4";
+	pixel_y = -32
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "tyJ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron/white,
@@ -59140,8 +59365,12 @@
 /turf/open/floor/plating,
 /area/maintenance/solars/port/aft)
 "tCW" = (
-/obj/structure/window/reinforced/spawner/west,
-/turf/open/floor/iron/white/smooth_corner,
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/trimline/red/filled/corner{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
 /area/security/execution/education)
 "tDc" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59799,10 +60028,8 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/junction/flip{
-	dir = 8
-	},
 /obj/structure/cable,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/catwalk_floor,
 /area/maintenance/starboard/central)
 "tPo" = (
@@ -60204,12 +60431,19 @@
 /turf/open/floor/iron/freezer,
 /area/commons/toilet/restrooms)
 "tVi" = (
-/obj/structure/table,
 /obj/machinery/light/small/directional/west,
 /obj/item/radio/intercom/prison/directional/south,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 10
 	},
+/obj/structure/closet/secure_closet/brig{
+	id = "Cell 3";
+	name = "Cell 3 Locker"
+	},
+/obj/machinery/flasher/directional/west{
+	id = "Cell 3";
+	pixel_y = -22
+	},
 /turf/open/floor/iron,
 /area/security/prison)
 "tVj" = (
@@ -60452,10 +60686,12 @@
 /area/engineering/atmospherics_engine)
 "tZs" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor{
 	dir = 1
 	},
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/right)
 "tZy" = (
@@ -60853,6 +61089,22 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/hallway/primary/central)
+"uin" = (
+/obj/machinery/light/small/directional/west,
+/obj/item/radio/intercom/prison/directional/south,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 10
+	},
+/obj/structure/closet/secure_closet/brig{
+	id = "Cell 4";
+	name = "Cell 4 Locker"
+	},
+/obj/machinery/flasher/directional/west{
+	id = "Cell 4";
+	pixel_y = -22
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "uir" = (
 /obj/effect/turf_decal/trimline/yellow/warning{
 	dir = 1
@@ -61243,11 +61495,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/red/filled/corner{
-	dir = 4
+	dir = 1
 	},
-/obj/effect/turf_decal/trimline/red/filled/corner,
-/turf/open/floor/iron/white,
-/area/security/execution/education)
+/obj/effect/turf_decal/trimline/red/filled/corner{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/security/prison)
 "upr" = (
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
@@ -61407,6 +61661,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/maintenance/port/central)
 "urU" = (
@@ -62067,6 +62322,9 @@
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 5
 	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
 "uDS" = (
@@ -62470,6 +62728,9 @@
 	name = "Blueshield's Office";
 	req_access_txt = "20"
 	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/blueshield)
 "uKe" = (
@@ -63375,8 +63636,10 @@
 /area/service/lawoffice)
 "vdk" = (
 /obj/effect/turf_decal/delivery,
-/obj/structure/holosign/barrier/atmos/sturdy,
 /obj/structure/fluff/tram_rail/floor,
+/obj/structure/fans/tiny/forcefield{
+	dir = 4
+	},
 /turf/open/floor/vault,
 /area/hallway/primary/tram/left)
 "vdn" = (
@@ -63760,10 +64023,13 @@
 /turf/open/floor/iron/white,
 /area/medical/chemistry)
 "vly" = (
-/obj/structure/window/reinforced/spawner/west,
-/turf/open/floor/iron/white/smooth_corner{
-	dir = 4
+/obj/item/radio/intercom/directional/east,
+/obj/effect/turf_decal/trimline/red/filled/corner,
+/obj/machinery/light_switch/directional/east{
+	pixel_x = 22;
+	pixel_y = -9
 	},
+/turf/open/floor/iron/white,
 /area/security/execution/education)
 "vlG" = (
 /turf/closed/mineral/random/stationside/asteroid/porus,
@@ -64294,6 +64560,7 @@
 /area/mine/explored)
 "vxQ" = (
 /obj/machinery/holopad,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
 "vyw" = (
@@ -64375,7 +64642,6 @@
 /turf/open/floor/iron/white,
 /area/medical/medbay/central)
 "vzH" = (
-/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -64384,9 +64650,10 @@
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
 	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Isolation Cell A";
-	req_access_txt = "2"
+/obj/machinery/door/window/brigdoor/security/cell{
+	dir = 1;
+	id = "Cell 2";
+	name = "Cell 2"
 	},
 /turf/open/floor/iron,
 /area/security/prison)
@@ -64807,12 +65074,8 @@
 /turf/open/floor/iron/cafeteria,
 /area/security/prison/mess)
 "vHL" = (
-/obj/structure/cable,
-/obj/structure/closet/secure_closet/injection{
-	name = "educational injections";
-	pixel_x = 2
-	},
-/turf/open/floor/iron/white,
+/obj/structure/window/reinforced/spawner/west,
+/turf/open/floor/iron/white/smooth_corner,
 /area/security/execution/education)
 "vHM" = (
 /obj/effect/turf_decal/siding/thinplating/end,
@@ -65868,7 +66131,6 @@
 /turf/open/floor/iron,
 /area/hallway/secondary/entry)
 "waG" = (
-/obj/structure/chair/stool/bar/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
@@ -65876,7 +66138,7 @@
 	dir = 9
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Isolation Chamber B";
+	c_tag = "Security - Holding Cell 4";
 	dir = 8;
 	network = list("ss13","Security","prison")
 	},
@@ -66212,6 +66474,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/security/office)
 "wiA" = (
@@ -66381,7 +66644,9 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/central)
 "wmb" = (
-/obj/structure/bed/roller,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/iron/white,
 /area/security/execution/education)
 "wmA" = (
@@ -67060,7 +67325,6 @@
 /area/commons/lounge)
 "wxO" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron,
@@ -67157,6 +67421,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/security/prison)
 "wyB" = (
@@ -67356,30 +67621,6 @@
 /obj/structure/cable,
 /turf/open/floor/engine,
 /area/engineering/supermatter/room)
-"wCa" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/toxin{
-	pixel_x = 6;
-	pixel_y = 8
-	},
-/obj/item/reagent_containers/glass/bottle/facid{
-	name = "fluorosulfuric acid bottle";
-	pixel_x = -3;
-	pixel_y = 6
-	},
-/obj/item/reagent_containers/glass/bottle/morphine{
-	name = "nyquil bottle";
-	pixel_x = 5;
-	pixel_y = 1
-	},
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/syringe{
-	pixel_y = 5
-	},
-/turf/open/floor/iron/white,
-/area/security/execution/education)
 "wCq" = (
 /obj/effect/turf_decal/stripes/corner,
 /obj/effect/turf_decal/stripes/corner{
@@ -67387,6 +67628,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ai_monitored/security/armory)
 "wCt" = (
@@ -67444,8 +67686,6 @@
 /turf/open/floor/iron/dark,
 /area/ai_monitored/command/nuke_storage)
 "wCW" = (
-/obj/machinery/light/directional/west,
-/obj/structure/bed,
 /turf/open/floor/iron/textured_large,
 /area/security/execution/education)
 "wDb" = (
@@ -68455,9 +68695,6 @@
 /obj/machinery/disposal/bin,
 /obj/effect/turf_decal/trimline/neutral/filled/line,
 /obj/effect/turf_decal/trimline/purple/filled/warning,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
@@ -68490,6 +68727,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ai_monitored/security/armory)
 "wYx" = (
@@ -68781,6 +69019,15 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/engine,
 /area/engineering/supermatter)
+"xcl" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/hallway/secondary/command)
 "xcv" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 6
@@ -68835,6 +69082,16 @@
 	dir = 5
 	},
 /area/science/breakroom)
+"xdG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/starboard/central)
 "xdO" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -68876,6 +69133,22 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/engine/n2o,
 /area/engineering/atmos)
+"xeF" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/ai_monitored/security/armory)
 "xeG" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 4
@@ -69092,6 +69365,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/catwalk_floor,
 /area/maintenance/central/secondary)
 "xhE" = (
@@ -69824,10 +70098,7 @@
 /turf/open/floor/iron/smooth,
 /area/maintenance/department/cargo)
 "xuN" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
+/turf/closed/wall,
 /area/security/execution/education)
 "xuO" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -70155,6 +70426,30 @@
 	},
 /turf/open/floor/iron/white,
 /area/command/heads_quarters/captain/private)
+"xzp" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/structure/table/glass,
+/obj/item/reagent_containers/glass/bottle/toxin{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/glass/bottle/facid{
+	name = "fluorosulfuric acid bottle";
+	pixel_x = -3;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/glass/bottle/morphine{
+	name = "nyquil bottle";
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/syringe{
+	pixel_y = 5
+	},
+/turf/open/floor/iron/white,
+/area/security/execution/education)
 "xzO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/trimline/yellow/warning,
@@ -70369,7 +70664,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/duct,
-/turf/open/space/basic,
+/turf/open/floor/iron/smooth,
 /area/service/janitor)
 "xEz" = (
 /obj/effect/turf_decal/trimline/purple/filled/line,
@@ -70400,6 +70695,16 @@
 /obj/item/clothing/head/welding,
 /turf/open/floor/iron/white,
 /area/medical/chemistry)
+"xFa" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/turf/open/floor/catwalk_floor,
+/area/maintenance/central/secondary)
 "xFg" = (
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
@@ -70782,6 +71087,7 @@
 	pixel_y = 23
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
 "xJM" = (
@@ -71070,6 +71376,7 @@
 	},
 /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/maintenance/port/central)
 "xPm" = (
@@ -71242,14 +71549,33 @@
 /turf/open/floor/plating,
 /area/security/interrogation)
 "xRK" = (
-/obj/structure/table,
 /obj/machinery/light/small/directional/west,
 /obj/item/radio/intercom/prison/directional/north,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 9
 	},
+/obj/structure/closet/secure_closet/brig{
+	id = "Cell 1";
+	name = "Cell 1 Locker"
+	},
+/obj/machinery/flasher/directional/west{
+	id = "Cell 1";
+	pixel_y = 22
+	},
 /turf/open/floor/iron,
 /area/security/prison)
+"xRW" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
+/area/science/research)
 "xRY" = (
 /obj/item/radio/intercom{
 	pixel_y = -29
@@ -72124,11 +72450,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/robot_debris/limb,
-/obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/maintenance/central/secondary)
 "ygD" = (
@@ -83682,11 +84004,11 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-ajc
+aBM
+aBM
+aBM
+aBM
+aBM
 ajc
 ajc
 ajc
@@ -83938,15 +84260,15 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
+dhe
+aBM
+aBM
+aBM
+aBM
+aBM
+aBM
+aBM
+aBM
 ajc
 ajc
 dhe
@@ -84195,22 +84517,22 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
 dhe
 dhe
 dhe
 dhe
 dhe
 dhe
+aBM
+aBM
+aBM
+aBM
+aBM
+dhe
+dhe
+dhe
+dhe
+dhe
 dhe
 dhe
 dhe
@@ -84452,13 +84774,6 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
 dhe
 dhe
 dhe
@@ -84467,6 +84782,13 @@ dhe
 dhe
 dhe
 dhe
+aBM
+aBM
+aBM
+dhe
+dhe
+dhe
+dhe
 dhe
 dhe
 dhe
@@ -84706,20 +85028,20 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-ajc
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
+dhe
+dhe
+dhe
+dhe
+dhe
+nBT
+nBT
+nBT
+nBT
+nBT
+dhe
+dhe
+dhe
+dhe
 dhe
 dhe
 dhe
@@ -84963,21 +85285,21 @@ ajc
 ajc
 ajc
 ajc
-ajc
-ajc
-ajc
-ajc
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
-aBM
+dhe
+dhe
+dhe
+dhe
+dhe
+nBT
+gTj
+rMf
+wCW
+nBT
+dhe
+dhe
+dhe
+dhe
+dhe
 dhe
 dhe
 dhe
@@ -85220,18 +85542,18 @@ ajc
 ajc
 dhe
 aBM
-aBM
-aBM
-aBM
-aBM
+dhe
+dhe
+dhe
 dhe
 nBT
 nBT
+leM
+leM
+leM
 nBT
 nBT
-nBT
-aBM
-aBM
+dhe
 dhe
 dhe
 dhe
@@ -85481,11 +85803,12 @@ dhe
 dhe
 dhe
 dhe
-dhe
 nBT
+dtB
 nnQ
 wCW
-ohx
+vHL
+lyW
 nBT
 dhe
 dhe
@@ -85498,7 +85821,6 @@ dhe
 dhe
 dhe
 dhe
-dhe
 aBM
 aBM
 aBM
@@ -85739,11 +86061,11 @@ dhe
 dhe
 dhe
 nBT
-nBT
+grV
 joQ
-joQ
-joQ
-nBT
+tfA
+wmb
+xzp
 nBT
 dhe
 dhe
@@ -86253,11 +86575,11 @@ dhe
 dhe
 dhe
 nBT
-ayM
-aaO
+xuN
+xuN
 lFw
 xuN
-wCa
+xuN
 nBT
 dhe
 dhe
@@ -86509,13 +86831,13 @@ dhe
 dhe
 dhe
 dhe
-nBT
-wmb
-gTj
+dhe
+ccM
+qHR
 upe
-rMf
-vHL
-nBT
+fJq
+ccM
+dhe
 xTS
 dhe
 dhe
@@ -86766,13 +87088,13 @@ dhe
 dhe
 nTn
 nTn
-nBT
+nTn
+ccM
 ele
-ele
-tfA
-ele
-ele
-nBT
+jbD
+dYS
+ccM
+nTn
 nTn
 nTn
 dhe
@@ -87024,11 +87346,11 @@ dhe
 nTn
 xRK
 gYp
-ccM
-qHR
-grV
-fJq
-ccM
+tHg
+rlg
+jbD
+fnz
+tHg
 lvI
 tVi
 nTn
@@ -87541,7 +87863,7 @@ ccM
 ccM
 nCq
 jbD
-pmL
+tyF
 ccM
 ccM
 ccM
@@ -87793,15 +88115,15 @@ dhe
 dhe
 dhe
 nTn
-xRK
+btd
 gPp
-ccM
-pCM
+tHg
+rlg
 jbD
 rVl
-ccM
+tHg
 waG
-tVi
+uin
 nTn
 nTn
 nTn
@@ -88060,7 +88382,7 @@ baV
 htz
 jut
 ccM
-ccM
+gAn
 gAn
 nTn
 nTn
@@ -89142,7 +89464,7 @@ mtH
 vpE
 aKl
 dYq
-myE
+qXW
 myE
 myE
 myE
@@ -92450,7 +92772,7 @@ ffu
 yiT
 gCU
 aaB
-fPR
+kuG
 tpS
 tpS
 tpS
@@ -92707,7 +93029,7 @@ fnv
 yiT
 gCU
 aaB
-fPR
+frb
 iti
 iti
 iti
@@ -92964,7 +93286,7 @@ yiT
 yiT
 gCU
 aaB
-fPR
+frb
 iti
 iti
 iti
@@ -93221,7 +93543,7 @@ yiT
 iti
 gCU
 aaB
-fPR
+frb
 uFJ
 nsG
 iti
@@ -97627,7 +97949,7 @@ dhe
 dhe
 dhe
 aJo
-xhD
+seo
 aJo
 dhe
 dhe
@@ -97884,7 +98206,7 @@ dhe
 dhe
 dhe
 aJo
-xhD
+seo
 aJo
 dhe
 dhe
@@ -98141,7 +98463,7 @@ aBM
 dhe
 dhe
 aJo
-xhD
+seo
 aJy
 sXN
 sXN
@@ -98398,7 +98720,7 @@ aBM
 dhe
 dhe
 aJo
-xhD
+seo
 aJy
 rrm
 duJ
@@ -98655,7 +98977,7 @@ aBM
 aBM
 dhe
 aJo
-xhD
+seo
 aJy
 jEz
 cdF
@@ -98912,7 +99234,7 @@ dhe
 dhe
 dhe
 aJo
-xhD
+seo
 aJy
 nWz
 ptQ
@@ -99169,7 +99491,7 @@ dhe
 dhe
 dhe
 aJo
-xhD
+seo
 aJy
 qrK
 ioa
@@ -99426,7 +99748,7 @@ aJo
 aJo
 aJo
 aJo
-xhD
+seo
 aJy
 qeq
 iVr
@@ -99674,6 +99996,7 @@ dhe
 dhe
 dhe
 aJo
+owk
 xhD
 xhD
 xhD
@@ -99681,9 +100004,8 @@ xhD
 xhD
 xhD
 xhD
-xhD
-xhD
-xhD
+afa
+xFa
 aJy
 mrp
 vrn
@@ -99931,7 +100253,7 @@ dhe
 dhe
 dhe
 aJo
-xhD
+seo
 aJy
 aJy
 aJy
@@ -100188,7 +100510,7 @@ aJo
 aJo
 aJo
 aJo
-xhD
+seo
 aJy
 ame
 buL
@@ -100442,10 +100764,10 @@ doC
 cBt
 aJy
 sIz
-qIr
-xhD
+ptC
 xhD
 xhD
+xFa
 aJy
 asV
 acC
@@ -100969,7 +101291,7 @@ oOY
 agA
 odO
 aPb
-leM
+aUb
 lxE
 pyh
 aUj
@@ -101226,7 +101548,7 @@ cMo
 cMo
 lvc
 azk
-dtB
+aJS
 iPb
 jED
 cni
@@ -112211,9 +112533,9 @@ knV
 dCA
 dCA
 dCA
-cwr
-cwr
-cwr
+dCA
+dCA
+dCA
 dhe
 dhe
 aBM
@@ -112470,7 +112792,7 @@ aBM
 aBM
 aBM
 aBM
-cwr
+dCA
 aBM
 aBM
 aBM
@@ -112727,7 +113049,7 @@ aBM
 aBM
 aBM
 aBM
-cwr
+dCA
 aBM
 aBM
 aBM
@@ -113822,8 +114144,8 @@ aJy
 eSj
 cLn
 hxD
-mRB
-mRB
+tFQ
+tFQ
 aJo
 dhe
 dhe
@@ -115338,7 +115660,7 @@ lNf
 rvc
 uom
 hft
-sIh
+mXM
 mJr
 mJr
 mJr
@@ -117383,7 +117705,7 @@ aeu
 aeu
 aeu
 aeu
-dUI
+jNp
 dUI
 iUp
 sIh
@@ -117640,7 +117962,7 @@ tPe
 tPe
 tPe
 tPe
-tPe
+xdG
 adS
 oZh
 adS
@@ -118668,7 +118990,7 @@ adS
 gGN
 uds
 adS
-tPe
+rpZ
 oZh
 adS
 lCc
@@ -118925,7 +119247,7 @@ adS
 vPZ
 aet
 adS
-tPe
+rpZ
 adS
 adS
 knx
@@ -144635,7 +144957,7 @@ aGH
 kbZ
 hON
 qLX
-aOv
+aBa
 did
 aOv
 aOv
@@ -148245,7 +148567,7 @@ aVR
 aVR
 aVR
 kca
-cOo
+okd
 awZ
 pNP
 pNP
@@ -148502,7 +148824,7 @@ aVR
 aVR
 aVR
 lKD
-cOo
+okd
 awZ
 pNP
 pNP
@@ -150247,11 +150569,11 @@ puC
 puC
 puC
 puC
-puC
-puC
-puC
-puC
-puC
+jpF
+jpF
+jpF
+jpF
+jpF
 puC
 puC
 aBM
@@ -150504,11 +150826,11 @@ puC
 puC
 puC
 sRq
-puC
-puC
-puC
-puC
-puC
+jpF
+jpF
+jpF
+jpF
+jpF
 puC
 puC
 aBM
@@ -155149,7 +155471,7 @@ sUI
 eVW
 ieT
 iwX
-iwX
+kGV
 rzM
 pII
 cUB
@@ -155663,7 +155985,7 @@ cxh
 ieT
 ssT
 cKe
-sjf
+iMU
 qgI
 bSa
 csN
@@ -157947,9 +158269,9 @@ dhe
 dhe
 hNf
 etz
-etz
-etz
-etz
+xeF
+xeF
+xeF
 laC
 lsi
 uwy
@@ -158206,7 +158528,7 @@ hNf
 erD
 hdj
 cJU
-etz
+xeF
 lbN
 eog
 qqK
@@ -158979,7 +159301,7 @@ dhe
 hNf
 hNf
 rSI
-etz
+xeF
 iKn
 hNf
 hNf
@@ -160288,7 +160610,7 @@ erH
 fPE
 erH
 uDD
-pmi
+xcl
 pmi
 xYg
 dYz
@@ -162089,8 +162411,8 @@ xvl
 ecC
 xzk
 ezo
-ezo
-ezo
+iXX
+kBA
 ezo
 wLS
 wLS
@@ -162345,10 +162667,10 @@ ezo
 ezo
 ezo
 ezo
-erH
-erH
-dhe
-dhe
+ezo
+ezo
+ezo
+ezo
 dhe
 dhe
 dhe
@@ -168539,8 +168861,8 @@ bgI
 ayd
 aBR
 tvO
-rlg
-rlg
+avK
+avK
 mJq
 hfy
 plF
@@ -174461,8 +174783,8 @@ vni
 vni
 lbM
 hKW
-gaa
-gaa
+jZI
+jZI
 xMQ
 xMQ
 xMQ
@@ -179869,7 +180191,7 @@ jHx
 inS
 jhg
 ceK
-wol
+mbm
 ceK
 wnG
 rdU
@@ -180374,7 +180696,7 @@ lJk
 wfS
 pfN
 mJd
-pfN
+xRW
 pfN
 pfN
 pfN
@@ -180630,8 +180952,8 @@ lar
 jLP
 wwN
 nYd
-btd
 nYd
+lKK
 nYd
 nYd
 nYd
diff --git a/config/maps.txt b/config/maps.txt
index b3ed0ddeb7b..027da158232 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -36,6 +36,7 @@ endmap
 
 map tramstation
 	minplayers 35
+endmap
 
 map waterkilostation
 	votable