diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 6610acc165c..20b1767b173 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -4252,7 +4252,8 @@
 "atG" = (
 /obj/structure/closet/wardrobe/red,
 /obj/machinery/newscaster/security_unit{
-	pixel_x = -30
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -19385,10 +19386,6 @@
 	name = "east bump";
 	pixel_x = 28
 	},
-/obj/machinery/newscaster{
-	name = "south bump";
-	pixel_y = -32
-	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "brown"
@@ -22629,7 +22626,8 @@
 	network = list("Interrogation")
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_x = -32
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -25665,14 +25663,15 @@
 	pixel_x = 30;
 	pixel_y = -30
 	},
-/obj/machinery/newscaster/security_unit{
-	pixel_x = 32
-	},
 /obj/structure/table/wood,
 /obj/machinery/computer/med_data/laptop{
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "vault"
@@ -25900,7 +25899,8 @@
 	pixel_x = -24
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_y = 32
+	pixel_y = 32;
+	name = "north bump"
 	},
 /turf/simulated/floor/carpet/red,
 /area/crew_quarters/heads/hos)
@@ -31327,6 +31327,10 @@
 	name = "east bump";
 	pixel_x = 24
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "darkred"
@@ -32430,13 +32434,14 @@
 	pixel_x = 32;
 	pixel_y = 32
 	},
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -32;
-	pixel_y = 32
-	},
 /obj/item/radio/intercom/custom{
 	pixel_y = 25
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	pixel_y = 32;
+	name = "delta AI newscaster"
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/turret_protected/ai)
 "bCY" = (
@@ -35469,10 +35474,6 @@
 	pixel_x = -32
 	},
 /obj/item/flashlight/lamp,
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "bIZ" = (
@@ -35513,9 +35514,9 @@
 	},
 /area/hallway/primary/central)
 "bJe" = (
-/obj/machinery/newscaster{
-	name = "south bump";
-	pixel_y = -32
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -32;
+	name = "south bump"
 	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
@@ -38097,10 +38098,11 @@
 /obj/structure/bed/dogbed{
 	name = "fox box"
 	},
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -32
-	},
 /mob/living/simple_animal/pet/dog/fox/Renault,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/crew_quarters/captain)
 "bOV" = (
@@ -41053,10 +41055,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central)
-"bUN" = (
-/obj/machinery/ai_status_display,
-/turf/simulated/wall,
-/area/hallway/primary/central)
 "bUO" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -43348,7 +43346,8 @@
 "cac" = (
 /obj/machinery/computer/secure_data,
 /obj/machinery/newscaster/security_unit{
-	pixel_y = 32
+	pixel_y = 32;
+	name = "north bump"
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/ntrep)
@@ -43410,7 +43409,8 @@
 "cak" = (
 /obj/machinery/computer/crew,
 /obj/machinery/newscaster/security_unit{
-	pixel_y = 32
+	pixel_y = 32;
+	name = "north bump"
 	},
 /turf/simulated/floor/carpet/blue,
 /area/blueshield)
@@ -43493,6 +43493,10 @@
 /area/crew_quarters/captain/bedroom)
 "cat" = (
 /obj/item/twohanded/required/kirbyplants,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/carpet/black,
 /area/crew_quarters/captain/bedroom)
 "cau" = (
@@ -44131,10 +44135,6 @@
 	c_tag = "Library Fore";
 	dir = 8
 	},
-/obj/machinery/newscaster{
-	name = "east bump";
-	pixel_x = 32
-	},
 /turf/simulated/floor/plasteel/dark,
 /area/library)
 "cbK" = (
@@ -45302,11 +45302,12 @@
 /obj/structure/chair/comfy/brown{
 	dir = 4
 	},
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -32
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/landmark/start/magistrate,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/carpet,
 /area/magistrateoffice)
 "ces" = (
@@ -45709,10 +45710,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /turf/simulated/floor/wood,
 /area/library)
 "cfv" = (
@@ -45749,10 +45746,6 @@
 /obj/machinery/camera{
 	c_tag = "Library Starboard"
 	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /turf/simulated/floor/wood,
 /area/library)
 "cfz" = (
@@ -45797,9 +45790,6 @@
 "cfE" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = 32
-	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop)
 "cfG" = (
@@ -46138,6 +46128,10 @@
 /obj/effect/turf_decal/loading_area{
 	dir = 8
 	},
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central)
 "cgF" = (
@@ -46882,9 +46876,9 @@
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
-/obj/machinery/newscaster{
-	name = "west bump";
-	pixel_x = -32
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -48353,9 +48347,9 @@
 "clI" = (
 /obj/structure/bed,
 /obj/item/bedsheet/hop,
-/obj/machinery/newscaster{
-	name = "west bump";
-	pixel_x = -32
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
@@ -52624,18 +52618,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/port)
-"cvc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
-	icon_state = "arrival"
-	},
-/area/hallway/secondary/entry)
 "cvd" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -52733,10 +52715,6 @@
 /area/library)
 "cvo" = (
 /obj/structure/cult/archives,
-/obj/machinery/newscaster{
-	name = "west bump";
-	pixel_x = -32
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
@@ -78021,10 +77999,6 @@
 	dir = 1;
 	name = "Robotics Operating Computer"
 	},
-/obj/machinery/newscaster{
-	name = "south bump";
-	pixel_y = -32
-	},
 /turf/simulated/floor/plasteel/white,
 /area/assembly/robotics)
 "dzZ" = (
@@ -83584,10 +83558,6 @@
 /turf/simulated/floor/plasteel/dark,
 /area/chapel/office)
 "dNI" = (
-/obj/machinery/newscaster{
-	name = "east bump";
-	pixel_x = 32
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 8;
@@ -88099,6 +88069,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/prison/cell_block)
+"ejr" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkred"
+	},
+/area/security/brig)
 "ejA" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -88273,6 +88253,15 @@
 	icon_state = "neutral"
 	},
 /area/maintenance/starboard)
+"ezV" = (
+/obj/machinery/camera{
+	c_tag = "Arrivals Hall Port"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "arrival"
+	},
+/area/hallway/secondary/entry)
 "eAi" = (
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -88285,6 +88274,17 @@
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
+"eCj" = (
+/obj/machinery/status_display{
+	pixel_x = 32
+	},
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/camera{
+	c_tag = "Arrivals Port Fore";
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "eCs" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -88483,6 +88483,15 @@
 	icon_state = "darkred"
 	},
 /area/security/warden)
+"eYW" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/hallway/secondary/entry)
 "faB" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -88649,6 +88658,18 @@
 	icon_state = "dark"
 	},
 /area/security/main)
+"fqF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+	icon_state = "arrival"
+	},
+/area/hallway/secondary/entry)
 "frp" = (
 /obj/structure/flora/ausbushes/sunnybush,
 /obj/structure/flora/ausbushes/lavendergrass,
@@ -88761,6 +88782,17 @@
 	icon_state = "neutral"
 	},
 /area/maintenance/fsmaint)
+"fCA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/hallway/secondary/entry)
 "fDu" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/disposalpipe/segment{
@@ -89002,18 +89034,6 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/brig)
-"fVf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/light,
-/turf/simulated/floor/plasteel{
-	icon_state = "arrival"
-	},
-/area/hallway/secondary/entry)
 "fVZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -89029,18 +89049,6 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
-"fWg" = (
-/obj/machinery/alarm{
-	dir = 4;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/decal/warning_stripes/northwest,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "fZU" = (
 /obj/structure/chair/stool/bar{
 	dir = 1
@@ -89268,6 +89276,18 @@
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/wood,
 /area/civilian/pet_store)
+"gEs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/light,
+/turf/simulated/floor/plasteel{
+	icon_state = "arrival"
+	},
+/area/hallway/secondary/entry)
 "gET" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -90657,6 +90677,10 @@
 /turf/simulated/floor/wood,
 /area/civilian/pet_store)
 "jou" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -32;
+	name = "south bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkredcorners"
@@ -90947,6 +90971,17 @@
 	},
 /turf/simulated/floor/engine,
 /area/toxins/mixing)
+"jWY" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 2;
+	height = 12;
+	id = "ferry_home";
+	name = "port bay 3";
+	width = 5
+	},
+/turf/space,
+/area/space)
 "jYK" = (
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -91124,6 +91159,18 @@
 	icon_state = "darkred"
 	},
 /area/security/main)
+"knM" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 9;
+	height = 18;
+	id = "admin_home";
+	name = "port bay 1";
+	timid = 1;
+	width = 19
+	},
+/turf/space,
+/area/space)
 "koC" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/light/small{
@@ -91452,6 +91499,23 @@
 	icon_state = "darkredfull"
 	},
 /area/security/prison/cell_block)
+"lnw" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/south,
+/obj/machinery/access_button{
+	command = "cycle_interior";
+	frequency = 1379;
+	master_tag = "sol_airlock";
+	name = "interior access button";
+	pixel_x = -25;
+	pixel_y = -25
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10;
+	initialize_directions = 10
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "lnY" = (
 /obj/effect/decal/cleanable/fungus,
 /turf/simulated/wall,
@@ -91512,6 +91576,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel/dark,
 /area/crew_quarters/courtroom)
+"ltw" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "ltY" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -91552,15 +91623,6 @@
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel,
 /area/maintenance/fore)
-"lwH" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/hallway/secondary/entry)
 "lxh" = (
 /obj/structure/rack,
 /obj/effect/decal/warning_stripes/southeast,
@@ -92133,6 +92195,16 @@
 	icon_state = "neutral"
 	},
 /area/maintenance/apmaint)
+"mFy" = (
+/obj/machinery/status_display{
+	pixel_x = 32
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/east,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "mGO" = (
 /obj/structure/cable{
 	d2 = 2;
@@ -92307,14 +92379,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry)
-"mWX" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/camera{
-	c_tag = "Arrivals Port Aft";
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "mXZ" = (
 /obj/machinery/camera{
 	c_tag = "Brig - Hallway North-East";
@@ -92592,6 +92656,14 @@
 	icon_state = "dark"
 	},
 /area/crew_quarters/heads/hos)
+"nvE" = (
+/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
+/turf/simulated/floor/plasteel/white,
+/area/toxins/misc_lab)
 "nyK" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -92803,17 +92875,18 @@
 /obj/machinery/optable,
 /turf/simulated/floor/plasteel/dark,
 /area/medical/surgery1)
-"nRM" = (
-/obj/machinery/status_display{
-	pixel_x = 32
-	},
-/obj/effect/decal/warning_stripes/east,
+"nTR" = (
 /obj/machinery/camera{
-	c_tag = "Arrivals Port Fore";
+	c_tag = "Central Ring Hallway West";
 	dir = 8
 	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
+/obj/machinery/ai_status_display{
+	pixel_x = 32
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralcorner"
+	},
+/area/hallway/primary/central)
 "nXf" = (
 /obj/machinery/computer/security/wooden_tv,
 /turf/simulated/floor/carpet,
@@ -93141,7 +93214,8 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/electrical)
 "oDy" = (
-/obj/machinery/newscaster/security_unit{
+/obj/machinery/newscaster{
+	name = "south bump";
 	pixel_y = -32
 	},
 /turf/simulated/floor/carpet,
@@ -93243,6 +93317,12 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/tcommsat/chamber)
+"oMA" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "oMO" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -93952,17 +94032,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
-"qdO" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 2;
-	height = 12;
-	id = "ferry_home";
-	name = "port bay 3";
-	width = 5
-	},
-/turf/space,
-/area/space)
 "qdY" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -94077,13 +94146,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel/dark,
 /area/crew_quarters/courtroom)
-"qpI" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes/northeast,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "qpZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
@@ -94113,6 +94175,13 @@
 "qrT" = (
 /turf/simulated/wall/r_wall,
 /area/tcommsat/chamber)
+"qtk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "arrival"
+	},
+/area/hallway/secondary/entry)
 "qul" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -94204,16 +94273,6 @@
 	icon_state = "darkredcorners"
 	},
 /area/security/brig)
-"qEq" = (
-/obj/item/radio/intercom{
-	name = "north bump";
-	pixel_y = 28
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "arrival"
-	},
-/area/hallway/secondary/entry)
 "qET" = (
 /obj/effect/spawner/random_spawners/wall_rusted_always,
 /turf/simulated/wall,
@@ -94279,6 +94338,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel/white,
 /area/toxins/misc_lab)
+"qQS" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/camera{
+	c_tag = "Arrivals Port Aft";
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "qRT" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
@@ -94490,6 +94557,14 @@
 	icon_state = "darkred"
 	},
 /area/security/brig)
+"reW" = (
+/obj/effect/decal/warning_stripes/southeast,
+/obj/item/radio/intercom{
+	name = "east bump";
+	pixel_x = 28
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "rfB" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable{
@@ -94629,12 +94704,6 @@
 	icon_state = "red"
 	},
 /area/hallway/secondary/exit)
-"rmI" = (
-/obj/machinery/door/firedoor,
-/obj/effect/decal/warning_stripes/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "rnA" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -94729,6 +94798,13 @@
 "rwU" = (
 /turf/simulated/wall,
 /area/civilian/barber)
+"ryh" = (
+/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "rBP" = (
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -94741,18 +94817,6 @@
 	icon_state = "arrival"
 	},
 /area/hallway/secondary/entry)
-"rCd" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 9;
-	height = 18;
-	id = "admin_home";
-	name = "port bay 1";
-	timid = 1;
-	width = 19
-	},
-/turf/space,
-/area/space)
 "rCe" = (
 /obj/machinery/atmospherics/pipe/simple/insulated{
 	dir = 10
@@ -94931,15 +94995,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/assembly/showroom)
-"rXq" = (
-/obj/machinery/camera{
-	c_tag = "Arrivals Hall Port"
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "arrival"
-	},
-/area/hallway/secondary/entry)
 "rZK" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -94970,6 +95025,13 @@
 /obj/structure/table/wood,
 /turf/simulated/floor/wood,
 /area/medical/psych)
+"san" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "saC" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -95326,23 +95388,6 @@
 	icon_state = "dark"
 	},
 /area/security/brig)
-"sFX" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/south,
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1379;
-	master_tag = "sol_airlock";
-	name = "interior access button";
-	pixel_x = -25;
-	pixel_y = -25
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10;
-	initialize_directions = 10
-	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "sGz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -95380,6 +95425,13 @@
 	},
 /turf/simulated/floor/engine,
 /area/toxins/mixing)
+"sMV" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes/northeast,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "sOo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -95396,13 +95448,6 @@
 	icon_state = "barber"
 	},
 /area/civilian/barber)
-"sOH" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "sPz" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -95574,13 +95619,6 @@
 	icon_state = "vault"
 	},
 /area/medical/morgue)
-"tfe" = (
-/obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "tge" = (
 /obj/structure/sign/electricshock{
 	pixel_y = 32
@@ -96073,6 +96111,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/range)
+"tXb" = (
+/obj/machinery/alarm{
+	dir = 4;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes/northwest,
+/turf/simulated/floor/plasteel,
+/area/hallway/secondary/entry)
 "tXj" = (
 /obj/machinery/cryopod/right,
 /obj/machinery/light_switch{
@@ -96084,16 +96134,6 @@
 	icon_state = "freezerfloor"
 	},
 /area/crew_quarters/sleep)
-"tYN" = (
-/obj/machinery/status_display{
-	pixel_x = 32
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/warning_stripes/east,
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "uaL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
@@ -96283,6 +96323,16 @@
 	icon_state = "darkred"
 	},
 /area/security/prison/cell_block)
+"upw" = (
+/obj/item/radio/intercom{
+	name = "north bump";
+	pixel_y = 28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "arrival"
+	},
+/area/hallway/secondary/entry)
 "upW" = (
 /obj/machinery/firealarm{
 	name = "north bump";
@@ -97123,21 +97173,6 @@
 	icon_state = "darkredcorners"
 	},
 /area/security/prison/cell_block)
-"wop" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
-"wpq" = (
-/obj/effect/decal/warning_stripes/southeast,
-/obj/item/radio/intercom{
-	name = "east bump";
-	pixel_x = 28
-	},
-/turf/simulated/floor/plasteel,
-/area/hallway/secondary/entry)
 "wpr" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -97260,7 +97295,8 @@
 /area/maintenance/fsmaint)
 "wGL" = (
 /obj/machinery/newscaster/security_unit{
-	pixel_x = -32
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/bridge)
@@ -97633,13 +97669,6 @@
 /obj/structure/shuttle/engine/propulsion/burst,
 /turf/simulated/wall/mineral/titanium,
 /area/shuttle/pod_2)
-"xCH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "arrival"
-	},
-/area/hallway/secondary/entry)
 "xDn" = (
 /obj/structure/sign/electricshock{
 	pixel_y = 32
@@ -97774,17 +97803,6 @@
 	icon_state = "darkred"
 	},
 /area/security/seceqstorage)
-"xMM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/hallway/secondary/entry)
 "xMN" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -97939,14 +97957,15 @@
 "ykx" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -32
-	},
 /obj/machinery/camera{
 	c_tag = "Brig - Warden's Office";
 	dir = 4;
 	network = list("SS13","Security")
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkred"
@@ -128574,7 +128593,7 @@ aaa
 aaa
 aaa
 aaa
-rCd
+knM
 aaa
 aaa
 aaa
@@ -129596,9 +129615,9 @@ acC
 acC
 acC
 buc
-fWg
+tXb
 adZ
-wop
+san
 adZ
 aeI
 adZ
@@ -129621,9 +129640,9 @@ aip
 agA
 agg
 adZ
-sFX
-rmI
-xCH
+lnw
+oMA
+qtk
 ani
 anH
 adb
@@ -129855,9 +129874,9 @@ adc
 adt
 afh
 aea
-xMM
+fCA
 asB
-lwH
+eYW
 asB
 asB
 asB
@@ -129882,7 +129901,7 @@ amA
 amM
 anu
 wvH
-cvc
+gEs
 adb
 aaa
 apG
@@ -130110,17 +130129,17 @@ acC
 acC
 acC
 adu
-qpI
+sMV
 aeb
-tfe
+ryh
 aeb
 aeO
 aeb
 aeb
-nRM
+eCj
 aeb
 aeb
-sOH
+ltw
 agB
 aeb
 aeb
@@ -130129,13 +130148,13 @@ aeb
 aeb
 aeb
 aeb
-mWX
+qQS
 aeb
 agB
 aeb
-tYN
+mFy
 aeb
-wpq
+reW
 amL
 anv
 ank
@@ -130652,7 +130671,7 @@ aaa
 aaa
 aaa
 adb
-rXq
+ezV
 anL
 adb
 abj
@@ -132032,7 +132051,7 @@ cLB
 cLX
 cNx
 cPg
-cTJ
+nvE
 dvf
 cMl
 dni
@@ -132709,7 +132728,7 @@ abj
 aaa
 adb
 ant
-fVf
+fqF
 aoo
 aoV
 apM
@@ -133284,7 +133303,7 @@ bIX
 bIX
 bIX
 bSz
-bSD
+nTR
 bUM
 bWM
 bWM
@@ -133542,7 +133561,7 @@ bKE
 bKE
 bHj
 bSE
-bUN
+bsv
 cgE
 btH
 btH
@@ -133978,7 +133997,7 @@ aaa
 aaa
 aaa
 aaa
-qdO
+jWY
 aaa
 aaa
 aaa
@@ -134507,8 +134526,8 @@ aaa
 aaa
 aaa
 adb
-qEq
-fVf
+upw
+fqF
 aoo
 apc
 apT
@@ -152299,7 +152318,7 @@ bBa
 mem
 bHU
 bPy
-bPz
+ejr
 bPz
 frI
 bPz
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 54dd9edb53c..0dc7133fe31 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -487,9 +487,9 @@
 	pixel_x = -4;
 	pixel_y = 8
 	},
-/obj/machinery/newscaster{
-	name = "west bump";
-	pixel_x = -32
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/carpet,
 /area/magistrateoffice)
@@ -550,6 +550,10 @@
 	pixel_x = 5;
 	pixel_y = 12
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -3563,6 +3567,10 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/accessory/red,
 /obj/item/clothing/head/soft/red,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
 	},
@@ -9087,10 +9095,6 @@
 	name = "east bump";
 	pixel_x = 24
 	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -11799,14 +11803,6 @@
 /obj/effect/spawner/window/shuttle,
 /turf/simulated/floor/plating,
 /area/shuttle/pod_1)
-"aSs" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/bot,
-/turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "yellow"
-	},
-/area/engine/break_room)
 "aSt" = (
 /obj/item/storage/toolbox/mechanical,
 /obj/effect/landmark/spawner/xeno,
@@ -11854,6 +11850,10 @@
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/engine/engineering)
 "aSE" = (
@@ -14990,15 +14990,6 @@
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
-"baz" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "baB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -18440,6 +18431,10 @@
 /obj/item/screwdriver{
 	pixel_y = 10
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -20061,12 +20056,13 @@
 /area/quartermaster/office)
 "bmo" = (
 /obj/structure/table/wood,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -30
-	},
 /obj/machinery/photocopier/faxmachine/longrange{
 	department = "Captain's Office"
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain{
 	name = "\improper Captain's Quarters"
@@ -20251,10 +20247,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "bmS" = (
-/obj/machinery/newscaster/security_unit{
-	pixel_y = 30
-	},
 /obj/machinery/computer/secure_data,
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "red"
@@ -21575,19 +21572,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/office)
-"bpX" = (
-/obj/machinery/access_button{
-	command = "cycle_exterior";
-	frequency = 1379;
-	master_tag = "engineering_east_airlock";
-	name = "interior access button";
-	pixel_x = -22;
-	pixel_y = 20;
-	req_access_txt = "10;13"
-	},
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "bpY" = (
 /obj/machinery/status_display{
 	layer = 4;
@@ -22002,7 +21986,8 @@
 	dir = 4
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_x = 30
+	pixel_x = 32;
+	name = "east bump"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -24278,12 +24263,13 @@
 	name = "\improper MiniSat East Wing"
 	})
 "bwc" = (
-/obj/machinery/newscaster/security_unit{
-	pixel_x = 32
-	},
 /obj/machinery/computer/security/mining{
 	dir = 8
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads)
 "bwd" = (
@@ -30007,10 +29993,6 @@
 	pixel_x = 1;
 	pixel_y = 5
 	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /obj/structure/table/wood,
 /turf/simulated/floor/wood,
 /area/library)
@@ -30066,10 +30048,6 @@
 	})
 "bKE" = (
 /obj/machinery/vending/coffee,
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -30407,6 +30385,10 @@
 	pixel_y = 2
 	},
 /obj/item/pen,
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
@@ -33588,13 +33570,14 @@
 /area/maintenance/apmaint)
 "bVg" = (
 /obj/structure/table/wood,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -30
-	},
 /obj/item/flashlight/lamp/green{
 	pixel_x = -5;
 	pixel_y = 1
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/carpet/royalblack,
 /area/ntrep)
 "bVi" = (
@@ -33953,9 +33936,6 @@
 /area/toxins/lab)
 "bWh" = (
 /obj/structure/table/wood,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -31
-	},
 /obj/machinery/camera{
 	c_tag = "Blueshield's Office"
 	},
@@ -33967,6 +33947,10 @@
 /obj/machinery/keycard_auth{
 	pixel_y = 24
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/carpet/blue,
 /area/blueshield)
 "bWi" = (
@@ -36698,6 +36682,10 @@
 /obj/item/paicard{
 	pixel_x = -15
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/assembly/robotics)
 "cdk" = (
@@ -38564,11 +38552,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/maintenance/turbine)
-"ciw" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "ciz" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -38705,6 +38688,10 @@
 	pixel_x = -2;
 	pixel_y = 18
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
 	},
@@ -39171,6 +39158,24 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/cryo)
+"ckg" = (
+/obj/machinery/atmospherics/binary/pump{
+	dir = 4;
+	name = "Gas to Chamber"
+	},
+/obj/machinery/power/apc{
+	cell_type = 25000;
+	dir = 1;
+	name = "Engineering Engine Super APC";
+	pixel_y = 24;
+	shock_proof = 1
+	},
+/obj/structure/cable/yellow{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/engine,
+/area/engine/supermatter)
 "cko" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced{
@@ -42378,6 +42383,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitepurplecorner"
@@ -52136,6 +52145,10 @@
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgreycheck"
 	},
@@ -53515,6 +53528,15 @@
 	icon_state = "whitebluefull"
 	},
 /area/medical/exam_room)
+"diA" = (
+/obj/machinery/vending/wallmed{
+	name = "Emergency NanoMed";
+	pixel_y = -28
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "diG" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -53766,6 +53788,19 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/supermatter)
+"dqs" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "dqw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -53811,21 +53846,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/aft2)
-"dsa" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "dtE" = (
 /turf/simulated/wall/r_wall,
 /area/medical/virology)
@@ -53930,6 +53950,14 @@
 	icon_state = "cafeteria"
 	},
 /area/medical/scibreak)
+"dxF" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/secure_closet/engineering_welding,
+/obj/structure/sign/nosmoking_2{
+	pixel_y = 32
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "dxT" = (
 /obj/item/radio/intercom{
 	name = "north bump";
@@ -53952,6 +53980,16 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"dyX" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/red{
+	dir = 1
+	},
+/obj/machinery/meter,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "dzD" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -54001,22 +54039,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry)
-"dAt" = (
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "dAy" = (
 /obj/machinery/firealarm{
 	dir = 1;
@@ -54159,6 +54181,24 @@
 	icon_state = "red"
 	},
 /area/security/brig)
+"dDq" = (
+/obj/machinery/door/airlock/engineering/glass{
+	autoclose = 0;
+	frequency = 1379;
+	id_tag = "sm_airlock_interior";
+	locked = 1;
+	name = "Supermatter Interior Access"
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "dDw" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -54285,10 +54325,6 @@
 /area/security/detectives_office)
 "dKd" = (
 /obj/structure/table/wood,
-/obj/machinery/newscaster{
-	name = "east bump";
-	pixel_x = 32
-	},
 /obj/item/paper_bin{
 	pixel_x = -12;
 	pixel_y = 4
@@ -54305,6 +54341,10 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/carpet,
 /area/security/detectives_office)
 "dKy" = (
@@ -54327,6 +54367,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
+"dKY" = (
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/space,
+/area/space/nearstation)
 "dLg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -54376,33 +54421,10 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/reception)
-"dMv" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "dMK" = (
 /obj/machinery/atmospherics/binary/valve/open,
 /turf/simulated/floor/plating,
 /area/toxins/xenobiology)
-"dNI" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "dNU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -54493,17 +54515,6 @@
 	icon_state = "darkgrey"
 	},
 /area/assembly/robotics)
-"dQd" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "dQq" = (
 /obj/structure/table,
 /obj/item/storage/box/bodybags{
@@ -54805,14 +54816,6 @@
 	icon_state = "white"
 	},
 /area/medical/research)
-"dXF" = (
-/obj/machinery/computer/sm_monitor{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "dXJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -54989,6 +54992,27 @@
 	icon_state = "green"
 	},
 /area/atmos/distribution)
+"eax" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/access_button{
+	command = "cycle_interior";
+	frequency = 1379;
+	master_tag = "engineering_east_airlock";
+	name = "interior access button";
+	pixel_x = -22;
+	pixel_y = -20;
+	req_access_txt = "10;13"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "eaG" = (
 /obj/structure/sign/poster/official/random{
 	pixel_x = 32
@@ -55328,6 +55352,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
 /area/assembly/showroom)
+"ekt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "elx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -55352,6 +55388,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/vacantoffice)
+"enh" = (
+/obj/machinery/atmospherics/pipe/manifold4w/visible,
+/obj/machinery/meter,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "enU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -55970,17 +56013,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"eBb" = (
-/obj/machinery/door/airlock/external{
-	frequency = 1379;
-	id_tag = "engineering_east_inner";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "eBk" = (
 /obj/structure/grille/broken,
 /obj/effect/landmark/damageturf,
@@ -56078,17 +56110,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
-"eEL" = (
-/obj/machinery/door/airlock/external{
-	frequency = 1379;
-	id_tag = "engineering_east_outer";
-	locked = 1;
-	name = "Engineering External Access"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "eEV" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 4;
@@ -56352,10 +56373,6 @@
 /area/space/nearstation)
 "eLh" = (
 /obj/structure/table,
-/obj/machinery/newscaster{
-	name = "east bump";
-	pixel_x = 32
-	},
 /obj/machinery/recharger{
 	pixel_y = 4
 	},
@@ -56634,6 +56651,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/locker)
+"eSa" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "eSt" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
@@ -56777,16 +56799,6 @@
 	icon_state = "darkred"
 	},
 /area/security/seceqstorage)
-"eXd" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Fore";
-	network = list("SS13","engine")
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "eXm" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable/yellow{
@@ -57006,6 +57018,10 @@
 	icon_state = "white"
 	},
 /area/toxins/xenobiology)
+"fbR" = (
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "fbS" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -57100,24 +57116,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/brig)
-"fdy" = (
-/obj/machinery/door/airlock/engineering/glass{
-	autoclose = 0;
-	frequency = 1379;
-	id_tag = "sm_airlock_interior";
-	locked = 1;
-	name = "Supermatter Interior Access"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "fdz" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-11"
@@ -57370,11 +57368,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
-"flp" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet/secure_closet/engineering_electrical,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "flr" = (
 /obj/structure/window/plasmareinforced{
 	dir = 1
@@ -57718,6 +57711,24 @@
 	icon_state = "darkblue"
 	},
 /area/bridge)
+"ftb" = (
+/obj/machinery/atmospherics/binary/pump{
+	name = "Mix to Gas"
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "ftd" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -57850,18 +57861,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/hos)
-"fvV" = (
-/obj/structure/table,
-/obj/effect/turf_decal/bot,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/geiger_counter,
-/obj/item/geiger_counter,
-/obj/item/clothing/glasses/meson,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "fvZ" = (
 /obj/structure/chair{
 	dir = 8
@@ -57892,6 +57891,23 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
+"fwJ" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "fwY" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -58078,6 +58094,23 @@
 	icon_state = "whiteyellow"
 	},
 /area/medical/chemistry)
+"fBW" = (
+/obj/machinery/atmospherics/binary/valve/digital/open{
+	name = "Output Release"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "fCn" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/drinkingglass{
@@ -58184,23 +58217,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central)
-"fEt" = (
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
-	id_tag = "engineering_east_airlock";
-	req_access_txt = "10;13";
-	tag_airpump = "engineering_east_pump";
-	tag_chamber_sensor = "engineering_east_sensor";
-	tag_exterior_door = "engineering_east_outer";
-	tag_interior_door = "engineering_east_inner";
-	pixel_y = 24
-	},
-/obj/machinery/airlock_sensor{
-	id_tag = "engineering_east_sensor";
-	pixel_y = 35;
-	pixel_x = -1
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "fEw" = (
 /obj/effect/landmark/spawner/nukedisc_respawn,
 /turf/simulated/floor/plasteel{
@@ -58221,6 +58237,11 @@
 	icon_state = "dark"
 	},
 /area/aisat)
+"fFL" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "fFW" = (
 /obj/structure/closet/crate/engineering,
 /obj/item/solar_assembly,
@@ -58473,20 +58494,6 @@
 	icon_state = "whitebluecorner"
 	},
 /area/medical/medbay)
-"fLr" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "fLw" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -58794,10 +58801,6 @@
 	icon_state = "cult"
 	},
 /area/lawoffice)
-"fTC" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "fTF" = (
 /obj/structure/rack{
 	dir = 8;
@@ -58971,12 +58974,37 @@
 	icon_state = "white"
 	},
 /area/toxins/storage)
+"fWD" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "fWH" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 10
 	},
 /turf/simulated/wall/r_wall,
 /area/atmos/distribution)
+"fWS" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/camera{
+	c_tag = "Engineering - Fore";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "fWW" = (
 /turf/simulated/floor/plasteel,
 /area/atmos)
@@ -59103,14 +59131,6 @@
 /obj/structure/cable/yellow,
 /turf/simulated/floor/plating,
 /area/security/armoury)
-"gbs" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/maintenance/fsmaint)
 "gbu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -59256,17 +59276,6 @@
 	icon_state = "white"
 	},
 /area/security/permabrig)
-"gdJ" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "gdM" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
 /obj/effect/spawner/window/reinforced/plasma,
@@ -59566,18 +59575,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/brig)
-"gkr" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "gkt" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
@@ -59652,6 +59649,33 @@
 	icon_state = "brown"
 	},
 /area/quartermaster/office)
+"gnd" = (
+/turf/simulated/floor/noslip,
+/area/engine/engineering)
+"gnv" = (
+/obj/machinery/door/airlock/engineering/glass{
+	autoclose = 0;
+	frequency = 1379;
+	id_tag = "sm_airlock_interior";
+	locked = 1;
+	name = "Supermatter Interior Access"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "gnJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -60242,6 +60266,20 @@
 /area/toxins/launch{
 	name = "Toxins Launch Room"
 	})
+"gGi" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "gGS" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
@@ -60278,6 +60316,15 @@
 	icon_state = "cult"
 	},
 /area/magistrateoffice)
+"gHz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "gHX" = (
 /obj/structure/closet/secure_closet/brig{
 	id = "Cell 3";
@@ -60421,6 +60468,14 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/medbay)
+"gLH" = (
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "yellow"
+	},
+/area/engine/break_room)
 "gMh" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -60833,20 +60888,6 @@
 /area/toxins/launch{
 	name = "Toxins Launch Room"
 	})
-"gWY" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "gXN" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -61213,6 +61254,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -32;
+	name = "south bump"
+	},
 /turf/simulated/floor/carpet,
 /area/security/hos)
 "hgW" = (
@@ -61570,6 +61615,16 @@
 	icon_state = "white"
 	},
 /area/medical/chemistry)
+"hok" = (
+/obj/machinery/atmospherics/trinary/filter/flipped{
+	dir = 1;
+	filter_type = -1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "hop" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
@@ -61745,18 +61800,6 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/engine/supermatter)
-"huq" = (
-/obj/machinery/atmospherics/pipe/simple/visible/green,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "huV" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/preopen{
@@ -61771,6 +61814,24 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/prison/cell_block/A)
+"huX" = (
+/obj/machinery/door/airlock/engineering/glass{
+	autoclose = 0;
+	frequency = 1379;
+	id_tag = "sm_airlock_exterior";
+	locked = 1;
+	name = "Supermatter Exterior Access"
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "hvz" = (
 /obj/structure/table,
 /obj/item/key/security,
@@ -61913,11 +61974,6 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/tcommsat/server)
-"hxQ" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/vending/assist,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "hyp" = (
 /obj/machinery/door/airlock/research,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -62117,23 +62173,6 @@
 	icon_state = "white"
 	},
 /area/medical/virology)
-"hCT" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "hDj" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -62283,11 +62322,6 @@
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
-"hFH" = (
-/obj/structure/lattice,
-/obj/structure/lattice,
-/turf/space,
-/area/space/nearstation)
 "hFN" = (
 /obj/structure/chair{
 	dir = 1
@@ -62564,16 +62598,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/brig)
-"hLF" = (
-/obj/machinery/atmospherics/binary/pump{
-	dir = 8;
-	name = "External Gas to Loop"
-	},
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "hLH" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -62728,6 +62752,9 @@
 	icon_state = "dark"
 	},
 /area/security/seceqstorage)
+"hPR" = (
+/turf/simulated/wall/r_wall,
+/area/engine/engine_smes)
 "hQB" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -63351,6 +63378,17 @@
 	icon_state = "white"
 	},
 /area/assembly/robotics)
+"iil" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
+/turf/simulated/floor/plasteel,
+/area/atmos)
 "iip" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -63498,6 +63536,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/locker)
+"imD" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+	dir = 5
+	},
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "imG" = (
 /obj/item/shard,
 /turf/simulated/floor/grass,
@@ -63632,6 +63679,12 @@
 	icon_state = "redfull"
 	},
 /area/security/permabrig)
+"iqc" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "iqd" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 5
@@ -63701,6 +63754,14 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/brig)
+"irX" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "isf" = (
 /mob/living/simple_animal/mouse,
 /turf/simulated/floor/plating,
@@ -64466,26 +64527,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel,
 /area/atmos/distribution)
-"iIc" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "iIf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64573,6 +64614,15 @@
 	icon_state = "darkgrey"
 	},
 /area/security/evidence)
+"iJz" = (
+/obj/machinery/atmospherics/unary/portables_connector,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "iKb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -64587,6 +64637,21 @@
 	icon_state = "white"
 	},
 /area/medical/paramedic)
+"iKF" = (
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "neutralcorner"
+	},
+/area/crew_quarters/dorms)
 "iKJ" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -64715,6 +64780,14 @@
 /obj/machinery/atmospherics/pipe/simple/visible/blue,
 /turf/simulated/wall/r_wall,
 /area/atmos/distribution)
+"iLI" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/maintenance/fsmaint)
 "iMm" = (
 /obj/structure/closet/crate,
 /obj/effect/landmark/costume/random,
@@ -64799,6 +64872,10 @@
 	icon_state = "red"
 	},
 /area/security/main)
+"iOr" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "iOO" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/visible/green,
@@ -64935,16 +65012,6 @@
 	icon_state = "white"
 	},
 /area/toxins/mixing)
-"iRi" = (
-/obj/machinery/atmospherics/trinary/filter/flipped{
-	dir = 1;
-	filter_type = -1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "iRu" = (
 /turf/simulated/wall/r_wall,
 /area/atmos/distribution)
@@ -64971,13 +65038,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/doors,
 /turf/simulated/floor/plasteel,
 /area/security/processing)
-"iSy" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 4
-	},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "iSE" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters{
@@ -65086,15 +65146,6 @@
 /area/toxins/launch{
 	name = "Toxins Launch Room"
 	})
-"iTR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "iUe" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -65381,6 +65432,17 @@
 	icon_state = "dark"
 	},
 /area/turret_protected/ai)
+"jiK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "jiW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -65814,20 +65876,18 @@
 	icon_state = "dark"
 	},
 /area/security/execution)
-"jxj" = (
-/obj/item/reagent_containers/food/snacks/monkeycube,
-/turf/simulated/floor/grass,
-/area/maintenance/aft2)
-"jxs" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8
+"jwN" = (
+/obj/machinery/computer/sm_monitor{
+	dir = 4
 	},
-/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/bot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/engine/engineering)
+"jxj" = (
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/turf/simulated/floor/grass,
+/area/maintenance/aft2)
 "jyP" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -66432,12 +66492,6 @@
 	icon_state = "white"
 	},
 /area/medical/cmo)
-"jLX" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "jLY" = (
 /obj/structure/lattice,
 /obj/effect/spawner/lootdrop{
@@ -66479,17 +66533,6 @@
 	icon_state = "red"
 	},
 /area/security/main)
-"jMt" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "jMN" = (
 /obj/machinery/door/window/northleft{
 	name = "Mass Driver Control Door"
@@ -66548,14 +66591,6 @@
 	icon_state = "dark"
 	},
 /area/medical/surgeryobs)
-"jNs" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
-	frequency = 1379;
-	id_tag = "engineering_east_pump"
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "jNt" = (
 /obj/machinery/door/window/eastright{
 	name = "Containment Pen #8"
@@ -67633,6 +67668,12 @@
 	icon_state = "red"
 	},
 /area/security/main)
+"ksf" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "ksi" = (
 /obj/structure/table,
 /obj/item/stack/sheet/glass/fifty,
@@ -67762,16 +67803,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central)
-"kwz" = (
-/obj/machinery/firealarm{
-	name = "north bump";
-	pixel_y = 24
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "kwD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -67858,6 +67889,30 @@
 	icon_state = "redcorner"
 	},
 /area/security/permabrig)
+"kyd" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/embedded_controller/radio/airlock/access_controller{
+	id_tag = "sm_airlock_control";
+	name = "Supermatter Access Console";
+	tag_exterior_door = "sm_airlock_exterior";
+	tag_interior_door = "sm_airlock_interior";
+	pixel_x = -22
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "kyo" = (
 /obj/structure/closet/lawcloset,
 /obj/machinery/light{
@@ -68410,17 +68465,6 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/space,
 /area/space/nearstation)
-"kKi" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "kKz" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable{
@@ -68554,6 +68598,16 @@
 	icon_state = "darkgrey"
 	},
 /area/toxins/storage)
+"kNk" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/security/main)
 "kNG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -68629,15 +68683,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/xenobiology)
-"kOU" = (
-/obj/machinery/vending/wallmed{
-	name = "Emergency NanoMed";
-	pixel_y = -28
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "kPa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -68707,6 +68752,10 @@
 	})
 "kPI" = (
 /obj/item/twohanded/required/kirbyplants,
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "whitegreen"
@@ -68859,6 +68908,16 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/toxins/xenobiology)
+"kTZ" = (
+/obj/machinery/atmospherics/binary/pump{
+	dir = 8;
+	name = "External Gas to Loop"
+	},
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "kUf" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/portable_atmospherics/canister/sleeping_agent,
@@ -69304,6 +69363,20 @@
 	icon_state = "white"
 	},
 /area/toxins/xenobiology)
+"ldg" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "leh" = (
 /obj/machinery/atmospherics/binary/valve,
 /turf/simulated/floor/plating,
@@ -69684,6 +69757,13 @@
 	icon_state = "whitepurplecorner"
 	},
 /area/medical/research)
+"llU" = (
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "lmi" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -69744,14 +69824,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/grass/no_creep,
 /area/security/permabrig)
-"lnl" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "lnu" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/iv_bag/blood/random,
@@ -70059,18 +70131,6 @@
 /area/toxins/launch{
 	name = "Toxins Launch Room"
 	})
-"lvQ" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "lwx" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
 /obj/structure/lattice/catwalk,
@@ -70097,22 +70157,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
-"lxi" = (
-/obj/machinery/atmospherics/binary/pump/on{
-	dir = 1;
-	name = "Cooling Loop to Gas"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "lxz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/yellow{
@@ -70227,6 +70271,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
+"lCb" = (
+/obj/effect/turf_decal/delivery,
+/obj/machinery/vending/assist,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "lCt" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -70366,6 +70415,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
+"lEQ" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/vending/chinese,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "yellow"
+	},
+/area/engine/break_room)
 "lFm" = (
 /obj/machinery/shower{
 	dir = 8
@@ -70681,6 +70738,22 @@
 	icon_state = "red"
 	},
 /area/security/main)
+"lKH" = (
+/obj/machinery/access_button{
+	command = "cycle_interior";
+	frequency = 1379;
+	master_tag = "sm_airlock_control";
+	name = "Supermatter Access Button";
+	req_access_txt = "10";
+	pixel_x = 24
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "lKK" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -70688,11 +70761,26 @@
 	icon_state = "bluecorner"
 	},
 /area/hallway/primary/central)
-"lLc" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+"lLt" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "lLx" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -70790,35 +70878,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"lNs" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/green{
-	dir = 8
-	},
-/obj/machinery/camera{
-	c_tag = "Engineering Supermatter Port";
-	dir = 8;
-	network = list("SS13","engine")
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "lNt" = (
 /obj/machinery/computer/arcade,
 /obj/structure/cable/yellow{
@@ -71020,6 +71079,23 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/coldroom)
+"lRu" = (
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+	id_tag = "engineering_east_airlock";
+	req_access_txt = "10;13";
+	tag_airpump = "engineering_east_pump";
+	tag_chamber_sensor = "engineering_east_sensor";
+	tag_exterior_door = "engineering_east_outer";
+	tag_interior_door = "engineering_east_inner";
+	pixel_y = 24
+	},
+/obj/machinery/airlock_sensor{
+	id_tag = "engineering_east_sensor";
+	pixel_y = 35;
+	pixel_x = -1
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "lRH" = (
 /obj/machinery/door/airlock/security/glass{
 	req_one_access_txt = "1;4"
@@ -71320,6 +71396,17 @@
 	icon_state = "white"
 	},
 /area/medical/research)
+"mbI" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "mcd" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -71451,6 +71538,12 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central)
+"mdF" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "mdH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
@@ -71468,6 +71561,12 @@
 	icon_state = "dark"
 	},
 /area/toxins/server)
+"mdN" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "mdS" = (
 /obj/structure/girder,
 /turf/simulated/floor/plating,
@@ -72085,6 +72184,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/aft2)
+"mtV" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "muo" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -72399,6 +72506,41 @@
 	icon_state = "darkgrey"
 	},
 /area/medical/morgue)
+"mCQ" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/embedded_controller/radio/airlock/access_controller{
+	id_tag = "atmos_airlock_control";
+	name = "Atmos Supermatter Access Console";
+	tag_exterior_door = "atmos_airlock_exterior";
+	tag_interior_door = "atmos_airlock_interior";
+	pixel_y = -24
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
+"mCT" = (
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "mCX" = (
 /obj/machinery/atmospherics/unary/thermomachine/heater/on{
 	dir = 4
@@ -72644,6 +72786,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/engimaint)
+"mLC" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 4
+	},
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "mMk" = (
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = 32
@@ -72809,12 +72958,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/courtroom)
-"mPG" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "mQb" = (
 /obj/machinery/disposal/deliveryChute{
 	dir = 4;
@@ -73089,6 +73232,12 @@
 	icon_state = "redcorner"
 	},
 /area/hallway/primary/fore)
+"mVO" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "mVR" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -73386,14 +73535,6 @@
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
-"nbA" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/vending/chinese,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "yellow"
-	},
-/area/engine/break_room)
 "nbG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -73645,6 +73786,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/toxins/xenobiology)
+"ngI" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "nht" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -73842,19 +73991,6 @@
 	icon_state = "darkpurple"
 	},
 /area/maintenance/aft2)
-"nkG" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "nkU" = (
 /mob/living/simple_animal/pet/dog/corgi/borgi,
 /obj/structure/cable/yellow{
@@ -74102,14 +74238,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
-"nrI" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/engimaint)
 "nsm" = (
 /obj/machinery/alarm{
 	dir = 4;
@@ -74188,6 +74316,16 @@
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
+"ntU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "nup" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -74482,21 +74620,16 @@
 	icon_state = "caution"
 	},
 /area/atmos/control)
-"nAR" = (
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1379;
-	master_tag = "sm_airlock_control";
-	name = "Supermatter Access Button";
-	req_access_txt = "10";
-	pixel_x = 24
+"nBp" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
+/turf/simulated/floor/plating,
 /area/engine/engineering)
 "nBF" = (
 /obj/structure/disposalpipe/segment{
@@ -74698,24 +74831,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/engine/break_room)
-"nHI" = (
-/obj/machinery/atmospherics/binary/pump{
-	name = "Mix to Gas"
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "nIi" = (
 /obj/machinery/alarm{
 	name = "north bump";
@@ -74796,17 +74911,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
-"nLX" = (
-/obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "nLZ" = (
 /obj/structure/cable/yellow{
 	d2 = 8;
@@ -74832,6 +74936,13 @@
 "nMC" = (
 /turf/simulated/wall/r_wall,
 /area/storage/secure)
+"nME" = (
+/obj/machinery/atmospherics/trinary/filter/flipped{
+	dir = 1;
+	filter_type = 2
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "nNk" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -75093,10 +75204,6 @@
 /area/security/prisonlockers)
 "nVd" = (
 /obj/structure/table,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = 29;
-	pixel_y = 1
-	},
 /obj/item/book/manual/wiki/security_space_law{
 	pixel_x = -4;
 	pixel_y = 4
@@ -75107,6 +75214,10 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -75209,14 +75320,6 @@
 	icon_state = "white"
 	},
 /area/toxins/xenobiology)
-"nXs" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "nXy" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -75604,15 +75707,6 @@
 	icon_state = "darkgreycheck"
 	},
 /area/crew_quarters/hor)
-"oia" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "oic" = (
 /obj/machinery/camera{
 	c_tag = "Science Hallway - Central";
@@ -75917,6 +76011,10 @@
 	icon_state = "neutralcorner"
 	},
 /area/crew_quarters/locker)
+"orw" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "orY" = (
 /turf/simulated/floor/plating,
 /area/maintenance/engimaint)
@@ -76003,6 +76101,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"owQ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "oxJ" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance/two,
@@ -76061,14 +76165,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
-"ozE" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "oAc" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable/yellow{
@@ -76361,16 +76457,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
-"oGi" = (
-/obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8
-	},
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/effect/turf_decal/bot,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "oGy" = (
 /obj/item/beach_ball/holoball,
 /obj/effect/decal/cleanable/dirt,
@@ -76864,16 +76950,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/aft2)
 "oUU" = (
-/obj/machinery/light_switch{
-	name = "custom placement";
-	pixel_x = 9;
-	pixel_y = 26
-	},
-/obj/machinery/newscaster{
-	name = "custom placement";
-	pixel_x = -4;
-	pixel_y = 32
-	},
 /obj/machinery/camera{
 	c_tag = "Science - Robotics Workshop";
 	network = list("Research","SS13")
@@ -76881,6 +76957,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	name = "north bump";
+	pixel_y = 24
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
 	},
@@ -77307,6 +77387,22 @@
 	icon_state = "caution"
 	},
 /area/atmos/distribution)
+"pfH" = (
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "pgs" = (
 /obj/structure/table,
 /obj/item/toy/crayon/white{
@@ -77447,14 +77543,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
-"plb" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera{
-	c_tag = "Engineering - Fore";
-	dir = 1
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "pln" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced,
@@ -77528,6 +77616,35 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/security/brig)
+"pos" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/green{
+	dir = 8
+	},
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Port";
+	dir = 8;
+	network = list("SS13","engine")
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "pps" = (
 /obj/structure/rack,
 /obj/item/crowbar/red,
@@ -77670,7 +77787,8 @@
 /area/security/permabrig)
 "psz" = (
 /obj/machinery/newscaster/security_unit{
-	pixel_x = -30
+	pixel_x = -32;
+	name = "west bump"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -78095,6 +78213,23 @@
 	icon_state = "brown"
 	},
 /area/hallway/primary/central)
+"pFo" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "pFG" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -78213,13 +78348,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
-"pHT" = (
-/obj/machinery/atmospherics/trinary/filter/flipped{
-	dir = 1;
-	filter_type = 2
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "pHY" = (
 /obj/effect/turf_decal/stripes/white/corner{
 	dir = 1
@@ -78469,12 +78597,6 @@
 	icon_state = "white"
 	},
 /area/toxins/xenobiology)
-"pNG" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "pNK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -78671,6 +78793,13 @@
 	icon_state = "whiteyellow"
 	},
 /area/medical/chemistry)
+"pSf" = (
+/obj/machinery/atmospherics/trinary/filter/flipped{
+	dir = 1;
+	filter_type = -1
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "pSg" = (
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop,
@@ -78773,16 +78902,6 @@
 	icon_state = "whitegreen"
 	},
 /area/medical/virology)
-"pTY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "pUc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -78868,10 +78987,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
-"pVx" = (
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "pVO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -78893,6 +79008,23 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/maintenance/medmaint)
+"pWt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "pWK" = (
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating,
@@ -79336,12 +79468,6 @@
 	icon_state = "darkgrey"
 	},
 /area/storage/tech)
-"qfC" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "qfR" = (
 /obj/machinery/porta_turret{
 	dir = 8
@@ -79414,6 +79540,15 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/toxins/xenobiology)
+"qiI" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "qkD" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -79690,10 +79825,16 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/aft)
-"qrS" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/engine,
+"qrh" = (
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/plating,
 /area/engine/engineering)
 "qse" = (
 /obj/machinery/hologram/holopad,
@@ -79739,6 +79880,16 @@
 	icon_state = "whitepurple"
 	},
 /area/medical/research)
+"qto" = (
+/obj/machinery/atmospherics/unary/portables_connector,
+/obj/machinery/camera{
+	c_tag = "Engineering Supermatter Fore";
+	network = list("SS13","engine")
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "qtr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -80075,10 +80226,16 @@
 /obj/machinery/light,
 /turf/simulated/floor/plasteel,
 /area/security/brig)
-"qCD" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plasteel,
+"qCP" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1379;
+	id_tag = "engineering_east_outer";
+	locked = 1;
+	name = "Engineering External Access"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
+/turf/simulated/floor/plating,
 /area/engine/engineering)
 "qDd" = (
 /obj/structure/table/glass,
@@ -80170,23 +80327,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
-"qGJ" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "qIg" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -80240,6 +80380,21 @@
 	icon_state = "white"
 	},
 /area/medical/research)
+"qKh" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "qKA" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/yellow{
@@ -80358,6 +80513,20 @@
 	icon_state = "red"
 	},
 /area/security/warden)
+"qOQ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "qPe" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -80497,14 +80666,6 @@
 	icon_state = "darkbluecorners"
 	},
 /area/aisat)
-"qSh" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/closet/secure_closet/engineering_welding,
-/obj/structure/sign/nosmoking_2{
-	pixel_y = 32
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "qSr" = (
 /obj/machinery/camera{
 	c_tag = "Prisoner Execution Chamber";
@@ -80712,12 +80873,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/grass/no_creep,
 /area/security/permabrig)
-"qZS" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "rak" = (
 /obj/structure/table/glass,
 /obj/structure/window/reinforced{
@@ -80843,6 +80998,16 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/doors,
 /turf/simulated/floor/plasteel,
 /area/security/brig)
+"rbC" = (
+/obj/machinery/firealarm{
+	name = "north bump";
+	pixel_y = 24
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "rbN" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -81212,17 +81377,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"rkw" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "rkX" = (
 /obj/item/radio/intercom{
 	name = "east bump";
@@ -81482,6 +81636,18 @@
 	icon_state = "dark"
 	},
 /area/security/seceqstorage)
+"rqN" = (
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "rqW" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 4
@@ -81573,6 +81739,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -81680,9 +81850,6 @@
 	icon_state = "dark"
 	},
 /area/medical/morgue)
-"rww" = (
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "rwE" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -81961,6 +82128,17 @@
 	icon_state = "black"
 	},
 /area/security/permabrig)
+"rBT" = (
+/obj/machinery/atmospherics/unary/thermomachine/freezer{
+	dir = 1
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "rCq" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -82229,6 +82407,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/port)
+"rGY" = (
+/obj/structure/table,
+/obj/effect/turf_decal/bot,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/geiger_counter,
+/obj/item/geiger_counter,
+/obj/item/clothing/glasses/meson,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "rHb" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
@@ -82499,6 +82689,16 @@
 	},
 /turf/simulated/floor/engine,
 /area/toxins/misc_lab)
+"rMp" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "rMs" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -82581,6 +82781,11 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/hos)
+"rOu" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/secure_closet/engineering_electrical,
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "rOD" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -82837,24 +83042,6 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
 /area/maintenance/aft2)
-"rVF" = (
-/obj/machinery/atmospherics/binary/pump{
-	dir = 4;
-	name = "Gas to Chamber"
-	},
-/obj/machinery/power/apc{
-	cell_type = 25000;
-	dir = 1;
-	name = "Engineering Engine Super APC";
-	pixel_y = 24;
-	shock_proof = 1
-	},
-/obj/structure/cable/yellow{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/engine,
-/area/engine/supermatter)
 "rVI" = (
 /obj/machinery/camera{
 	c_tag = "Prison Common Room";
@@ -83650,6 +83837,12 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
+"srS" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/noslip,
+/area/engine/engineering)
 "srT" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/three,
@@ -84015,17 +84208,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/warden)
-"sDR" = (
-/obj/machinery/atmospherics/unary/thermomachine/freezer{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "sDT" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -84250,6 +84432,11 @@
 	icon_state = "darkgrey"
 	},
 /area/medical/morgue)
+"sID" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "sJe" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -84345,6 +84532,17 @@
 	icon_state = "darkblue"
 	},
 /area/bridge)
+"sLD" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "sLS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/bar{
@@ -84480,30 +84678,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"sOa" = (
-/obj/machinery/door/airlock/engineering/glass{
-	autoclose = 0;
-	frequency = 1379;
-	id_tag = "sm_airlock_interior";
-	locked = 1;
-	name = "Supermatter Interior Access"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "sOw" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8;
@@ -84801,24 +84975,6 @@
 	icon_state = "dark"
 	},
 /area/medical/morgue)
-"sWj" = (
-/obj/machinery/door/airlock/engineering/glass{
-	autoclose = 0;
-	frequency = 1379;
-	id_tag = "sm_airlock_exterior";
-	locked = 1;
-	name = "Supermatter Exterior Access"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "sWv" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -85138,6 +85294,19 @@
 	icon_state = "darkbluecorners"
 	},
 /area/bridge)
+"tdz" = (
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "tdA" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/portable_atmospherics/canister/sleeping_agent,
@@ -85203,6 +85372,20 @@
 	},
 /turf/simulated/floor/carpet,
 /area/library)
+"teY" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "tfl" = (
 /turf/simulated/wall/r_wall,
 /area/security/prisonlockers)
@@ -85428,6 +85611,19 @@
 	icon_state = "whiteyellowfull"
 	},
 /area/medical/chemistry)
+"tiH" = (
+/obj/structure/chair,
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 32
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "brown"
+	},
+/area/construction/hallway{
+	name = "\improper Storage Wing"
+	})
 "tiN" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -85454,6 +85650,18 @@
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
+"tjY" = (
+/obj/machinery/atmospherics/pipe/simple/visible/green,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "tkb" = (
 /obj/structure/flora/junglebush/c,
 /obj/machinery/light{
@@ -85648,6 +85856,30 @@
 	icon_state = "white"
 	},
 /area/security/permabrig)
+"toX" = (
+/obj/machinery/door/airlock/engineering/glass{
+	autoclose = 0;
+	frequency = 1379;
+	id_tag = "sm_airlock_exterior";
+	locked = 1;
+	name = "Supermatter Exterior Access"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "tpq" = (
 /obj/structure/lattice,
 /obj/structure/sign/electricshock{
@@ -86652,11 +86884,6 @@
 	icon_state = "greenblue"
 	},
 /area/hydroponics)
-"tTj" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "tTl" = (
 /obj/structure/plasticflaps{
 	opacity = 1
@@ -86806,37 +87033,6 @@
 	icon_state = "bar"
 	},
 /area/crew_quarters/bar)
-"tXK" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/embedded_controller/radio/airlock/access_controller{
-	id_tag = "sm_airlock_control";
-	name = "Supermatter Access Console";
-	tag_exterior_door = "sm_airlock_exterior";
-	tag_interior_door = "sm_airlock_interior";
-	pixel_x = -22
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
-"tXY" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "tYD" = (
 /obj/structure/cable/yellow{
 	d1 = 2;
@@ -86882,23 +87078,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
-"tYY" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "tZI" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	frequency = 1441;
@@ -87289,6 +87468,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/brig)
+"ujj" = (
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 1;
+	name = "Cooling Loop to Gas"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "ujB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -87836,6 +88031,11 @@
 /obj/effect/turf_decal/loading_area,
 /turf/simulated/floor/plasteel,
 /area/maintenance/apmaint)
+"uDi" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "uDq" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/simple/visible{
@@ -88046,6 +88246,14 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
+"uIW" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/engimaint)
 "uIX" = (
 /obj/machinery/computer/security/engineering,
 /obj/effect/turf_decal/bot,
@@ -88203,9 +88411,6 @@
 	icon_state = "dark"
 	},
 /area/turret_protected/ai_upload)
-"uMg" = (
-/turf/simulated/wall/r_wall,
-/area/engine/engine_smes)
 "uMj" = (
 /obj/structure/chair/office/dark{
 	dir = 1
@@ -88307,6 +88512,16 @@
 	icon_state = "white"
 	},
 /area/medical/research)
+"uNp" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/bot,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "uNL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -88335,6 +88550,19 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/armoury)
+"uOm" = (
+/obj/machinery/alarm{
+	dir = 1;
+	name = "south bump";
+	pixel_y = -24
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/engine/engineering)
 "uPt" = (
 /obj/structure/table,
 /obj/item/storage/box/evidence,
@@ -88351,20 +88579,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/assembly/showroom)
-"uQc" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "uQj" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
@@ -88608,12 +88822,6 @@
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
-"uXh" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "uXo" = (
 /obj/structure/closet/emcloset,
 /obj/machinery/camera{
@@ -88782,16 +88990,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/theatre)
-"uZq" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 1
-	},
-/obj/machinery/meter,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "uZt" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/storage/hazardvest,
@@ -89045,6 +89243,10 @@
 /obj/machinery/atmospherics/unary/portables_connector{
 	dir = 1
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/toxins/mixing)
 "vfe" = (
@@ -89155,6 +89357,15 @@
 /obj/item/reagent_containers/glass/bottle/ammonia,
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
+"vkG" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/engine/engineering)
 "vkL" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating,
@@ -89256,6 +89467,11 @@
 	icon_state = "white"
 	},
 /area/medical/cmo)
+"vmT" = (
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "vnj" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/purple{
 	dir = 8
@@ -89639,19 +89855,6 @@
 	icon_state = "whitehall"
 	},
 /area/medical/reception)
-"vzd" = (
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "vzg" = (
 /obj/machinery/camera{
 	c_tag = "Engineering - Transit Tube Access";
@@ -89860,27 +90063,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/toxins/test_chamber)
-"vCQ" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1379;
-	master_tag = "engineering_east_airlock";
-	name = "interior access button";
-	pixel_x = -22;
-	pixel_y = -20;
-	req_access_txt = "10;13"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "vCR" = (
 /obj/machinery/light{
 	dir = 4
@@ -89924,10 +90106,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medmaint)
-"vEf" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/simulated/floor/plasteel,
-/area/engine/engineering)
 "vEp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -90114,12 +90292,6 @@
 	icon_state = "white"
 	},
 /area/toxins/xenobiology)
-"vLw" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "vLA" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -90385,6 +90557,9 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
+"vUb" = (
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "vUm" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -90394,6 +90569,12 @@
 	},
 /turf/simulated/floor/engine,
 /area/crew_quarters/hor)
+"vUB" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "vUD" = (
 /obj/machinery/power/emitter{
 	anchored = 1;
@@ -90445,10 +90626,6 @@
 	pixel_y = 5
 	},
 /obj/machinery/syndicatebomb/training,
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -28;
-	pixel_y = -30
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -90469,15 +90646,6 @@
 	icon_state = "freezerfloor"
 	},
 /area/security/permabrig)
-"vWh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "vWl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -90509,23 +90677,6 @@
 	icon_state = "darkgrey"
 	},
 /area/medical/morgue)
-"vWP" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "vXb" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable/yellow{
@@ -90885,6 +91036,15 @@
 "wjf" = (
 /turf/simulated/floor/carpet,
 /area/lawoffice)
+"wjn" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "wjq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -90990,6 +91150,17 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
+"wky" = (
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Supermatter Engine Room"
+	},
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "wkL" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/structure/cable/yellow{
@@ -91046,6 +91217,20 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/doors,
 /turf/simulated/floor/plasteel,
 /area/security/brig)
+"wlL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "wlT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop{
@@ -91099,13 +91284,6 @@
 	icon_state = "white"
 	},
 /area/security/permabrig)
-"wnJ" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
-/obj/machinery/meter,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "wnX" = (
 /obj/machinery/atmospherics/pipe/simple/visible/green,
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
@@ -91250,25 +91428,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
-"wso" = (
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/embedded_controller/radio/airlock/access_controller{
-	id_tag = "atmos_airlock_control";
-	name = "Atmos Supermatter Access Console";
-	tag_exterior_door = "atmos_airlock_exterior";
-	tag_interior_door = "atmos_airlock_interior";
-	pixel_y = -24
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "wsu" = (
 /obj/machinery/atmospherics/pipe/simple/insulated,
 /obj/machinery/light/small{
@@ -91661,19 +91820,6 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
-"wBy" = (
-/obj/machinery/alarm{
-	dir = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "wBz" = (
 /obj/machinery/door/window/southleft{
 	name = "Containment Pen #2"
@@ -91930,13 +92076,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
-"wJS" = (
-/obj/machinery/atmospherics/trinary/filter/flipped{
-	dir = 1;
-	filter_type = -1
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "wJX" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
 	dir = 1;
@@ -91955,6 +92094,12 @@
 	icon_state = "whiteblue"
 	},
 /area/atmos)
+"wKL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "wKS" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
@@ -91991,10 +92136,6 @@
 	icon_state = "dark"
 	},
 /area/security/main)
-"wMi" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "wMR" = (
 /obj/effect/turf_decal/stripes/white/line,
 /obj/effect/turf_decal/stripes/white/line{
@@ -92007,12 +92148,6 @@
 	icon_state = "darkgrey"
 	},
 /area/toxins/storage)
-"wNp" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "wNA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -92416,6 +92551,17 @@
 	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central)
+"wWl" = (
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "wWG" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -92441,15 +92587,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel,
 /area/toxins/xenobiology)
-"wXG" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red{
-	dir = 5
-	},
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "wYk" = (
 /obj/machinery/atmospherics/unary/portables_connector{
 	dir = 4
@@ -92842,17 +92979,6 @@
 	icon_state = "dark"
 	},
 /area/bridge)
-"xix" = (
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room"
-	},
-/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "xiy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -93235,23 +93361,6 @@
 	icon_state = "green"
 	},
 /area/hallway/primary/central)
-"xuw" = (
-/obj/machinery/atmospherics/binary/valve/digital/open{
-	name = "Output Release"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "xux" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 4
@@ -93641,6 +93750,17 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/tcommsat/server)
+"xEY" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1379;
+	id_tag = "engineering_east_inner";
+	locked = 1;
+	name = "Engineering External Access"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
+/turf/simulated/floor/plating,
+/area/engine/engineering)
 "xFu" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -93680,6 +93800,19 @@
 /obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/simulated/floor/plating,
 /area/maintenance/aft)
+"xGj" = (
+/obj/machinery/access_button{
+	command = "cycle_exterior";
+	frequency = 1379;
+	master_tag = "engineering_east_airlock";
+	name = "interior access button";
+	pixel_x = -22;
+	pixel_y = 20;
+	req_access_txt = "10;13"
+	},
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
 "xGP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -94207,30 +94340,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/mixing)
-"xUw" = (
-/obj/machinery/door/airlock/engineering/glass{
-	autoclose = 0;
-	frequency = 1379;
-	id_tag = "sm_airlock_exterior";
-	locked = 1;
-	name = "Supermatter Exterior Access"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/engine/engineering)
 "xUx" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -94360,6 +94469,18 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"xXh" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 8;
+	frequency = 1379;
+	id_tag = "engineering_east_pump"
+	},
+/turf/simulated/floor/plating,
+/area/engine/engineering)
+"xXv" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/turf/simulated/floor/engine,
+/area/engine/engineering)
 "xXD" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -94393,22 +94514,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/assembly/robotics)
-"xXK" = (
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Supermatter Engine Room"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/obj/structure/cable/yellow{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/engine/engineering)
 "xYk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -94459,20 +94564,6 @@
 	icon_state = "white"
 	},
 /area/medical/surgeryobs)
-"xYZ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/engine,
-/area/engine/engineering)
 "xZD" = (
 /obj/structure/rack{
 	dir = 1
@@ -94831,9 +94922,6 @@
 /obj/machinery/space_heater,
 /turf/simulated/floor/plating,
 /area/toxins/xenobiology)
-"yjB" = (
-/turf/simulated/floor/noslip,
-/area/engine/engineering)
 "yjJ" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/sign/vacuum{
@@ -94893,12 +94981,6 @@
 	icon_state = "brown"
 	},
 /area/quartermaster/office)
-"ymf" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/noslip,
-/area/engine/engineering)
 
 (1,1,1) = {"
 aaa
@@ -115568,7 +115650,7 @@ gqF
 aLK
 aXB
 aZt
-jPT
+tiH
 hDK
 nPw
 aOy
@@ -124021,7 +124103,7 @@ eMS
 vKs
 eTo
 rsQ
-fax
+kNk
 fax
 aiN
 wdi
@@ -129947,7 +130029,7 @@ aBJ
 avr
 bgb
 aHV
-aGM
+iKF
 aIk
 aJC
 aLd
@@ -133816,7 +133898,7 @@ aWN
 aYE
 aZI
 aYV
-uMg
+hPR
 bdE
 bdy
 beI
@@ -134073,7 +134155,7 @@ aUL
 aYD
 aXx
 bAL
-uMg
+hPR
 bfd
 bdy
 beJ
@@ -134330,7 +134412,7 @@ aWX
 aYG
 aXF
 aYU
-uMg
+hPR
 bbK
 bdy
 beK
@@ -134587,7 +134669,7 @@ aST
 aUK
 aZM
 jUV
-uMg
+hPR
 bam
 bdA
 bmN
@@ -135599,7 +135681,7 @@ mdS
 mdS
 dHr
 aBZ
-hxQ
+lCb
 aHg
 jke
 aIB
@@ -135870,7 +135952,7 @@ aPp
 aUR
 aPp
 aZc
-vzd
+tdz
 baw
 blt
 bmh
@@ -136123,11 +136205,11 @@ aQR
 aOg
 aUh
 iIk
-rkw
+jiK
 aVh
 aVh
 aYW
-baz
+vkG
 aSn
 bcq
 aFR
@@ -136370,17 +136452,17 @@ azs
 aBZ
 aEy
 aEz
-fvV
+rGY
 kxf
-vEf
+iOr
 vRY
 aCg
 aZe
 aCg
 aCg
-xUw
+toX
 aCg
-sWj
+huX
 aHi
 aHi
 aZe
@@ -136629,16 +136711,16 @@ aCd
 aEE
 aIA
 iof
-vEf
+iOr
 vRY
 aHi
 drL
 drL
 drL
-hCT
+fWD
 bEL
-gdJ
-dXF
+sLD
+jwN
 nRh
 pcW
 pcW
@@ -136889,17 +136971,17 @@ aIi
 aSn
 vRY
 aHi
-ymf
-yjB
-yjB
-tYY
-nAR
-gdJ
+srS
+gnd
+gnd
+fwJ
+lKH
+sLD
 nRh
 nRh
 nRh
 nRh
-kOU
+diA
 aCg
 qeD
 jvf
@@ -137142,16 +137224,16 @@ amk
 aCf
 aDw
 ccH
-plb
+fWS
 aCg
 aCg
 aCg
 aCg
 aHi
 aHi
-sOa
+gnv
 aCg
-fdy
+dDq
 aHi
 aHi
 aCg
@@ -137396,24 +137478,24 @@ amk
 aBZ
 nwp
 aBZ
-pNG
+ksf
 aEn
-tXY
+llU
 aSn
 aHi
 kcU
 kWg
-dsa
+qKh
 kWg
-nkG
+dqs
 aPu
-tXK
-vWP
-gkr
-gkr
+kyd
+pWt
+ekt
+ekt
 aLE
-gkr
-fLr
+ekt
+teY
 aCg
 uIX
 itu
@@ -137441,7 +137523,7 @@ rBn
 cdw
 fTF
 aAG
-lfh
+iil
 lfh
 kxo
 aAG
@@ -137655,22 +137737,22 @@ aAK
 aBZ
 aFZ
 aHg
-vEf
-qCD
+iOr
+eSa
 aHi
 rsT
-rww
-wNp
-rww
-rww
-rww
-nXs
-ozE
-rww
-rww
-qfC
-rww
-lvQ
+vUb
+mdF
+vUb
+vUb
+vUb
+ngI
+irX
+vUb
+vUb
+owQ
+vUb
+rqN
 aCg
 aFR
 aFR
@@ -137910,24 +137992,24 @@ ayz
 aBZ
 aEv
 aBZ
-qSh
+dxF
 aHg
-vEf
-flp
+iOr
+rOu
 aHi
-qGJ
+pFo
 aMU
 aPa
 aRg
 aTJ
 aPs
 aVs
-lNs
+pos
 knc
 aXs
-huq
+tjY
 bao
-wso
+mCQ
 aCg
 drL
 hFO
@@ -138168,30 +138250,30 @@ cbc
 pxj
 aBZ
 aCD
-pNG
+ksf
 aSn
-flp
+rOu
 aHi
-qGJ
+pFo
 aMQ
-hLF
-hLF
+kTZ
+kTZ
 kez
 aPt
 aRb
 aTR
 yeW
-uZq
-wXG
+dyX
+imD
 tvk
 ccu
 gBW
 iEX
 bza
 aCg
-aSs
+gLH
 nya
-nbA
+lEQ
 sRU
 mWL
 lcl
@@ -138429,17 +138511,17 @@ aHi
 aHi
 aHi
 aCg
-iIc
+lLt
 aMQ
-oGi
-oGi
+rMp
+rMp
 kez
-rVF
+ckg
 aRc
 lGr
 kez
-jxs
-jxs
+uNp
+uNp
 ebM
 bbC
 aCg
@@ -138681,12 +138763,12 @@ aBZ
 hQX
 tSX
 avA
-gbs
+iLI
 aDi
-vWh
-pTY
-xix
-nHI
+gHz
+ntU
+wky
+ftb
 rlJ
 gpj
 aRa
@@ -138698,10 +138780,10 @@ aOe
 tVw
 gpj
 tAn
-vCQ
-eBb
-mPG
-iSy
+eax
+xEY
+mdN
+mLC
 aCg
 aaa
 aaa
@@ -138937,11 +139019,11 @@ arT
 aBZ
 azr
 aEv
-lLc
+vmT
 aBZ
-eXd
+qto
 bsw
-lnl
+mtV
 aHi
 vIz
 aDL
@@ -138957,15 +139039,15 @@ kGw
 mVG
 bbC
 aCg
-fEt
-jNs
+lRu
+xXh
 aCg
 aaa
 aaa
 wUa
 xpX
 bvi
-nrI
+uIW
 wUa
 bRq
 sls
@@ -139196,9 +139278,9 @@ ano
 mXQ
 apL
 aBZ
-dNI
-wnJ
-sDR
+iJz
+enh
+rBT
 aHi
 vIz
 aDL
@@ -139214,8 +139296,8 @@ qUA
 mVG
 bbC
 aCg
-eEL
-fTC
+qCP
+orw
 aCg
 aaa
 abq
@@ -139471,7 +139553,7 @@ kGw
 dea
 oXB
 aCg
-bpX
+xGj
 aef
 aef
 aef
@@ -140228,19 +140310,19 @@ aaa
 aef
 tZI
 aJJ
-xuw
-tTj
-wJS
-wMi
-wJS
-qrS
+fBW
+uDi
+pSf
+xXv
+pSf
+sID
 aRe
-iRi
-wMi
-pHT
-ciw
-uXh
-lxi
+hok
+xXv
+nME
+fFL
+vUB
+ujj
 gdM
 mMu
 nzP
@@ -140485,19 +140567,19 @@ aaa
 aef
 aef
 aCg
-xYZ
-uQc
-vLw
-vLw
-iTR
-qZS
-pVx
-jLX
-oia
-vLw
-vLw
-dMv
-gWY
+wlL
+gGi
+mVO
+mVO
+qiI
+wKL
+fbR
+iqc
+wjn
+mVO
+mVO
+qOQ
+ldg
 aCg
 iab
 mBA
@@ -140743,7 +140825,7 @@ abq
 abq
 aCg
 aHi
-dAt
+pfH
 aHi
 aCg
 aCg
@@ -140753,7 +140835,7 @@ aHi
 aCg
 aCg
 aHi
-xXK
+mCT
 aHi
 aCg
 gkt
@@ -141000,7 +141082,7 @@ aaa
 aaa
 aCg
 nRh
-dQd
+nBp
 aOd
 nRh
 nRh
@@ -141010,7 +141092,7 @@ jbk
 nRh
 nRh
 aOd
-kKi
+mbI
 nRh
 aCg
 iab
@@ -141256,8 +141338,8 @@ aaa
 aaa
 aaa
 aCg
-kwz
-nLX
+rbC
+qrh
 raV
 nRh
 nRh
@@ -141267,8 +141349,8 @@ nRh
 nRh
 nRh
 oWm
-jMt
-wBy
+wWl
+uOm
 aCg
 deX
 aMp
@@ -141768,7 +141850,7 @@ abq
 abq
 aaa
 abq
-hFH
+dKY
 aCg
 aOd
 vCR
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 1e53f95c1b7..895057af251 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -1108,6 +1108,25 @@
 /obj/item/pen/multi,
 /turf/simulated/floor/carpet,
 /area/security/hos)
+"afN" = (
+/obj/structure/chair/office/dark{
+	dir = 1
+	},
+/obj/effect/landmark/start/mime,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/structure/cable{
+	d2 = 8;
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "afO" = (
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
@@ -1489,19 +1508,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/security/hos)
-"ahy" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "44"
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "ahC" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -2820,13 +2826,13 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = 32
 	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4809,6 +4815,10 @@
 	pixel_y = 7
 	},
 /obj/item/pen,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/plasteel,
 /area/security/processing)
 "apd" = (
@@ -5064,15 +5074,6 @@
 	icon_state = "red"
 	},
 /area/security/seceqstorage)
-"apF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "apG" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -6729,7 +6730,8 @@
 	},
 /obj/machinery/light,
 /obj/machinery/newscaster/security_unit{
-	pixel_y = -30
+	pixel_y = -32;
+	name = "south bump"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
@@ -11766,9 +11768,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/newscaster{
-	name = "south bump";
-	pixel_y = -32
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -32;
+	name = "south bump"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -13074,13 +13076,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "aIF" = (
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/dorms)
 "aIG" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
@@ -13395,8 +13399,9 @@
 	},
 /area/security/detectives_office)
 "aJo" = (
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -13842,6 +13847,7 @@
 /area/security/detectives_office)
 "aKC" = (
 /obj/machinery/photocopier,
+/obj/machinery/light,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
 	},
@@ -20107,6 +20113,10 @@
 	pixel_y = -28
 	},
 /obj/machinery/hologram/holopad,
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "red"
@@ -21877,6 +21887,10 @@
 /obj/structure/table,
 /obj/item/storage/belt/utility,
 /obj/item/storage/firstaid/regular,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
 "bdh" = (
@@ -23412,13 +23426,6 @@
 	icon_state = "darkbluecorners"
 	},
 /area/chapel/main)
-"bgd" = (
-/obj/structure/table/wood,
-/obj/item/storage/pill_bottle/dice,
-/turf/simulated/floor/plasteel{
-	icon_state = "bar"
-	},
-/area/crew_quarters/dorms)
 "bgf" = (
 /obj/structure/table/wood,
 /obj/item/candle,
@@ -23870,6 +23877,10 @@
 /obj/item/clothing/suit/soldiercoat,
 /obj/item/clothing/under/soldieruniform,
 /obj/item/clothing/head/stalhelm,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/wood,
 /area/clownoffice)
 "bhk" = (
@@ -29213,6 +29224,10 @@
 	name = "north bump";
 	pixel_y = 24
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "bte" = (
@@ -29486,6 +29501,10 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/locker)
 "btU" = (
@@ -31369,16 +31388,16 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "bxY" = (
-/obj/machinery/newscaster{
-	name = "south bump";
-	pixel_y = -32
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = -32;
+	name = "south bump"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 0;
 	icon_state = "blue"
@@ -31736,13 +31755,13 @@
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "byI" = (
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
 /turf/simulated/floor/wood,
 /area/bridge/meeting_room)
 "byJ" = (
@@ -35554,6 +35573,10 @@
 /area/hallway/primary/starboard/east)
 "bHG" = (
 /obj/machinery/bodyscanner,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -36144,6 +36167,10 @@
 	pixel_y = 3
 	},
 /obj/item/clothing/head/soft,
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/storage)
 "bIW" = (
@@ -36615,6 +36642,10 @@
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central/sw)
 "bJP" = (
@@ -36985,6 +37016,10 @@
 /obj/machinery/conveyor_switch/oneway{
 	id = "packageExternal"
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = 32;
+	name = "east bump"
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/office)
 "bKD" = (
@@ -38023,13 +38058,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/maintcentral)
 "bMN" = (
-/obj/machinery/newscaster/security_unit{
-	pixel_x = -32
-	},
 /obj/structure/table/wood,
 /obj/machinery/photocopier/faxmachine/longrange{
 	department = "Captain's Office"
 	},
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "bMO" = (
@@ -40345,6 +40381,10 @@
 	pixel_x = -5;
 	pixel_y = -5
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "whiteblue"
@@ -40447,6 +40487,10 @@
 	pixel_y = -24
 	},
 /obj/structure/cable,
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
 	},
@@ -41487,7 +41531,8 @@
 "bTc" = (
 /obj/structure/table,
 /obj/machinery/newscaster/security_unit{
-	pixel_y = 32
+	pixel_y = 32;
+	name = "north bump"
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/heads)
@@ -48420,6 +48465,10 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -48936,6 +48985,10 @@
 	name = "Chief Medical Officer Requests Console";
 	pixel_y = -30
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkblue"
@@ -49298,6 +49351,10 @@
 "cix" = (
 /obj/structure/table,
 /obj/item/coin/silver,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/qm)
 "ciy" = (
@@ -51976,6 +52033,10 @@
 /obj/machinery/computer/med_data{
 	dir = 8
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
 	},
@@ -52603,6 +52664,10 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitegreen"
 	},
@@ -54528,7 +54593,8 @@
 	dir = 1
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_y = -32
+	pixel_y = -32;
+	name = "south bump"
 	},
 /turf/simulated/floor/wood,
 /area/blueshield)
@@ -54591,7 +54657,8 @@
 	department = "NT Representative's Office"
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_y = -32
+	pixel_y = -32;
+	name = "south bump"
 	},
 /turf/simulated/floor/wood,
 /area/ntrep)
@@ -55474,6 +55541,10 @@
 	tag_interior_door = "viro_lab_airlock_interior"
 	},
 /obj/effect/decal/warning_stripes/northeastcorner,
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitegreen"
 	},
@@ -55965,6 +56036,10 @@
 /obj/machinery/atmospherics/trinary/mixer{
 	dir = 8
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -63282,20 +63357,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/engine/break_room)
-"cKY" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/newscaster{
-	name = "north bump";
-	pixel_y = 32
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/toxins/xenobiology)
 "cKZ" = (
 /obj/effect/landmark/spawner/rev,
 /turf/simulated/floor/engine,
@@ -65469,6 +65530,10 @@
 	name = "Distribution Loop"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan,
+/obj/machinery/newscaster{
+	name = "north bump";
+	pixel_y = 32
+	},
 /turf/simulated/floor/plasteel,
 /area/atmos/distribution)
 "cQi" = (
@@ -66073,6 +66138,10 @@
 /obj/machinery/processor{
 	name = "Slime Processor"
 	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -67165,6 +67234,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/engine/equipmentstorage)
 "cTU" = (
@@ -68137,6 +68210,10 @@
 	pixel_x = 2;
 	pixel_y = 2
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "cWq" = (
@@ -68568,6 +68645,10 @@
 /obj/machinery/computer/station_alert{
 	dir = 4
 	},
+/obj/machinery/newscaster{
+	name = "west bump";
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel,
 /area/engine/hardsuitstorage)
 "cXx" = (
@@ -75913,16 +75994,6 @@
 /area/aisat{
 	name = "\improper AI Satellite Hallway"
 	})
-"dqo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/dorms)
 "dqp" = (
 /turf/simulated/wall,
 /area/aisat{
@@ -76278,11 +76349,12 @@
 	pixel_x = 32;
 	pixel_y = -32
 	},
+/obj/effect/landmark/start/ai,
 /obj/machinery/newscaster/security_unit{
 	pixel_x = -32;
-	pixel_y = -32
+	pixel_y = -32;
+	name = "box AI newscaster"
 	},
-/obj/effect/landmark/start/ai,
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
 "drV" = (
@@ -76718,19 +76790,6 @@
 	},
 /turf/space,
 /area/space/nearstation)
-"duz" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/spray/waterflower,
-/obj/machinery/firealarm{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "dvD" = (
 /obj/machinery/camera{
 	c_tag = "Prison Cafeteria External";
@@ -76772,6 +76831,18 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"dzb" = (
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "dAq" = (
 /obj/structure/chair,
 /obj/structure/disposalpipe/segment{
@@ -76911,6 +76982,26 @@
 	icon_state = "dark"
 	},
 /area/engine/engine_smes)
+"edu" = (
+/obj/structure/closet/secure_closet/mime,
+/obj/item/radio/intercom{
+	name = "west bump";
+	pixel_x = -28
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
+"edM" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "caution"
+	},
+/area/crew_quarters/dorms)
 "eei" = (
 /obj/machinery/light{
 	dir = 8
@@ -77020,6 +77111,13 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"emL" = (
+/obj/structure/closet/masks,
+/turf/simulated/floor/plasteel{
+	dir = 6;
+	icon_state = "caution"
+	},
+/area/crew_quarters/dorms)
 "enG" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -77037,6 +77135,23 @@
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
 /area/engine/engine_smes)
+"epW" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/spray/waterflower,
+/obj/machinery/firealarm{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "erU" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -77066,25 +77181,6 @@
 	icon_state = "bar"
 	},
 /area/security/permabrig)
-"etX" = (
-/obj/structure/chair/office/dark{
-	dir = 1
-	},
-/obj/effect/landmark/start/mime,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "euu" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 8
@@ -77142,15 +77238,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/engine/supermatter)
-"eDY" = (
-/obj/structure/table/wood,
-/obj/item/paper/crumpled/bloody{
-	info = "Mr. Ducky, I shall miss you!";
-	desc = "A scrap of paper with dried blood on it."
-	},
-/obj/item/bikehorn/rubberducky,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "eES" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -77193,12 +77280,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint2)
-"eJe" = (
-/obj/machinery/vending/autodrobe,
-/turf/simulated/floor/plasteel{
-	icon_state = "cafeteria"
-	},
-/area/crew_quarters/dorms)
 "eJr" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -77257,6 +77338,15 @@
 /obj/structure/flora/ausbushes/fullgrass,
 /turf/simulated/floor/grass,
 /area/hallway/primary/aft)
+"ePV" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "caution"
+	},
+/area/crew_quarters/dorms)
 "ePY" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -77337,12 +77427,6 @@
 	icon_state = "red"
 	},
 /area/security/permabrig)
-"fcu" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel{
-	icon_state = "caution"
-	},
-/area/crew_quarters/dorms)
 "fcH" = (
 /obj/machinery/hydroponics/soil,
 /obj/effect/decal/cleanable/dirt,
@@ -77480,13 +77564,6 @@
 	icon_state = "red"
 	},
 /area/security/permabrig)
-"fxz" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/dorms)
 "fxP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed,
@@ -77499,6 +77576,13 @@
 	icon_state = "red"
 	},
 /area/security/permabrig)
+"fzd" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
+/turf/simulated/floor/plasteel,
+/area/hallway/primary/starboard/west)
 "fAw" = (
 /obj/machinery/tcomms/core/station,
 /obj/machinery/camera{
@@ -77536,6 +77620,14 @@
 	icon_state = "dark"
 	},
 /area/engine/engineering)
+"fIB" = (
+/obj/structure/chair/stool{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/crew_quarters/dorms)
 "fIO" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -77590,6 +77682,16 @@
 	icon_state = "redfull"
 	},
 /area/security/prisonlockers)
+"fNQ" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_x = -32;
+	name = "west bump"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkred"
+	},
+/area/security/brig)
 "fPU" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -77651,6 +77753,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/engine/hardsuitstorage)
+"fUX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "fWP" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 4
@@ -77760,15 +77871,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint2)
-"gsJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "gsQ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -77888,6 +77990,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/engine/hardsuitstorage)
+"gCU" = (
+/obj/structure/punching_bag,
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/dorms)
 "gDJ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
@@ -78038,21 +78145,6 @@
 	icon_state = "darkred"
 	},
 /area/security/brig)
-"gWB" = (
-/obj/machinery/light_switch{
-	dir = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
-/obj/machinery/light,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "gYV" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
@@ -78223,17 +78315,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"hlX" = (
-/obj/structure/chair/wood{
-	dir = 4
-	},
-/obj/effect/decal/remains/human{
-	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
-	name = "human remains"
-	},
-/obj/effect/decal/cleanable/blood/old,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "hoB" = (
 /obj/docking_port/stationary{
 	dwidth = 2;
@@ -78376,21 +78457,6 @@
 	icon_state = "red"
 	},
 /area/security/permabrig)
-"hBS" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "hCs" = (
 /obj/effect/turf_decal/stripes/white/line,
 /obj/effect/decal/cleanable/dirt,
@@ -78562,6 +78628,18 @@
 	icon_state = "dark"
 	},
 /area/security/permabrig)
+"idg" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "idy" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red,
 /turf/simulated/floor/plating/airless,
@@ -78585,15 +78663,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/engine,
 /area/engine/supermatter)
-"ifo" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "caution"
-	},
-/area/crew_quarters/dorms)
 "ihJ" = (
 /obj/machinery/atmospherics/trinary/filter/flipped{
 	dir = 4;
@@ -78614,14 +78683,6 @@
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/engine,
 /area/engine/engineering)
-"imM" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "ioM" = (
 /obj/structure/window/plasmareinforced{
 	dir = 8
@@ -78701,6 +78762,16 @@
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
 /area/engine/engineering)
+"iGP" = (
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/closet/boxinggloves,
+/turf/simulated/floor/plasteel{
+	icon_state = "caution";
+	dir = 10
+	},
+/area/crew_quarters/dorms)
 "iJf" = (
 /obj/machinery/atmospherics/binary/pump{
 	layer = 3.3;
@@ -78855,6 +78926,21 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/engine/engineering)
+"jqS" = (
+/obj/machinery/light_switch{
+	dir = 1;
+	name = "south bump";
+	pixel_y = -24
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "jts" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 9
@@ -79074,6 +79160,16 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/supermatter)
+"jVf" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "darkred"
+	},
+/area/security/warden)
 "jVj" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -79095,10 +79191,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint2)
-"kaI" = (
-/obj/structure/lattice,
-/turf/simulated/wall,
-/area/maintenance/fsmaint)
 "kbU" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
@@ -79180,6 +79272,17 @@
 /obj/effect/spawner/random_spawners/blood_often,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
+"knB" = (
+/obj/structure/chair/wood{
+	dir = 4
+	},
+/obj/effect/decal/remains/human{
+	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
+	name = "human remains"
+	},
+/obj/effect/decal/cleanable/blood/old,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "kok" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -79451,6 +79554,14 @@
 	icon_state = "red"
 	},
 /area/security/prisonlockers)
+"ljR" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "lkw" = (
 /obj/machinery/light{
 	dir = 8
@@ -79645,6 +79756,17 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
+"lOY" = (
+/obj/machinery/camera{
+	c_tag = "Dormitories East";
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/deck/cards,
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/crew_quarters/dorms)
 "lPK" = (
 /obj/structure/table,
 /obj/structure/bedsheetbin{
@@ -79653,15 +79775,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
-"lPM" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "caution"
-	},
-/area/crew_quarters/dorms)
 "lQS" = (
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
@@ -79938,6 +80051,15 @@
 	icon_state = "dark"
 	},
 /area/engine/engineering)
+"mxZ" = (
+/obj/structure/table/wood,
+/obj/item/paper/crumpled/bloody{
+	info = "Mr. Ducky, I shall miss you!";
+	desc = "A scrap of paper with dried blood on it."
+	},
+/obj/item/bikehorn/rubberducky,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "mzv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -79959,17 +80081,6 @@
 	icon_state = "cmo"
 	},
 /area/security/permabrig)
-"mCL" = (
-/obj/structure/closet/secure_closet/mime,
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "mEh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/canister/air{
@@ -80127,6 +80238,12 @@
 /obj/effect/decal/warning_stripes/southeastcorner,
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"naU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/barricade/wooden,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "ncT" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -80186,6 +80303,22 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint2)
+"npS" = (
+/obj/machinery/newscaster{
+	name = "south bump";
+	pixel_y = -32
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/toxins/explab)
+"nqG" = (
+/obj/machinery/vending/cola,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "caution"
+	},
+/area/crew_quarters/dorms)
 "nqX" = (
 /obj/structure/table,
 /obj/item/paper{
@@ -80342,6 +80475,18 @@
 	},
 /turf/space,
 /area/space/nearstation)
+"nNB" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/machinery/alarm{
+	name = "north bump";
+	pixel_y = 24
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "nQG" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 9
@@ -80437,17 +80582,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
-"odR" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "ofW" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -80464,6 +80598,13 @@
 "omz" = (
 /turf/simulated/wall/r_wall,
 /area/engine/supermatter)
+"omD" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/dorms)
 "orF" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -80507,18 +80648,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"owb" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "oAs" = (
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -80597,10 +80726,14 @@
 	icon_state = "red"
 	},
 /area/security/permabrig)
-"oGB" = (
-/obj/structure/weightmachine/stacklifter,
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/dorms)
+"oHO" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "oOZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
 /turf/simulated/wall/r_wall,
@@ -81034,18 +81167,6 @@
 	},
 /turf/space,
 /area/space/nearstation)
-"qbn" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/machinery/alarm{
-	name = "north bump";
-	pixel_y = 24
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "qdi" = (
 /obj/machinery/door/poddoor/preopen{
 	id_tag = "Prison Gate";
@@ -81089,6 +81210,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
+"qhT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "qjs" = (
 /obj/structure/weightmachine/stacklifter,
 /obj/effect/decal/cleanable/dirt,
@@ -81310,6 +81440,10 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/dorms)
+"qFv" = (
+/obj/structure/lattice,
+/turf/simulated/wall,
+/area/maintenance/fsmaint)
 "qFw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -81396,6 +81530,13 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"qTO" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
+/turf/simulated/floor/plasteel,
+/area/security/main)
 "qUv" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/space,
@@ -81444,6 +81585,21 @@
 "rgM" = (
 /turf/simulated/wall/r_wall,
 /area/engine/hardsuitstorage)
+"rhh" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mimeoffice)
 "rhk" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -81498,6 +81654,17 @@
 /obj/effect/decal/warning_stripes/northwest,
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"rtY" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "ruR" = (
 /obj/effect/decal/warning_stripes/north,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -81669,11 +81836,6 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
-"rUV" = (
-/obj/structure/punching_bag,
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel,
-/area/crew_quarters/dorms)
 "rWq" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -81725,15 +81887,6 @@
 	icon_state = "dark"
 	},
 /area/engine/engineering)
-"sbC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/fsmaint)
 "scM" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -81937,18 +82090,6 @@
 /obj/item/plant_analyzer,
 /turf/simulated/floor/grass,
 /area/security/permabrig)
-"sGg" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plasteel{
-	icon_regular_floor = "yellowsiding";
-	icon_state = "tranquillite"
-	},
-/area/mimeoffice)
 "sHt" = (
 /turf/simulated/floor/engine,
 /area/holodeck/alphadeck)
@@ -81994,6 +82135,20 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/dorms)
+"sQe" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/machinery/newscaster{
+	name = "east bump";
+	pixel_x = 32
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "grimy"
+	},
+/area/hallway/secondary/entry)
 "sSb" = (
 /obj/structure/cable/yellow{
 	d1 = 2;
@@ -82022,6 +82177,12 @@
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/grass,
 /area/security/permabrig)
+"sXh" = (
+/obj/machinery/vending/autodrobe,
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/crew_quarters/dorms)
 "sZe" = (
 /obj/effect/decal/cleanable/cobweb2,
 /obj/effect/decal/cleanable/dirt,
@@ -82098,6 +82259,10 @@
 	},
 /turf/simulated/floor/engine,
 /area/engine/engineering)
+"tuZ" = (
+/obj/structure/weightmachine/stacklifter,
+/turf/simulated/floor/plasteel,
+/area/crew_quarters/dorms)
 "tvr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -82392,6 +82557,15 @@
 	icon_state = "wood-broken5"
 	},
 /area/maintenance/apmaint2)
+"ucs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "ufc" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -82567,16 +82741,6 @@
 "uLp" = (
 /turf/simulated/floor/wood,
 /area/security/permabrig)
-"uNO" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/closet/boxinggloves,
-/turf/simulated/floor/plasteel{
-	icon_state = "caution";
-	dir = 10
-	},
-/area/crew_quarters/dorms)
 "uPT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -82793,18 +82957,17 @@
 	icon_state = "red"
 	},
 /area/security/brig)
-"vtZ" = (
-/obj/structure/chair/stool{
-	dir = 1
+"vvy" = (
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "44"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "cafeteria"
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/area/crew_quarters/dorms)
-"vxp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/barricade/wooden,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "vxy" = (
@@ -83037,6 +83200,19 @@
 	icon_state = "dark"
 	},
 /area/security/execution)
+"weF" = (
+/obj/structure/table/wood,
+/obj/item/storage/pill_bottle/dice,
+/turf/simulated/floor/plasteel{
+	icon_state = "bar"
+	},
+/area/crew_quarters/dorms)
+"wfQ" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+	icon_state = "caution"
+	},
+/area/crew_quarters/dorms)
 "whv" = (
 /obj/machinery/computer/HolodeckControl{
 	dir = 4
@@ -83495,17 +83671,6 @@
 "xBl" = (
 /turf/simulated/floor/grass,
 /area/security/permabrig)
-"xBz" = (
-/obj/machinery/camera{
-	c_tag = "Dormitories East";
-	dir = 8
-	},
-/obj/structure/table/wood,
-/obj/item/deck/cards,
-/turf/simulated/floor/plasteel{
-	icon_state = "cafeteria"
-	},
-/area/crew_quarters/dorms)
 "xDw" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 1
@@ -83519,13 +83684,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/engine/hardsuitstorage)
-"xIl" = (
-/obj/machinery/vending/cola,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "caution"
-	},
-/area/crew_quarters/dorms)
 "xJa" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 6
@@ -83634,13 +83792,6 @@
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
 /turf/simulated/wall/r_wall,
 /area/security/permabrig)
-"xRd" = (
-/obj/structure/closet/masks,
-/turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "caution"
-	},
-/area/crew_quarters/dorms)
 "xRI" = (
 /obj/machinery/camera{
 	c_tag = "Prison Solitary External";
@@ -98119,7 +98270,7 @@ aZh
 aUt
 bgB
 bhO
-aSY
+sQe
 bhv
 bhv
 aSY
@@ -107855,7 +108006,7 @@ wrj
 aqX
 nuk
 atg
-gVE
+fNQ
 gVE
 nsZ
 oSF
@@ -111954,7 +112105,7 @@ ajk
 aqR
 alh
 agt
-amz
+jVf
 anz
 aou
 aph
@@ -117348,7 +117499,7 @@ acx
 acE
 acE
 anA
-aoJ
+qTO
 alq
 afK
 amr
@@ -121518,7 +121669,7 @@ byE
 bwn
 bdT
 bdT
-bAk
+fzd
 bHy
 bAk
 bEo
@@ -121749,11 +121900,11 @@ aFK
 aFK
 aFK
 aPk
-ifo
-uNO
+ePV
+iGP
 aVt
 aXf
-bgd
+weF
 aIe
 bdo
 aIP
@@ -122776,12 +122927,12 @@ sHt
 sHt
 sHt
 aOI
-rUV
+gCU
 aPm
 aSM
-dqo
+aIF
 aZL
-eJe
+sXh
 aLA
 aLA
 aLA
@@ -123041,7 +123192,7 @@ aZL
 aZL
 aIh
 bds
-mCL
+edu
 bhl
 aLA
 bbI
@@ -123290,16 +123441,16 @@ aOI
 aOI
 aOI
 aOI
-oGB
+tuZ
 aPm
-fcu
-fxz
+wfQ
+omD
 aZL
 aZL
 bbD
 aXi
 rHR
-gWB
+jqS
 aLA
 bbV
 aGY
@@ -123547,7 +123698,7 @@ aOI
 aUW
 aLc
 aOI
-oGB
+tuZ
 aPm
 aSM
 aVv
@@ -123555,9 +123706,9 @@ aZL
 aZL
 aIh
 bdt
-sGg
-hBS
-ahy
+dzb
+rhh
+vvy
 bbU
 beJ
 beb
@@ -123800,20 +123951,20 @@ sPb
 lop
 xcB
 mzv
-imM
-sbC
+ljR
+fUX
 aGY
 aOI
-xIl
-lPM
-xRd
+nqG
+edM
+emL
 aVv
-xBz
-vtZ
+lOY
+fIB
 aLA
-qbn
-etX
-duz
+nNB
+afN
+epW
 aLA
 bbY
 bfO
@@ -124064,7 +124215,7 @@ aOI
 aOI
 aOI
 aOI
-owb
+idg
 aOI
 aOI
 aLA
@@ -124314,17 +124465,17 @@ aaa
 aab
 aab
 aab
-kaI
-apF
-aIF
+qFv
+ucs
+oHO
 aRX
 aRX
 aRX
-vxp
-gsJ
+naU
+qhT
 aGY
-eDY
-hlX
+mxZ
+knB
 aMz
 aLc
 aNh
@@ -124587,7 +124738,7 @@ aGY
 aXW
 bjX
 bcb
-odR
+rtY
 beb
 bfD
 bjV
@@ -127458,7 +127609,7 @@ cpR
 csA
 ctB
 cuO
-crL
+npS
 cpR
 cxT
 csL
@@ -129011,7 +129162,7 @@ aaa
 aaa
 aaa
 cBR
-cKY
+cPp
 cEH
 cPp
 cEH
diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm
index 75b3777f4e0..0dd8f4ed37e 100644
--- a/code/modules/newscaster/obj/newscaster.dm
+++ b/code/modules/newscaster/obj/newscaster.dm
@@ -53,6 +53,7 @@
 
 /obj/machinery/newscaster/security_unit
 	name = "security newscaster"
+	desc = "A security Nanotrasen-licensed newsfeed handler for use in commercial space stations. It comes with a small slot for inserting photos."
 	is_security = TRUE
 
 /obj/machinery/newscaster/Initialize(mapload)
diff --git a/icons/obj/terminals.dmi b/icons/obj/terminals.dmi
index f6541a96c4b..b2da5b801ef 100644
Binary files a/icons/obj/terminals.dmi and b/icons/obj/terminals.dmi differ