diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..d90dd34b993
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*]
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 22c65977d92..2f71bf841ce 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -211,10 +211,10 @@
 	possible_destinations = "pod_asteroid1";
 	shuttleId = "pod1"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_1)
 "aaA" = (
 /obj/structure/chair{
@@ -231,17 +231,17 @@
 	possible_destinations = "pod_asteroid2";
 	shuttleId = "pod2"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_2)
 "aaB" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/mining_construction)
 "aaC" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -260,10 +260,10 @@
 /obj/item/weapon/storage/pod{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_1)
 "aaF" = (
 /obj/structure/chair{
@@ -275,10 +275,10 @@
 /obj/item/weapon/storage/pod{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_2)
 "aaG" = (
 /turf/closed/wall,
@@ -298,10 +298,10 @@
 	pixel_x = -23;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -309,10 +309,10 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -329,8 +329,8 @@
 	name = "escape pod 1";
 	port_angle = 180
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/end,
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_1)
 "aaM" = (
 /obj/structure/shuttle/engine/propulsion/burst,
@@ -345,8 +345,8 @@
 	name = "escape pod 2";
 	port_angle = 180
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/end,
+/turf/open/floor/plasteel/white,
 /area/shuttle/pod_2)
 "aaO" = (
 /obj/item/stack/cable_coil,
@@ -354,18 +354,18 @@
 /turf/open/space,
 /area/solar/auxstarboard)
 "aaP" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "aaQ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -374,19 +374,19 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "aaS" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -394,10 +394,10 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -406,24 +406,24 @@
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/mining_construction)
 "aaV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/external{
 	name = "Escape Pod 1"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -432,12 +432,12 @@
 /obj/machinery/door/airlock/external{
 	name = "Escape Pod 2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -451,29 +451,29 @@
 /obj/structure/sign/vacuum{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "aaY" = (
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "aaZ" = (
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "aba" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -481,18 +481,18 @@
 /obj/structure/sign/pods{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "abc" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -503,10 +503,10 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -522,12 +522,12 @@
 	pixel_x = 32;
 	tag = "icon-doors"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/mining_construction)
 "abf" = (
 /turf/closed/wall/r_wall,
@@ -579,10 +579,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abn" = (
 /obj/machinery/power/smes,
@@ -590,10 +590,10 @@
 	tag = "icon-0-8";
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abo" = (
 /obj/item/device/radio/intercom{
@@ -604,10 +604,10 @@
 	c_tag = "Solar - Fore Starboard";
 	name = "solar camera"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abp" = (
 /obj/structure/shuttle/engine/propulsion{
@@ -615,10 +615,10 @@
 	icon_state = "propulsion";
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/shuttle/arrival)
 "abq" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -668,10 +668,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarstarboard)
 "abv" = (
 /obj/structure/cable/white{
@@ -686,10 +686,10 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abw" = (
 /obj/machinery/power/terminal{
@@ -718,10 +718,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "aby" = (
 /obj/structure/cable{
@@ -735,10 +735,10 @@
 	name = "External Solar Access";
 	req_access_txt = "10"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarstarboard)
 "abz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -750,8 +750,8 @@
 	tag = ""
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarstarboard)
 "abA" = (
 /obj/structure/lattice/catwalk,
@@ -775,10 +775,10 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -800,10 +800,10 @@
 	dir = 8;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -814,10 +814,10 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -834,10 +834,10 @@
 	dir = 8;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -848,10 +848,10 @@
 	icon_state = "heater";
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/shuttle/arrival)
 "abG" = (
 /obj/machinery/status_display{
@@ -865,10 +865,10 @@
 	dir = 4;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -880,10 +880,10 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -934,17 +934,17 @@
 	name = "Fore Starboard Solar APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abN" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abO" = (
 /obj/machinery/power/solar_control{
@@ -953,10 +953,10 @@
 	track = 0
 	},
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "abP" = (
 /obj/structure/grille,
@@ -974,10 +974,10 @@
 	})
 "abQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -991,10 +991,10 @@
 	})
 "abS" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1106,18 +1106,18 @@
 	pixel_y = 9
 	},
 /obj/structure/closet/crate/internals,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "abZ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "aca" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/toolbox/emergency,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acb" = (
 /obj/structure/table/reinforced,
@@ -1129,14 +1129,14 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/firstaid/regular,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acc" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acd" = (
 /obj/structure/rack,
@@ -1169,18 +1169,18 @@
 /obj/machinery/door/airlock/external{
 	name = "External Docking Port"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "aci" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1188,17 +1188,17 @@
 /obj/machinery/door/airlock/external{
 	name = "External Docking Port"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "ack" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1207,10 +1207,10 @@
 	name = "Arrival Shuttle Airlock";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/arrival)
 "acm" = (
 /turf/open/floor/plasteel/neutral/side{
@@ -1237,12 +1237,12 @@
 	name = "Auxiliary Construction Storage";
 	req_access_txt = "32;47;48"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/mining_construction)
 "acq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -1250,10 +1250,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1283,8 +1283,8 @@
 /area/shuttle/arrival)
 "act" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acu" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -1347,28 +1347,28 @@
 	},
 /area/mining_construction)
 "acz" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acA" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acB" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acC" = (
 /obj/structure/closet/emcloset,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1380,8 +1380,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1392,17 +1392,17 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "acF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1416,8 +1416,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1426,16 +1426,16 @@
 	dir = 4
 	},
 /obj/effect/landmark/latejoin,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acI" = (
 /obj/structure/chair{
 	dir = 8
 	},
 /obj/effect/landmark/latejoin,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "acJ" = (
 /obj/structure/flora/ausbushes/grassybush,
@@ -1450,8 +1450,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1460,10 +1460,10 @@
 	id = "construction";
 	name = "Construction Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "acM" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1502,10 +1502,10 @@
 	},
 /area/mining_construction)
 "acP" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acQ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1515,15 +1515,15 @@
 /turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acS" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "acT" = (
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1535,8 +1535,8 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1544,8 +1544,8 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1553,8 +1553,8 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1564,8 +1564,8 @@
 /area/shuttle/arrival)
 "acY" = (
 /obj/machinery/vending/cola,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1575,10 +1575,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1594,10 +1594,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1609,10 +1609,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "add" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
@@ -1648,8 +1648,8 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1663,8 +1663,8 @@
 /area/shuttle/arrival)
 "adi" = (
 /obj/item/device/radio/beacon,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1739,8 +1739,8 @@
 "adq" = (
 /obj/structure/closet/firecloset,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1751,8 +1751,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1760,8 +1760,8 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1814,10 +1814,10 @@
 /obj/machinery/door/airlock/external{
 	name = "Auxiliary Base Airlock"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/mining_construction)
 "adx" = (
 /obj/machinery/light{
@@ -1909,10 +1909,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1923,10 +1923,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1946,10 +1946,10 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -1973,15 +1973,15 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/clipboard,
 /obj/item/toy/figure/assistant,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "adO" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/folder,
 /obj/item/weapon/storage/pill_bottle/dice,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "adP" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -2067,19 +2067,19 @@
 /area/shuttle/syndicate)
 "adZ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "aea" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2095,10 +2095,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2112,10 +2112,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "aee" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -2158,8 +2158,8 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "aej" = (
 /turf/open/floor/plasteel/neutral/side,
@@ -2184,8 +2184,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/secure/briefcase,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/arrival)
 "aeo" = (
 /obj/machinery/door/firedoor,
@@ -2194,10 +2194,10 @@
 	req_access_txt = "0";
 	req_one_access_txt = "32;47;48"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/mining_construction)
 "aep" = (
 /obj/structure/table/reinforced,
@@ -2213,16 +2213,16 @@
 	},
 /area/mining_construction)
 "aeq" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "aer" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "aes" = (
 /turf/open/space,
@@ -2253,10 +2253,10 @@
 "aew" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2269,12 +2269,12 @@
 	name = "Cockpit";
 	req_access_txt = "19"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/shuttle/arrival)
 "aez" = (
 /obj/machinery/ai_status_display,
@@ -2334,8 +2334,8 @@
 	},
 /area/mining_construction)
 "aeD" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/auxillary_base)
 "aeE" = (
 /turf/open/space,
@@ -2389,10 +2389,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2410,10 +2410,10 @@
 	dir = 8;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2425,10 +2425,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2446,10 +2446,10 @@
 	dir = 8;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2484,10 +2484,10 @@
 	dir = 4;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2500,10 +2500,10 @@
 	icon_state = "tube1"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2518,12 +2518,12 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/mining_construction)
 "aeT" = (
 /obj/structure/chair{
@@ -2551,27 +2551,21 @@
 /area/shuttle/arrival)
 "aeX" = (
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aeY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/emcloset,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aeZ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -2579,9 +2573,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -2593,35 +2585,27 @@
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
 	tag = "icon-neutral (NORTHEAST)"
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afc" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afd" = (
 /obj/machinery/vending/snack,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plasteel/vault{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afe" = (
 /obj/machinery/vending/cola,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aff" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -2633,9 +2617,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afg" = (
 /obj/structure/chair/stool,
 /obj/machinery/light/small{
@@ -2645,9 +2627,7 @@
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel/vault,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afh" = (
 /obj/structure/table/wood,
 /obj/machinery/newscaster{
@@ -2655,16 +2635,12 @@
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/vault,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afi" = (
 /obj/structure/chair/stool,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -2674,9 +2650,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/vault,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afk" = (
 /obj/machinery/porta_turret/syndicate{
 	dir = 4
@@ -2686,10 +2660,10 @@
 "afl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2699,19 +2673,15 @@
 	req_access_txt = "12"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afn" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -2719,53 +2689,39 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afp" = (
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afq" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afr" = (
 /obj/structure/door_assembly/door_assembly_mhatch,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afs" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aft" = (
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afu" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afv" = (
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/open/floor/plasteel/podhatch{
@@ -2780,43 +2736,43 @@
 /area/shuttle/syndicate)
 "afx" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afy" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afA" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -2827,9 +2783,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -2841,9 +2795,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -2853,11 +2805,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -2872,30 +2822,24 @@
 	dir = 4
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afI" = (
 /obj/effect/landmark{
 	name = "blobstart"
@@ -2904,9 +2848,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -2914,9 +2856,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afK" = (
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/open/floor/plasteel/podhatch{
@@ -2984,24 +2924,24 @@
 "afO" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afP" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3009,12 +2949,12 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3028,41 +2968,35 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "afT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afV" = (
 /obj/structure/table_frame/wood,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afW" = (
 /obj/item/chair/stool/bar{
 	pixel_y = -8
@@ -3070,36 +3004,26 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/vomit/old,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afX" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afY" = (
 /obj/machinery/light/small,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "afZ" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aga" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agb" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -3140,8 +3064,8 @@
 "agh" = (
 /obj/structure/table,
 /obj/item/weapon/storage/briefcase,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3378,17 +3302,15 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "agA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -3399,9 +3321,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agC" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -3410,25 +3330,19 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agD" = (
 /obj/structure/table/reinforced,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agE" = (
 /obj/structure/sign/nosmoking_2,
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agF" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/reagent_containers/food/condiment/saltshaker{
@@ -3438,11 +3352,9 @@
 /obj/item/weapon/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "agG" = (
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -3471,8 +3383,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3696,8 +3608,8 @@
 	pixel_x = 32
 	},
 /obj/item/weapon/storage/toolbox/emergency,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3708,9 +3620,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -3718,14 +3628,10 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahh" = (
 /turf/open/floor/plasteel/red/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahi" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -3734,16 +3640,12 @@
 	dir = 2;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahj" = (
 /turf/open/floor/plasteel/white/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahk" = (
 /obj/structure/sink/kitchen{
 	desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -3753,19 +3655,15 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/red/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahl" = (
 /obj/structure/closet/crate/freezer/blood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahm" = (
 /obj/structure/sink/kitchen{
 	desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -3774,9 +3672,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/white/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahn" = (
 /obj/structure/table,
 /obj/item/clothing/gloves/color/latex,
@@ -3785,9 +3681,7 @@
 /turf/open/floor/plasteel/red/corner{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aho" = (
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/open/floor/plasteel/podhatch{
@@ -3831,12 +3725,12 @@
 	name = "Auxiliary Storage Closet";
 	req_access_txt = "32"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -3857,12 +3751,12 @@
 	req_access_txt = "32"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/vacantoffice)
 "ahy" = (
 /obj/machinery/status_display,
@@ -3879,15 +3773,13 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ahA" = (
 /turf/closed/wall,
 /area/bridge{
@@ -3941,23 +3833,23 @@
 "ahG" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "ahH" = (
 /obj/machinery/vending/clothing,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "ahI" = (
 /obj/machinery/vending/coffee,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -4011,9 +3903,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -4025,11 +3915,9 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -4042,13 +3930,11 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahR" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -4057,9 +3943,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/red,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -4068,15 +3952,11 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahT" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/red,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (EAST)";
@@ -4084,9 +3964,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahV" = (
 /obj/machinery/newscaster{
 	pixel_x = 32;
@@ -4097,11 +3975,9 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -4114,20 +3990,16 @@
 	req_access_txt = "12"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahX" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -4135,9 +4007,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/red,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ahZ" = (
 /obj/structure/table/optable,
 /obj/effect/decal/cleanable/blood/old,
@@ -4147,38 +4017,28 @@
 	icon_state = "whitehall";
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aia" = (
 /obj/machinery/ai_status_display,
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/syndicate)
 "aib" = (
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aic" = (
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aid" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aie" = (
 /obj/structure/table,
 /obj/item/weapon/storage/toolbox/emergency,
 /obj/item/weapon/tank/internals/oxygen,
 /obj/item/weapon/wrench,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aif" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
@@ -4265,11 +4125,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aiq" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/box/ids,
@@ -4364,9 +4222,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiz" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -4378,9 +4234,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiA" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -4392,9 +4246,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -4405,9 +4257,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiC" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -4419,9 +4269,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiD" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -4430,9 +4278,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiE" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -4441,46 +4287,36 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/reagent_containers/blood/random,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiF" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiG" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiH" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/storage/box/donkpockets,
 /obj/item/weapon/kitchen/knife/butcher,
 /obj/item/stack/packageWrap,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiI" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/apron/chef,
 /obj/item/clothing/head/chefhat,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiJ" = (
 /obj/structure/table,
 /obj/machinery/microwave{
@@ -4493,11 +4329,9 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
@@ -4505,11 +4339,9 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiL" = (
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/dirt,
@@ -4517,9 +4349,7 @@
 /turf/open/floor/plasteel/white/side{
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiM" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -4528,9 +4358,7 @@
 /turf/open/floor/plasteel/red/corner{
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aiN" = (
 /obj/machinery/sleeper/syndie{
 	dir = 4
@@ -4658,16 +4486,12 @@
 	})
 "aiX" = (
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aiY" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aiZ" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -4680,9 +4504,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aja" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (EAST)";
@@ -4690,17 +4512,13 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ajb" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ajc" = (
 /obj/structure/chair/office/dark{
 	dir = 1
@@ -4772,9 +4590,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ajm" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -4810,8 +4626,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/bridge{
 	name = "Customs"
 	})
@@ -4841,10 +4657,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge{
 	name = "Customs"
 	})
@@ -4923,10 +4739,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "ajy" = (
 /obj/machinery/light_switch{
@@ -4953,8 +4769,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "ajA" = (
 /obj/structure/cable/white{
@@ -4980,26 +4796,20 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajC" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajD" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajE" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -5007,18 +4817,14 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
 /obj/item/weapon/crowbar/red,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate{
@@ -5030,15 +4836,11 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajH" = (
 /obj/structure/sign/poster,
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ajI" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
@@ -5129,9 +4931,7 @@
 /obj/item/clothing/under/waiter,
 /obj/item/clothing/tie/waistcoat,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajR" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -5142,9 +4942,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajS" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/box/matches{
@@ -5152,9 +4950,7 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajT" = (
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -5163,25 +4959,19 @@
 	dir = 1
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajU" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajV" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajW" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/briefcase,
@@ -5189,17 +4979,13 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajX" = (
 /obj/structure/table/wood,
 /obj/item/weapon/electronics/firelock,
 /obj/item/weapon/electronics/airlock,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajY" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -5208,9 +4994,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ajZ" = (
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -5222,17 +5006,13 @@
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aka" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
 /obj/item/weapon/electronics/apc,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akb" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -5242,9 +5022,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "akc" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -5256,9 +5034,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "akd" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	tag = "icon-connector_map (WEST)";
@@ -5267,9 +5043,7 @@
 	},
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ake" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
@@ -5319,9 +5093,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "akn" = (
 /obj/machinery/computer/crew,
 /obj/machinery/ai_status_display{
@@ -5484,16 +5256,12 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akE" = (
 /obj/machinery/computer/arcade,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akF" = (
 /obj/structure/cable/white{
 	tag = "icon-0-2";
@@ -5509,9 +5277,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/stool/bar,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akG" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -5520,35 +5286,27 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akH" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akI" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akJ" = (
 /obj/structure/table/wood,
 /obj/item/clothing/suit/syndicatefake,
 /obj/item/clothing/head/syndicatefake,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "akK" = (
 /turf/open/floor/plasteel/podhatch{
 	dir = 9
@@ -5611,14 +5369,10 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akT" = (
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akU" = (
 /obj/structure/table/wood,
 /obj/item/clothing/neck/tie/red,
@@ -5626,21 +5380,15 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akV" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akW" = (
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akX" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -5650,9 +5398,7 @@
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akY" = (
 /obj/structure/table/wood,
 /obj/item/weapon/poster/contraband{
@@ -5665,9 +5411,7 @@
 	},
 /obj/item/weapon/poster/contraband,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "akZ" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -5676,23 +5420,17 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ala" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alb" = (
 /obj/structure/frame/computer,
 /obj/item/stack/cable_coil/white,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alc" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -5704,9 +5442,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ald" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	tag = "icon-connector_map (WEST)";
@@ -5717,9 +5453,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ale" = (
 /obj/machinery/airalarm{
 	dir = 4;
@@ -5788,10 +5522,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/vacantoffice)
 "all" = (
 /obj/structure/cable/white{
@@ -5807,11 +5541,9 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "alm" = (
 /obj/machinery/computer/card,
 /obj/machinery/light{
@@ -5878,17 +5610,17 @@
 	name = "Customs Desk";
 	req_access_txt = "19"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge{
 	name = "Customs"
 	})
 "alq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -5906,8 +5638,8 @@
 "alt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -5921,10 +5653,10 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "alv" = (
 /obj/structure/cable/white{
@@ -5976,9 +5708,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -5989,9 +5719,7 @@
 	name = "blobstart"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alA" = (
 /obj/structure/table/wood,
 /obj/item/toy/carpplushie,
@@ -5999,35 +5727,27 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alB" = (
 /obj/machinery/computer/arcade,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alC" = (
 /obj/machinery/computer/arcade,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alD" = (
 /obj/structure/table/wood,
 /obj/item/weapon/coin/antagtoken,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alE" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -6035,9 +5755,7 @@
 	},
 /obj/structure/chair/stool/bar,
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alF" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
@@ -6046,26 +5764,20 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alG" = (
 /obj/structure/chair/office/dark{
 	dir = 8
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alH" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
 /obj/item/toy/syndicateballoon,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "alI" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -6153,9 +5865,7 @@
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alT" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
@@ -6164,25 +5874,19 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alW" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
@@ -6191,9 +5895,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alX" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
@@ -6203,9 +5905,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alY" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
@@ -6216,26 +5916,20 @@
 	dir = 1
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "alZ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 8;
 	on = 1
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ama" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "amb" = (
 /obj/structure/frame/computer,
 /obj/item/weapon/circuitboard/computer/secure_data,
@@ -6243,17 +5937,13 @@
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "amc" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "amd" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -6263,15 +5953,11 @@
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ame" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "amf" = (
 /obj/structure/chair/office/dark,
 /turf/open/floor/plasteel/grimy,
@@ -6308,9 +5994,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "amk" = (
 /obj/machinery/computer/med_data,
 /obj/machinery/status_display{
@@ -6357,8 +6041,8 @@
 	})
 "amo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -6452,52 +6136,38 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amz" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
 	layer = 4.1
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amA" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amB" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amC" = (
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amD" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amE" = (
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amF" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -6517,17 +6187,13 @@
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amG" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder/blue,
 /obj/item/clothing/head/collectable/HoP,
 /turf/open/floor/plasteel/redyellow,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "amH" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
@@ -6542,13 +6208,13 @@
 	id = "garbage";
 	verted = -1
 	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_end (WEST)";
 	icon_state = "plating_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 8
-	},
 /area/maintenance/disposal)
 "amJ" = (
 /obj/machinery/conveyor{
@@ -6562,13 +6228,13 @@
 /obj/structure/sign/vacuum{
 	pixel_y = 32
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (WEST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/maintenance/disposal)
 "amK" = (
 /obj/machinery/conveyor{
@@ -6579,13 +6245,13 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (WEST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/maintenance/disposal)
 "amL" = (
 /obj/machinery/mass_driver{
@@ -6595,13 +6261,13 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (WEST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/maintenance/disposal)
 "amM" = (
 /obj/machinery/door/poddoor{
@@ -6609,10 +6275,10 @@
 	name = "Disposals Launch Seal"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "amN" = (
 /obj/structure/window/reinforced{
@@ -6794,9 +6460,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ane" = (
 /obj/structure/table/wood,
 /obj/item/weapon/electronics/airalarm,
@@ -6804,15 +6468,11 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "anf" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ang" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -6823,9 +6483,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "anh" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder/red,
@@ -6835,9 +6493,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ani" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -6849,18 +6505,14 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "anj" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "ank" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -6869,18 +6521,14 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "anl" = (
 /obj/structure/frame/computer,
 /obj/machinery/status_display{
 	pixel_x = 32
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "anm" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -6888,9 +6536,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ann" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/neutral/side{
@@ -6898,9 +6544,7 @@
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
 	tag = "icon-neutral (SOUTHEAST)"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ano" = (
 /obj/structure/table/wood,
 /obj/item/weapon/phone{
@@ -7116,9 +6760,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anJ" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -7131,11 +6773,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anK" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7148,9 +6788,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anL" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7160,9 +6798,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anM" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7174,9 +6810,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anN" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7189,9 +6823,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anO" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -7201,17 +6833,13 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anP" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "anQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -7231,10 +6859,10 @@
 	id = "garbage"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "anS" = (
 /obj/machinery/button/door{
@@ -7259,8 +6887,8 @@
 	icon_state = "pipe-c"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "anT" = (
 /obj/machinery/conveyor_switch/oneway{
@@ -7272,8 +6900,8 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "anU" = (
 /obj/structure/disposalpipe/segment{
@@ -7282,8 +6910,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "anV" = (
 /obj/structure/disposalpipe/segment{
@@ -7293,8 +6921,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "anW" = (
 /obj/item/weapon/surgicaldrill,
@@ -7364,9 +6992,7 @@
 /obj/item/weapon/stock_parts/console_screen,
 /obj/item/weapon/circuitboard/machine/microwave,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoc" = (
 /obj/machinery/newscaster{
 	pixel_y = -32
@@ -7375,9 +7001,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aod" = (
 /obj/structure/table/wood,
 /obj/item/weapon/poster/contraband{
@@ -7390,9 +7014,7 @@
 	},
 /obj/item/weapon/poster/contraband,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoe" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -7402,29 +7024,21 @@
 	tag = "icon-wood-broken";
 	icon_state = "wood-broken"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aof" = (
 /obj/machinery/light/small,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aog" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoh" = (
 /turf/open/floor/wood{
 	tag = "icon-wood-broken7";
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoi" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -7439,9 +7053,7 @@
 	pixel_y = -26
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoj" = (
 /obj/structure/table/wood,
 /obj/machinery/newscaster{
@@ -7450,16 +7062,12 @@
 /obj/item/weapon/folder/red,
 /obj/item/weapon/lighter,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aok" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aol" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -7470,15 +7078,13 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aom" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -7487,9 +7093,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aon" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -7501,12 +7105,12 @@
 	req_access_txt = "19"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/bridge{
 	name = "Customs"
 	})
@@ -7521,12 +7125,12 @@
 	req_access_txt = "63"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint2)
 "aop" = (
 /obj/structure/cable/white{
@@ -7536,37 +7140,27 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aoq" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aor" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aos" = (
 /turf/open/floor/plasteel/black,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aot" = (
 /obj/structure/table/wood,
 /obj/item/toy/talking/AI,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aou" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -7596,8 +7190,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "aow" = (
 /obj/machinery/conveyor{
@@ -7612,8 +7206,8 @@
 	req_access_txt = "12"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "aox" = (
 /obj/machinery/mineral/stacking_machine{
@@ -7626,8 +7220,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "aoy" = (
 /obj/machinery/mineral/stacking_unit_console{
@@ -7672,8 +7266,8 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/syndicate)
 "aoD" = (
 /turf/open/space,
@@ -7724,12 +7318,12 @@
 	req_access_txt = "24"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -7747,21 +7341,19 @@
 	req_access_txt = "24"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aoM" = (
 /obj/structure/sign/poster,
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/area/crew_quarters/electronic_marketing_den)
 "aoN" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -7773,15 +7365,13 @@
 	icon_state = "1-2"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/crew_quarters/electronic_marketing_den)
 "aoO" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -7790,29 +7380,23 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/crew_quarters/bar{
-	name = "Electronic Marketing Den"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/crew_quarters/electronic_marketing_den)
 "aoP" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoQ" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -7821,41 +7405,31 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoS" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoT" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoU" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoV" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -7865,9 +7439,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoX" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7876,9 +7448,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -7886,9 +7456,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aoZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -7904,9 +7472,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apa" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -7917,9 +7483,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -7931,20 +7495,16 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/space_heater,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apd" = (
 /obj/machinery/light{
 	dir = 8
@@ -7973,8 +7533,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -7986,8 +7546,8 @@
 	dir = 2;
 	name = "arrivals camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -7997,8 +7557,8 @@
 	name = "Station Intercom";
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
@@ -8031,9 +7591,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8042,9 +7600,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apm" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -8055,9 +7611,7 @@
 	name = "3maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apn" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -8066,40 +7620,30 @@
 	name = "arcade coin"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apo" = (
 /obj/machinery/computer/arcade,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "app" = (
 /obj/structure/table/wood,
 /obj/item/toy/talking/codex_gigas,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apq" = (
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/regular/hipster,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apr" = (
 /obj/machinery/computer/arcade,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aps" = (
 /obj/machinery/airalarm{
 	dir = 1;
@@ -8113,18 +7657,14 @@
 	name = "arcade coin"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apt" = (
 /obj/structure/table/wood,
 /obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "apu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -8139,20 +7679,20 @@
 	id = "garbage";
 	verted = -1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "apw" = (
 /obj/machinery/conveyor{
 	dir = 4;
 	id = "garbage"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "apx" = (
 /obj/machinery/conveyor{
@@ -8160,10 +7700,10 @@
 	id = "garbage"
 	},
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "apy" = (
 /obj/machinery/conveyor{
@@ -8179,10 +7719,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "apz" = (
 /obj/structure/disposalpipe/segment,
@@ -8197,20 +7737,20 @@
 /obj/structure/shuttle/engine/propulsion{
 	icon_state = "propulsion_l"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/syndicate)
 "apB" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/syndicate)
 "apC" = (
 /obj/structure/shuttle/engine/propulsion{
 	icon_state = "propulsion_r"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/syndicate)
 "apD" = (
 /obj/structure/cable{
@@ -8232,8 +7772,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8241,10 +7781,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8260,10 +7800,10 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8288,10 +7828,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8304,10 +7844,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8319,19 +7859,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "apL" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8370,10 +7910,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8381,10 +7921,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8395,18 +7935,18 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "apS" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8414,8 +7954,8 @@
 /obj/structure/table/reinforced,
 /obj/item/clothing/suit/radiation,
 /obj/item/clothing/head/radiation,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -8427,9 +7967,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8437,9 +7975,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8449,9 +7985,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apX" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -8462,18 +7996,14 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apY" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "apZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8483,9 +8013,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8498,9 +8026,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqb" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8510,9 +8036,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8523,9 +8047,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8539,9 +8061,7 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqe" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8550,11 +8070,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqf" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8566,9 +8084,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqg" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8578,9 +8094,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqh" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -8596,26 +8110,20 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/corner,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqk" = (
 /obj/structure/closet/crate{
 	icon_state = "crateopen";
@@ -8629,9 +8137,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aql" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -8640,9 +8146,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqm" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -8653,25 +8157,19 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -8684,18 +8182,14 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqq" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqr" = (
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
@@ -8710,9 +8204,7 @@
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -8722,9 +8214,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqt" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -8735,9 +8225,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqu" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8750,9 +8238,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqv" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -8769,13 +8255,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aqw" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -8890,13 +8374,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -8906,9 +8388,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqG" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -8920,9 +8400,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8933,9 +8411,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8952,9 +8428,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -8964,9 +8438,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -8974,32 +8446,26 @@
 	req_access_txt = "12"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "aqN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -9016,10 +8482,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "aqP" = (
 /obj/machinery/light/small{
@@ -9031,10 +8497,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "aqQ" = (
 /obj/structure/disposalpipe/segment{
@@ -9054,10 +8520,10 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "aqS" = (
 /obj/machinery/conveyor{
@@ -9069,8 +8535,8 @@
 	icon_state = "pipe-c"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "aqT" = (
 /obj/machinery/conveyor{
@@ -9083,8 +8549,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "aqU" = (
 /obj/machinery/conveyor{
@@ -9093,8 +8559,8 @@
 	},
 /obj/machinery/recycler,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "aqV" = (
 /obj/machinery/door/window/eastright{
@@ -9107,10 +8573,10 @@
 	id = "garbage"
 	},
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/maintenance/disposal)
 "aqW" = (
 /obj/structure/disposalpipe/segment,
@@ -9130,16 +8596,16 @@
 /obj/item/device/analyzer,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aqZ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9204,10 +8670,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9268,10 +8734,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9310,10 +8776,10 @@
 	name = "Atmospherics Engine"
 	})
 "arm" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9338,26 +8804,22 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aro" = (
 /obj/structure/sign/poster,
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "arp" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "arq" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -9365,38 +8827,32 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "arr" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ars" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "art" = (
 /turf/closed/wall,
 /area/janitor)
@@ -9404,9 +8860,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "arv" = (
 /turf/closed/wall,
 /area/crew_quarters/toilet{
@@ -9499,9 +8953,7 @@
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -9511,9 +8963,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9528,9 +8978,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -9542,17 +8990,13 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arH" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arI" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -9567,9 +9011,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9585,9 +9027,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9600,11 +9040,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arL" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -9619,9 +9057,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arM" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -9634,9 +9070,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9650,9 +9084,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arO" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -9667,11 +9099,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9687,9 +9117,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -9707,9 +9135,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arR" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -9724,9 +9150,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "arS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -9743,10 +9167,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "arT" = (
 /obj/effect/decal/cleanable/dirt,
@@ -9774,8 +9198,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "arV" = (
 /obj/structure/disposalpipe/segment{
@@ -9787,10 +9211,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/disposal)
 "arW" = (
 /obj/structure/disposalpipe/segment{
@@ -9889,8 +9313,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9899,10 +9323,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9919,8 +9343,8 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9929,8 +9353,8 @@
 	dir = 4
 	},
 /obj/machinery/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9938,8 +9362,8 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9950,10 +9374,10 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -9997,10 +9421,10 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10014,8 +9438,8 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10024,10 +9448,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10045,10 +9469,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10067,8 +9491,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10076,16 +9500,12 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/grille,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asv" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -10093,9 +9513,7 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asw" = (
 /obj/structure/closet/crate{
 	icon_state = "crateopen";
@@ -10106,9 +9524,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asx" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -10116,9 +9532,7 @@
 /obj/item/clothing/gloves/color/white,
 /obj/item/clothing/head/rabbitears,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -10127,24 +9541,18 @@
 	icon_state = "redblue";
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asz" = (
 /obj/structure/table_frame/wood,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asA" = (
 /obj/structure/easel,
 /obj/item/weapon/canvas/twentythreeXtwentythree,
 /obj/item/weapon/canvas/twentythreeXtwentythree,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asB" = (
 /obj/structure/easel,
 /obj/item/weapon/canvas/twentythreeXtwentythree,
@@ -10152,25 +9560,19 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asC" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asD" = (
 /obj/structure/table/wood,
 /obj/item/device/camera_film,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/wood,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asE" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -10180,9 +9582,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asF" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light/small{
@@ -10209,8 +9609,8 @@
 	icon_state = "beartrap0"
 	},
 /obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "asG" = (
 /obj/vehicle/janicart,
@@ -10220,8 +9620,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/storage/bag/trash,
 /obj/item/key/janitor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "asH" = (
 /obj/structure/closet/jcloset,
@@ -10238,9 +9638,9 @@
 	},
 /obj/item/clothing/under/maid,
 /obj/item/clothing/shoes/laceup,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/space)
+/turf/open/floor/plasteel,
+/area/janitor)
 "asI" = (
 /obj/structure/closet/l3closet/janitor,
 /obj/machinery/requests_console{
@@ -10256,8 +9656,8 @@
 	dir = 2;
 	name = "service camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "asJ" = (
 /obj/structure/table/reinforced,
@@ -10286,15 +9686,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "asM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -10303,8 +9701,8 @@
 	pixel_y = 28
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -10337,12 +9735,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -10368,24 +9766,24 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "asT" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
 	name = "Fore Primary Hallway"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "asU" = (
 /obj/machinery/door/firedoor,
@@ -10393,12 +9791,12 @@
 /obj/machinery/door/airlock/glass{
 	name = "Fore Primary Hallway"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "asV" = (
 /obj/structure/sign/directions/evac{
@@ -10431,12 +9829,12 @@
 	req_access_txt = "31"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -10487,12 +9885,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/quartermaster/storage)
 "ate" = (
 /obj/structure/lattice/catwalk,
@@ -10527,8 +9925,8 @@
 	icon_state = "plant-22"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10549,10 +9947,10 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10570,10 +9968,10 @@
 	})
 "atn" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10590,10 +9988,10 @@
 	name = "scrubbers pipe"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10608,8 +10006,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -10639,9 +10037,7 @@
 "att" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -10652,15 +10048,11 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atv" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atw" = (
 /obj/structure/mirror{
 	desc = "Mirror mirror on the wall, who is the most robust of them all?";
@@ -10671,9 +10063,7 @@
 /obj/item/clothing/suit/suspenders,
 /obj/effect/landmark/costume,
 /turf/open/floor/plasteel/redblue,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atx" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 1;
@@ -10684,57 +10074,43 @@
 	icon_state = "redblue";
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aty" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/melee/skateboard,
 /turf/open/floor/plasteel/cafeteria,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atz" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atA" = (
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/wood,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atB" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
 	on = 1
 	},
 /turf/open/floor/wood,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atE" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -10743,22 +10119,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atG" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -10772,9 +10144,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atH" = (
 /obj/structure/mirror{
 	desc = "Mirror mirror on the wall, who is the most robust of them all?";
@@ -10792,8 +10162,8 @@
 /obj/item/weapon/grenade/chem_grenade/cleaner,
 /obj/item/weapon/grenade/chem_grenade/cleaner,
 /obj/item/weapon/grenade/chem_grenade/cleaner,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "atI" = (
 /obj/effect/decal/cleanable/dirt,
@@ -10849,8 +10219,8 @@
 	},
 /obj/item/weapon/reagent_containers/glass/bucket,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "atN" = (
 /obj/effect/landmark{
@@ -10859,9 +10229,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "atO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/mirror{
@@ -10873,8 +10241,8 @@
 	icon_state = "sink";
 	pixel_x = -12
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -11048,23 +10416,23 @@
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
 /obj/structure/table,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "auh" = (
 /obj/machinery/airalarm{
 	pixel_y = 22
 	},
 /obj/structure/filingcabinet/filingcabinet,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aui" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/filingcabinet/filingcabinet,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "auj" = (
 /obj/effect/decal/cleanable/dirt,
@@ -11080,8 +10448,8 @@
 "auk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aul" = (
 /obj/effect/decal/cleanable/dirt,
@@ -11148,14 +10516,14 @@
 	icon_state = "crateopen";
 	opened = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aus" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aut" = (
 /obj/machinery/status_display{
@@ -11195,8 +10563,8 @@
 	pixel_y = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11206,10 +10574,10 @@
 	dir = 6
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11235,10 +10603,10 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11254,10 +10622,10 @@
 	name = "Radiation Chamber Shutters"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11336,10 +10704,10 @@
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11350,10 +10718,10 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11365,10 +10733,10 @@
 	})
 "auL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11381,16 +10749,14 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "auN" = (
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -11399,45 +10765,33 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auP" = (
 /obj/structure/rack,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auQ" = (
 /obj/structure/table_frame/wood,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redblue,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auR" = (
 /turf/open/floor/plasteel/redblue,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auS" = (
 /turf/open/floor/plasteel/redblue/redside{
 	tag = "icon-redblue (WEST)";
 	icon_state = "redblue";
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auT" = (
 /obj/structure/dresser,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/cafeteria,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auU" = (
 /obj/structure/table/wood,
 /obj/item/device/camera,
@@ -11445,9 +10799,7 @@
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auV" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -11457,18 +10809,14 @@
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/nosmoking_2{
 	pixel_y = -32
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster{
@@ -11478,15 +10826,11 @@
 	tag = "icon-wood-broken7";
 	icon_state = "wood-broken7"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auY" = (
 /obj/machinery/photocopier,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "auZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -11497,9 +10841,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ava" = (
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
@@ -11534,17 +10876,17 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "avd" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
 /mob/living/simple_animal/hostile/lizard{
 	name = "Eats-The-Roaches";
 	real_name = "Wags-His-Tail"
 	},
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/bot,
 /area/janitor)
 "ave" = (
 /turf/open/floor/plasteel/purple/side{
@@ -11571,9 +10913,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "avh" = (
 /obj/machinery/light/small,
 /obj/structure/extinguisher_cabinet{
@@ -11688,10 +11028,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11717,8 +11057,8 @@
 "avs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/secure/loot,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11746,8 +11086,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11756,8 +11096,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11771,8 +11111,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11797,10 +11137,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -11808,39 +11148,39 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avD" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -11849,38 +11189,38 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avF" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avG" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avH" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "avI" = (
 /obj/effect/decal/cleanable/dirt,
@@ -11916,8 +11256,8 @@
 	on = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11927,10 +11267,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -11947,10 +11287,10 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12000,10 +11340,10 @@
 	name = "Radiation Chamber Shutters"
 	},
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12024,10 +11364,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12047,10 +11387,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12058,9 +11398,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "avX" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -12068,9 +11406,7 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "avY" = (
 /obj/machinery/light/small,
 /obj/machinery/power/apc{
@@ -12080,18 +11416,14 @@
 	},
 /obj/structure/cable/white,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "avZ" = (
 /obj/structure/sign/poster{
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/redblue,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awa" = (
 /obj/machinery/vending/autodrobe{
 	req_access_txt = "0"
@@ -12103,9 +11435,7 @@
 	icon_state = "redblue";
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awb" = (
 /obj/structure/table/wood,
 /obj/structure/sign/poster{
@@ -12115,9 +11445,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/effect/landmark/costume,
 /turf/open/floor/plasteel/cafeteria,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awc" = (
 /obj/structure/table/wood,
 /obj/item/weapon/lipstick/random{
@@ -12133,9 +11461,7 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/cafeteria,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awd" = (
 /obj/structure/table/wood,
 /obj/item/weapon/canvas/twentythreeXnineteen,
@@ -12148,9 +11474,7 @@
 	tag = "icon-wood-broken6";
 	icon_state = "wood-broken6"
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awe" = (
 /obj/structure/sink{
 	dir = 8;
@@ -12175,8 +11499,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "awf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -12200,8 +11524,8 @@
 /turf/open/floor/plasteel/green/side,
 /area/janitor)
 "awh" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/janitor)
 "awi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -12209,8 +11533,8 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/janitor)
 "awj" = (
 /obj/machinery/disposal/bin,
@@ -12222,27 +11546,27 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/janitor)
 "awk" = (
 /obj/machinery/door/airlock{
 	name = "Toilet Unit"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
 "awl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -12325,8 +11649,8 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -12336,8 +11660,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -12356,8 +11680,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -12383,10 +11707,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -12394,18 +11718,18 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awB" = (
 /obj/effect/decal/cleanable/dirt,
@@ -12414,10 +11738,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awC" = (
 /turf/open/floor/plasteel/neutral,
@@ -12434,31 +11758,31 @@
 	opened = 1
 	},
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awF" = (
 /obj/effect/landmark/start{
 	name = "Cargo Technician"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awG" = (
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awH" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awI" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "awJ" = (
 /turf/open/floor/plasteel/loadingarea{
@@ -12478,33 +11802,33 @@
 /area/quartermaster/storage)
 "awL" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/shuttle/supply)
 "awM" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "awN" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "awO" = (
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHEAST)"
+	},
 /area/shuttle/supply)
 "awP" = (
 /obj/structure/lattice/catwalk,
@@ -12537,8 +11861,8 @@
 	dir = 4;
 	name = "atmospherics camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12547,10 +11871,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12572,10 +11896,10 @@
 	id = "engsm";
 	name = "Radiation Chamber Shutters"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12598,10 +11922,10 @@
 	pixel_y = 0
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -12621,40 +11945,32 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "awX" = (
 /turf/closed/wall,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "awY" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "awZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
 	name = "blobstart"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "axa" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "axb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -12665,9 +11981,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "axc" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
@@ -12683,24 +11997,24 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/janitor)
 "axe" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "custodialshutters";
 	name = "Custodial Closet Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/janitor)
 "axf" = (
 /obj/machinery/door/poddoor/shutters{
@@ -12714,20 +12028,18 @@
 	req_access_txt = "26"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/janitor)
 "axg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "axh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/vomit/old,
@@ -12755,8 +12067,8 @@
 	pixel_x = -32
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -12774,8 +12086,8 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/toilet{
 	name = "\improper Auxiliary Restrooms"
 	})
@@ -12896,8 +12208,8 @@
 	freq = 1400;
 	location = "QM #1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "axw" = (
 /obj/structure/window/reinforced{
@@ -12910,10 +12222,10 @@
 "axx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "axy" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -12999,26 +12311,26 @@
 /area/quartermaster/storage)
 "axG" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "axH" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "axI" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "axJ" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "axK" = (
 /obj/structure/lattice/catwalk,
@@ -13031,8 +12343,8 @@
 /area/solar/auxport)
 "axL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13040,10 +12352,10 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13073,10 +12385,10 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13137,10 +12449,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13160,10 +12472,10 @@
 	icon_state = "pump_map";
 	name = "Nitrogen to Loop"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13178,8 +12490,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13207,11 +12519,9 @@
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/sunflower,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayb" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -13223,27 +12533,21 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayc" = (
 /obj/structure/table,
 /obj/item/clothing/suit/apron/overalls,
 /obj/item/weapon/cultivator,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayd" = (
 /obj/machinery/biogenerator,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aye" = (
 /obj/structure/table,
 /obj/item/seeds/poppy/lily{
@@ -13255,20 +12559,16 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/wheat,
 /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
 /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayf" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/tea,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayg" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -13279,11 +12579,9 @@
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayh" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap,
@@ -13292,20 +12590,16 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/tea,
 /obj/item/weapon/reagent_containers/food/snacks/grown/grapes,
 /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayi" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/poppy,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "ayj" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -13316,9 +12610,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -13334,9 +12626,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -13350,9 +12640,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aym" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -13365,9 +12653,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -13381,9 +12667,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayo" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -13396,9 +12680,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayp" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -13416,9 +12698,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -13433,9 +12713,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -13456,11 +12734,9 @@
 	name = "Bar Junction";
 	sortType = 19
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ays" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -13471,9 +12747,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -13481,11 +12755,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -13497,11 +12769,9 @@
 	name = "Custodial Junction";
 	sortType = 22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayv" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -13513,9 +12783,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -13527,9 +12795,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayx" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -13542,17 +12808,13 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "ayz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -13590,8 +12852,8 @@
 	})
 "ayD" = (
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -13609,8 +12871,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/deadcockroach,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -13630,15 +12892,15 @@
 "ayH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/storage/box/mousetraps,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
 "ayI" = (
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -13647,8 +12909,8 @@
 	opacity = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -13660,12 +12922,12 @@
 	freq = 1400;
 	location = "QM #2"
 	},
+/obj/effect/turf_decal/delivery,
 /mob/living/simple_animal/bot/mulebot{
 	home_destination = "QM #3";
 	suffix = "#3"
 	},
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/delivery,
 /area/quartermaster/storage)
 "ayL" = (
 /turf/open/floor/plasteel/loadingarea{
@@ -13687,8 +12949,8 @@
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/storage)
 "ayP" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "ayQ" = (
 /obj/structure/closet/crate,
@@ -13696,22 +12958,22 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "ayR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "ayS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "ayT" = (
 /obj/effect/decal/cleanable/dirt,
@@ -13768,14 +13030,14 @@
 /area/shuttle/supply)
 "ayY" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "ayZ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aza" = (
 /obj/machinery/atmospherics/components/trinary/filter{
@@ -13798,18 +13060,18 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "azc" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13842,16 +13104,16 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "azh" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13864,10 +13126,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13885,10 +13147,10 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -13919,14 +13181,10 @@
 "azn" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "azo" = (
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "azp" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -13939,32 +13197,24 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azr" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azs" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -13973,9 +13223,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azu" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -13987,11 +13235,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -14003,9 +13249,7 @@
 	},
 /obj/machinery/light/small,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azw" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -14013,9 +13257,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -14029,9 +13271,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -14044,9 +13284,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -14060,13 +13298,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "azA" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -14141,10 +13377,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14188,8 +13424,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14226,8 +13462,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14237,8 +13473,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14247,8 +13483,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14263,8 +13499,8 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/sorting{
 	name = "\improper Warehouse"
 	})
@@ -14299,8 +13535,8 @@
 	freq = 1400;
 	location = "QM #3"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "azO" = (
 /obj/effect/decal/cleanable/dirt,
@@ -14351,19 +13587,19 @@
 	name = "Supply Dock Airlock";
 	req_access_txt = "31"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "azV" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/storage)
 "azW" = (
 /obj/structure/cable/white{
@@ -14375,10 +13611,10 @@
 	name = "Supply Dock Airlock";
 	req_access_txt = "31"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "azX" = (
 /obj/machinery/door/airlock/shuttle{
@@ -14389,17 +13625,17 @@
 /turf/open/floor/plating,
 /area/shuttle/supply)
 "azY" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "azZ" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14418,8 +13654,8 @@
 	dir = 5
 	},
 /obj/item/weapon/wrench,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14430,8 +13666,8 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14443,8 +13679,8 @@
 	})
 "aAe" = (
 /obj/machinery/atmospherics/components/binary/pump,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14453,8 +13689,8 @@
 	name = "External Gas to Loop"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14472,10 +13708,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14511,20 +13747,16 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aAl" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 2;
 	on = 1
 	},
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aAm" = (
 /obj/structure/sink{
 	dir = 4;
@@ -14533,11 +13765,9 @@
 /obj/structure/sign/botany{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aAn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -14550,9 +13780,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aAo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
@@ -14622,12 +13850,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -14742,13 +13970,13 @@
 	freq = 1400;
 	location = "QM #4"
 	},
+/obj/effect/turf_decal/delivery,
 /mob/living/simple_animal/bot/mulebot{
 	beacon_freq = 1400;
 	home_destination = "QM #1";
 	suffix = "#1"
 	},
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/delivery,
 /area/quartermaster/storage)
 "aAK" = (
 /obj/effect/decal/cleanable/dirt,
@@ -14759,34 +13987,34 @@
 /area/quartermaster/storage)
 "aAL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAM" = (
 /obj/structure/closet/cardboard,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start{
 	name = "Cargo Technician"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAP" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAQ" = (
 /turf/open/floor/plasteel/brown{
@@ -14817,8 +14045,8 @@
 	dir = 8;
 	name = "cargo camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aAS" = (
 /obj/structure/grille,
@@ -14850,10 +14078,10 @@
 	pixel_x = -24;
 	pixel_y = -8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aAV" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -14861,10 +14089,10 @@
 	name = "Gas to Cooling Loop";
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14885,10 +14113,10 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14902,10 +14130,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14925,10 +14153,10 @@
 	dir = 8;
 	req_access = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14946,10 +14174,10 @@
 	pixel_y = 24;
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14965,10 +14193,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -14984,10 +14212,10 @@
 	c_tag = "Atmospherics - Engine Aft";
 	name = "atmospherics camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15005,10 +14233,10 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15021,10 +14249,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15037,10 +14265,10 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15065,10 +14293,10 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15089,10 +14317,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15108,8 +14336,8 @@
 	icon_state = "0-8"
 	},
 /obj/structure/cable,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15120,18 +14348,14 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aBl" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aBm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -15140,18 +14364,14 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aBn" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
 /turf/open/floor/plasteel/hydrofloor,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aBo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -15161,9 +14381,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aBp" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
@@ -15459,12 +14677,12 @@
 	req_access_txt = "31"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -15481,20 +14699,20 @@
 	})
 "aBR" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aBS" = (
 /obj/machinery/door/airlock/external{
 	name = "Supply Dock Airlock";
 	req_access_txt = "31"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aBT" = (
 /obj/docking_port/mobile/supply{
@@ -15556,8 +14774,8 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15571,10 +14789,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15589,10 +14807,10 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15632,8 +14850,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15687,8 +14905,8 @@
 	tag = "icon-1-8";
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15696,10 +14914,10 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15709,8 +14927,8 @@
 /obj/item/weapon/wrench,
 /obj/item/clothing/mask/gas,
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -15719,20 +14937,16 @@
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCq" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/harebell,
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCr" = (
 /obj/structure/table,
 /obj/item/weapon/shovel/spade,
@@ -15750,70 +14964,56 @@
 	name = "Abandoned Garden APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCs" = (
 /obj/machinery/seed_extractor,
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
 /obj/item/weapon/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCt" = (
 /obj/structure/table,
 /obj/item/device/plant_analyzer,
 /obj/item/weapon/hatchet,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCw" = (
 /obj/structure/table,
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wrench,
 /obj/item/weapon/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCx" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/tower,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel,
+/area/hydroponics/Abandoned_Garden)
 "aCy" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -15822,9 +15022,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aCz" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
@@ -15897,8 +15095,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -15919,8 +15117,8 @@
 	freq = 1400;
 	location = "Bar"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/bar)
 "aCI" = (
 /obj/machinery/firealarm{
@@ -15934,8 +15132,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/bar)
 "aCJ" = (
 /obj/structure/cable/white{
@@ -16039,8 +15237,8 @@
 /area/crew_quarters/bar)
 "aCS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aCT" = (
 /obj/machinery/conveyor{
@@ -16089,8 +15287,8 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -16100,10 +15298,10 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -16118,10 +15316,10 @@
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -16214,8 +15412,8 @@
 /area/quartermaster/storage)
 "aDf" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aDg" = (
 /obj/effect/decal/cleanable/dirt,
@@ -16226,8 +15424,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aDh" = (
 /obj/item/clothing/suit/hazardvest{
@@ -16306,8 +15504,8 @@
 	pixel_y = 9
 	},
 /obj/structure/closet/crate/internals,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aDi" = (
 /obj/machinery/conveyor{
@@ -16448,10 +15646,10 @@
 	pixel_y = 26
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aDt" = (
 /obj/machinery/power/smes,
@@ -16462,10 +15660,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aDu" = (
 /obj/structure/cable/white{
@@ -16483,10 +15681,10 @@
 	c_tag = "Solar - Fore Port";
 	name = "solar camera"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aDv" = (
 /obj/machinery/disposal/bin,
@@ -16574,10 +15772,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16592,8 +15790,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16605,8 +15803,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16627,8 +15825,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16645,8 +15843,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16659,10 +15857,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16692,8 +15890,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16708,8 +15906,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16723,8 +15921,8 @@
 	},
 /obj/machinery/light,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16740,8 +15938,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16752,8 +15950,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16765,10 +15963,10 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -16777,9 +15975,7 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/area/hydroponics/Abandoned_Garden)
 "aDR" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -16789,15 +15985,13 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/hydroponics/Abandoned_Garden)
 "aDS" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -16809,15 +16003,13 @@
 	icon_state = "1-2"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/hydroponics{
-	name = "Abandoned Garden"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/hydroponics/Abandoned_Garden)
 "aDT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -16827,9 +16019,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aDU" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -16870,8 +16060,8 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -16891,10 +16081,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/bar)
 "aDX" = (
 /obj/structure/cable/white{
@@ -16908,8 +16098,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/bar)
 "aDY" = (
 /obj/structure/cable/white{
@@ -16999,8 +16189,8 @@
 /area/crew_quarters/bar)
 "aEj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aEk" = (
 /obj/structure/grille,
@@ -17017,8 +16207,8 @@
 	dir = 4
 	},
 /obj/machinery/door/window,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -17035,10 +16225,10 @@
 "aEn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -17103,10 +16293,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint/supply{
 	name = "Security Post - Cargo"
 	})
@@ -17199,25 +16389,25 @@
 /area/quartermaster/storage)
 "aEC" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aED" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aEE" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aEF" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aEG" = (
 /obj/structure/cable/white{
@@ -17306,10 +16496,10 @@
 	name = "External Solar Access";
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarport)
 "aEO" = (
 /obj/effect/decal/cleanable/dirt,
@@ -17322,8 +16512,8 @@
 	},
 /obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarport)
 "aEP" = (
 /obj/structure/cable{
@@ -17339,10 +16529,10 @@
 	tag = ""
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aEQ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -17373,14 +16563,14 @@
 	on = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/maintenance/auxsolarport)
 "aES" = (
 /obj/machinery/door/firedoor,
@@ -17396,10 +16586,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarport)
 "aET" = (
 /obj/effect/decal/cleanable/dirt,
@@ -17417,10 +16607,10 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aEV" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -17433,10 +16623,10 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aEW" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -17448,10 +16638,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aEX" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -17461,10 +16651,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aEY" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -17479,10 +16669,10 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aEZ" = (
 /obj/machinery/power/terminal{
@@ -17494,10 +16684,10 @@
 	icon_state = "0-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aFa" = (
 /obj/machinery/light{
@@ -17515,10 +16705,10 @@
 	icon_state = "0-2"
 	},
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aFb" = (
 /obj/machinery/firealarm{
@@ -17534,8 +16724,8 @@
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aFc" = (
 /obj/machinery/door/firedoor,
@@ -17549,12 +16739,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -17582,12 +16772,12 @@
 	req_access_txt = "24"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -17635,12 +16825,12 @@
 	req_access_txt = "24"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -17661,11 +16851,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aFl" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -17675,9 +16863,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aFm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -17690,9 +16876,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aFn" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -17711,9 +16895,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aFo" = (
 /obj/structure/table/wood,
 /obj/structure/table/wood,
@@ -17793,8 +16975,8 @@
 	})
 "aFv" = (
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/bar)
 "aFw" = (
 /turf/open/floor/plasteel/grimy,
@@ -17882,8 +17064,8 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -17926,10 +17108,10 @@
 	})
 "aFK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -18034,16 +17216,16 @@
 /area/quartermaster/storage)
 "aFU" = (
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aFV" = (
 /obj/effect/landmark/start{
 	name = "Cargo Technician"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aFW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -18055,17 +17237,17 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aFX" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aFY" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/supply)
 "aFZ" = (
 /obj/machinery/hydroponics/constructable,
@@ -18111,10 +17293,10 @@
 	track = 0
 	},
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aGg" = (
 /obj/structure/chair/office/dark{
@@ -18125,8 +17307,8 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aGh" = (
 /obj/structure/cable/white,
@@ -18136,10 +17318,10 @@
 	name = "Fore Port Solar APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarport)
 "aGi" = (
 /obj/structure/sign/electricshock,
@@ -18163,10 +17345,10 @@
 	pixel_y = 0
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aGl" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -18244,8 +17426,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aGt" = (
 /obj/machinery/door/firedoor,
@@ -18261,10 +17443,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aGu" = (
 /obj/effect/decal/cleanable/dirt,
@@ -18275,10 +17457,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18292,18 +17474,18 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aGw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/secure_closet/atmospherics,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18320,8 +17502,8 @@
 	c_tag = "Atmospherics - Engine Access";
 	name = "atmospherics camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18337,10 +17519,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18355,8 +17537,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18367,18 +17549,18 @@
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aGB" = (
 /obj/structure/closet/radiation,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18397,10 +17579,10 @@
 	dir = 1;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18413,8 +17595,8 @@
 	icon_state = "1-4";
 	tag = "90Curve"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -18432,19 +17614,17 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
 "aGF" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aGG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -18453,26 +17633,18 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aGH" = (
 /obj/structure/closet,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aGI" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aGJ" = (
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aGK" = (
 /obj/structure/table/wood,
 /obj/item/device/camera,
@@ -18603,29 +17775,21 @@
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aGX" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aGY" = (
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aGZ" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aHa" = (
 /obj/structure/chair/stool/bar,
 /obj/item/device/radio/intercom{
@@ -18634,14 +17798,10 @@
 	pixel_y = 0
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aHb" = (
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aHc" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -18652,8 +17812,8 @@
 	name = "Cargo Desk";
 	req_access_txt = "50"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -18733,10 +17893,10 @@
 	pixel_x = -1;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -18799,8 +17959,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/checkpoint/supply{
 	name = "Security Post - Cargo"
 	})
@@ -18847,8 +18007,8 @@
 	dir = 1
 	},
 /obj/structure/shuttle/engine/heater,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/supply)
 "aHt" = (
 /obj/structure/window/reinforced{
@@ -18856,8 +18016,8 @@
 	},
 /obj/structure/shuttle/engine/heater,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/supply)
 "aHu" = (
 /turf/closed/wall,
@@ -18916,13 +18076,13 @@
 	id = "justiceblast";
 	name = "Justice Blast door"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/black{
 	tag = "icon-black_warn_side (WEST)";
 	icon_state = "black_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/prison/solitary{
 	name = "Prisoner Education Chamber"
 	})
@@ -18954,10 +18114,10 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aHD" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -18988,8 +18148,8 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aHH" = (
 /obj/machinery/meter,
@@ -19013,8 +18173,8 @@
 "aHK" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aHL" = (
 /obj/structure/sign/vacuum{
@@ -19028,10 +18188,10 @@
 	dir = 1;
 	name = "atmospherics camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19041,10 +18201,10 @@
 	dir = 1;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19055,8 +18215,8 @@
 /obj/structure/closet/emcloset{
 	anchored = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19066,8 +18226,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19079,10 +18239,10 @@
 	},
 /obj/machinery/light/small,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19095,8 +18255,8 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19113,10 +18273,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19133,8 +18293,8 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -19188,9 +18348,7 @@
 	})
 "aHW" = (
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aHX" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -19201,9 +18359,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aHY" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
@@ -19294,9 +18450,7 @@
 	pixel_x = -26
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aIg" = (
 /obj/machinery/airalarm{
 	dir = 8;
@@ -19308,9 +18462,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aIh" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/loadingarea,
@@ -19362,10 +18514,10 @@
 	dir = 1;
 	name = "cargo camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -19449,8 +18601,8 @@
 "aIr" = (
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aIs" = (
 /obj/machinery/conveyor{
@@ -19468,20 +18620,20 @@
 /obj/structure/shuttle/engine/propulsion{
 	icon_state = "burst_l"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/supply)
 "aIu" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/supply)
 "aIv" = (
 /obj/structure/shuttle/engine/propulsion{
 	icon_state = "burst_r"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/supply)
 "aIw" = (
 /obj/machinery/shower{
@@ -19765,10 +18917,10 @@
 	pixel_y = 0
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aIT" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -19793,12 +18945,12 @@
 	name = "Turbine Generator Access";
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "aIX" = (
 /obj/structure/grille,
@@ -19820,12 +18972,12 @@
 	name = "Atmospherics Access";
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "aJb" = (
 /obj/structure/sign/radiation,
@@ -19842,12 +18994,12 @@
 	name = "Atmospherics Engine Access";
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "aJd" = (
 /obj/structure/sign/fire,
@@ -19898,9 +19050,7 @@
 /obj/structure/table/wood,
 /obj/item/clothing/glasses/sunglasses,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJk" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -19909,26 +19059,20 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJl" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJm" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJn" = (
 /obj/structure/cable/white{
 	tag = "icon-0-2";
@@ -19944,9 +19088,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJo" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -19955,9 +19097,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aJp" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
@@ -20001,9 +19141,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJu" = (
 /obj/structure/table/wood,
 /obj/structure/sign/poster{
@@ -20013,9 +19151,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJv" = (
 /obj/structure/cable/white{
 	tag = "icon-0-2";
@@ -20037,9 +19173,7 @@
 	name = "service camera"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJw" = (
 /obj/structure/sign/poster{
 	pixel_y = 32
@@ -20048,9 +19182,7 @@
 /obj/item/weapon/canvas/twentythreeXtwentythree,
 /obj/item/weapon/canvas/twentythreeXtwentythree,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJx" = (
 /obj/structure/window/reinforced{
 	dir = 4;
@@ -20066,39 +19198,29 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJy" = (
 /obj/machinery/vending/cigarette,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 2;
 	on = 1
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJA" = (
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJB" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aJC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/item/device/radio/intercom{
@@ -20133,8 +19255,8 @@
 "aJF" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -20209,10 +19331,10 @@
 	name = "Station Intercom";
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aJM" = (
 /obj/effect/decal/cleanable/dirt,
@@ -20553,18 +19675,18 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/components/binary/valve,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aKo" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/maintenance/incinerator)
 "aKp" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -20628,8 +19750,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aKw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -20684,8 +19806,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aKB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -20724,33 +19846,25 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKG" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKH" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
 /obj/item/weapon/folder/red,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKI" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKJ" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
@@ -20760,9 +19874,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKK" = (
 /obj/machinery/computer/slot_machine,
 /obj/machinery/light/small{
@@ -20775,9 +19887,7 @@
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aKL" = (
 /obj/structure/dresser,
 /obj/machinery/newscaster{
@@ -20855,23 +19965,17 @@
 "aKR" = (
 /obj/structure/sign/poster,
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKS" = (
 /obj/structure/table/wood,
 /obj/item/device/instrument/guitar,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKT" = (
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKU" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -20882,14 +19986,10 @@
 	on = 1
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKV" = (
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKW" = (
 /obj/structure/window/reinforced{
 	dir = 4;
@@ -20899,32 +19999,24 @@
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKX" = (
 /obj/structure/table/wood,
 /obj/item/clothing/head/fedora,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKY" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aKZ" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/pill_bottle/dice,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aLa" = (
 /obj/item/weapon/reagent_containers/food/condiment/saltshaker{
 	pixel_x = -8;
@@ -20935,16 +20027,12 @@
 	},
 /obj/structure/table/wood,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aLb" = (
 /obj/structure/table/wood,
 /obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aLc" = (
 /obj/structure/table,
 /obj/structure/cable/white{
@@ -21024,8 +20112,8 @@
 "aLg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/plasticflaps,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -21087,14 +20175,14 @@
 	})
 "aLl" = (
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLm" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLn" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -21102,8 +20190,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -21111,27 +20199,27 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLq" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLr" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLs" = (
 /obj/structure/cable/white{
@@ -21144,18 +20232,18 @@
 	dir = 1;
 	name = "cargo camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLt" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLu" = (
 /obj/effect/decal/cleanable/dirt,
@@ -21163,16 +20251,16 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLv" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aLw" = (
 /obj/structure/cable/white,
@@ -21507,8 +20595,8 @@
 	},
 /area/atmos)
 "aMb" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aMc" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -21580,8 +20668,8 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aMh" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -21659,24 +20747,18 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aMo" = (
 /obj/structure/sign/poster{
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMp" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/briefcase,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMq" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/syndicate{
@@ -21685,14 +20767,10 @@
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMr" = (
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMs" = (
 /obj/structure/chair/stool/bar,
 /obj/structure/cable/white{
@@ -21700,9 +20778,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMt" = (
 /obj/machinery/computer/slot_machine,
 /obj/structure/sign/poster{
@@ -21712,9 +20788,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aMu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -21726,9 +20800,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aMv" = (
 /obj/structure/mirror{
 	desc = "Mirror mirror on the wall, who is the most robust of them all?";
@@ -21754,8 +20826,8 @@
 /turf/open/floor/plasteel/redblue,
 /area/crew_quarters/theatre)
 "aMy" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aMz" = (
 /obj/structure/plasticflaps{
@@ -21768,13 +20840,13 @@
 	freq = 1400;
 	location = "Theatre"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aMA" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -21804,9 +20876,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMD" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -21814,24 +20884,18 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aME" = (
 /obj/structure/chair/wood/normal,
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMF" = (
 /obj/structure/window/reinforced{
 	dir = 4;
 	pixel_x = 0
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMG" = (
 /obj/structure/chair/comfy/brown{
 	icon_state = "comfychair";
@@ -21840,17 +20904,13 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMI" = (
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -21858,9 +20918,7 @@
 	},
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMJ" = (
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -21868,9 +20926,7 @@
 	},
 /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMK" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck,
@@ -21878,26 +20934,20 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aML" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMM" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aMN" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -21906,13 +20956,11 @@
 /obj/machinery/door/airlock/glass{
 	name = "Atrium"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar/atrium)
 "aMO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -22279,8 +21327,8 @@
 	prison_radio = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aNw" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -22383,10 +21431,10 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/space)
 "aNE" = (
 /obj/machinery/door/poddoor{
@@ -22432,10 +21480,10 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNJ" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -22443,10 +21491,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/stool,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNK" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -22454,49 +21502,49 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNL" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNM" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNN" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNO" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNP" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -22506,20 +21554,20 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNQ" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNR" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -22529,10 +21577,10 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aNS" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -22564,31 +21612,23 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aNX" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aNY" = (
 /turf/open/floor/wood{
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aNZ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aOa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -22600,18 +21640,14 @@
 	tag = "icon-wood-broken5";
 	icon_state = "wood-broken5"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aOb" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aOc" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -22632,11 +21668,9 @@
 	name = "Theatre Junction";
 	sortType = 18
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aOd" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -22653,10 +21687,10 @@
 	name = "Theatre Backstage";
 	req_access_txt = "46"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aOe" = (
 /obj/structure/cable/white{
@@ -22693,8 +21727,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aOg" = (
 /obj/structure/cable/white{
@@ -22744,8 +21778,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aOj" = (
 /obj/machinery/door/firedoor,
@@ -22760,10 +21794,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aOk" = (
 /obj/structure/cable/white{
@@ -22774,8 +21808,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -22793,8 +21827,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -22811,13 +21845,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar/atrium)
 "aOn" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -22833,9 +21865,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aOo" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -22845,9 +21875,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aOp" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (EAST)";
@@ -22864,35 +21892,27 @@
 	dir = 9
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aOq" = (
 /obj/machinery/holopad,
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aOr" = (
 /obj/effect/landmark{
 	name = "lightsout"
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aOs" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
 	name = "Atrium"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar/atrium)
 "aOt" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -22913,12 +21933,12 @@
 	req_one_access_txt = "48;50"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -22983,12 +22003,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint/supply{
 	name = "Security Post - Cargo"
 	})
@@ -23223,12 +22243,12 @@
 	name = "Cell 3"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/prison)
 "aOW" = (
 /obj/machinery/door/poddoor{
@@ -23246,12 +22266,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/prison)
 "aOX" = (
 /obj/machinery/door/poddoor{
@@ -23266,12 +22286,12 @@
 	name = "Cell 1"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/prison)
 "aOY" = (
 /obj/structure/table/reinforced,
@@ -23503,10 +22523,10 @@
 /obj/machinery/atmospherics/pipe/simple/yellow/visible{
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aPm" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible{
@@ -23585,10 +22605,10 @@
 	dir = 1
 	},
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aPu" = (
 /obj/structure/window/reinforced{
@@ -23668,28 +22688,22 @@
 	req_access_txt = "12"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/abandoned_gambling_den)
 "aPD" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aPE" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/wood{
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aPF" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
@@ -23697,9 +22711,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aPG" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -23711,9 +22723,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aPH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -23724,9 +22734,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aPI" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -23737,13 +22745,11 @@
 	icon_state = "4-8"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/abandoned_gambling_den)
 "aPJ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -23759,11 +22765,9 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aPK" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (WEST)";
@@ -23819,8 +22823,8 @@
 	dir = 8;
 	name = "service camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre)
 "aPP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23857,9 +22861,7 @@
 	dir = 4
 	},
 /turf/closed/wall,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPT" = (
 /obj/structure/table/wood,
 /obj/item/weapon/lipstick/random{
@@ -23877,17 +22879,13 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPU" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPV" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (SOUTHWEST)";
@@ -23895,9 +22893,7 @@
 	dir = 10
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPW" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (NORTH)";
@@ -23905,23 +22901,17 @@
 	dir = 1
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPX" = (
 /obj/structure/table/wood,
 /obj/item/weapon/reagent_containers/food/drinks/coffee,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPY" = (
 /obj/structure/table/wood,
 /obj/item/device/paicard,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aPZ" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23930,17 +22920,13 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aQa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aQb" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23949,13 +22935,11 @@
 /obj/machinery/door/airlock/glass{
 	name = "Atrium"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar/atrium)
 "aQc" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -24605,13 +23589,13 @@
 	name = "Security External Airlock";
 	req_access_txt = "63"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (EAST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/security/prison)
 "aQZ" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -24638,10 +23622,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aRc" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -24733,10 +23717,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aRl" = (
 /obj/machinery/computer/atmos_control/tank{
@@ -24793,18 +23777,14 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aRr" = (
 /obj/machinery/light/small,
 /obj/structure/table/wood,
 /obj/item/weapon/storage/pill_bottle,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aRs" = (
 /obj/machinery/computer/slot_machine,
 /obj/structure/sign/poster{
@@ -24814,9 +23794,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aRt" = (
 /obj/machinery/computer/slot_machine,
 /obj/structure/sign/poster{
@@ -24824,9 +23802,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aRu" = (
 /obj/machinery/light/small,
 /obj/structure/table/wood,
@@ -24837,9 +23813,7 @@
 /obj/item/weapon/reagent_containers/syringe,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "aRv" = (
 /obj/structure/table/wood,
 /obj/machinery/requests_console{
@@ -24923,9 +23897,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
@@ -24933,54 +23905,40 @@
 	scrub_Toxins = 0
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRD" = (
 /obj/structure/table/wood,
 /obj/item/clothing/mask/cigarette/pipe,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRE" = (
 /obj/structure/chair/stool,
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRF" = (
 /obj/structure/table/wood,
 /obj/item/weapon/reagent_containers/food/snacks/chips,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRG" = (
 /obj/structure/table/wood,
 /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRH" = (
 /obj/structure/table/wood,
 /obj/item/weapon/reagent_containers/food/drinks/britcup,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aRJ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -25168,10 +24126,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aRV" = (
 /obj/structure/cable/white{
@@ -25254,8 +24212,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aSa" = (
 /obj/structure/cable/white{
@@ -25328,10 +24286,10 @@
 	name = "Quartermaster's Office";
 	req_access_txt = "41"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aSf" = (
 /obj/structure/cable/white{
@@ -25369,8 +24327,8 @@
 	tag = "icon-1-8";
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aSj" = (
 /obj/structure/table/reinforced,
@@ -25420,10 +24378,10 @@
 	name = "Quartermaster's Quarters";
 	req_access_txt = "41"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aSn" = (
 /obj/structure/cable/white{
@@ -25763,18 +24721,18 @@
 /area/atmos)
 "aSP" = (
 /obj/machinery/atmospherics/pipe/manifold4w/yellow/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aSQ" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aSR" = (
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -25815,12 +24773,12 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "aSX" = (
 /obj/structure/sign/nosmoking_2,
@@ -25857,10 +24815,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aTd" = (
 /obj/structure/window/reinforced{
@@ -25958,9 +24916,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTk" = (
 /obj/structure/table/wood,
 /obj/structure/sign/poster{
@@ -25971,9 +24927,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTl" = (
 /obj/structure/piano{
 	tag = "icon-piano";
@@ -25986,18 +24940,14 @@
 	},
 /obj/machinery/light,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTm" = (
 /obj/structure/chair/stool/bar,
 /obj/structure/sign/poster{
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTn" = (
 /obj/machinery/door/window/eastright{
 	name = "Theatre Stage"
@@ -26006,16 +24956,12 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTo" = (
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTp" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
@@ -26023,9 +24969,7 @@
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
@@ -26033,9 +24977,7 @@
 	scrub_Toxins = 0
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aTr" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -26054,8 +24996,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "aTt" = (
 /obj/structure/plasticflaps{
@@ -26065,8 +25007,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -26075,8 +25017,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -26124,8 +25066,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -26174,10 +25116,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aTE" = (
 /obj/structure/disposalpipe/segment{
@@ -26322,10 +25264,10 @@
 	name = "Station Intercom";
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aTS" = (
 /obj/structure/cable/white{
@@ -26337,18 +25279,18 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aTT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/qm)
 "aTU" = (
 /obj/structure/cable/white{
@@ -26454,13 +25396,13 @@
 	pixel_x = 32;
 	tag = "icon-doors"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (EAST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/security/prison)
 "aUg" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -26505,18 +25447,18 @@
 /area/atmos)
 "aUm" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUn" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater{
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUo" = (
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -26546,10 +25488,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -26583,8 +25525,8 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUv" = (
 /obj/structure/table/reinforced,
@@ -26594,8 +25536,8 @@
 /obj/machinery/newscaster{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUw" = (
 /obj/structure/table/reinforced,
@@ -26605,10 +25547,10 @@
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUx" = (
 /obj/effect/decal/cleanable/dirt,
@@ -26639,10 +25581,10 @@
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aUB" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -26680,9 +25622,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUE" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -26695,9 +25635,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUF" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -26711,9 +25649,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUG" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -26723,9 +25659,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUH" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -26738,9 +25672,7 @@
 	sortType = 21
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUI" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -26763,11 +25695,9 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -26779,9 +25709,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -26792,9 +25720,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -26804,11 +25730,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aUM" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -26821,10 +25745,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -26886,9 +25810,7 @@
 	name = "service camera"
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aUS" = (
 /obj/machinery/firealarm{
 	dir = 4;
@@ -26902,9 +25824,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aUT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/camera{
@@ -27066,8 +25986,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aVi" = (
 /obj/structure/closet/wardrobe/cargotech,
@@ -27077,8 +25997,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aVj" = (
 /obj/machinery/disposal/bin,
@@ -27092,8 +26012,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "aVk" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
@@ -27560,20 +26480,20 @@
 	name = "Prison Wing";
 	req_access_txt = "1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aVS" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aVT" = (
 /obj/structure/cable/white{
@@ -27585,8 +26505,8 @@
 	name = "Prison Blast door"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aVU" = (
 /obj/structure/cable/white{
@@ -27622,14 +26542,14 @@
 /area/security/prison)
 "aVY" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/security/prison)
 "aVZ" = (
 /obj/structure/shuttle/engine/propulsion/burst{
@@ -27699,8 +26619,8 @@
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aWi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -27727,10 +26647,10 @@
 	dir = 8
 	},
 /obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aWm" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -27758,19 +26678,19 @@
 "aWo" = (
 /obj/structure/closet/secure_closet/atmospherics,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 1
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (NORTH)"
+	},
 /area/atmos)
 "aWp" = (
 /obj/machinery/pipedispenser/disposal/transit_tube,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aWq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -27858,9 +26778,7 @@
 /area/atmos)
 "aWz" = (
 /turf/open/floor/plasteel/neutral/corner,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aWA" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -27868,9 +26786,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aWB" = (
 /turf/closed/wall,
 /area/hydroponics)
@@ -27888,12 +26804,12 @@
 	req_access_txt = "35"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hydroponics)
 "aWE" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -27921,12 +26837,12 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -27937,19 +26853,19 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
 "aWI" = (
 /obj/structure/kitchenspike,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aWJ" = (
 /obj/structure/sink/kitchen{
@@ -27957,18 +26873,18 @@
 	name = "sink";
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aWK" = (
 /obj/machinery/gibber,
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aWL" = (
 /obj/structure/sink/kitchen{
@@ -27981,15 +26897,15 @@
 	dir = 2;
 	name = "service camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aWM" = (
 /obj/structure/closet/secure_closet/freezer/meat,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aWN" = (
 /obj/machinery/newscaster{
@@ -28002,9 +26918,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aWO" = (
 /obj/structure/chair/stool/bar,
 /obj/structure/disposalpipe/segment{
@@ -28012,18 +26926,14 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aWP" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
 /turf/open/floor/plasteel/redyellow,
-/area/crew_quarters/bar{
-	name = "Atrium"
-	})
+/area/crew_quarters/bar/atrium)
 "aWQ" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
@@ -28174,12 +27084,12 @@
 	req_access_txt = "48"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -28196,8 +27106,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -28213,12 +27123,12 @@
 	req_access_txt = "48"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -28453,10 +27363,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aXB" = (
 /obj/machinery/door/poddoor/preopen{
@@ -28466,8 +27376,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aXC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -28496,10 +27406,10 @@
 /obj/machinery/door/airlock/external{
 	name = "Escape Pod 3"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "aXG" = (
 /obj/machinery/door/airlock/shuttle{
@@ -28512,13 +27422,13 @@
 	port_angle = 180;
 	preferred_direction = 4
 	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_end (WEST)";
 	icon_state = "white_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 8
-	},
 /area/shuttle/pod_3)
 "aXH" = (
 /obj/structure/chair{
@@ -28531,13 +27441,13 @@
 	pixel_x = 6;
 	pixel_y = -32
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/shuttle/pod_3)
 "aXI" = (
 /obj/structure/chair{
@@ -28554,13 +27464,13 @@
 	possible_destinations = "pod_asteroid3";
 	shuttleId = "pod3"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/shuttle/pod_3)
 "aXJ" = (
 /obj/structure/grille,
@@ -28651,17 +27561,17 @@
 "aXT" = (
 /obj/machinery/suit_storage_unit/atmos,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aXU" = (
 /obj/machinery/pipedispenser/disposal,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aXV" = (
 /obj/effect/decal/cleanable/dirt,
@@ -28685,10 +27595,10 @@
 /area/atmos)
 "aXX" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aXY" = (
 /obj/machinery/computer/atmos_control/tank{
@@ -28738,13 +27648,13 @@
 	pixel_y = 1
 	},
 /obj/item/weapon/reagent_containers/glass/bucket,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYe" = (
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYf" = (
 /obj/structure/cable/white{
@@ -28752,8 +27662,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYg" = (
 /obj/structure/closet/secure_closet/hydroponics,
@@ -28761,21 +27671,21 @@
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYh" = (
 /obj/structure/closet/secure_closet/hydroponics,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYi" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYj" = (
 /obj/structure/closet/wardrobe/botanist,
@@ -28784,15 +27694,15 @@
 	pixel_x = 0;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYk" = (
 /obj/structure/table/glass,
 /obj/item/weapon/wrench,
 /obj/item/clothing/suit/apron,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYl" = (
 /obj/machinery/airalarm{
@@ -28808,8 +27718,8 @@
 /obj/machinery/chem_master/condimaster{
 	name = "BrewMaster 3000"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aYm" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -28834,8 +27744,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -28853,8 +27763,8 @@
 	freq = 1400;
 	location = "Kitchen"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYp" = (
 /obj/machinery/light_switch{
@@ -28866,8 +27776,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -28891,8 +27801,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYu" = (
 /obj/structure/table/reinforced,
@@ -28909,8 +27819,8 @@
 	pixel_x = -8
 	},
 /obj/item/weapon/reagent_containers/food/drinks/britcup,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYv" = (
 /obj/structure/table/reinforced,
@@ -28919,8 +27829,8 @@
 	id = "kitchencounter";
 	name = "Kitchen Counter Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYw" = (
 /obj/structure/table/reinforced,
@@ -28931,8 +27841,8 @@
 	},
 /obj/item/weapon/storage/fancy/donut_box,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aYx" = (
 /obj/structure/sign/nanotrasen,
@@ -28941,12 +27851,12 @@
 "aYy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "aYz" = (
 /obj/structure/cable/white{
@@ -28955,22 +27865,22 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "aYA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "aYB" = (
 /obj/structure/grille,
@@ -28989,12 +27899,12 @@
 	req_one_access_txt = "48;50"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -29007,8 +27917,8 @@
 	dir = 1;
 	req_access_txt = "50"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/office{
 	name = "\improper Cargo Office"
 	})
@@ -29086,16 +27996,16 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "aYK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -29105,23 +28015,23 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "aYM" = (
 /obj/structure/closet/secure_closet/miner,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "aYN" = (
 /obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -29131,8 +28041,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -29144,16 +28054,16 @@
 	pixel_y = 5
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "aYQ" = (
 /obj/structure/table,
 /obj/item/weapon/storage/box/donkpockets,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -29200,12 +28110,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/prison)
 "aYX" = (
 /obj/structure/cable/white,
@@ -29220,12 +28130,12 @@
 	req_access_txt = "1"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/prison)
 "aYZ" = (
 /obj/structure/table/reinforced,
@@ -29315,14 +28225,14 @@
 /turf/open/floor/plasteel/red/side,
 /area/security/prison)
 "aZh" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/security/prison)
 "aZi" = (
 /turf/open/floor/engine/plasma,
@@ -29383,10 +28293,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aZo" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -29394,8 +28304,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aZp" = (
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -29432,15 +28342,15 @@
 /area/atmos)
 "aZu" = (
 /obj/structure/closet/secure_closet/atmospherics,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/end,
+/turf/open/floor/plasteel,
 /area/atmos)
 "aZv" = (
 /obj/machinery/pipedispenser,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "aZw" = (
 /obj/structure/window/reinforced{
@@ -29485,9 +28395,7 @@
 "aZA" = (
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aZB" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -29497,9 +28405,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "aZC" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/structure/window/reinforced,
@@ -29509,8 +28415,8 @@
 	pixel_x = -32;
 	tag = "icon-poster2_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aZD" = (
 /obj/structure/disposalpipe/segment{
@@ -29617,8 +28523,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "aZK" = (
 /obj/machinery/door/firedoor,
@@ -29633,10 +28539,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -29653,8 +28559,8 @@
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -29668,8 +28574,8 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -29686,10 +28592,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aZO" = (
 /obj/structure/cable/white{
@@ -29700,8 +28606,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aZP" = (
 /obj/structure/cable/white{
@@ -29741,8 +28647,8 @@
 /area/crew_quarters/kitchen)
 "aZS" = (
 /obj/structure/closet/chefcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aZT" = (
 /obj/structure/rack,
@@ -29754,8 +28660,8 @@
 	icon_state = "alarm0";
 	pixel_x = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aZU" = (
 /turf/open/floor/plasteel/red,
@@ -29796,8 +28702,8 @@
 	},
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "aZZ" = (
 /turf/closed/wall,
@@ -29860,20 +28766,20 @@
 	},
 /area/hallway/primary/fore)
 "baf" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bag" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bah" = (
 /obj/machinery/computer/cargo/request,
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bai" = (
 /obj/machinery/computer/cargo/request,
@@ -30060,20 +28966,20 @@
 "bay" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/toolbox/emergency,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/shuttle/mining)
 "baz" = (
 /obj/machinery/computer/shuttle/mining,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "baA" = (
 /obj/structure/table/reinforced,
@@ -30082,10 +28988,10 @@
 /obj/item/weapon/wrench,
 /obj/item/weapon/tank/internals/emergency_oxygen/engi,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "baB" = (
 /obj/machinery/door/poddoor/preopen{
@@ -30101,16 +29007,16 @@
 	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "baC" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "brigprison";
 	name = "Prison Blast door"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "baD" = (
 /obj/machinery/door/poddoor/preopen{
@@ -30118,8 +29024,8 @@
 	name = "Prison Blast door"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/prison)
 "baE" = (
 /obj/item/device/radio/intercom{
@@ -30133,10 +29039,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "baF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -30195,10 +29101,10 @@
 "baM" = (
 /obj/structure/table/reinforced,
 /obj/item/device/analyzer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "baN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -30223,8 +29129,8 @@
 "baO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "baP" = (
 /obj/structure/closet/wardrobe/atmospherics_yellow,
@@ -30234,8 +29140,8 @@
 	icon_state = "tube1"
 	},
 /obj/item/weapon/storage/backpack/satchel/eng,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "baQ" = (
 /obj/structure/sign/atmosplaque,
@@ -30245,10 +29151,10 @@
 /obj/structure/table/reinforced,
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "baS" = (
 /obj/effect/decal/cleanable/dirt,
@@ -30265,10 +29171,10 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "baU" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -30301,11 +29207,9 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "baX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -30316,17 +29220,15 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "baY" = (
 /obj/structure/closet/crate/hydroponics,
 /obj/item/weapon/cultivator,
 /obj/item/weapon/hatchet,
 /obj/item/weapon/wirecutters,
 /obj/item/weapon/shovel/spade,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "baZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -30350,8 +29252,8 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bbc" = (
 /obj/machinery/camera{
@@ -30385,8 +29287,8 @@
 	pixel_x = 8;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bbh" = (
 /obj/structure/plasticflaps{
@@ -30399,8 +29301,8 @@
 	freq = 1400;
 	location = "Hydroponics"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -30410,8 +29312,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -30437,8 +29339,8 @@
 	pixel_y = 0
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbl" = (
 /obj/machinery/airalarm{
@@ -30451,13 +29353,13 @@
 	pixel_x = -26;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbn" = (
 /obj/structure/cable/white,
@@ -30466,21 +29368,21 @@
 	name = "Kitchen APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbo" = (
 /obj/machinery/chem_master/condimaster,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbp" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/machinery/newscaster{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbq" = (
 /mob/living/carbon/monkey/punpun,
@@ -30491,8 +29393,8 @@
 /obj/effect/landmark/start{
 	name = "Cook"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbs" = (
 /obj/structure/disposalpipe/segment,
@@ -30505,8 +29407,8 @@
 	id = "kitchenside";
 	name = "Kitchen Hall Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bbu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -30563,8 +29465,8 @@
 	name = "Mining Desk";
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -30614,10 +29516,10 @@
 	name = "Mining Dock";
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -30716,16 +29618,16 @@
 "bbR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/ore_box,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bbS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -30738,10 +29640,10 @@
 	name = "\improper Mining Office"
 	})
 "bbU" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bbV" = (
 /obj/structure/chair{
@@ -30752,10 +29654,10 @@
 "bbW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bbX" = (
 /obj/structure/cable/white{
@@ -30777,10 +29679,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bbY" = (
 /obj/structure/cable/white{
@@ -30790,10 +29692,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bbZ" = (
 /obj/machinery/button/door{
@@ -30811,10 +29713,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bca" = (
 /obj/machinery/door/firedoor,
@@ -30834,10 +29736,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bcb" = (
 /obj/structure/cable/white{
@@ -30848,10 +29750,10 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/prison)
 "bcc" = (
 /obj/structure/closet/l3closet/security,
@@ -30933,12 +29835,12 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "bck" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -30952,10 +29854,10 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bcm" = (
 /obj/structure/window/reinforced{
@@ -31013,9 +29915,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bcs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -31023,11 +29923,9 @@
 	lootcount = 3;
 	name = "3maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bct" = (
 /obj/structure/sign/botany,
 /turf/closed/wall,
@@ -31044,12 +29942,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hydroponics)
 "bcw" = (
 /obj/machinery/door/firedoor,
@@ -31062,12 +29960,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -31088,12 +29986,12 @@
 	req_access_txt = "28"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/kitchen)
 "bcA" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
@@ -31105,26 +30003,26 @@
 	dir = 4;
 	name = "service camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcB" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/bag/tray,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcC" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/reagent_containers/glass/bowl,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcD" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bcE" = (
 /obj/structure/cable/white{
@@ -31160,10 +30058,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bcH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -31191,15 +30089,15 @@
 /area/hallway/primary/fore)
 "bcJ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bcK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bcL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -31209,8 +30107,8 @@
 /area/hallway/primary/fore)
 "bcM" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bcN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -31263,8 +30161,8 @@
 	name = "lightsout"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -31318,34 +30216,34 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bcW" = (
 /obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bcX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bcY" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -31357,31 +30255,31 @@
 	req_access = null;
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bda" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bdb" = (
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -31394,10 +30292,10 @@
 	req_access = null;
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -31406,26 +30304,26 @@
 	name = "Mining Shuttle Airlock";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/mining)
 "bde" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bdf" = (
 /turf/open/floor/plasteel/neutral,
 /area/shuttle/mining)
 "bdg" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bdh" = (
 /obj/docking_port/mobile{
@@ -31449,10 +30347,10 @@
 	name = "Mining Shuttle Airlock";
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/mining)
 "bdi" = (
 /turf/closed/wall/r_wall,
@@ -31468,12 +30366,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/brig)
 "bdk" = (
 /obj/structure/cable/white{
@@ -31499,12 +30397,12 @@
 	req_access_txt = "1"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/brig)
 "bdm" = (
 /turf/closed/wall/r_wall,
@@ -31641,10 +30539,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bdB" = (
 /obj/machinery/computer/atmos_control/tank{
@@ -31692,8 +30590,8 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdH" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -31702,15 +30600,15 @@
 	dir = 4;
 	pixel_x = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdI" = (
 /obj/machinery/disposal/bin,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdJ" = (
 /obj/machinery/light_switch{
@@ -31719,8 +30617,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdK" = (
 /obj/structure/table/glass,
@@ -31734,8 +30632,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/box/syringes,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdL" = (
 /obj/machinery/reagentgrinder{
@@ -31743,8 +30641,8 @@
 	pixel_y = 5
 	},
 /obj/structure/table/glass,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdM" = (
 /obj/structure/table/glass,
@@ -31753,15 +30651,15 @@
 	},
 /obj/item/weapon/clipboard,
 /obj/item/toy/figure/botanist,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdN" = (
 /obj/machinery/firealarm{
 	pixel_y = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bdO" = (
 /obj/machinery/smartfridge,
@@ -31853,13 +30751,13 @@
 "bdX" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/reagent_containers/food/snacks/dough,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bdY" = (
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bdZ" = (
 /obj/structure/table/reinforced,
@@ -31883,8 +30781,8 @@
 	tag = "icon-paperbag_NanotrasenStandard_closed";
 	icon_state = "paperbag_NanotrasenStandard_closed"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bea" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -31923,10 +30821,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bee" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -31948,8 +30846,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "beh" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -31957,8 +30855,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bei" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -31971,15 +30869,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bek" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/fore)
 "bel" = (
 /obj/machinery/door/firedoor,
@@ -31991,10 +30889,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -32069,10 +30967,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -32158,16 +31056,16 @@
 	})
 "bez" = (
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "beA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -32188,36 +31086,36 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/shuttle/mining)
 "beD" = (
 /obj/structure/chair{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/shuttle/mining)
 "beE" = (
 /obj/structure/chair{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/shuttle/mining)
 "beF" = (
 /obj/structure/cable/white{
@@ -32538,10 +31436,10 @@
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bff" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -32651,8 +31549,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bfp" = (
 /obj/structure/cable/white{
@@ -32680,10 +31578,10 @@
 /area/atmos)
 "bfs" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bft" = (
 /obj/structure/window/reinforced{
@@ -32746,11 +31644,9 @@
 	},
 /obj/item/device/flashlight,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bfz" = (
 /obj/structure/sink{
 	dir = 8;
@@ -32762,8 +31658,8 @@
 	icon_state = "alarm0";
 	pixel_x = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bfA" = (
 /turf/open/floor/plasteel/greenblue/side{
@@ -32824,8 +31720,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bfG" = (
 /obj/machinery/door/firedoor,
@@ -32836,10 +31732,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bfH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -32860,8 +31756,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -32892,10 +31788,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bfL" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -32991,8 +31887,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bfW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -33310,8 +32206,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/pickaxe/emergency,
 /obj/item/weapon/pickaxe/emergency,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bgr" = (
 /obj/structure/shuttle/engine/heater,
@@ -33324,14 +32220,14 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/mining)
 "bgs" = (
 /obj/structure/ore_box,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/mining)
 "bgt" = (
 /obj/structure/cable/white{
@@ -33439,8 +32335,8 @@
 	},
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/main)
 "bgC" = (
 /obj/structure/cable/white{
@@ -33594,33 +32490,33 @@
 "bgU" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bgV" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bgW" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bgX" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bgY" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bgZ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -33628,8 +32524,8 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bha" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
@@ -33638,8 +32534,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhb" = (
 /obj/effect/decal/cleanable/dirt,
@@ -33649,10 +32545,10 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhc" = (
 /obj/effect/decal/cleanable/dirt,
@@ -33673,14 +32569,14 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhe" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhf" = (
 /obj/effect/decal/cleanable/dirt,
@@ -33690,8 +32586,8 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -33699,10 +32595,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bhh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -33733,17 +32629,13 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bhl" = (
 /obj/effect/landmark{
 	name = "blobstart"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bhm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -33755,16 +32647,14 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bhn" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bho" = (
 /turf/open/floor/plasteel/greenblue/side{
@@ -33785,16 +32675,16 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bhr" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bhs" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -33818,8 +32708,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bhv" = (
 /obj/structure/table/reinforced,
@@ -33834,8 +32724,8 @@
 	},
 /obj/item/weapon/storage/bag/plants/portaseeder,
 /obj/machinery/door/window/eastright,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bhw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -33884,8 +32774,8 @@
 	},
 /obj/item/weapon/storage/bag/tray,
 /obj/machinery/door/window/westleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhA" = (
 /obj/structure/sign/poster{
@@ -33896,16 +32786,16 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhB" = (
 /obj/machinery/food_cart,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhC" = (
 /obj/machinery/light,
@@ -33914,8 +32804,8 @@
 	},
 /obj/machinery/vending/dinnerware,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhD" = (
 /obj/machinery/icecream_vat,
@@ -33925,8 +32815,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhE" = (
 /obj/structure/rack,
@@ -33942,8 +32832,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhF" = (
 /obj/structure/table/reinforced,
@@ -33954,8 +32844,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhG" = (
 /obj/structure/table/reinforced,
@@ -33966,8 +32856,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhH" = (
 /obj/structure/table/reinforced,
@@ -33976,8 +32866,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhI" = (
 /obj/machinery/light,
@@ -33985,12 +32875,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 1
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (NORTH)"
+	},
 /area/crew_quarters/kitchen)
 "bhJ" = (
 /obj/structure/table/reinforced,
@@ -34001,8 +32891,8 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhK" = (
 /obj/structure/table/reinforced,
@@ -34014,8 +32904,8 @@
 	pixel_x = -8
 	},
 /obj/item/weapon/kitchen/knife,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhL" = (
 /obj/structure/table/reinforced,
@@ -34024,8 +32914,8 @@
 	pixel_x = -3;
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhM" = (
 /obj/structure/table/reinforced,
@@ -34044,8 +32934,8 @@
 	pixel_y = 0;
 	tag = "icon-poster3_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
 "bhN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -34166,8 +33056,8 @@
 "bia" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34226,15 +33116,15 @@
 /obj/item/weapon/shovel,
 /obj/item/weapon/pickaxe,
 /obj/item/weapon/pickaxe,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bie" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34246,8 +33136,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34262,8 +33152,8 @@
 	pixel_y = -26
 	},
 /obj/item/weapon/storage/backpack/satchel/explorer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34271,8 +33161,8 @@
 /obj/machinery/disposal/bin,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34283,8 +33173,8 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34293,15 +33183,15 @@
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
 "bik" = (
 /obj/machinery/computer/shuttle/mining,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -34311,8 +33201,8 @@
 	dir = 1;
 	layer = 2.9
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/mining)
 "bim" = (
 /obj/structure/cable/white,
@@ -34655,16 +33545,16 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "biV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "biW" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible{
@@ -34672,28 +33562,28 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "biX" = (
 /obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "biY" = (
 /obj/machinery/atmospherics/pipe/manifold/cyan/visible{
 	dir = 8;
 	initialize_directions = 11
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "biZ" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bja" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -34745,10 +33635,10 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bjf" = (
 /obj/structure/cable/white{
@@ -34764,10 +33654,10 @@
 /area/atmos)
 "bjg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bjh" = (
 /obj/structure/table/reinforced,
@@ -34782,8 +33672,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bji" = (
 /obj/structure/table/reinforced,
@@ -34803,8 +33693,8 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bjj" = (
 /obj/structure/table/reinforced,
@@ -34814,8 +33704,8 @@
 	pixel_y = -32;
 	tag = "icon-poster16_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bjk" = (
 /obj/structure/window/reinforced{
@@ -34867,11 +33757,9 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bjp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -34880,16 +33768,14 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bjq" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bjr" = (
 /obj/effect/landmark/start{
@@ -34933,8 +33819,8 @@
 	dir = 8;
 	name = "service camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bjx" = (
 /obj/structure/grille,
@@ -34953,12 +33839,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/sleep{
 	name = "Service Hall"
 	})
@@ -35000,12 +33886,12 @@
 /obj/machinery/door/airlock/glass{
 	name = "Fore Primary Hallway"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "bjD" = (
 /obj/machinery/door/firedoor,
@@ -35017,12 +33903,12 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "bjE" = (
 /obj/structure/sign/directions/security{
@@ -35043,22 +33929,22 @@
 /area/hallway/primary/fore)
 "bjF" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "bjG" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "bjH" = (
 /obj/machinery/status_display,
@@ -35067,19 +33953,19 @@
 "bjI" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/fore)
 "bjJ" = (
 /obj/machinery/mineral/ore_redemption,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -35088,8 +33974,8 @@
 	opacity = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -35104,12 +33990,12 @@
 	name = "Mining Dock";
 	req_access_txt = "48"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -35517,12 +34403,12 @@
 	name = "Distribution Loop";
 	req_access_txt = "24"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "bky" = (
 /obj/structure/grille,
@@ -35539,8 +34425,8 @@
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bkA" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -35560,8 +34446,8 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bkC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -35569,10 +34455,10 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bkD" = (
 /obj/effect/decal/cleanable/dirt,
@@ -35607,10 +34493,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bkF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -35621,31 +34507,31 @@
 /obj/structure/sign/botany{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bkH" = (
 /obj/machinery/biogenerator,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bkI" = (
 /obj/machinery/seed_extractor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bkJ" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bkK" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bkL" = (
 /obj/machinery/status_display,
@@ -35728,10 +34614,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bkT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -35879,10 +34765,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -35915,8 +34801,8 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/quartermaster/miningdock{
 	name = "\improper Mining Office"
 	})
@@ -35946,10 +34832,10 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "blm" = (
 /obj/structure/filingcabinet/chestdrawer,
@@ -36046,8 +34932,8 @@
 /area/security/main)
 "blw" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/main)
 "blx" = (
 /obj/structure/table/reinforced,
@@ -36465,8 +35351,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -36489,8 +35375,8 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmj" = (
 /obj/structure/cable/white{
@@ -36518,10 +35404,10 @@
 	on = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bml" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -36535,16 +35421,16 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmn" = (
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmo" = (
 /obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -36554,8 +35440,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmp" = (
 /obj/effect/decal/cleanable/dirt,
@@ -36563,8 +35449,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmq" = (
 /obj/effect/decal/cleanable/dirt,
@@ -36572,8 +35458,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bmr" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -36635,13 +35521,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -36651,11 +35535,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -36667,9 +35549,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmy" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -36681,9 +35561,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -36697,9 +35575,7 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmA" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -36708,11 +35584,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -36724,9 +35598,7 @@
 	icon_state = "pipe-j2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -36742,27 +35614,25 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bmD" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/newscaster{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bmE" = (
 /obj/machinery/seed_extractor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bmF" = (
 /obj/machinery/biogenerator,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bmG" = (
 /obj/structure/chair/office/dark{
@@ -36771,8 +35641,8 @@
 /obj/effect/landmark/start{
 	name = "Botanist"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bmH" = (
 /obj/structure/table/reinforced,
@@ -36785,8 +35655,8 @@
 	req_access_txt = "35"
 	},
 /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bmI" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -36867,10 +35737,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bmO" = (
 /obj/structure/cable/white{
@@ -37018,10 +35888,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bna" = (
 /obj/structure/cable/white{
@@ -37087,10 +35957,10 @@
 /obj/structure/sign/electricshock{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bnh" = (
 /obj/structure/cable/white{
@@ -37102,15 +35972,15 @@
 	},
 /area/security/transfer)
 "bni" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bnj" = (
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bnk" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -37118,8 +35988,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bnl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -37550,18 +36420,18 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bnZ" = (
 /obj/machinery/atmospherics/pipe/manifold/green/visible,
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "boa" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -37569,19 +36439,19 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bob" = (
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "boc" = (
 /obj/effect/decal/cleanable/dirt,
@@ -37590,10 +36460,10 @@
 	name = "Mix to Filter";
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bod" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
@@ -37602,10 +36472,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "boe" = (
 /obj/structure/table/reinforced,
@@ -37616,8 +36486,8 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bof" = (
 /obj/effect/decal/cleanable/dirt,
@@ -37636,18 +36506,18 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "boh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "boi" = (
 /obj/structure/cable/white{
@@ -37670,10 +36540,10 @@
 	on = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bok" = (
 /obj/structure/cable/white{
@@ -37695,16 +36565,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bom" = (
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bon" = (
 /obj/effect/decal/cleanable/dirt,
@@ -37712,24 +36582,24 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "boo" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bop" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "boq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -37797,9 +36667,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "boy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
@@ -37809,8 +36677,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "boA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -37846,8 +36714,8 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/wheat,
 /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,
 /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "boD" = (
 /obj/structure/cable/white{
@@ -37932,10 +36800,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "boK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -38193,10 +37061,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bph" = (
 /obj/structure/cable/white{
@@ -38536,10 +37404,10 @@
 /obj/item/clothing/head/HoS/beret,
 /obj/item/clothing/suit/armor/hos/trenchcoat,
 /obj/item/clothing/under/rank/head_of_security/grey,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/security/hos)
 "bpG" = (
 /obj/machinery/light,
@@ -38556,17 +37424,17 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/hos)
 "bpH" = (
 /obj/machinery/suit_storage_unit/hos,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/security/hos)
 "bpI" = (
 /obj/structure/lattice,
@@ -38646,10 +37514,10 @@
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bpS" = (
 /obj/effect/decal/cleanable/dirt,
@@ -38715,8 +37583,8 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bpY" = (
 /obj/effect/decal/cleanable/dirt,
@@ -38733,14 +37601,14 @@
 	icon_state = "intact";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqa" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqb" = (
 /obj/structure/cable/white{
@@ -38772,10 +37640,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqd" = (
 /obj/machinery/door/firedoor,
@@ -38801,10 +37669,10 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqe" = (
 /obj/effect/decal/cleanable/dirt,
@@ -38817,8 +37685,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqf" = (
 /obj/structure/cable/white{
@@ -38831,8 +37699,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqg" = (
 /obj/structure/cable/white{
@@ -38845,8 +37713,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqh" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -38855,8 +37723,8 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqi" = (
 /obj/machinery/portable_atmospherics/canister/air,
@@ -38865,8 +37733,8 @@
 	dir = 8;
 	name = "atmospherics camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bqj" = (
 /obj/machinery/status_display,
@@ -38897,18 +37765,16 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bqn" = (
 /obj/machinery/vending/hydroseeds,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bqo" = (
 /obj/machinery/vending/hydronutrients,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bqp" = (
 /obj/structure/table/glass,
@@ -38919,18 +37785,18 @@
 /obj/item/stack/packageWrap,
 /obj/item/weapon/book/manual/hydroponics_pod_people,
 /obj/item/weapon/hand_labeler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bqq" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "bqr" = (
 /obj/machinery/door/firedoor,
@@ -38939,23 +37805,23 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "bqs" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "bqt" = (
 /obj/structure/grille,
@@ -38972,12 +37838,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "bqw" = (
 /turf/closed/wall/r_wall,
@@ -39017,10 +37883,10 @@
 	name = "Labor Shuttle Airlock";
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/labor)
 "bqC" = (
 /obj/machinery/door/airlock/external{
@@ -39028,15 +37894,15 @@
 	name = "Gulag Shuttle Airlock";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqD" = (
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqE" = (
 /obj/machinery/door/airlock/external{
@@ -39044,16 +37910,16 @@
 	name = "Gulag Shuttle Airlock";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqF" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqG" = (
 /obj/structure/cable/white{
@@ -39078,10 +37944,10 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqI" = (
 /obj/structure/cable/white{
@@ -39095,10 +37961,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqJ" = (
 /obj/structure/cable/white{
@@ -39112,10 +37978,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bqK" = (
 /obj/structure/cable/white{
@@ -39311,10 +38177,10 @@
 	dir = 4
 	},
 /obj/machinery/meter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brd" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -39326,8 +38192,8 @@
 /area/atmos)
 "bre" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "brf" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
@@ -39336,8 +38202,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "brg" = (
 /obj/effect/decal/cleanable/dirt,
@@ -39408,10 +38274,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brm" = (
 /obj/effect/decal/cleanable/dirt,
@@ -39424,8 +38290,8 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/atmos)
 "brn" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -39448,10 +38314,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bro" = (
 /obj/structure/cable/white,
@@ -39472,10 +38338,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -39486,10 +38352,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brr" = (
 /obj/effect/decal/cleanable/dirt,
@@ -39500,20 +38366,20 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brs" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "brt" = (
 /obj/structure/disposalpipe/segment{
@@ -39624,8 +38490,8 @@
 	pixel_y = 0;
 	tag = "icon-poster3_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "brD" = (
 /turf/open/floor/plasteel/greenblue/side{
@@ -39655,8 +38521,8 @@
 	pixel_x = 32;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "brG" = (
 /obj/structure/grille,
@@ -39684,8 +38550,8 @@
 /area/hallway/primary/central)
 "brK" = (
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "brL" = (
 /obj/structure/grille,
@@ -39694,8 +38560,8 @@
 /area/space)
 "brM" = (
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "brN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -39780,13 +38646,13 @@
 	name = "Labor Shuttle Airlock";
 	req_access_txt = "2"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/shuttle/labor)
 "brX" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -39796,13 +38662,13 @@
 	input_dir = 2;
 	output_dir = 1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/shuttle/labor)
 "brZ" = (
 /obj/structure/closet/emcloset,
@@ -39810,10 +38676,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bsa" = (
 /obj/structure/cable/white{
@@ -39968,8 +38834,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/ai)
 "bsq" = (
 /obj/machinery/power/smes{
@@ -39991,8 +38857,8 @@
 	name = "motion-sensitive ai camera";
 	network = list("AI")
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/ai)
 "bsr" = (
 /obj/structure/cable/white{
@@ -40005,8 +38871,8 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/ai)
 "bss" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/heater{
@@ -40026,10 +38892,10 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/atmos)
 "bsu" = (
 /obj/machinery/atmospherics/components/binary/pump{
@@ -40114,12 +38980,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/atmos)
 "bsC" = (
 /obj/machinery/disposal/bin,
@@ -40188,8 +39054,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bsH" = (
 /obj/effect/decal/cleanable/dirt,
@@ -40218,15 +39084,15 @@
 	freq = 1400;
 	location = "Atmospherics"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bsI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bsJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -40255,10 +39121,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bsL" = (
 /obj/structure/rack,
@@ -40283,8 +39149,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bsM" = (
 /obj/structure/rack,
@@ -40301,10 +39167,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bsN" = (
 /obj/item/weapon/shovel/spade,
@@ -40322,13 +39188,13 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,
 /obj/item/weapon/reagent_containers/food/snacks/grown/grapes,
 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bsO" = (
 /obj/machinery/hydroponics/constructable,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bsP" = (
 /obj/machinery/hydroponics/constructable,
@@ -40337,8 +39203,8 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bsQ" = (
 /obj/machinery/hydroponics/constructable,
@@ -40346,8 +39212,8 @@
 	pixel_x = 0;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bsR" = (
 /obj/structure/table/glass,
@@ -40362,8 +39228,8 @@
 	pixel_y = -32;
 	tag = "icon-poster8_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hydroponics)
 "bsS" = (
 /obj/structure/cable/white{
@@ -40567,17 +39433,17 @@
 	},
 /area/security/nuke_storage)
 "btk" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "btl" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "btm" = (
 /obj/machinery/mineral/labor_claim_console{
@@ -40586,10 +39452,10 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "btn" = (
 /obj/machinery/door/firedoor,
@@ -40789,12 +39655,12 @@
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator)
 "btF" = (
 /turf/closed/wall/r_wall,
@@ -40859,8 +39725,8 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "btN" = (
 /obj/structure/table/reinforced,
@@ -40884,22 +39750,22 @@
 	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "btP" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "btQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "btR" = (
 /obj/structure/table/reinforced,
@@ -40993,8 +39859,8 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bua" = (
 /obj/structure/cable/white{
@@ -41005,8 +39871,8 @@
 	dir = 2;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bub" = (
 /obj/machinery/light/small{
@@ -41017,8 +39883,8 @@
 	dir = 8;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "buc" = (
 /obj/structure/cable/white{
@@ -41028,9 +39894,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bud" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/extinguisher_cabinet{
@@ -41282,14 +40146,14 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "buA" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "buB" = (
 /obj/structure/chair{
@@ -41299,10 +40163,10 @@
 	id = "gulagshuttleflasher";
 	pixel_x = 25
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "buC" = (
 /obj/machinery/gulag_item_reclaimer{
@@ -41318,10 +40182,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "buD" = (
 /obj/structure/cable/white{
@@ -41607,21 +40471,21 @@
 /obj/structure/closet/emcloset{
 	anchored = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bve" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bvf" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bvg" = (
 /turf/closed/wall,
@@ -41642,8 +40506,8 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bvi" = (
 /obj/structure/table/reinforced,
@@ -41652,8 +40516,8 @@
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bvj" = (
 /obj/structure/cable/white{
@@ -41675,8 +40539,8 @@
 	pixel_y = -2
 	},
 /obj/item/stack/cable_coil/white,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bvl" = (
 /obj/structure/table/reinforced,
@@ -41691,8 +40555,8 @@
 	pixel_x = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bvm" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -41720,8 +40584,8 @@
 /turf/open/floor/plasteel/redyellow,
 /area/engine/break_room)
 "bvo" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bvp" = (
 /obj/machinery/vending/cola,
@@ -41745,12 +40609,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bvs" = (
 /obj/structure/sign/securearea,
@@ -41781,8 +40645,8 @@
 /obj/effect/landmark/start{
 	name = "Atmospheric Technician"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bvw" = (
 /obj/structure/cable/white{
@@ -41827,8 +40691,8 @@
 	req_access_txt = "24"
 	},
 /obj/machinery/door/window/eastright,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/atmos)
 "bvz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -41880,12 +40744,12 @@
 	},
 /obj/machinery/door/airlock/highsecurity,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/storage/tech)
 "bvD" = (
 /obj/structure/extinguisher_cabinet,
@@ -41905,11 +40769,9 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bvF" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -41923,9 +40785,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bvG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -41939,9 +40799,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bvH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -41960,9 +40818,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bvI" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -41975,13 +40831,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bvJ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -42121,8 +40975,8 @@
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bvW" = (
 /obj/structure/cable/white,
@@ -42229,25 +41083,25 @@
 	},
 /obj/structure/closet/crate/internals,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/labor)
 "bwa" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/shuttle/labor)
 "bwb" = (
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/shuttle/labor)
 "bwc" = (
 /obj/machinery/door/airlock/shuttle{
@@ -42271,10 +41125,10 @@
 	name = "fore bay 1";
 	width = 9
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/labor)
 "bwd" = (
 /obj/machinery/door/airlock/external{
@@ -42282,16 +41136,16 @@
 	name = "Gulag Shuttle Airlock";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bwe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bwf" = (
 /obj/machinery/door/airlock/external{
@@ -42299,10 +41153,10 @@
 	name = "Gulag Shuttle Airlock";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bwg" = (
 /obj/structure/cable/white{
@@ -42329,8 +41183,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bwj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -42644,10 +41498,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bwL" = (
 /obj/machinery/power/apc{
@@ -42666,10 +41520,10 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bwM" = (
 /obj/machinery/power/terminal{
@@ -42692,10 +41546,10 @@
 	icon_state = "0-2";
 	tag = "icon-0-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bwN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -42713,8 +41567,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bwO" = (
 /turf/closed/wall,
@@ -42726,23 +41580,23 @@
 	req_access_txt = "13"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator)
 "bwQ" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bwR" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bwS" = (
 /obj/structure/cable/white{
@@ -42759,8 +41613,8 @@
 	pixel_x = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bwU" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -42781,12 +41635,12 @@
 	name = "Atmospherics Lockdown Blast door"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bwY" = (
 /obj/structure/cable/white{
@@ -42797,12 +41651,12 @@
 	id = "atmoslock";
 	name = "Atmospherics Lockdown Blast door"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bwZ" = (
 /obj/machinery/door/poddoor/preopen{
@@ -42816,12 +41670,12 @@
 	req_access_txt = "24"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bxa" = (
 /obj/machinery/computer/atmos_control,
@@ -42921,8 +41775,8 @@
 /obj/item/device/analyzer,
 /obj/item/device/assembly/signaler,
 /obj/item/device/assembly/signaler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bxk" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -42931,8 +41785,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bxl" = (
 /obj/structure/cable/white{
@@ -42940,23 +41794,23 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bxm" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bxn" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/aiModule/reset,
 /obj/item/device/assembly/flash/handheld,
 /obj/item/device/assembly/flash/handheld,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bxo" = (
 /obj/structure/table/reinforced,
@@ -42978,9 +41832,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bxq" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (WEST)";
@@ -43003,12 +41855,12 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/storage/primary)
 "bxt" = (
 /obj/effect/decal/cleanable/dirt,
@@ -43029,8 +41881,8 @@
 	freq = 1400;
 	location = "Tool Storage"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bxu" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -43331,8 +42183,8 @@
 	dir = 1;
 	layer = 2.9
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/labor)
 "bxX" = (
 /obj/structure/cable/white{
@@ -43591,10 +42443,10 @@
 /turf/open/floor/plating,
 /area/engine/gravity_generator)
 "byz" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byA" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -43622,10 +42474,10 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byC" = (
 /obj/effect/decal/cleanable/dirt,
@@ -43639,8 +42491,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byD" = (
 /obj/structure/sign/radiation,
@@ -43666,10 +42518,10 @@
 	dir = 4;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -43677,8 +42529,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byG" = (
 /obj/structure/closet/radiation,
@@ -43693,10 +42545,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "byH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -43740,12 +42592,12 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "byK" = (
 /obj/structure/cable/white{
@@ -43790,12 +42642,12 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "byM" = (
 /obj/structure/cable/white{
@@ -43814,10 +42666,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "byO" = (
 /obj/machinery/firealarm{
@@ -43828,8 +42680,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "byP" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -44071,8 +42923,8 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzk" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -44081,8 +42933,8 @@
 	pixel_y = 32;
 	tag = "icon-poster22_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzl" = (
 /obj/machinery/disposal/bin,
@@ -44094,12 +42946,12 @@
 	pixel_y = 32
 	},
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzm" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzn" = (
 /obj/structure/cable/white{
@@ -44107,8 +42959,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzo" = (
 /obj/item/clothing/suit/hazardvest{
@@ -44190,8 +43042,8 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzp" = (
 /obj/structure/table/reinforced,
@@ -44201,8 +43053,8 @@
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzq" = (
 /obj/structure/table/reinforced,
@@ -44213,8 +43065,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bzr" = (
 /obj/machinery/status_display,
@@ -44663,8 +43515,8 @@
 /area/hallway/primary/central)
 "bzR" = (
 /obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/shuttle/labor)
 "bzS" = (
 /turf/closed/wall,
@@ -44691,10 +43543,10 @@
 	pixel_x = -24;
 	pixel_y = -40
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/security/transfer)
 "bzU" = (
 /obj/structure/cable/white{
@@ -44978,26 +43830,26 @@
 	name = "Gravity Generator Chamber";
 	req_access_txt = "19; 61"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAn" = (
 /obj/machinery/holopad,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAo" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAp" = (
 /obj/effect/decal/cleanable/dirt,
@@ -45005,8 +43857,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAq" = (
 /obj/machinery/door/firedoor,
@@ -45018,10 +43870,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAr" = (
 /obj/structure/cable/white{
@@ -45033,8 +43885,8 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAs" = (
 /obj/machinery/holopad,
@@ -45043,8 +43895,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAt" = (
 /obj/structure/cable/white{
@@ -45057,8 +43909,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bAu" = (
 /obj/machinery/door/firedoor,
@@ -45076,10 +43928,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bAv" = (
 /obj/structure/cable/white{
@@ -45091,12 +43943,12 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/engine/break_room)
 "bAw" = (
 /obj/structure/cable/white{
@@ -45113,12 +43965,12 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bAx" = (
 /obj/structure/cable/white{
@@ -45130,12 +43982,12 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bAy" = (
 /obj/structure/cable/white{
@@ -45151,12 +44003,12 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bAz" = (
 /obj/structure/cable/white{
@@ -45168,12 +44020,12 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/engine/break_room)
 "bAA" = (
 /obj/machinery/door/firedoor,
@@ -45191,10 +44043,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bAB" = (
 /obj/structure/cable/white{
@@ -45202,10 +44054,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bAC" = (
 /obj/structure/cable/white{
@@ -45217,8 +44069,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bAD" = (
 /obj/structure/cable/white{
@@ -45346,8 +44198,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bAP" = (
 /obj/structure/rack,
@@ -45360,8 +44212,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bAQ" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -45397,8 +44249,8 @@
 	tag = "icon-0-4";
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bAS" = (
 /obj/structure/cable/white{
@@ -45462,8 +44314,8 @@
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wrench,
 /obj/item/device/gps,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bAZ" = (
 /obj/structure/grille,
@@ -45825,8 +44677,8 @@
 	dir = 1
 	},
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bBF" = (
 /turf/closed/wall/r_wall,
@@ -45875,10 +44727,10 @@
 	name = "Station Intercom";
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bBL" = (
 /obj/machinery/suit_storage_unit/security,
@@ -45988,10 +44840,10 @@
 /area/engine/gravity_generator)
 "bBS" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bBT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -46007,10 +44859,10 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bBV" = (
 /obj/effect/decal/cleanable/dirt,
@@ -46020,8 +44872,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bBW" = (
 /obj/structure/sign/radiation,
@@ -46043,10 +44895,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bBY" = (
 /obj/machinery/status_display{
@@ -46058,8 +44910,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bBZ" = (
 /obj/structure/closet/radiation,
@@ -46070,10 +44922,10 @@
 	dir = 9
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bCa" = (
 /obj/machinery/firealarm{
@@ -46087,8 +44939,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -46130,14 +44982,14 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCf" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -46262,10 +45114,10 @@
 	dir = 4
 	},
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCq" = (
 /obj/machinery/light{
@@ -46278,19 +45130,19 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bCs" = (
 /obj/structure/disposalpipe/segment{
@@ -46350,8 +45202,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bCy" = (
 /obj/structure/rack,
@@ -46365,8 +45217,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bCz" = (
 /obj/structure/table/reinforced,
@@ -46392,8 +45244,8 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bCB" = (
 /turf/open/floor/plasteel/yellow/side{
@@ -46406,8 +45258,8 @@
 "bCD" = (
 /obj/machinery/holopad,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bCE" = (
 /turf/open/floor/plasteel/yellow/side{
@@ -46421,8 +45273,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bCG" = (
 /obj/structure/cable/white{
@@ -46884,20 +45736,20 @@
 	name = "Security E.V.A. Storage";
 	req_access_txt = "3"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bDA" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bDB" = (
 /obj/structure/tank_dispenser/oxygen,
@@ -46966,10 +45818,10 @@
 	dir = 1;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bDH" = (
 /obj/effect/decal/cleanable/dirt,
@@ -46983,8 +45835,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bDI" = (
 /obj/machinery/newscaster{
@@ -46995,10 +45847,10 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bDJ" = (
 /obj/machinery/firealarm{
@@ -47016,8 +45868,8 @@
 	amount = 20
 	},
 /obj/item/weapon/wrench,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator)
 "bDK" = (
 /obj/structure/cable/white{
@@ -47029,12 +45881,12 @@
 	name = "Transit Tube Lockdown Door"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator)
 "bDL" = (
 /obj/effect/decal/cleanable/dirt,
@@ -47043,12 +45895,12 @@
 	name = "Transit Tube Lockdown Door"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/gravity_generator)
 "bDM" = (
 /turf/closed/wall/r_wall,
@@ -47095,23 +45947,23 @@
 "bDR" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bDS" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/folder/yellow,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bDT" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/folder/yellow,
 /obj/item/device/lightreplacer,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bDU" = (
 /obj/structure/cable/white{
@@ -47160,18 +46012,18 @@
 	req_access_txt = "0";
 	req_one_access_txt = "32;19"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bDZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bEa" = (
 /obj/structure/cable/white{
@@ -47189,8 +46041,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bEc" = (
 /obj/machinery/door/firedoor,
@@ -47212,10 +46064,10 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bEd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -47317,8 +46169,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bEl" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -47362,8 +46214,8 @@
 	dir = 4;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bEo" = (
 /obj/effect/landmark{
@@ -47375,15 +46227,15 @@
 /obj/structure/table/reinforced,
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bEq" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bEr" = (
 /obj/effect/landmark/start{
@@ -47408,8 +46260,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bEu" = (
 /obj/machinery/door/firedoor,
@@ -47420,10 +46272,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bEv" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -47648,10 +46500,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/hallway/primary/central)
 "bER" = (
 /obj/effect/decal/cleanable/dirt,
@@ -47680,8 +46532,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bEU" = (
 /obj/structure/cable/white{
@@ -47964,10 +46816,10 @@
 /turf/open/floor/plating,
 /area/security/warden)
 "bFt" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bFu" = (
 /obj/machinery/suit_storage_unit/security,
@@ -48225,10 +47077,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bFO" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -48239,8 +47091,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bFP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -48293,8 +47145,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bFV" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -48334,10 +47186,10 @@
 	dir = 1
 	},
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bFZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -48345,15 +47197,15 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bGa" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bGb" = (
 /obj/structure/cable/white,
@@ -48399,8 +47251,8 @@
 	pixel_y = -3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bGg" = (
 /obj/structure/rack,
@@ -48413,8 +47265,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bGh" = (
 /obj/structure/table/reinforced,
@@ -48438,22 +47290,22 @@
 	pixel_x = -26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bGj" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/weapon/storage/box/lights/mixed,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bGk" = (
 /turf/open/floor/plasteel/yellow/corner,
 /area/storage/primary)
 "bGl" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bGm" = (
 /obj/machinery/door/firedoor,
@@ -48461,10 +47313,10 @@
 	name = "Primary Tool Storage";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bGn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -48702,13 +47554,13 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (EAST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/hallway/primary/central)
 "bGN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -48727,10 +47579,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/detectives_office)
 "bGP" = (
 /obj/structure/extinguisher_cabinet{
@@ -49271,10 +48123,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bHH" = (
 /obj/machinery/door/poddoor/preopen{
@@ -49290,10 +48142,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bHI" = (
 /obj/structure/cable/white{
@@ -49305,8 +48157,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bHJ" = (
 /obj/structure/cable/white{
@@ -49504,8 +48356,8 @@
 	pixel_y = -3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bHY" = (
 /obj/structure/rack,
@@ -49522,8 +48374,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bHZ" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -49550,8 +48402,8 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bIb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -49564,8 +48416,8 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bId" = (
 /obj/structure/cable/white{
@@ -50525,10 +49377,10 @@
 	id = "ceblast";
 	name = "Chief's Lockdown Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bJL" = (
 /obj/item/device/radio/intercom{
@@ -50682,9 +49534,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Fore Port Maintenance"
-	})
+/area/maintenance/fpmaint2/fore_port_maintenance)
 "bKd" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/sheet/metal{
@@ -50699,8 +49549,8 @@
 	pixel_x = -23;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bKe" = (
 /turf/open/floor/plasteel/yellow/side{
@@ -50724,8 +49574,8 @@
 "bKi" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/toolbox/electrical,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bKj" = (
 /obj/structure/cable/white,
@@ -51246,8 +50096,8 @@
 	},
 /obj/machinery/holopad,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bLf" = (
 /obj/structure/table/reinforced,
@@ -51262,8 +50112,8 @@
 	},
 /obj/item/weapon/folder/red,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bLg" = (
 /obj/structure/chair/office/dark{
@@ -51309,10 +50159,10 @@
 /turf/open/floor/plating,
 /area/ai_monitored/security/armory)
 "bLk" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bLl" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -51321,16 +50171,16 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bLm" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bLn" = (
 /obj/structure/closet/secure_closet{
@@ -51615,12 +50465,12 @@
 	req_access_txt = "10"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/break_room)
 "bLN" = (
 /obj/structure/sign/securearea,
@@ -51634,8 +50484,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/break_room)
 "bLP" = (
 /obj/structure/cable/white{
@@ -51712,8 +50562,8 @@
 /obj/item/device/assembly/timer,
 /obj/item/device/assembly/voice,
 /obj/item/device/assembly/voice,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bLZ" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -51725,8 +50575,8 @@
 	pixel_y = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bMa" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -51738,8 +50588,8 @@
 /obj/machinery/light_switch{
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bMb" = (
 /obj/structure/table/reinforced,
@@ -51749,8 +50599,8 @@
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/tech)
 "bMc" = (
 /obj/structure/table/reinforced,
@@ -51768,26 +50618,26 @@
 /obj/item/device/multitool,
 /obj/item/device/multitool,
 /obj/machinery/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bMe" = (
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bMf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bMg" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bMh" = (
 /obj/structure/table/reinforced,
@@ -51811,8 +50661,8 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/storage/primary)
 "bMi" = (
 /turf/closed/wall,
@@ -52312,10 +51162,10 @@
 /turf/open/floor/plasteel/red,
 /area/security/warden)
 "bNf" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bNg" = (
 /obj/structure/rack,
@@ -52325,14 +51175,14 @@
 	},
 /obj/item/weapon/gun/ballistic/shotgun/riot,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bNh" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bNi" = (
 /obj/structure/rack,
@@ -52375,10 +51225,10 @@
 "bNk" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNl" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -52390,10 +51240,10 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNm" = (
 /obj/machinery/power/smes{
@@ -52409,10 +51259,10 @@
 /obj/machinery/ai_status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNn" = (
 /obj/machinery/power/port_gen/pacman,
@@ -52423,19 +51273,19 @@
 /obj/structure/sign/electricshock{
 	pixel_y = 32
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNo" = (
 /obj/machinery/cell_charger,
 /obj/structure/table/reinforced,
 /obj/item/weapon/stock_parts/cell/high,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNp" = (
 /obj/structure/sign/nanotrasen,
@@ -52500,10 +51350,10 @@
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNy" = (
 /obj/machinery/teleport/station,
@@ -52513,15 +51363,15 @@
 /obj/machinery/ai_status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNz" = (
 /obj/machinery/computer/teleporter,
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bNA" = (
 /obj/structure/lattice,
@@ -52641,8 +51491,8 @@
 /area/crew_quarters/chief)
 "bNM" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bNN" = (
 /obj/structure/table/reinforced,
@@ -52727,10 +51577,10 @@
 	dir = 2;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bNV" = (
 /obj/structure/closet/radiation,
@@ -52741,10 +51591,10 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bNW" = (
 /obj/structure/cable/white{
@@ -52752,8 +51602,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bNX" = (
 /obj/structure/closet/toolcloset,
@@ -52762,10 +51612,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bNY" = (
 /turf/closed/wall,
@@ -52835,12 +51685,12 @@
 	req_access_txt = "23"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/storage/tech)
 "bOg" = (
 /obj/machinery/door/firedoor,
@@ -52849,12 +51699,12 @@
 	req_access_txt = "0"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/storage/primary)
 "bOh" = (
 /obj/machinery/door/firedoor,
@@ -52862,12 +51712,12 @@
 	name = "Primary Tool Storage";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/storage/primary)
 "bOi" = (
 /obj/structure/sign/directions/science{
@@ -52890,12 +51740,12 @@
 "bOj" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "bOk" = (
 /obj/machinery/ai_status_display{
@@ -53359,8 +52209,8 @@
 	pixel_y = -3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bOX" = (
 /obj/structure/rack,
@@ -53452,8 +52302,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bPc" = (
 /obj/structure/cable/white{
@@ -53466,8 +52316,8 @@
 	dir = 4
 	},
 /obj/machinery/meter,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bPd" = (
 /obj/machinery/power/terminal{
@@ -53478,8 +52328,8 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bPe" = (
 /obj/structure/cable/yellow{
@@ -53487,8 +52337,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bPf" = (
 /obj/machinery/camera{
@@ -53500,8 +52350,8 @@
 	pixel_y = 0;
 	start_active = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bPg" = (
 /obj/structure/showcase{
@@ -53889,10 +52739,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bPI" = (
 /obj/structure/cable/white{
@@ -53948,10 +52798,10 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bPM" = (
 /obj/structure/cable/white{
@@ -53969,10 +52819,10 @@
 "bPN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bPO" = (
 /obj/structure/cable/white{
@@ -53989,10 +52839,10 @@
 /area/engine/engineering)
 "bPP" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bPQ" = (
 /obj/structure/cable/white{
@@ -54139,10 +52989,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bPZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -54260,10 +53110,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bQi" = (
 /obj/structure/cable/white{
@@ -54301,10 +53151,10 @@
 /obj/machinery/door/airlock/glass{
 	name = "Port Primary Hallway"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bQl" = (
 /obj/structure/cable/white{
@@ -54451,9 +53301,7 @@
 /area/crew_quarters/captain)
 "bQC" = (
 /turf/closed/wall/r_wall,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bQD" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -54478,10 +53326,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bQF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -54538,10 +53386,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bQK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -54650,10 +53498,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bQT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -54771,8 +53619,8 @@
 	pixel_y = -3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bRd" = (
 /obj/structure/rack,
@@ -55366,10 +54214,10 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/chief)
 "bSa" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -55377,10 +54225,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bSb" = (
 /obj/structure/cable/white{
@@ -55397,10 +54245,10 @@
 /area/engine/engineering)
 "bSc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bSd" = (
 /obj/structure/cable/white{
@@ -55516,10 +54364,10 @@
 /area/hallway/primary/port)
 "bSm" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bSn" = (
 /turf/open/floor/plasteel/neutral,
@@ -55549,10 +54397,10 @@
 /obj/machinery/door/airlock/glass{
 	name = "Port Primary Hallway"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bSs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -55776,9 +54624,7 @@
 	name = "Captain"
 	},
 /turf/open/floor/plasteel/white,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bSP" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -55796,9 +54642,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/white,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bSQ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/light{
@@ -55853,10 +54697,10 @@
 /obj/machinery/door/airlock/glass{
 	name = "Starboard Primary Hallway"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bSU" = (
 /obj/structure/cable/white{
@@ -55890,10 +54734,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bSY" = (
 /obj/structure/cable/white{
@@ -55963,10 +54807,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bTf" = (
 /obj/item/device/radio/beacon,
@@ -56019,10 +54863,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bTi" = (
 /obj/structure/cable/white{
@@ -56039,10 +54883,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bTj" = (
 /obj/structure/cable/white{
@@ -56063,8 +54907,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bTk" = (
 /obj/structure/cable/white{
@@ -56181,10 +55025,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bTs" = (
 /obj/structure/cable/white{
@@ -56194,10 +55038,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bTt" = (
 /obj/structure/cable/white{
@@ -56207,10 +55051,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bTu" = (
 /obj/structure/rack,
@@ -56232,18 +55076,18 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bTv" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bTw" = (
 /obj/structure/rack,
@@ -56667,10 +55511,10 @@
 	dir = 1;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bUf" = (
 /obj/effect/decal/cleanable/dirt,
@@ -56679,17 +55523,17 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bUg" = (
 /obj/structure/closet/radiation,
 /obj/machinery/light/small,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bUh" = (
 /obj/structure/cable/white,
@@ -56788,10 +55632,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bUr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -56837,10 +55681,10 @@
 	pixel_y = -22
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bUw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -56864,10 +55708,10 @@
 /obj/machinery/door/airlock/glass{
 	name = "Port Primary Hallway"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "bUy" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -56898,8 +55742,8 @@
 	id = "hopflash";
 	pixel_y = 58
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bUC" = (
 /obj/structure/table/reinforced,
@@ -56916,10 +55760,10 @@
 /obj/machinery/door/window/westright{
 	name = "Access Queue"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/heads)
 "bUD" = (
 /obj/structure/chair/office/dark{
@@ -57017,9 +55861,7 @@
 "bUP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bUQ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command{
@@ -57034,20 +55876,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bUR" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bUS" = (
 /turf/open/floor/plasteel/white,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bUT" = (
 /obj/structure/sink{
 	dir = 4;
@@ -57057,9 +55893,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bUU" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (WEST)";
@@ -57083,10 +55917,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bUW" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -57136,10 +55970,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bVb" = (
 /obj/effect/decal/cleanable/dirt,
@@ -57243,10 +56077,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bVk" = (
 /obj/structure/sign/poster{
@@ -57270,8 +56104,8 @@
 /area/hallway/primary/starboard)
 "bVl" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "bVm" = (
 /obj/structure/disposalpipe/segment,
@@ -57299,10 +56133,10 @@
 	dir = 2;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bVp" = (
 /obj/structure/cable/white{
@@ -57313,8 +56147,8 @@
 	id = "brigfront";
 	name = "Brig Blast door"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bVq" = (
 /obj/structure/cable/white{
@@ -57431,10 +56265,10 @@
 	name = "Armoury";
 	req_access_txt = "3"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bVy" = (
 /turf/open/floor/plasteel,
@@ -57451,10 +56285,10 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bVB" = (
 /obj/structure/closet/secure_closet/lethalshots,
@@ -57487,20 +56321,20 @@
 	pixel_y = -27
 	},
 /obj/structure/cable/white,
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bVD" = (
 /obj/machinery/recharge_station,
 /obj/machinery/ai_status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bVE" = (
 /obj/machinery/computer/monitor,
@@ -57513,20 +56347,20 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bVF" = (
 /obj/machinery/recharge_station,
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bVG" = (
 /obj/item/weapon/storage/toolbox/mechanical{
@@ -57535,10 +56369,10 @@
 	},
 /obj/item/weapon/storage/toolbox/electrical,
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel/black,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel/black,
 /area/ai_monitored/turret_protected/aisat_interior)
 "bVH" = (
 /obj/structure/cable/white,
@@ -57683,25 +56517,25 @@
 "bVU" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/firstaid/fire,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bVV" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bVW" = (
 /obj/structure/closet/secure_closet/engineering_personal,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bVX" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/fancy/donut_box,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bVY" = (
 /obj/structure/sign/securearea,
@@ -57719,12 +56553,12 @@
 	req_access_txt = "10"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/engineering)
 "bWa" = (
 /obj/structure/sign/radiation,
@@ -57742,12 +56576,12 @@
 	req_access_txt = "63"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/checkpoint/engineering)
 "bWc" = (
 /obj/structure/cable/white,
@@ -57789,24 +56623,20 @@
 /area/hallway/primary/port)
 "bWg" = (
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bWh" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/maintenance/fpmaint2/port_maintenance)
 "bWi" = (
 /turf/closed/wall,
 /area/library)
@@ -57847,8 +56677,8 @@
 /turf/closed/wall,
 /area/library)
 "bWn" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bWo" = (
 /obj/structure/cable/white{
@@ -57984,9 +56814,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWE" = (
 /obj/machinery/light_switch{
 	pixel_x = 26;
@@ -57999,56 +56827,42 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWF" = (
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWG" = (
 /obj/machinery/light{
 	dir = 1
 	},
 /obj/machinery/suit_storage_unit/captain,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/captain/captains_quarters)
 "bWH" = (
 /obj/structure/closet/secure_closet/captains,
 /obj/item/clothing/suit/armor/vest/capcarapace,
 /obj/item/clothing/head/caphat,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/turf/open/floor/plasteel,
+/area/crew_quarters/captain/captains_quarters)
 "bWI" = (
 /turf/closed/wall,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWJ" = (
 /obj/machinery/door/airlock/silver{
 	name = "Bathroom"
 	},
 /turf/open/floor/plasteel/white,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bWL" = (
 /obj/structure/sign/directions/evac{
 	pixel_y = -8
@@ -58096,8 +56910,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/courtroom)
 "bWR" = (
 /turf/closed/wall,
@@ -58183,10 +56997,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bWZ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -58198,10 +57012,10 @@
 	pixel_y = -32;
 	tag = "icon-doors"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bXa" = (
 /obj/machinery/door/poddoor/preopen{
@@ -58211,8 +57025,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "bXb" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
@@ -58284,10 +57098,10 @@
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bXj" = (
 /obj/machinery/button/door{
@@ -58325,10 +57139,10 @@
 	dir = 1;
 	name = "security camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bXm" = (
 /obj/structure/reagent_dispensers/peppertank{
@@ -58371,8 +57185,8 @@
 /area/ai_monitored/turret_protected/aisat_interior)
 "bXo" = (
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXp" = (
 /obj/structure/cable/white{
@@ -58380,8 +57194,8 @@
 	icon_state = "2-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXq" = (
 /obj/structure/cable/white{
@@ -58389,8 +57203,8 @@
 	icon_state = "4-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXr" = (
 /obj/structure/cable/white{
@@ -58398,10 +57212,10 @@
 	icon_state = "2-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXs" = (
 /obj/structure/cable/white{
@@ -58409,8 +57223,8 @@
 	icon_state = "2-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXt" = (
 /obj/structure/cable/white{
@@ -58422,8 +57236,8 @@
 	icon_state = "4-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXu" = (
 /obj/structure/cable/white{
@@ -58431,8 +57245,8 @@
 	icon_state = "2-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bXv" = (
 /obj/structure/closet/emcloset{
@@ -58442,8 +57256,8 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXw" = (
 /obj/structure/sign/vacuum,
@@ -58456,20 +57270,20 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXy" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -58481,10 +57295,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXA" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -58495,10 +57309,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXB" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -58521,20 +57335,20 @@
 	dir = 2;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXC" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXD" = (
 /obj/structure/cable/white{
@@ -58554,10 +57368,10 @@
 	name = "Engineering Junction";
 	sortType = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXE" = (
 /obj/structure/cable/white{
@@ -58568,10 +57382,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXF" = (
 /obj/structure/cable/white{
@@ -58586,10 +57400,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXG" = (
 /obj/structure/cable/white{
@@ -58609,10 +57423,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bXH" = (
 /obj/structure/cable/white{
@@ -58661,30 +57475,24 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/maintenance/fpmaint2/port_maintenance)
 "bXL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/firecloset,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bXM" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bXN" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -58702,9 +57510,7 @@
 	icon_state = "0-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bXO" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/libraryconsole,
@@ -58974,9 +57780,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYp" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -58987,17 +57791,13 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYr" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (NORTH)";
@@ -59005,9 +57805,7 @@
 	dir = 1
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYs" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
@@ -59019,17 +57817,13 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYu" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -59041,9 +57835,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "bYv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
@@ -59301,20 +58093,20 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/poster/legit,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/warden)
 "bYT" = (
 /obj/machinery/door/poddoor{
 	id = "armouryaccess";
 	name = "Armoury Access"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/security/armory)
 "bYU" = (
 /obj/structure/table/reinforced,
@@ -59328,8 +58120,8 @@
 /obj/machinery/door/window/southright{
 	name = "Armoury Desk"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/ai_monitored/security/armory)
 "bYV" = (
 /turf/closed/wall/r_wall,
@@ -59398,10 +58190,10 @@
 /area/ai_monitored/turret_protected/ai_upload)
 "bZe" = (
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/space)
 "bZf" = (
 /turf/open/floor/plating,
@@ -59412,10 +58204,10 @@
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bZh" = (
 /obj/structure/cable/white{
@@ -59423,10 +58215,10 @@
 	icon_state = "1-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bZi" = (
 /obj/structure/cable/white{
@@ -59434,10 +58226,10 @@
 	icon_state = "1-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "bZj" = (
 /obj/structure/cable/white{
@@ -59457,10 +58249,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZl" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59469,18 +58261,18 @@
 	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZm" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZn" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59574,10 +58366,10 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZw" = (
 /obj/machinery/door/firedoor,
@@ -59598,10 +58390,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZx" = (
 /obj/machinery/power/terminal{
@@ -59617,10 +58409,10 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZy" = (
 /obj/machinery/power/terminal{
@@ -59636,10 +58428,10 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59663,10 +58455,10 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "bZA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -59675,9 +58467,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bZB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -59685,29 +58475,21 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "bZC" = (
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bZD" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bZE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bZF" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -59716,9 +58498,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "bZG" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
@@ -59818,8 +58598,8 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bZR" = (
 /obj/structure/cable/white{
@@ -60045,9 +58825,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cai" = (
 /obj/structure/chair/comfy/brown{
 	color = "#c45c57";
@@ -60066,9 +58844,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "caj" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -60084,9 +58860,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cak" = (
 /obj/machinery/holopad,
 /obj/structure/cable/white{
@@ -60103,9 +58877,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cal" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -60116,9 +58888,7 @@
 	on = 1
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cam" = (
 /obj/machinery/door/window/brigdoor/westleft{
 	name = "Captain's Bedroom";
@@ -60129,14 +58899,10 @@
 	icon_state = "2-8"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "can" = (
 /turf/open/floor/carpet,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cao" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -60150,9 +58916,7 @@
 	name = "Captain"
 	},
 /turf/open/floor/carpet,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cap" = (
 /obj/structure/table,
 /obj/machinery/microwave{
@@ -60256,8 +59020,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/lawoffice)
 "caz" = (
 /obj/structure/cable/white{
@@ -60633,8 +59397,8 @@
 	},
 /area/ai_monitored/turret_protected/ai_upload)
 "cbd" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cbe" = (
 /obj/machinery/camera/emp_proof{
@@ -60659,14 +59423,14 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbh" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -60674,10 +59438,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -60709,8 +59473,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbl" = (
 /obj/effect/decal/cleanable/dirt,
@@ -60720,8 +59484,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -60734,8 +59498,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -60752,10 +59516,10 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbo" = (
 /obj/structure/cable/white,
@@ -60791,10 +59555,10 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbq" = (
 /obj/structure/chair/office/dark,
@@ -60809,8 +59573,8 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbr" = (
 /obj/structure/sign/electricshock{
@@ -60829,10 +59593,10 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cbs" = (
 /obj/structure/rack,
@@ -60841,9 +59605,7 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cbt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/white{
@@ -60851,33 +59613,25 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cbu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cbv" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cbw" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cbx" = (
 /obj/machinery/light{
 	dir = 8
@@ -61056,9 +59810,7 @@
 	},
 /obj/item/weapon/razor,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbR" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/security/wooden_tv,
@@ -61067,9 +59819,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbS" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-18";
@@ -61082,9 +59832,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbT" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -61096,9 +59844,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbU" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -61120,9 +59866,7 @@
 	name = "command camera"
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbV" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger,
@@ -61137,21 +59881,15 @@
 	},
 /obj/structure/cable/white,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbW" = (
 /obj/structure/filingcabinet/security,
 /turf/open/floor/carpet,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbX" = (
 /obj/structure/dresser,
 /turf/open/floor/carpet,
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/area/crew_quarters/captain/captains_quarters)
 "cbY" = (
 /obj/structure/table,
 /obj/machinery/ai_status_display{
@@ -61522,8 +60260,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/brig)
 "ccD" = (
 /obj/structure/cable/white{
@@ -61764,24 +60502,24 @@
 /area/space)
 "ccT" = (
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ccU" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "engpa";
 	name = "Engineering Chamber Shutters"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ccV" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ccW" = (
 /turf/open/floor/plasteel/yellow/side{
@@ -61798,10 +60536,10 @@
 /area/engine/engineering)
 "ccY" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ccZ" = (
 /obj/structure/cable{
@@ -61818,10 +60556,10 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cdb" = (
 /turf/open/floor/plasteel/yellow/side{
@@ -61836,8 +60574,8 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cdd" = (
 /obj/structure/cable/white,
@@ -61889,9 +60627,7 @@
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cdi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/white{
@@ -61899,17 +60635,13 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cdj" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cdk" = (
 /obj/effect/landmark{
 	name = "blobstart"
@@ -61917,9 +60649,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cdl" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
@@ -62120,15 +60850,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/crew_quarters/captain{
-	name = "\improper Captain's Quarters"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/crew_quarters/captain/captains_quarters)
 "cdJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
@@ -62657,14 +61385,14 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/engine/engineering)
 "ceE" = (
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -62676,17 +61404,17 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ceF" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ceG" = (
 /obj/effect/landmark/start{
@@ -62702,8 +61430,8 @@
 	},
 /obj/item/weapon/book/manual/engineering_particle_accelerator,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ceI" = (
 /obj/structure/table/reinforced,
@@ -62716,8 +61444,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/book/manual/engineering_singularity_safety,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ceJ" = (
 /obj/effect/landmark/start{
@@ -62746,17 +61474,15 @@
 /area/engine/engineering)
 "ceN" = (
 /obj/machinery/vending/tool,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ceO" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ceP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -62766,9 +61492,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ceQ" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
@@ -62938,8 +61662,8 @@
 "cfj" = (
 /obj/machinery/shieldwallgen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -63076,8 +61800,8 @@
 	name = "Courtroom";
 	req_access_txt = "42"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/courtroom)
 "cfx" = (
 /obj/item/device/radio/beacon,
@@ -63090,8 +61814,8 @@
 /obj/effect/landmark/start{
 	name = "Lawyer"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/courtroom)
 "cfz" = (
 /obj/structure/cable/white{
@@ -63222,12 +61946,12 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/brig)
 "cfK" = (
 /obj/structure/cable/white{
@@ -63336,24 +62060,24 @@
 /area/space)
 "cfU" = (
 /obj/machinery/power/grounding_rod,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/space)
 "cfV" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/space)
 "cfW" = (
 /obj/machinery/power/tesla_coil,
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/space)
 "cfX" = (
 /obj/machinery/power/grounding_rod,
@@ -63362,10 +62086,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/space)
 "cfY" = (
 /obj/effect/decal/cleanable/oil,
@@ -63390,10 +62114,10 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cfZ" = (
 /obj/structure/cable{
@@ -63402,10 +62126,10 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cga" = (
 /obj/structure/cable{
@@ -63435,10 +62159,10 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cge" = (
 /obj/structure/cable/white{
@@ -63471,29 +62195,25 @@
 	pixel_x = 26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cgh" = (
 /obj/machinery/shieldgen,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cgi" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cgj" = (
 /obj/structure/rack,
 /obj/item/weapon/crowbar/red,
@@ -63502,9 +62222,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cgk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -63513,15 +62231,11 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cgl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cgm" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -63655,13 +62369,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (WEST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -63815,13 +62529,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (EAST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/lawoffice)
 "cgR" = (
 /obj/effect/decal/cleanable/cobweb,
@@ -63897,8 +62611,8 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/range)
 "cgZ" = (
 /obj/structure/cable/white{
@@ -63910,10 +62624,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "cha" = (
 /obj/structure/table/reinforced,
@@ -63923,10 +62637,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "chb" = (
 /obj/structure/window/reinforced{
@@ -63941,10 +62655,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "chd" = (
 /obj/structure/sign/securearea{
@@ -63965,19 +62679,19 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "chf" = (
 /turf/open/floor/plating,
 /area/security/range)
 "chg" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "chh" = (
 /obj/effect/decal/cleanable/dirt,
@@ -63988,10 +62702,10 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "chj" = (
 /obj/structure/table/reinforced,
@@ -64047,40 +62761,40 @@
 	},
 /area/ai_monitored/turret_protected/ai_upload)
 "cho" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/space)
 "chp" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/space)
 "chq" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/space)
 "chr" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/space)
 "chs" = (
 /obj/structure/cable{
@@ -64088,10 +62802,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/space)
 "cht" = (
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -64103,18 +62817,18 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "chu" = (
 /obj/structure/rack,
 /obj/item/weapon/crowbar,
 /obj/item/weapon/tank/internals/emergency_oxygen/engi,
 /obj/item/stack/cable_coil/white,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chv" = (
 /obj/structure/cable{
@@ -64122,8 +62836,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chw" = (
 /obj/structure/rack,
@@ -64136,32 +62850,32 @@
 /obj/item/clothing/gloves/color/black,
 /obj/item/weapon/wrench,
 /obj/item/clothing/glasses/meson/engine,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chx" = (
 /obj/structure/closet/radiation,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chy" = (
 /obj/structure/closet/secure_closet/engineering_welding,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chz" = (
 /obj/structure/closet/wardrobe/engineering_yellow,
 /obj/item/weapon/storage/backpack/satchel/eng,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chA" = (
 /obj/structure/closet/secure_closet/engineering_personal,
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chB" = (
 /obj/structure/closet/secure_closet/engineering_personal,
@@ -64179,16 +62893,14 @@
 	pixel_y = 0;
 	tag = "icon-poster16_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "chC" = (
 /obj/machinery/shieldgen,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "chD" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
@@ -64198,23 +62910,19 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "chE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "chF" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -64223,23 +62931,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "chG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "chH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -64248,9 +62952,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "chI" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -64260,9 +62962,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "chJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -64273,9 +62973,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "chK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -64287,9 +62985,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "chL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -64309,11 +63005,9 @@
 	tag = "icon-1-8";
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "chM" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -64326,10 +63020,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/library)
 "chN" = (
 /obj/structure/cable/white{
@@ -64486,8 +63180,8 @@
 	pixel_x = 0;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64509,8 +63203,8 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64523,8 +63217,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64535,8 +63229,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64552,10 +63246,10 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64579,10 +63273,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -64862,10 +63556,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "ciI" = (
 /obj/structure/cable/white{
@@ -64884,10 +63578,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "ciJ" = (
 /obj/structure/cable/white{
@@ -64927,10 +63621,10 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "ciL" = (
 /obj/structure/cable/white{
@@ -64972,8 +63666,8 @@
 	},
 /obj/item/target/syndicate,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/range)
 "ciP" = (
 /obj/structure/cable/white{
@@ -65119,10 +63813,10 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/space)
 "ciZ" = (
 /obj/structure/sign/radiation,
@@ -65142,12 +63836,12 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/engineering)
 "cjc" = (
 /obj/machinery/requests_console{
@@ -65173,8 +63867,8 @@
 	pixel_x = -26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cje" = (
 /obj/machinery/status_display,
@@ -65182,9 +63876,7 @@
 /area/engine/engineering)
 "cjf" = (
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cjg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -65195,9 +63887,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cjh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -65210,9 +63900,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cji" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -65385,16 +64073,16 @@
 	on = 1;
 	target_temperature = 80
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cjD" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cjE" = (
 /obj/structure/cable/white{
@@ -65406,10 +64094,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cjF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -65421,10 +64109,10 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cjG" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
@@ -65439,16 +64127,16 @@
 	name = "telecomms camera";
 	network = list("SS13","tcomm")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cjH" = (
 /obj/structure/rack,
 /obj/item/weapon/storage/toolbox/emergency,
 /obj/item/weapon/wrench,
 /obj/item/weapon/crowbar,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -65483,8 +64171,8 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -65537,10 +64225,10 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -65754,8 +64442,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/range)
 "ckk" = (
 /obj/structure/cable/white{
@@ -65770,8 +64458,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/security/range)
 "ckl" = (
 /obj/structure/table/reinforced,
@@ -65789,10 +64477,10 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/security/range)
 "ckm" = (
 /obj/structure/window/reinforced{
@@ -65807,8 +64495,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/security/range)
 "cko" = (
 /obj/structure/sign/securearea{
@@ -65834,14 +64522,14 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/security/range)
 "ckq" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "ckr" = (
 /obj/structure/cable/white{
@@ -65854,10 +64542,10 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/security/range)
 "ckt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -65873,10 +64561,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ckw" = (
 /obj/structure/cable{
@@ -65884,10 +64572,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ckx" = (
 /obj/structure/cable{
@@ -65900,10 +64588,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cky" = (
 /obj/structure/cable{
@@ -65916,10 +64604,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ckz" = (
 /obj/machinery/button/door{
@@ -65928,23 +64616,23 @@
 	pixel_y = 26;
 	req_access_txt = "11"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "ckA" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/clipboard,
 /obj/item/toy/figure/engineer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckB" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/airlock_painter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckC" = (
 /obj/structure/sign/securearea,
@@ -65963,13 +64651,13 @@
 /obj/item/device/gps/engineering{
 	gpstag = "ENG0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckE" = (
 /obj/machinery/shieldgen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckF" = (
 /obj/machinery/shieldgen,
@@ -65978,30 +64666,26 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckG" = (
 /obj/machinery/field/generator,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ckH" = (
 /obj/machinery/shieldwallgen,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ckI" = (
 /obj/machinery/shieldwallgen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "ckJ" = (
 /obj/structure/tank_dispenser,
 /obj/effect/decal/cleanable/dirt,
@@ -66011,19 +64695,15 @@
 	pixel_y = 26
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "ckK" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "ckL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -66034,9 +64714,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ckM" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -66184,8 +64862,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cld" = (
 /obj/machinery/light,
@@ -66195,10 +64873,10 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "cle" = (
 /obj/structure/cable/white{
@@ -66206,8 +64884,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "clf" = (
 /obj/machinery/firealarm{
@@ -66215,10 +64893,10 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "clg" = (
 /obj/structure/table,
@@ -66230,8 +64908,8 @@
 /obj/item/weapon/screwdriver{
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/tcommsat/server)
 "clh" = (
 /obj/structure/rack,
@@ -66242,8 +64920,8 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66253,8 +64931,8 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66272,14 +64950,14 @@
 	dir = 1;
 	name = "command camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
 "clk" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66289,8 +64967,8 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66306,10 +64984,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66319,10 +64997,10 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66404,12 +65082,12 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/crew_quarters/locker)
 "clx" = (
 /turf/closed/wall,
@@ -66430,12 +65108,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/maintenance/starboard)
 "clA" = (
 /obj/structure/plasticflaps{
@@ -66447,8 +65125,8 @@
 	freq = 1400;
 	location = "Security"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/range)
 "clB" = (
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -66459,12 +65137,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/range)
 "clC" = (
 /obj/structure/cable/white,
@@ -66512,39 +65190,39 @@
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/space)
 "clJ" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/space)
 "clK" = (
 /obj/machinery/the_singularitygen,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/space)
 "clL" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/space)
 "clM" = (
 /obj/structure/cable{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "clN" = (
 /obj/structure/particle_accelerator/particle_emitter/left{
@@ -66581,10 +65259,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "clS" = (
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -66596,10 +65274,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clT" = (
 /obj/structure/cable{
@@ -66607,10 +65285,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -66619,10 +65297,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clV" = (
 /obj/structure/cable{
@@ -66648,10 +65326,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -66659,10 +65337,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clY" = (
 /obj/machinery/door/poddoor{
@@ -66674,10 +65352,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "clZ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -66686,10 +65364,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cma" = (
 /obj/machinery/shieldgen,
@@ -66699,8 +65377,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cmb" = (
 /obj/machinery/field/generator,
@@ -66709,8 +65387,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cmc" = (
 /obj/machinery/field/generator,
@@ -66720,38 +65398,30 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cmd" = (
 /obj/machinery/shieldwallgen,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cme" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cmf" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cmg" = (
 /obj/structure/sign/securearea,
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cmh" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -66759,9 +65429,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cmi" = (
 /obj/machinery/light{
 	dir = 8
@@ -66879,12 +65547,12 @@
 	req_access_txt = "61"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -66894,12 +65562,12 @@
 	name = "Teleport Access";
 	req_access_txt = "17"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66915,12 +65583,12 @@
 	id = "teleportershutters";
 	name = "Teleporter Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -66930,12 +65598,12 @@
 	name = "Teleporter Shutters"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/teleporter{
 	name = "\improper Teleporter Room"
 	})
@@ -67093,8 +65761,8 @@
 /area/maintenance/starboard)
 "cmS" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/starboard)
 "cmT" = (
 /obj/structure/cable/white{
@@ -67124,12 +65792,12 @@
 "cmW" = (
 /obj/structure/closet/secure_closet/security/sec,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 1
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (NORTH)"
+	},
 /area/maintenance/starboard)
 "cmX" = (
 /turf/closed/wall,
@@ -67195,10 +65863,10 @@
 /turf/open/floor/plating,
 /area/space)
 "cne" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/space)
 "cnf" = (
 /obj/structure/cable{
@@ -67212,10 +65880,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/space)
 "cng" = (
 /obj/structure/grille,
@@ -67238,10 +65906,10 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cni" = (
 /obj/structure/particle_accelerator/particle_emitter/center{
@@ -67280,10 +65948,10 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cnn" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -67303,10 +65971,10 @@
 	pixel_x = -30;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cno" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -67324,8 +65992,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cnq" = (
 /obj/structure/cable/white{
@@ -67345,10 +66013,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cns" = (
 /obj/machinery/door/poddoor{
@@ -67356,34 +66024,34 @@
 	name = "Engineering Secure Storage Lockdown"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cnt" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cnu" = (
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/engine/engineering)
 "cnv" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/engine/engineering)
 "cnw" = (
 /obj/effect/decal/cleanable/dirt,
@@ -67398,24 +66066,22 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/engine/engineering)
 "cnx" = (
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cny" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -67426,36 +66092,30 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cnz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cnA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cnB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/highsecurity{
@@ -67465,22 +66125,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cnC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cnD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -67495,9 +66151,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cnE" = (
 /obj/machinery/newscaster{
 	pixel_x = -32
@@ -67573,10 +66227,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -67766,10 +66420,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -67783,10 +66437,10 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -67795,10 +66449,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -67806,10 +66460,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -68085,17 +66739,17 @@
 	req_access_txt = "63"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/starboard)
 "coD" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/maintenance/starboard)
 "coE" = (
 /obj/structure/grille,
@@ -68141,35 +66795,35 @@
 	name = "\improper MiniSat Exterior"
 	})
 "coI" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/space)
 "coJ" = (
 /obj/machinery/the_singularitygen/tesla,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/space)
 "coK" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/space)
 "coL" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/space)
 "coM" = (
 /obj/structure/particle_accelerator/particle_emitter/right{
@@ -68206,10 +66860,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coR" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
@@ -68218,10 +66872,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -68248,8 +66902,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coU" = (
 /obj/effect/decal/cleanable/dirt,
@@ -68258,10 +66912,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coV" = (
 /obj/machinery/door/poddoor{
@@ -68274,10 +66928,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -68285,55 +66939,49 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coX" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coY" = (
 /obj/machinery/power/tesla_coil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "coZ" = (
 /obj/machinery/power/emitter,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cpa" = (
 /obj/machinery/power/emitter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cpb" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
-"cpc" = (
 /turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
+"cpc" = (
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cpd" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cpe" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -68342,21 +66990,17 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cpf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cpg" = (
 /obj/structure/bookcase/random/nonfiction,
 /turf/open/floor/wood,
@@ -68467,10 +67111,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -68948,10 +67592,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "cpW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -68960,8 +67604,8 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/starboard)
 "cpX" = (
 /obj/effect/decal/cleanable/dirt,
@@ -69027,8 +67671,8 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/storage/box/flashes,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/end,
+/turf/open/floor/plating,
 /area/maintenance/starboard)
 "cqe" = (
 /turf/closed/wall,
@@ -69081,10 +67725,10 @@
 	icon_state = "1-4";
 	tag = ""
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cqj" = (
 /obj/structure/cable{
@@ -69092,8 +67736,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cqk" = (
 /obj/effect/decal/cleanable/dirt,
@@ -69102,8 +67746,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cql" = (
 /obj/structure/cable{
@@ -69116,8 +67760,8 @@
 	dir = 1;
 	network = list("Singularity")
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cqm" = (
 /obj/structure/cable{
@@ -69128,8 +67772,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cqn" = (
 /obj/machinery/button/door{
@@ -69138,10 +67782,10 @@
 	pixel_y = -26;
 	req_access_txt = "11"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cqo" = (
 /obj/structure/table/reinforced,
@@ -69149,8 +67793,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqp" = (
 /obj/structure/disposalpipe/segment,
@@ -69163,18 +67807,18 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqr" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqs" = (
 /obj/machinery/the_singularitygen,
@@ -69183,14 +67827,14 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqt" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqu" = (
 /obj/machinery/power/tesla_coil,
@@ -69200,14 +67844,14 @@
 	dir = 1;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqv" = (
 /obj/machinery/power/emitter,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cqw" = (
 /obj/structure/rack,
@@ -69216,11 +67860,9 @@
 /obj/item/weapon/tank/internals/emergency_oxygen/engi,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cqx" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/sheet/metal{
@@ -69232,11 +67874,9 @@
 /obj/item/weapon/electronics/apc,
 /obj/item/weapon/electronics/airlock,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cqy" = (
 /obj/structure/table/reinforced,
 /obj/structure/extinguisher_cabinet{
@@ -69246,11 +67886,9 @@
 /obj/item/weapon/folder/blue,
 /obj/item/weapon/electronics/firelock,
 /obj/item/weapon/stock_parts/console_screen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cqz" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/cable_coil/white,
@@ -69258,20 +67896,16 @@
 /obj/item/weapon/electronics/firealarm,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cqA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cqB" = (
 /obj/machinery/door/airlock/glass{
 	name = "Library Game Room"
@@ -69334,12 +67968,12 @@
 	req_access_txt = "18"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -69351,12 +67985,12 @@
 	req_access_txt = "18"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -69418,8 +68052,8 @@
 /obj/effect/landmark{
 	name = "lightsout"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -69475,31 +68109,31 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/gateway)
 "cqV" = (
 /obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
 "cqW" = (
 /obj/machinery/vending/coffee,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
 "cqX" = (
 /obj/machinery/vending/cola,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/bridge/meeting_room{
 	name = "\improper Command Hallway"
 	})
@@ -69547,10 +68181,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "crc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -69631,10 +68265,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "crj" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -69660,10 +68294,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "crl" = (
 /obj/structure/cable/white{
@@ -69747,8 +68381,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "cru" = (
 /obj/effect/decal/cleanable/dirt,
@@ -69864,8 +68498,8 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "crG" = (
 /obj/structure/disposalpipe/segment,
@@ -69880,10 +68514,10 @@
 	pixel_x = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "crI" = (
 /turf/closed/wall/r_wall,
@@ -69898,9 +68532,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "crK" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
@@ -70008,10 +68640,10 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -70021,10 +68653,10 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -70033,10 +68665,10 @@
 	icon_state = "plant-21";
 	layer = 4.1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -70051,19 +68683,19 @@
 	tag = "icon-0-2";
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "csa" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -70074,12 +68706,12 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHEAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -70226,8 +68858,8 @@
 "csm" = (
 /obj/structure/closet/secure_closet/exile,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "csn" = (
 /obj/structure/cable/white{
@@ -70243,8 +68875,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cso" = (
 /obj/structure/cable/white{
@@ -70256,8 +68888,8 @@
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "csp" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -70267,8 +68899,8 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "csq" = (
 /obj/structure/closet/crate,
@@ -70282,8 +68914,8 @@
 	pixel_x = 26
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "csr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -70311,10 +68943,10 @@
 /obj/machinery/door/airlock/glass{
 	name = "Starboard Auxiliary Hallway"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "csu" = (
 /turf/open/floor/plasteel/neutral,
@@ -70340,10 +68972,10 @@
 /area/hallway/primary/central)
 "csy" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "csz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -70475,8 +69107,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/starboard)
 "csN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -70494,10 +69126,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -70554,28 +69186,28 @@
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/space)
 "csT" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/space)
 "csU" = (
 /obj/machinery/field/generator{
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/space)
 "csV" = (
 /obj/machinery/power/rad_collector{
@@ -70588,14 +69220,14 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/engine/engineering)
 "csW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -70608,18 +69240,18 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "csX" = (
 /obj/structure/rack,
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wirecutters,
 /obj/item/stack/cable_coil/white,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "csY" = (
 /obj/structure/rack,
@@ -70632,13 +69264,13 @@
 /obj/item/weapon/storage/belt/utility,
 /obj/item/weapon/weldingtool,
 /obj/item/clothing/head/welding,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "csZ" = (
 /obj/structure/closet/toolcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cta" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
@@ -70646,8 +69278,8 @@
 	pixel_x = -26;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ctb" = (
 /obj/structure/cable/white{
@@ -70660,10 +69292,10 @@
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "ctc" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -70676,8 +69308,8 @@
 /obj/structure/sign/electricshock{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -70688,10 +69320,10 @@
 /obj/machinery/ai_status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -70706,8 +69338,8 @@
 	pixel_y = 26
 	},
 /obj/machinery/suit_storage_unit/engine,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -70716,10 +69348,10 @@
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -70745,8 +69377,8 @@
 	pixel_y = 32;
 	tag = "icon-poster22_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -70756,9 +69388,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cti" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -70766,9 +69396,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ctj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -70779,18 +69407,14 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ctk" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ctl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -70800,9 +69424,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ctm" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -70810,9 +69432,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "ctn" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -70830,9 +69450,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cto" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
@@ -70986,10 +69604,10 @@
 	name = "E.V.A. Storage"
 	})
 "ctD" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71004,8 +69622,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71019,8 +69637,8 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71033,8 +69651,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71048,8 +69666,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71064,8 +69682,8 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71074,10 +69692,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71157,8 +69775,8 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "ctT" = (
 /obj/structure/cable/white{
@@ -71170,12 +69788,12 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/gateway)
 "ctU" = (
 /obj/structure/cable/white{
@@ -71191,12 +69809,12 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (NORTH)"
+	},
 /area/gateway)
 "ctV" = (
 /obj/effect/decal/cleanable/dirt,
@@ -71205,18 +69823,18 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (NORTHEAST)"
+	},
 /area/gateway)
 "ctW" = (
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "ctX" = (
 /obj/structure/cable/white{
@@ -71294,10 +69912,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cue" = (
 /obj/machinery/light,
@@ -71322,10 +69940,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cuh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -71380,10 +69998,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "cul" = (
 /obj/structure/cable/white{
@@ -71409,8 +70027,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "cun" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -71624,14 +70242,14 @@
 	})
 "cuI" = (
 /obj/machinery/power/grounding_rod,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/space)
 "cuJ" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/space)
 "cuK" = (
 /obj/machinery/power/tesla_coil,
@@ -71639,8 +70257,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/space)
 "cuL" = (
 /obj/machinery/power/grounding_rod,
@@ -71649,8 +70267,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
 /area/space)
 "cuM" = (
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -71674,10 +70292,10 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cuN" = (
 /obj/structure/cable{
@@ -71709,8 +70327,8 @@
 	pixel_x = -22;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -71754,17 +70372,15 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
 "cuT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cuU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -71776,9 +70392,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cuV" = (
 /obj/machinery/light{
 	dir = 8
@@ -71963,26 +70577,26 @@
 	})
 "cvk" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cvl" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cvm" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -71994,19 +70608,19 @@
 	})
 "cvo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cvp" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -72069,8 +70683,8 @@
 "cvv" = (
 /obj/structure/bed/roller,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cvw" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -72078,10 +70692,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cvx" = (
 /obj/structure/cable/white{
@@ -72106,12 +70720,12 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
 /area/gateway)
 "cvz" = (
 /obj/structure/table,
@@ -72124,8 +70738,8 @@
 /obj/item/weapon/paper/pamphlet,
 /obj/item/weapon/paper/pamphlet,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cvA" = (
 /obj/structure/cable/white,
@@ -72188,12 +70802,12 @@
 /obj/machinery/door/airlock{
 	name = "Primary Restroom"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -72403,14 +71017,14 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/engine/engineering)
 "cwd" = (
 /obj/effect/decal/cleanable/dirt,
@@ -72424,15 +71038,15 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cwf" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cwg" = (
 /obj/structure/cable/white{
@@ -72444,10 +71058,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cwh" = (
 /obj/structure/cable/white,
@@ -72474,8 +71088,8 @@
 	dir = 8
 	},
 /obj/machinery/power/port_gen/pacman,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -72517,8 +71131,8 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -72529,19 +71143,15 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cwo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cwp" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/tank/internals/emergency_oxygen{
@@ -72557,9 +71167,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cwq" = (
 /obj/structure/rack,
 /obj/item/clothing/gloves/color/black,
@@ -72569,11 +71177,9 @@
 	dir = 1
 	},
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cwr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -72583,11 +71189,9 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cws" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -72683,17 +71287,17 @@
 	name = "E.V.A. Storage"
 	})
 "cwC" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cwD" = (
 /obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -72711,10 +71315,10 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -72854,16 +71458,16 @@
 	dir = 4;
 	name = "command camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cwQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cwR" = (
 /obj/structure/cable/white{
@@ -72874,12 +71478,12 @@
 /area/gateway)
 "cwS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
 /area/gateway)
 "cwT" = (
 /obj/structure/tank_dispenser/oxygen,
@@ -72892,8 +71496,8 @@
 	pixel_x = 26
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cwU" = (
 /turf/closed/wall,
@@ -73072,8 +71676,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -73085,8 +71689,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -73356,8 +71960,8 @@
 	},
 /obj/machinery/vending/coffee,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -73427,10 +72031,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cxK" = (
 /turf/open/floor/plasteel/yellow/side,
@@ -73443,10 +72047,10 @@
 "cxM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cxN" = (
 /obj/structure/cable/white{
@@ -73458,10 +72062,10 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cxO" = (
 /obj/machinery/door/firedoor,
@@ -73481,10 +72085,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -73494,8 +72098,8 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -73506,8 +72110,8 @@
 	})
 "cxR" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -73522,8 +72126,8 @@
 	dir = 8;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -73539,31 +72143,23 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cxU" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cxV" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/yellow/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cxW" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cxX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -73574,9 +72170,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cxY" = (
 /obj/structure/table/wood,
 /obj/item/weapon/newspaper{
@@ -73660,9 +72254,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cyg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -73674,24 +72266,18 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cyh" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cyi" = (
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cyj" = (
 /obj/machinery/door/window/northleft{
 	dir = 4;
@@ -73725,16 +72311,16 @@
 	})
 "cyk" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cyl" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -73997,8 +72583,8 @@
 	pixel_y = 9
 	},
 /obj/structure/closet/crate/internals,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cyy" = (
 /obj/structure/cable/white{
@@ -74014,22 +72600,22 @@
 "cyz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cyA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (NORTHEAST)"
+	},
 /area/gateway)
 "cyB" = (
 /obj/structure/cable/white{
@@ -74047,12 +72633,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/gateway)
 "cyD" = (
 /obj/structure/cable/white{
@@ -74064,21 +72650,21 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (NORTH)"
+	},
 /area/gateway)
 "cyE" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-warning (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (NORTHEAST)"
+	},
 /area/gateway)
 "cyF" = (
 /obj/machinery/shower{
@@ -74113,10 +72699,10 @@
 	name = "Unisex Showers";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -74339,17 +72925,17 @@
 	name = "\improper Recreation Area"
 	})
 "czj" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "czk" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "czl" = (
 /obj/machinery/camera/emp_proof{
@@ -74369,16 +72955,16 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "czn" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "czo" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -74386,10 +72972,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "czp" = (
 /obj/effect/landmark{
@@ -74414,10 +73000,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "czr" = (
 /obj/structure/cable/white,
@@ -74448,8 +73034,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -74507,8 +73093,8 @@
 	tag = "icon-0-8";
 	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -74518,11 +73104,9 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "czy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -74535,9 +73119,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/yellow,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czz" = (
 /obj/effect/landmark{
 	name = "blobstart"
@@ -74546,18 +73128,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "czB" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -74567,13 +73145,11 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "czC" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -74585,9 +73161,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czD" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
@@ -74692,10 +73266,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/library)
 "czM" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -74708,23 +73282,17 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
 	name = "blobstart"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czO" = (
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -74736,9 +73304,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "czQ" = (
 /obj/item/stack/sheet/metal/fifty,
 /obj/item/stack/sheet/glass/fifty,
@@ -74755,10 +73321,10 @@
 	name = "E.V.A. Storage"
 	})
 "czR" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -74768,10 +73334,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -74782,18 +73348,18 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "czU" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -74803,10 +73369,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -74815,21 +73381,21 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "czX" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHEAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -74945,8 +73511,8 @@
 	pixel_x = -24
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAi" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -74954,10 +73520,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAj" = (
 /obj/structure/cable/white{
@@ -74967,8 +73533,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAk" = (
 /obj/structure/cable/white{
@@ -74979,8 +73545,8 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAl" = (
 /obj/structure/cable/white{
@@ -74990,12 +73556,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (SOUTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (SOUTHEAST)"
+	},
 /area/gateway)
 "cAm" = (
 /obj/structure/cable/white{
@@ -75018,10 +73584,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAn" = (
 /obj/structure/cable/white{
@@ -75031,10 +73597,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAo" = (
 /obj/machinery/holopad,
@@ -75045,8 +73611,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cAp" = (
 /obj/effect/decal/cleanable/dirt,
@@ -75055,12 +73621,12 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
 /area/gateway)
 "cAq" = (
 /obj/effect/decal/cleanable/dirt,
@@ -75121,8 +73687,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -75245,10 +73811,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -75417,8 +73983,8 @@
 	anchored = 1;
 	state = 2
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cAV" = (
 /obj/structure/cable/white{
@@ -75426,10 +73992,10 @@
 	icon_state = "2-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cAW" = (
 /obj/structure/cable/white{
@@ -75437,10 +74003,10 @@
 	icon_state = "4-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cAX" = (
 /obj/structure/cable/white{
@@ -75448,10 +74014,10 @@
 	icon_state = "2-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cAY" = (
 /obj/structure/cable/white{
@@ -75469,10 +74035,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cBa" = (
 /obj/structure/cable/white{
@@ -75480,8 +74046,8 @@
 	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cBb" = (
 /obj/effect/decal/cleanable/dirt,
@@ -75542,10 +74108,10 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cBf" = (
 /obj/structure/cable/white,
@@ -75566,8 +74132,8 @@
 	pixel_x = -24;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -75599,8 +74165,8 @@
 /obj/machinery/newscaster{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -75612,42 +74178,30 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBl" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBm" = (
 /turf/open/floor/plasteel/yellow/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBn" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/caution,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBp" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cBq" = (
 /obj/item/weapon/clipboard,
 /obj/item/weapon/folder/yellow,
@@ -75670,10 +74224,10 @@
 	dir = 1;
 	name = "command camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -75687,29 +74241,29 @@
 	layer = 4.1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cBt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cBu" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
 "cBv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -75718,8 +74272,8 @@
 	icon_state = "plant-18";
 	layer = 4.1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -75728,10 +74282,10 @@
 	pixel_x = 0;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -75880,8 +74434,8 @@
 "cBI" = (
 /obj/structure/table,
 /obj/machinery/recharger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBJ" = (
 /obj/structure/table,
@@ -75894,8 +74448,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBK" = (
 /obj/machinery/light_switch{
@@ -75907,8 +74461,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBL" = (
 /obj/machinery/airalarm{
@@ -75926,14 +74480,14 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBM" = (
 /obj/machinery/recharge_station,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBN" = (
 /obj/structure/cable/white,
@@ -75943,23 +74497,23 @@
 /area/gateway)
 "cBO" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBP" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/gateway)
 "cBQ" = (
-/turf/open/floor/plasteel{
-	tag = "icon-warning (SOUTHEAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (SOUTHEAST)"
+	},
 /area/gateway)
 "cBR" = (
 /obj/structure/cable/white{
@@ -75983,8 +74537,8 @@
 	pixel_x = -12
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -76135,10 +74689,10 @@
 	})
 "cCm" = (
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCn" = (
 /obj/structure/cable/white{
@@ -76146,10 +74700,10 @@
 	icon_state = "1-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCo" = (
 /obj/structure/cable/white{
@@ -76157,10 +74711,10 @@
 	icon_state = "1-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCp" = (
 /obj/structure/cable/white{
@@ -76168,10 +74722,10 @@
 	icon_state = "1-4"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCq" = (
 /obj/structure/cable/white{
@@ -76183,10 +74737,10 @@
 	icon_state = "4-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCr" = (
 /obj/structure/cable/white{
@@ -76194,18 +74748,18 @@
 	icon_state = "1-8"
 	},
 /obj/structure/grille,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/engine/engineering)
 "cCs" = (
 /obj/structure/closet/emcloset{
 	anchored = 1
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCt" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -76214,10 +74768,10 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -76225,8 +74779,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCv" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -76234,8 +74788,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCw" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -76248,8 +74802,8 @@
 	dir = 1;
 	name = "engineering camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCx" = (
 /obj/effect/decal/cleanable/dirt,
@@ -76264,8 +74818,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCy" = (
 /obj/structure/cable/white{
@@ -76281,8 +74835,8 @@
 /obj/item/clothing/head/cone,
 /obj/item/clothing/head/cone,
 /obj/item/clothing/head/cone,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCz" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -76297,10 +74851,10 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cCA" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -76310,8 +74864,8 @@
 /obj/structure/sign/electricshock{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -76320,8 +74874,8 @@
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -76335,8 +74889,8 @@
 	pixel_y = -32;
 	tag = "icon-nboard00 (NORTH)"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -76346,8 +74900,8 @@
 /obj/machinery/ai_status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -76358,8 +74912,8 @@
 	},
 /obj/item/weapon/wrench,
 /obj/item/weapon/storage/box/lights/mixed,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/engine/engineering{
 	name = "Engineering Storage"
 	})
@@ -76368,9 +74922,7 @@
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCG" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/rods{
@@ -76382,11 +74934,9 @@
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cCH" = (
 /obj/structure/rack,
 /obj/item/weapon/book/manual/wiki/engineering_hacking{
@@ -76401,18 +74951,14 @@
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -76427,26 +74973,20 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
@@ -76456,9 +74996,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -76467,9 +75005,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/sortjunction{
@@ -76479,18 +75015,14 @@
 	sortType = 16
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCQ" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -76499,18 +75031,14 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cCS" = (
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
@@ -76530,12 +75058,12 @@
 	name = "E.V.A. Storage Shutters"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -76544,12 +75072,12 @@
 	id = "evashutters";
 	name = "E.V.A. Storage Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -76565,12 +75093,12 @@
 	name = "E.V.A. Storage Shutters"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/ai_monitored/storage/eva{
 	name = "E.V.A. Storage"
 	})
@@ -76614,12 +75142,12 @@
 	name = "Gateway Atrium";
 	req_access_txt = "62"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/gateway)
 "cDa" = (
 /obj/machinery/door/poddoor/shutters{
@@ -76633,12 +75161,12 @@
 	req_access_txt = "19"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/gateway)
 "cDb" = (
 /obj/machinery/door/poddoor/shutters{
@@ -76646,24 +75174,24 @@
 	name = "Gateway Chamber Shutters"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/gateway)
 "cDc" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "gatewayshutters";
 	name = "Gateway Chamber Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/gateway)
 "cDd" = (
 /obj/structure/sign/directions/engineering{
@@ -76678,9 +75206,7 @@
 /area/gateway)
 "cDe" = (
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cDf" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
@@ -76690,22 +75216,16 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cDg" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cDh" = (
 /obj/structure/mopbucket,
 /obj/item/weapon/mop,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cDi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/vending/cigarette,
@@ -76752,8 +75272,8 @@
 	pixel_x = -32
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -76771,8 +75291,8 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -76786,12 +75306,12 @@
 	name = "Lockerroom"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/locker)
 "cDo" = (
 /obj/machinery/door/firedoor,
@@ -76800,12 +75320,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/locker)
 "cDp" = (
 /obj/machinery/door/firedoor,
@@ -76890,11 +75410,9 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cDy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/plasticflaps{
@@ -76906,8 +75424,8 @@
 	freq = 1400;
 	location = "Engineering"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/engine/engineering)
 "cDz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -76924,12 +75442,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/engine/engineering)
 "cDB" = (
 /obj/structure/cable/white{
@@ -76939,21 +75457,15 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cDC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cDD" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cDE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -76964,17 +75476,13 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cDF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cDG" = (
 /obj/effect/landmark{
 	name = "lightsout"
@@ -77015,36 +75523,36 @@
 	dir = 2;
 	name = "hallway camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cDK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cDL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cDM" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cDN" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -77052,10 +75560,10 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cDO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -77180,10 +75688,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cEb" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -77210,20 +75718,14 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEd" = (
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEe" = (
 /obj/structure/girder,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
@@ -77241,12 +75743,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/crew_quarters/locker/locker_toilet{
 	name = "\improper Restrooms"
 	})
@@ -77255,9 +75757,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/emcloset,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -77268,26 +75768,20 @@
 	icon_state = "bluecorner";
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEj" = (
 /obj/structure/table,
 /obj/item/weapon/storage/box/bodybags,
 /obj/item/weapon/pen,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEk" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cEl" = (
 /obj/machinery/washing_machine,
 /obj/machinery/camera{
@@ -77349,10 +75843,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "cEq" = (
 /obj/structure/cable/white{
@@ -77450,10 +75944,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "cEx" = (
 /obj/structure/cable/white{
@@ -77540,10 +76034,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -77556,8 +76050,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -77570,10 +76064,10 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -77586,10 +76080,10 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -77598,8 +76092,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -77644,21 +76138,17 @@
 	req_access_txt = "13"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cEN" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEO" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -77669,9 +76159,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate{
@@ -77689,9 +76177,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -77705,9 +76191,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cER" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -77719,9 +76203,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cES" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (WEST)";
@@ -77732,9 +76214,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cET" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77750,9 +76230,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77765,9 +76243,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77780,9 +76256,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEW" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -77794,9 +76268,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77812,9 +76284,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEY" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -77829,9 +76299,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cEZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77847,11 +76315,9 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cFa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77871,9 +76337,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77897,11 +76361,9 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cFc" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -77914,9 +76376,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77930,9 +76390,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77949,9 +76407,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77969,9 +76425,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -77987,9 +76441,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFh" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -78006,9 +76458,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78024,9 +76474,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFj" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78041,9 +76489,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFk" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78057,9 +76503,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78076,9 +76520,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78089,9 +76531,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFn" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78101,9 +76541,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78114,9 +76552,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFp" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78129,9 +76565,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -78144,9 +76578,7 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFr" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78159,9 +76591,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFs" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78173,9 +76603,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFt" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -78193,9 +76621,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFu" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78210,9 +76636,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cFv" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -78226,13 +76650,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cFw" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78434,13 +76856,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFK" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -78453,9 +76873,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78469,9 +76887,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78481,9 +76897,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFN" = (
 /obj/structure/girder,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78493,9 +76907,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -78506,9 +76918,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78527,11 +76937,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78545,9 +76953,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78560,11 +76966,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFS" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -78582,13 +76986,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFT" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -78604,9 +77006,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -78616,9 +77016,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78631,9 +77029,7 @@
 /obj/item/weapon/reagent_containers/glass/beaker,
 /obj/item/weapon/reagent_containers/dropper,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cFW" = (
 /obj/structure/table,
 /obj/structure/bedsheetbin,
@@ -78734,8 +77130,8 @@
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -78801,9 +77197,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -78811,9 +77205,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGr" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -78821,9 +77213,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78832,20 +77222,16 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGt" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (NORTH)";
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cGu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -78855,9 +77241,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -78867,9 +77251,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78878,9 +77260,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -78892,11 +77272,9 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cGy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -78906,9 +77284,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGz" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -78919,9 +77295,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
@@ -78935,9 +77309,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -78949,9 +77321,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGC" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -78965,9 +77335,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -78976,9 +77344,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -78987,9 +77353,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGF" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -79003,9 +77367,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79021,25 +77383,19 @@
 	dir = 4
 	},
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -79050,9 +77406,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGM" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (NORTH)";
@@ -79060,17 +77414,13 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cGO" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
@@ -79228,17 +77578,13 @@
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHe" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -79248,9 +77594,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -79262,9 +77606,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHg" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -79277,9 +77619,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHh" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -79287,9 +77627,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHi" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -79299,9 +77637,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHj" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79325,9 +77661,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (SOUTHWEST)";
@@ -79335,9 +77669,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -79347,9 +77679,7 @@
 /turf/open/floor/plasteel/blue/corner{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cHn" = (
 /obj/machinery/washing_machine,
 /turf/open/floor/plasteel/arrival{
@@ -79400,10 +77730,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "cHs" = (
 /obj/machinery/firealarm{
@@ -79506,10 +77836,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/sleep)
 "cHA" = (
 /obj/machinery/light_switch{
@@ -79582,8 +77912,8 @@
 	})
 "cHF" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -79605,21 +77935,17 @@
 "cHH" = (
 /obj/machinery/shieldgen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cHI" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cHJ" = (
 /turf/closed/wall,
 /area/maintenance/electrical)
@@ -79655,12 +77981,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/maintenance/electrical)
 "cHP" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -79670,18 +77996,14 @@
 	},
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cHQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 8;
 	on = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cHR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -79694,9 +78016,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cHS" = (
 /turf/closed/wall/r_wall,
 /area/toxins/xenobiology)
@@ -79704,8 +78024,8 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/weapon/extinguisher,
 /obj/item/weapon/extinguisher,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cHU" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -79714,13 +78034,13 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cHV" = (
 /obj/machinery/atmospherics/components/unary/tank/air,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cHW" = (
 /turf/closed/wall,
@@ -79791,16 +78111,12 @@
 /obj/item/device/flashlight,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cId" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cIe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -79810,22 +78126,20 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cIf" = (
 /obj/machinery/light,
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cIg" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cIh" = (
 /obj/structure/sign/science,
@@ -79849,12 +78163,12 @@
 "cIk" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -79866,12 +78180,12 @@
 	})
 "cIm" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -79897,24 +78211,24 @@
 	name = "Aft Primary Hallway"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "cIp" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
 	name = "Aft Primary Hallway"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "cIq" = (
 /obj/machinery/door/firedoor,
@@ -79923,12 +78237,12 @@
 	name = "Aft Primary Hallway"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/central)
 "cIr" = (
 /obj/structure/sign/directions/evac{
@@ -79954,12 +78268,12 @@
 	})
 "cIt" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -79972,12 +78286,12 @@
 "cIv" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -79995,13 +78309,13 @@
 "cIy" = (
 /obj/machinery/vending/snack,
 /obj/machinery/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cIz" = (
 /obj/machinery/vending/cola,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "cIA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -80009,21 +78323,15 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cIB" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cIC" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cID" = (
 /turf/closed/wall/r_wall,
 /area/medical/medbay2{
@@ -80068,8 +78376,8 @@
 "cII" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -80086,9 +78394,7 @@
 	icon_state = "bluecorner";
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cIK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -80098,9 +78404,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cIL" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (EAST)";
@@ -80108,9 +78412,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cIM" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -80183,10 +78485,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -80197,8 +78499,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -80211,10 +78513,10 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -80227,10 +78529,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -80244,8 +78546,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -80278,21 +78580,17 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJd" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cJe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -80300,15 +78598,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
+/area/maintenance/fpmaint2/port_maintenance)
 "cJf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -80317,9 +78613,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -80330,9 +78624,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJh" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/structure/sign/poster{
@@ -80341,31 +78633,31 @@
 	pixel_y = 32;
 	tag = "icon-poster4_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJi" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJk" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/machinery/light_switch{
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJl" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
@@ -80378,8 +78670,8 @@
 	pixel_x = -26
 	},
 /obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJn" = (
 /obj/structure/table/reinforced,
@@ -80391,8 +78683,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/electronics/apc,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJo" = (
 /obj/machinery/power/port_gen/pacman,
@@ -80400,15 +78692,15 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJp" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJq" = (
 /obj/effect/decal/cleanable/dirt,
@@ -80417,8 +78709,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJr" = (
 /obj/machinery/light_switch{
@@ -80432,8 +78724,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJs" = (
 /obj/machinery/light/small{
@@ -80450,8 +78742,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/toolbox/electrical,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJt" = (
 /obj/structure/table/reinforced,
@@ -80464,8 +78756,8 @@
 	},
 /obj/item/stack/cable_coil/white,
 /obj/item/device/multitool,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJu" = (
 /obj/structure/table/reinforced,
@@ -80475,8 +78767,8 @@
 	},
 /obj/item/weapon/storage/box/lights/mixed,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cJv" = (
 /obj/effect/decal/cleanable/dirt,
@@ -80486,9 +78778,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJw" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -80497,9 +78787,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -80511,9 +78799,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJy" = (
 /obj/structure/rack,
 /obj/item/weapon/book/manual/wiki/engineering_guide,
@@ -80522,26 +78808,20 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJA" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cJB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -80553,11 +78833,9 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cJC" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -80568,20 +78846,20 @@
 	name = "Xenobiology Maintenance";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cJD" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cJE" = (
 /obj/structure/cable/white{
@@ -80596,10 +78874,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cJF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -80608,10 +78886,10 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cJG" = (
 /mob/living/simple_animal/slime,
@@ -80676,12 +78954,12 @@
 	req_access_txt = "47"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -80992,29 +79270,21 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/weapon/reagent_containers/glass/bucket,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKv" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKw" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKx" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -81110,10 +79380,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -81135,11 +79405,9 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -81152,9 +79420,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKE" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -81166,9 +79432,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKF" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -81184,9 +79448,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/blue/corner,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKG" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -81198,11 +79460,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -81219,13 +79479,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKI" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -81239,11 +79497,9 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKJ" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -81252,9 +79508,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cKK" = (
 /obj/structure/dresser,
 /obj/item/device/radio/intercom{
@@ -81300,8 +79554,8 @@
 "cKP" = (
 /obj/machinery/vending/cola,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -81343,23 +79597,19 @@
 /obj/item/weapon/wrench,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cKV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cKW" = (
 /obj/machinery/atmospherics/components/binary/valve,
 /obj/machinery/airalarm{
@@ -81369,17 +79619,17 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cKX" = (
 /obj/machinery/atmospherics/components/binary/valve,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cKY" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible,
@@ -81424,23 +79674,23 @@
 /turf/open/floor/plating,
 /area/maintenance/electrical)
 "cLd" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLe" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLf" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLg" = (
 /obj/structure/cable/white{
@@ -81452,10 +79702,10 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLh" = (
 /obj/effect/decal/cleanable/dirt,
@@ -81464,10 +79714,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -81475,10 +79725,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cLj" = (
 /obj/effect/decal/cleanable/dirt,
@@ -81515,9 +79765,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cLm" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -81529,12 +79777,12 @@
 	req_access_txt = "47"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/xenobiology)
 "cLn" = (
 /obj/structure/disposaloutlet{
@@ -81579,8 +79827,8 @@
 	dir = 8
 	},
 /obj/item/weapon/storage/backpack/satchel/tox,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -81898,8 +80146,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -81916,8 +80164,8 @@
 	freq = 1400;
 	location = "Medbay"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -81928,11 +80176,9 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMd" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (WEST)";
@@ -81940,18 +80186,14 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -81960,9 +80202,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/blue/corner,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -81970,9 +80210,7 @@
 	},
 /obj/machinery/space_heater,
 /turf/open/floor/plasteel/blue,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMh" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -81987,16 +80225,12 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cMj" = (
 /obj/structure/bed,
 /obj/item/weapon/bedsheet/clown,
@@ -82041,8 +80275,8 @@
 	pixel_x = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -82059,16 +80293,12 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cMq" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cMr" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible{
 	tag = "icon-intact (NORTHEAST)";
@@ -82079,17 +80309,17 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cMs" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cMt" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/visible{
@@ -82115,8 +80345,8 @@
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cMw" = (
 /obj/machinery/status_display,
@@ -82128,10 +80358,10 @@
 /turf/open/floor/plating,
 /area/maintenance/electrical)
 "cMy" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cMz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -82181,10 +80411,10 @@
 /turf/open/floor/plasteel/neutral,
 /area/maintenance/electrical)
 "cME" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cMF" = (
 /obj/machinery/space_heater,
@@ -82200,18 +80430,14 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cMH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cMI" = (
 /turf/open/floor/plasteel/vault{
 	tag = "icon-vault (NORTHEAST)";
@@ -82235,18 +80461,18 @@
 	tag = "icon-0-4";
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/toxins/xenobiology)
 "cML" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cMM" = (
 /obj/structure/cable/white{
@@ -82266,8 +80492,8 @@
 	name = "xenobiology camera";
 	network = list("SS13","xeno","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cMN" = (
 /obj/machinery/light_switch{
@@ -82279,8 +80505,8 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cMO" = (
 /obj/structure/table,
@@ -82294,8 +80520,8 @@
 	},
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cMP" = (
 /obj/structure/cable/white{
@@ -82467,12 +80693,12 @@
 	name = "Xenobiology Kill Room";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/xenobiology)
 "cNa" = (
 /obj/structure/cable/white{
@@ -82643,10 +80869,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -82676,10 +80902,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -82754,10 +80980,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -82986,12 +81212,12 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -83003,9 +81229,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cNS" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
@@ -83082,23 +81306,19 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cOc" = (
 /obj/machinery/space_heater,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cOd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -83106,9 +81326,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cOe" = (
 /obj/machinery/status_display{
 	pixel_x = -32
@@ -83119,13 +81337,13 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOf" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOg" = (
 /obj/machinery/atmospherics/components/binary/volume_pump{
@@ -83145,23 +81363,23 @@
 "cOi" = (
 /obj/structure/table/reinforced,
 /obj/item/device/analyzer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOj" = (
 /obj/machinery/computer/monitor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOk" = (
 /obj/structure/chair/office/light{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOl" = (
 /turf/open/floor/plasteel/neutral,
@@ -83172,8 +81390,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOn" = (
 /obj/effect/decal/cleanable/dirt,
@@ -83181,18 +81399,18 @@
 /area/maintenance/electrical)
 "cOo" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOp" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engineering Auxiliary Power";
 	req_access_txt = "10"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cOq" = (
 /obj/structure/cable/white{
@@ -83200,11 +81418,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cOr" = (
 /obj/effect/decal/remains/xeno,
 /obj/effect/decal/cleanable/xenoblood,
@@ -83234,8 +81450,8 @@
 	dir = 4;
 	network = list("xeno")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOv" = (
 /obj/structure/cable/white{
@@ -83247,8 +81463,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOw" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -83269,8 +81485,8 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOy" = (
 /obj/structure/sign/xenobio,
@@ -83286,8 +81502,8 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOA" = (
 /obj/structure/cable/white{
@@ -83299,8 +81515,8 @@
 	name = "Creature Pen";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOB" = (
 /obj/structure/window/reinforced{
@@ -83312,8 +81528,8 @@
 	icon_state = "pipe-t";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOC" = (
 /obj/structure/sign/electricshock,
@@ -83329,8 +81545,8 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOE" = (
 /obj/structure/window/reinforced{
@@ -83346,8 +81562,8 @@
 	icon_state = "pipe-t";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOF" = (
 /obj/structure/sign/directions/engineering{
@@ -83373,8 +81589,8 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOH" = (
 /obj/structure/sign/biohazard,
@@ -83385,8 +81601,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOJ" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
@@ -83395,26 +81611,26 @@
 	on = 1;
 	target_temperature = 80
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOK" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOL" = (
 /obj/machinery/chem_master,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOM" = (
 /obj/machinery/chem_dispenser/constructable,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cON" = (
 /obj/structure/table/reinforced,
@@ -83429,8 +81645,8 @@
 	pixel_y = 32
 	},
 /obj/item/weapon/extinguisher/mini,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cOO" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -83492,10 +81708,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint/science{
 	name = "Security Post - Research Division"
 	})
@@ -83653,10 +81869,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -83698,10 +81914,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -83820,10 +82036,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -84019,10 +82235,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -84082,9 +82298,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cPM" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
@@ -84255,13 +82469,11 @@
 /obj/item/clothing/head/hardhat/red,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cQc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -84269,20 +82481,16 @@
 	on = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cQd" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (EAST)";
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cQe" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 6
@@ -84291,10 +82499,10 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQf" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
@@ -84304,10 +82512,10 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible,
@@ -84332,13 +82540,13 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/crowbar/red,
 /obj/item/weapon/wrench,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQj" = (
 /obj/machinery/computer/station_alert,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQk" = (
 /obj/effect/decal/cleanable/dirt,
@@ -84347,37 +82555,37 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cQl" = (
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cQm" = (
 /obj/structure/cable/white,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cQn" = (
 /obj/structure/cable{
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cQo" = (
 /obj/structure/cable{
@@ -84385,33 +82593,31 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cQp" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQq" = (
 /obj/machinery/light_switch{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cQr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cQs" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -84445,18 +82651,18 @@
 	pixel_x = 0;
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQu" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQv" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -84471,25 +82677,25 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQx" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQy" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQz" = (
 /obj/structure/cable/white{
@@ -84499,10 +82705,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -84559,10 +82765,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -84601,10 +82807,10 @@
 /obj/structure/chair/office/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQJ" = (
 /obj/structure/table/reinforced,
@@ -84622,10 +82828,10 @@
 /obj/machinery/newscaster{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cQK" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -84856,10 +83062,10 @@
 	name = "Security Post - Medical";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint/medical)
 "cRi" = (
 /obj/machinery/newscaster,
@@ -84938,12 +83144,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -84958,16 +83164,12 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cRq" = (
 /obj/structure/girder,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cRr" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -85018,13 +83220,11 @@
 "cRv" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cRw" = (
 /obj/machinery/atmospherics/components/binary/valve{
 	tag = "icon-mvalve_map (NORTH)";
@@ -85034,10 +83234,10 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRx" = (
 /obj/machinery/atmospherics/components/binary/valve{
@@ -85046,78 +83246,78 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRy" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRz" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/folder/yellow,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRA" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRB" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cRC" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cRD" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cRE" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cRF" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cRG" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRH" = (
 /obj/structure/sign/nosmoking_2{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cRI" = (
 /obj/effect/decal/cleanable/dirt,
@@ -85132,9 +83332,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cRJ" = (
 /obj/machinery/camera{
 	c_tag = "Xenobiology - Secure Cell";
@@ -85180,8 +83378,8 @@
 	name = "Secure Creature Pen";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRM" = (
 /obj/structure/cable/white{
@@ -85196,10 +83394,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRN" = (
 /obj/structure/cable/white{
@@ -85215,8 +83413,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRP" = (
 /obj/machinery/door/firedoor,
@@ -85224,10 +83422,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRQ" = (
 /obj/structure/cable/white{
@@ -85245,26 +83443,26 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_end (WEST)";
 	icon_state = "white_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 8
-	},
 /area/toxins/xenobiology)
 "cRR" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/xenobiology)
 "cRS" = (
 /obj/structure/cable/white{
@@ -85282,13 +83480,13 @@
 /obj/effect/landmark{
 	name = "lightsout"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/xenobiology)
 "cRT" = (
 /obj/structure/cable/white{
@@ -85304,13 +83502,13 @@
 	dir = 1;
 	on = 1
 	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_end (EAST)";
 	icon_state = "white_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 4
-	},
 /area/toxins/xenobiology)
 "cRU" = (
 /obj/structure/cable/white{
@@ -85325,10 +83523,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRV" = (
 /obj/structure/cable/white{
@@ -85359,10 +83557,10 @@
 	},
 /area/toxins/xenobiology)
 "cRY" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cRZ" = (
 /obj/machinery/computer/camera_advanced/xenobio,
@@ -85555,8 +83753,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -85615,8 +83813,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -85781,12 +83979,12 @@
 	pixel_y = 0;
 	tag = "icon-poster3_legit"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -85796,12 +83994,12 @@
 	name = "Medbay Storage";
 	req_access_txt = "5"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay2{
 	name = "Medbay Storage"
 	})
@@ -85857,8 +84055,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -85869,17 +84067,13 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cST" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -85889,9 +84083,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -85900,9 +84092,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -85912,9 +84102,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -85929,9 +84117,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSX" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -85939,9 +84125,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSY" = (
 /obj/structure/closet/crate,
 /obj/item/weapon/storage/box/donkpockets,
@@ -85953,9 +84137,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cSZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -85967,9 +84149,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cTa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -85978,9 +84158,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cTb" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -86044,10 +84222,10 @@
 	dir = 1
 	},
 /obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTj" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -86056,22 +84234,22 @@
 /obj/machinery/light_switch{
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/visible,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTm" = (
 /obj/structure/extinguisher_cabinet{
@@ -86084,8 +84262,8 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTo" = (
 /obj/structure/table/reinforced,
@@ -86104,10 +84282,10 @@
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cTq" = (
 /obj/machinery/light_switch{
@@ -86119,12 +84297,12 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTr" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTs" = (
 /obj/machinery/power/smes,
@@ -86133,15 +84311,15 @@
 	pixel_y = -32
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/maintenance/electrical)
 "cTt" = (
 /obj/structure/closet/toolcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/electrical)
 "cTu" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
@@ -86193,14 +84371,14 @@
 	icon_state = "pipe-t";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTy" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTz" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -86208,25 +84386,25 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTA" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTC" = (
 /obj/structure/cable/white{
@@ -86236,10 +84414,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTD" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -86282,10 +84460,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -86309,17 +84487,17 @@
 /area/toxins/xenobiology)
 "cTK" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTL" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/box/monkeycubes,
 /obj/item/weapon/storage/box/monkeycubes,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTM" = (
 /obj/structure/table/reinforced,
@@ -86339,8 +84517,8 @@
 	name = "xenobiology camera";
 	network = list("SS13","xeno","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cTN" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -86409,12 +84587,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -86432,12 +84610,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -86487,8 +84665,8 @@
 	name = "Research and Development Shutter"
 	},
 /obj/machinery/door/window/northleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cUa" = (
 /obj/structure/grille,
@@ -86550,8 +84728,8 @@
 	},
 /obj/item/weapon/folder/yellow,
 /obj/machinery/door/window/northleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -86572,8 +84750,8 @@
 /obj/machinery/door/firedoor,
 /obj/item/weapon/folder/white,
 /obj/item/weapon/reagent_containers/hypospray/medipen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -86585,8 +84763,8 @@
 	},
 /obj/item/weapon/reagent_containers/glass/bottle/epinephrine,
 /obj/item/weapon/reagent_containers/syringe,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -86594,8 +84772,8 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/item/weapon/reagent_containers/food/drinks/britcup,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -86825,9 +85003,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUC" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -86845,9 +85021,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUD" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86862,9 +85036,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUE" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86878,9 +85050,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUF" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86894,9 +85064,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUG" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86910,9 +85078,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUH" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86925,9 +85091,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUI" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86942,9 +85106,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUJ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86958,9 +85120,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUK" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -86973,11 +85133,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cUL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -86994,10 +85152,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -87119,9 +85277,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/mop,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cUX" = (
 /obj/structure/sink/kitchen{
 	desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -87130,21 +85286,19 @@
 	},
 /obj/item/weapon/reagent_containers/glass/bucket,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cUY" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics Auxiliary Port";
 	req_access_txt = "24"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/maintenance/electrical)
 "cUZ" = (
 /obj/structure/sign/securearea,
@@ -87156,12 +85310,12 @@
 	name = "Engineering Auxiliary Power";
 	req_access_txt = "10"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/maintenance/electrical)
 "cVb" = (
 /obj/structure/cable/white,
@@ -87176,8 +85330,8 @@
 "cVc" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVd" = (
 /obj/structure/cable/white{
@@ -87188,8 +85342,8 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVe" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -87207,8 +85361,8 @@
 	pixel_y = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVg" = (
 /obj/structure/window/reinforced{
@@ -87216,8 +85370,8 @@
 	},
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVh" = (
 /obj/structure/cable/white{
@@ -87229,8 +85383,8 @@
 	name = "Creature Pen";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVi" = (
 /obj/structure/table/reinforced,
@@ -87246,8 +85400,8 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVj" = (
 /obj/structure/window/reinforced{
@@ -87259,8 +85413,8 @@
 	pixel_y = -32
 	},
 /obj/structure/disposalpipe/trunk,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVk" = (
 /obj/structure/table/reinforced,
@@ -87272,8 +85426,8 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVl" = (
 /obj/structure/table/reinforced,
@@ -87285,13 +85439,13 @@
 	name = "Containment Control";
 	req_access_txt = "55"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVm" = (
 /obj/machinery/processor/slime,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVn" = (
 /turf/open/floor/plasteel/whitepurple/side{
@@ -87315,10 +85469,10 @@
 	icon_state = "officechair_white";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cVq" = (
 /obj/structure/cable/white{
@@ -87397,8 +85551,8 @@
 	})
 "cVv" = (
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -87410,10 +85564,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -87426,10 +85580,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -87444,17 +85598,17 @@
 	dir = 9
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
 "cVz" = (
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -87469,10 +85623,10 @@
 	icon_state = "pipe-t";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cVC" = (
 /obj/structure/disposalpipe/segment{
@@ -87602,10 +85756,10 @@
 /obj/machinery/chem_master{
 	density = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cVP" = (
 /obj/structure/chair/office/light{
@@ -87614,16 +85768,16 @@
 /obj/effect/landmark/start{
 	name = "Chemist"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cVQ" = (
 /obj/machinery/chem_dispenser,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cVR" = (
 /obj/structure/cable/white{
@@ -87643,12 +85797,12 @@
 /area/medical/chemistry)
 "cVS" = (
 /obj/structure/closet/wardrobe/chemistry_white,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/medical/chemistry)
 "cVT" = (
 /obj/machinery/ai_status_display,
@@ -87759,10 +85913,10 @@
 	})
 "cWd" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -87854,9 +86008,7 @@
 /obj/structure/girder,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cWn" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -87865,9 +86017,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cWo" = (
 /turf/closed/wall,
 /area/medical/medbay3{
@@ -87879,22 +86029,18 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cWq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cWr" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -87973,9 +86119,7 @@
 /turf/open/floor/plasteel/green/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -87989,18 +86133,14 @@
 	icon_state = "purple";
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cWB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -88011,9 +86151,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWC" = (
 /obj/effect/landmark{
 	name = "blobstart"
@@ -88027,9 +86165,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -88041,16 +86177,12 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWE" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cWF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -88063,9 +86195,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -88079,9 +86209,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -88100,9 +86228,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWI" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -88114,9 +86240,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -88132,9 +86256,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -88149,9 +86271,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -88164,11 +86284,9 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cWM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -88184,9 +86302,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWN" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (NORTH)";
@@ -88194,9 +86310,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cWO" = (
 /obj/machinery/light,
 /turf/open/floor/plasteel/vault{
@@ -88211,10 +86325,10 @@
 	tag = "icon-0-4";
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/toxins/xenobiology)
 "cWQ" = (
 /obj/structure/cable/white{
@@ -88226,15 +86340,15 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cWR" = (
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cWS" = (
 /obj/structure/table,
@@ -88246,8 +86360,8 @@
 	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cWT" = (
 /obj/structure/cable/white{
@@ -88401,8 +86515,8 @@
 /obj/machinery/light_switch{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cXd" = (
 /turf/open/floor/plasteel/whitepurple/side{
@@ -88442,10 +86556,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cXh" = (
 /obj/structure/table/reinforced,
@@ -88465,8 +86579,8 @@
 	pixel_x = 26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cXi" = (
 /obj/structure/chair{
@@ -88503,10 +86617,10 @@
 	name = "Security Post - Science";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint/science{
 	name = "Security Post - Research Division"
 	})
@@ -88516,8 +86630,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -88529,18 +86643,18 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
 "cXo" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -88550,10 +86664,10 @@
 	on = 1
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -88565,8 +86679,8 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -88584,10 +86698,10 @@
 	pixel_x = -23;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cXs" = (
 /obj/effect/decal/cleanable/dirt,
@@ -88608,16 +86722,16 @@
 /area/toxins/lab)
 "cXv" = (
 /obj/machinery/r_n_d/destructive_analyzer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cXw" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cXx" = (
 /obj/machinery/r_n_d/protolathe,
@@ -88628,10 +86742,10 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cXy" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -88675,24 +86789,24 @@
 /area/medical/chemistry)
 "cXC" = (
 /obj/machinery/chem_heater,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cXD" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cXE" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cXF" = (
 /obj/structure/cable/white{
@@ -88704,10 +86818,10 @@
 "cXG" = (
 /obj/structure/closet/secure_closet/medical1,
 /obj/structure/window/reinforced,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "cXH" = (
 /obj/machinery/computer/crew,
@@ -88761,10 +86875,10 @@
 	name = "Medbay Desk";
 	req_access_txt = "5"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -88900,9 +87014,7 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cXZ" = (
 /obj/machinery/airalarm{
 	dir = 4;
@@ -88913,10 +87025,10 @@
 	icon_state = "sleeper-open";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay3{
 	name = "Abandoned Medbay"
 	})
@@ -88988,30 +87100,26 @@
 /obj/structure/frame/machine,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay3{
 	name = "Abandoned Medbay"
 	})
 "cYg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cYh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cYi" = (
 /obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/fitness{
 	name = "\improper Recreation Area"
 	})
@@ -89080,28 +87188,20 @@
 /turf/open/floor/plasteel/green/side{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYp" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYq" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYr" = (
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (NORTHEAST)";
@@ -89109,18 +87209,14 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYt" = (
 /obj/structure/closet/emcloset,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -89132,26 +87228,20 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYv" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -89165,11 +87255,9 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cYy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -89181,9 +87269,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYz" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -89193,9 +87279,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -89206,9 +87290,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYB" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -89223,9 +87305,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYC" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (EAST)";
@@ -89235,9 +87315,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cYD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -89264,12 +87342,12 @@
 	},
 /obj/item/weapon/storage/bag/bio,
 /obj/item/weapon/storage/bag/bio,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cYG" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cYH" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -89278,8 +87356,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cYI" = (
 /obj/structure/filingcabinet/chestdrawer,
@@ -89287,15 +87365,15 @@
 /obj/machinery/ai_status_display{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cYJ" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/gloves/color/latex,
 /obj/item/device/slime_scanner,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/xenobiology)
 "cYK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -89331,8 +87409,8 @@
 	pixel_y = -32
 	},
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -89344,10 +87422,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -89356,8 +87434,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -89372,17 +87450,17 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
 "cYQ" = (
 /obj/structure/closet/l3closet/scientist,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -89405,10 +87483,10 @@
 	pixel_x = -26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cYS" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -89428,22 +87506,22 @@
 /area/toxins/lab)
 "cYV" = (
 /obj/machinery/computer/rdconsole/core,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cYW" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cYX" = (
 /obj/machinery/r_n_d/circuit_imprinter,
 /obj/item/weapon/reagent_containers/glass/beaker/sulphuric,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "cYY" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -89627,12 +87705,12 @@
 	icon_state = "sleeper-open";
 	dir = 4
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -89657,12 +87735,12 @@
 	icon_state = "sleeper-open";
 	dir = 8
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -89718,9 +87796,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cZA" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -89728,9 +87804,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "cZB" = (
 /obj/structure/sign/examroom{
 	pixel_x = -32
@@ -89793,13 +87867,11 @@
 	icon_state = "1-2"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cZJ" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -89808,13 +87880,11 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "cZK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -89823,9 +87893,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -89836,9 +87904,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZM" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -89853,9 +87919,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZN" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -89866,9 +87930,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZO" = (
 /obj/structure/rack,
 /obj/item/weapon/crowbar/red,
@@ -89882,9 +87944,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (WEST)";
@@ -89894,9 +87954,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -89906,9 +87964,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "cZR" = (
 /obj/structure/sign/xenobio,
 /turf/closed/wall/r_wall,
@@ -89948,12 +88004,12 @@
 	name = "Xenobiology Lab";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/xenobiology)
 "cZU" = (
 /obj/structure/cable/white{
@@ -89971,35 +88027,35 @@
 "cZV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
 "cZW" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
 "cZX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -90016,8 +88072,8 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/box/gloves,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -90027,8 +88083,8 @@
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wrench,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -90040,8 +88096,8 @@
 /obj/item/weapon/storage/pod{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -90073,10 +88129,10 @@
 	pixel_x = -26;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "daf" = (
 /obj/structure/cable/white{
@@ -90211,8 +88267,8 @@
 /obj/machinery/door/firedoor,
 /obj/item/weapon/folder/white,
 /obj/item/weapon/reagent_containers/spray/cleaner,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -90245,45 +88301,45 @@
 	name = "Medical Cell";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint/medical)
 "dat" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
 "dau" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
 "dav" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -90299,12 +88355,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -90323,12 +88379,12 @@
 	req_access_txt = "5"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -90345,9 +88401,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "daC" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -90366,9 +88420,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "daD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -90383,10 +88435,10 @@
 	dir = 4
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay3{
 	name = "Abandoned Medbay"
 	})
@@ -90452,10 +88504,10 @@
 	req_access_txt = "12"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay3{
 	name = "Abandoned Medbay"
 	})
@@ -90463,24 +88515,18 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "daL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "daM" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "daN" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -90491,33 +88537,25 @@
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daP" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daQ" = (
 /obj/structure/table/wood,
 /obj/machinery/cell_charger,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daR" = (
 /obj/structure/table/wood,
 /obj/structure/cable/white{
@@ -90534,9 +88572,7 @@
 	pixel_y = 25
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daS" = (
 /obj/structure/table/wood,
 /obj/machinery/light{
@@ -90554,9 +88590,7 @@
 	pixel_y = 32
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daT" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -90565,44 +88599,34 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daU" = (
 /obj/structure/sign/poster{
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daV" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daX" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "daY" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -90614,9 +88638,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "daZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -90628,9 +88650,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dba" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -90644,9 +88664,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -90659,9 +88677,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbc" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -90673,9 +88689,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -90688,9 +88702,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbe" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -90702,9 +88714,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -90716,9 +88726,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dbg" = (
 /obj/machinery/light/small,
 /obj/machinery/camera{
@@ -90862,10 +88870,10 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -90951,8 +88959,8 @@
 	req_access_txt = "7"
 	},
 /obj/machinery/door/window/westleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "dbz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -91059,10 +89067,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "dbL" = (
 /obj/machinery/disposal/bin,
@@ -91071,10 +89079,10 @@
 	icon_state = "pipe-t";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "dbM" = (
 /turf/open/floor/plasteel/whiteyellow/side{
@@ -91122,8 +89130,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "dbR" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -91195,10 +89203,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -91320,9 +89328,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dcj" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -91332,9 +89338,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dck" = (
 /obj/machinery/shower{
 	dir = 4;
@@ -91402,30 +89406,22 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dcr" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/tinted/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dcs" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dct" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -91437,9 +89433,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -91447,9 +89441,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (WEST)";
@@ -91459,9 +89451,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcx" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -91477,9 +89467,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcy" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -91493,9 +89481,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcz" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -91510,9 +89496,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcA" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -91531,17 +89515,13 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcB" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -91552,9 +89532,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcD" = (
 /obj/structure/sign/poster{
 	pixel_x = 32
@@ -91564,9 +89542,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dcE" = (
 /turf/closed/wall,
 /area/medical/research{
@@ -91597,9 +89573,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dcI" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
@@ -91662,10 +89636,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -91721,10 +89695,10 @@
 	id = "rdrnd";
 	name = "Research and Development Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "dcV" = (
 /turf/open/floor/plasteel/whitepurple/corner{
@@ -91770,8 +89744,8 @@
 	name = "Secondary Research and Development Shutter"
 	},
 /obj/machinery/door/window/eastright,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "dcZ" = (
 /turf/open/floor/plasteel/purple,
@@ -91794,8 +89768,8 @@
 /obj/item/weapon/folder/white,
 /obj/item/weapon/pen,
 /obj/machinery/door/window/eastleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "ddc" = (
 /obj/structure/chair/office/light{
@@ -91804,8 +89778,8 @@
 /obj/effect/landmark/start{
 	name = "Chemist"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "ddd" = (
 /obj/machinery/requests_console{
@@ -91815,10 +89789,10 @@
 	pixel_x = 0;
 	pixel_y = -64
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "dde" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -91926,10 +89900,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -92050,10 +90024,10 @@
 	name = "Medbay Maintenance";
 	req_access_txt = "5"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -92064,11 +90038,9 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddB" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -92082,9 +90054,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddC" = (
 /obj/structure/sink{
 	dir = 8;
@@ -92141,16 +90111,12 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddI" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/dresser,
 /turf/open/floor/wood,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -92159,9 +90125,7 @@
 /obj/item/clothing/under/owl,
 /obj/item/clothing/mask/gas/owl_mask,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/wood,
@@ -92169,9 +90133,7 @@
 /obj/item/weapon/restraints/handcuffs,
 /obj/item/weapon/grenade/smokebomb,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "ddL" = (
 /obj/machinery/vending/assist,
 /obj/machinery/newscaster{
@@ -92182,24 +90144,18 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddM" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddN" = (
 /obj/structure/chair/stool,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddO" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -92207,9 +90163,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddP" = (
 /obj/structure/chair/wood/normal,
 /obj/effect/decal/cleanable/dirt,
@@ -92217,22 +90171,16 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddQ" = (
 /obj/structure/chair/wood/normal,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddR" = (
 /obj/structure/chair/wood/normal,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddS" = (
 /obj/structure/table/wood/poker,
 /obj/structure/cable/white{
@@ -92241,18 +90189,14 @@
 	},
 /obj/item/weapon/storage/wallet/random,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddT" = (
 /obj/structure/table/wood/poker,
 /obj/item/weapon/storage/briefcase,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -92265,15 +90209,11 @@
 	pixel_x = -1
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddV" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "ddW" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -92304,8 +90244,8 @@
 /obj/item/weapon/reagent_containers/dropper,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -92320,16 +90260,16 @@
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dea" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -92338,8 +90278,8 @@
 	icon_state = "plant-22"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -92372,8 +90312,8 @@
 /obj/structure/table,
 /obj/item/device/flashlight/lamp,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -92383,9 +90323,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "deg" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -92397,9 +90335,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "deh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -92408,9 +90344,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dei" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -92421,9 +90355,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dej" = (
 /turf/closed/wall/r_wall,
 /area/toxins/explab)
@@ -92437,15 +90369,15 @@
 	},
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "del" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dem" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
@@ -92455,15 +90387,15 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "den" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "deo" = (
 /obj/structure/cable/white{
@@ -92484,36 +90416,36 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dep" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "deq" = (
 /obj/structure/closet/l3closet/scientist,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "der" = (
 /obj/structure/closet/bombcloset,
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "des" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/suit/radiation,
 /obj/item/clothing/head/radiation,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "det" = (
 /turf/closed/wall,
@@ -92593,10 +90525,10 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -92666,10 +90598,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "deI" = (
 /obj/structure/table/reinforced,
@@ -92678,10 +90610,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "deJ" = (
 /obj/structure/table/reinforced,
@@ -92698,10 +90630,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "deK" = (
 /obj/structure/cable/white{
@@ -92724,10 +90656,10 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "deM" = (
 /obj/structure/table/reinforced,
@@ -92748,10 +90680,10 @@
 	pixel_y = -23;
 	req_access_txt = "7"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/lab)
 "deN" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -92780,15 +90712,15 @@
 	pixel_x = -32;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "deQ" = (
 /obj/machinery/chem_heater,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "deR" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -92862,10 +90794,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/chemistry)
 "deW" = (
 /obj/structure/cable/white{
@@ -92953,10 +90885,10 @@
 	},
 /obj/machinery/light,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -93084,9 +91016,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfq" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -93098,9 +91028,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfr" = (
 /obj/structure/closet/secure_closet/medical2,
 /obj/effect/decal/cleanable/dirt,
@@ -93192,9 +91120,7 @@
 /obj/machinery/space_heater,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -93202,11 +91128,9 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -93216,13 +91140,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -93238,9 +91160,7 @@
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/office/dark{
@@ -93250,23 +91170,17 @@
 	name = "revenantspawn"
 	},
 /turf/open/floor/wood,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/wood,
 /obj/item/device/modular_computer/tablet/preset/cheap,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dfE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfF" = (
 /obj/structure/cable/white{
 	tag = "icon-0-2";
@@ -93287,9 +91201,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfG" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -93304,9 +91216,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfH" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -93320,9 +91230,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfI" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -93337,9 +91245,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfJ" = (
 /obj/structure/cable/white{
 	tag = "icon-0-2";
@@ -93358,23 +91264,17 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfK" = (
 /obj/structure/table/wood/poker,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfL" = (
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfM" = (
 /obj/machinery/airalarm{
 	dir = 8;
@@ -93382,9 +91282,7 @@
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dfN" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/disk/tech_disk{
@@ -93393,16 +91291,16 @@
 	},
 /obj/item/weapon/disk/tech_disk,
 /obj/item/device/assembly/timer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dfO" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -93415,18 +91313,18 @@
 "dfQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dfR" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -93443,8 +91341,8 @@
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -93456,9 +91354,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dfV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -93470,9 +91366,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dfW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -93483,9 +91377,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dfX" = (
 /obj/structure/table/reinforced,
 /obj/machinery/newscaster{
@@ -93494,8 +91386,8 @@
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wrench,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dfY" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -93562,8 +91454,8 @@
 	},
 /obj/item/stack/cable_coil/white,
 /obj/item/device/geiger_counter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dgf" = (
 /obj/structure/grille,
@@ -93579,12 +91471,12 @@
 	name = "Research Division Access";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -93620,12 +91512,12 @@
 	req_access_txt = "47"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -93752,32 +91644,32 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/assembly/chargebay)
 "dgy" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/primary/aft)
 "dgz" = (
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/primary/aft)
 "dgA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -93790,12 +91682,12 @@
 	tag = "icon-fire0 (EAST)"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/primary/aft)
 "dgB" = (
 /turf/closed/wall,
@@ -93807,12 +91699,12 @@
 	req_access_txt = "5; 33"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/aft)
 "dgD" = (
 /turf/closed/wall,
@@ -93833,12 +91725,12 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -93848,12 +91740,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -93871,12 +91763,12 @@
 	req_access_txt = "0"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/surgery)
 "dgL" = (
 /obj/structure/grille,
@@ -93889,12 +91781,12 @@
 	name = "Surgery Observation";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/surgery)
 "dgN" = (
 /obj/structure/girder,
@@ -93902,9 +91794,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dgO" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -93915,9 +91805,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dgP" = (
 /turf/closed/wall,
 /area/hallway/secondary/construction)
@@ -93927,16 +91815,12 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgS" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -93948,25 +91832,19 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgT" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgU" = (
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgV" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -93978,9 +91856,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgW" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (WEST)";
@@ -93990,9 +91866,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dgX" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/stock_parts/matter_bin,
@@ -94002,18 +91876,18 @@
 	pixel_x = -23;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dgY" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -94021,29 +91895,29 @@
 /obj/structure/frame/machine,
 /obj/item/stack/cable_coil/white,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dha" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dhb" = (
 /obj/structure/frame/machine,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -94062,10 +91936,10 @@
 	})
 "dhe" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -94084,9 +91958,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dhh" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -94094,8 +91966,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dhi" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -94128,8 +92000,8 @@
 /area/toxins/explab)
 "dhn" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dho" = (
 /turf/open/floor/plasteel/whitepurple/side{
@@ -94144,8 +92016,8 @@
 	pixel_y = 0;
 	tag = "icon-fire0 (EAST)"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dhq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -94158,8 +92030,8 @@
 	pixel_x = -24;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -94169,18 +92041,18 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
 "dhs" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -94190,10 +92062,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -94208,8 +92080,8 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -94238,8 +92110,8 @@
 	pixel_x = -26;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -94257,10 +92129,10 @@
 	icon_state = "2-8"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -94291,8 +92163,8 @@
 	tag = "icon-0-8";
 	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -94309,26 +92181,26 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dhz" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dhA" = (
 /obj/structure/displaycase/labcage,
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dhB" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -94337,17 +92209,17 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dhC" = (
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dhD" = (
 /obj/structure/cable/white,
@@ -94390,28 +92262,28 @@
 	pixel_x = 0;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhG" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhH" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhI" = (
 /obj/structure/cable/white{
@@ -94423,10 +92295,10 @@
 	tag = "icon-1-8";
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhJ" = (
 /obj/structure/cable/white{
@@ -94434,10 +92306,10 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhK" = (
 /obj/structure/cable/white{
@@ -94451,10 +92323,10 @@
 	pixel_x = 0;
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhL" = (
 /obj/structure/table,
@@ -94467,8 +92339,8 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dhM" = (
 /obj/effect/decal/cleanable/dirt,
@@ -94640,10 +92512,10 @@
 	})
 "dic" = (
 /obj/machinery/atmospherics/components/unary/cryo_cell,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -94658,19 +92530,19 @@
 	pixel_y = 6
 	},
 /obj/item/weapon/storage/pill_bottle/mannitol,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
 "die" = (
 /obj/machinery/atmospherics/components/unary/cryo_cell,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -94772,9 +92644,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dis" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -94785,69 +92655,67 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dit" = (
 /obj/structure/table,
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "diu" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/hallway/secondary/construction)
 "div" = (
 /obj/machinery/pipedispenser,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/secondary/construction)
 "diw" = (
 /obj/machinery/pipedispenser/disposal,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/secondary/construction)
 "dix" = (
 /obj/machinery/pipedispenser/disposal/transit_tube,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/secondary/construction)
 "diy" = (
 /obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/hallway/secondary/construction)
 "diz" = (
 /obj/structure/table,
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/mask/gas,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "diA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -94857,9 +92725,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "diB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -94868,23 +92734,19 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "diC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "diD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -94897,18 +92759,14 @@
 	on = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "diE" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "diF" = (
 /obj/structure/sign/poster{
 	pixel_x = -32
@@ -94918,14 +92776,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diG" = (
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diH" = (
 /obj/structure/table/wood/poker,
 /obj/item/stack/spacecash/c1000{
@@ -94933,9 +92787,7 @@
 	},
 /obj/item/stack/spacecash/c500,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diI" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (EAST)";
@@ -94943,14 +92795,10 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diJ" = (
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diK" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (WEST)";
@@ -94958,16 +92806,12 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "diM" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/cable_coil/white,
@@ -94981,26 +92825,26 @@
 	pixel_y = 0
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "diN" = (
 /obj/structure/frame/computer,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "diO" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -95008,10 +92852,10 @@
 /obj/structure/frame/machine,
 /obj/item/stack/cable_coil/white,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -95038,16 +92882,16 @@
 	name = "Abandoned Research Lab"
 	})
 "diS" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "diT" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -95069,13 +92913,11 @@
 	},
 /obj/structure/girder,
 /obj/structure/grille,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "diW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -95084,9 +92926,7 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "diX" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -95103,9 +92943,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "diY" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -95119,10 +92957,10 @@
 	name = "Science Maintenance";
 	req_access_txt = "47"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "diZ" = (
 /obj/structure/cable/white{
@@ -95132,8 +92970,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dja" = (
 /obj/structure/cable/white{
@@ -95196,10 +93034,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dje" = (
 /obj/structure/chair/office/light,
@@ -95210,10 +93048,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "djf" = (
 /obj/structure/table/reinforced,
@@ -95228,10 +93066,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "djg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -95249,8 +93087,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dji" = (
 /obj/machinery/door/firedoor,
@@ -95264,10 +93102,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "djj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -95276,8 +93114,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -95289,10 +93127,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -95307,8 +93145,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -95317,10 +93155,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -95336,10 +93174,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -95351,10 +93189,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -95369,8 +93207,8 @@
 	dir = 4;
 	icon_state = "pipe-j2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -95383,10 +93221,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -95417,8 +93255,8 @@
 	name = "RD's Junction";
 	sortType = 13
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "djt" = (
 /obj/structure/cable/white{
@@ -95428,17 +93266,17 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dju" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "djv" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -95450,10 +93288,10 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "djw" = (
 /obj/structure/filingcabinet/chestdrawer,
@@ -95463,8 +93301,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "djx" = (
 /obj/structure/cable/white,
@@ -95536,8 +93374,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "djD" = (
 /obj/structure/cable/white{
@@ -95551,18 +93389,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "djE" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "djF" = (
 /obj/machinery/computer/mech_bay_power_console,
@@ -95578,22 +93416,22 @@
 	icon_state = "recharge_port";
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/assembly/chargebay)
 "djI" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "djJ" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "djK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -95603,10 +93441,10 @@
 	dir = 4;
 	name = "hallway camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "djL" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -95627,10 +93465,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "djN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -95734,10 +93572,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/genetics_cloning)
 "djZ" = (
 /obj/structure/cable/white{
@@ -95782,10 +93620,10 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -95804,10 +93642,10 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -95832,10 +93670,10 @@
 	name = "Surgery Observation";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/surgery)
 "dki" = (
 /obj/structure/chair,
@@ -95856,9 +93694,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dkk" = (
 /obj/structure/rack,
 /obj/machinery/light/small{
@@ -95870,8 +93706,8 @@
 	lootcount = 2;
 	name = "2maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dkl" = (
 /turf/open/floor/plating,
@@ -95899,40 +93735,30 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dkp" = (
 /obj/structure/closet/emcloset,
 /obj/item/clothing/mask/breath,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dkq" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dkr" = (
 /obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dks" = (
 /obj/structure/table/wood/poker,
 /obj/item/clothing/glasses/sunglasses/big,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkt" = (
 /obj/structure/table/wood/poker,
 /obj/item/stack/spacecash/c10{
@@ -95942,9 +93768,7 @@
 /obj/item/stack/spacecash/c100,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dku" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck/syndicate{
@@ -95953,17 +93777,13 @@
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkw" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (EAST)";
@@ -95975,18 +93795,14 @@
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkx" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dky" = (
 /obj/effect/decal/cleanable/vomit/old,
 /obj/effect/landmark{
@@ -95995,9 +93811,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkz" = (
 /obj/item/weapon/storage/toolbox/emergency,
 /obj/effect/decal/cleanable/blood/old,
@@ -96005,9 +93819,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkA" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (WEST)";
@@ -96015,9 +93827,7 @@
 	dir = 8
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dkB" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/folder/white,
@@ -96033,17 +93843,17 @@
 "dkC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dkD" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96058,8 +93868,8 @@
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96073,8 +93883,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96088,10 +93898,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96105,8 +93915,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96126,10 +93936,10 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96150,13 +93960,11 @@
 	},
 /obj/structure/girder,
 /obj/structure/grille,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "dkL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -96171,9 +93979,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dkM" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -96191,9 +93997,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dkN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (WEST)";
@@ -96212,13 +94016,13 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkP" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkQ" = (
 /obj/machinery/light,
@@ -96229,8 +94033,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkR" = (
 /obj/structure/table/reinforced,
@@ -96241,10 +94045,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkS" = (
 /obj/structure/table/reinforced,
@@ -96253,18 +94057,18 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkT" = (
 /obj/machinery/computer/rdconsole/experiment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkU" = (
 /obj/structure/table/reinforced,
@@ -96274,10 +94078,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkV" = (
 /obj/structure/table/reinforced,
@@ -96287,10 +94091,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkW" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -96302,8 +94106,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/explab)
 "dkX" = (
 /obj/structure/sign/securearea,
@@ -96318,17 +94122,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
 "dkZ" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -96336,8 +94140,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -96345,10 +94149,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -96377,8 +94181,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -96396,8 +94200,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -96407,8 +94211,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -96427,10 +94231,10 @@
 	req_access = null;
 	req_access_txt = "30"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dlh" = (
 /obj/structure/cable/white{
@@ -96442,8 +94246,8 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dli" = (
 /obj/structure/cable/white{
@@ -96506,8 +94310,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dlm" = (
 /obj/machinery/door/firedoor,
@@ -96530,10 +94334,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dln" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -96585,8 +94389,8 @@
 /obj/machinery/light_switch{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dlr" = (
 /obj/structure/cable/white{
@@ -96594,28 +94398,28 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dls" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dlt" = (
 /turf/open/floor/plasteel/circuit,
 /area/assembly/chargebay)
 "dlu" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dlv" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dlw" = (
 /obj/effect/decal/cleanable/dirt,
@@ -96629,10 +94433,10 @@
 	pixel_y = 26;
 	req_access_txt = "29"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dlx" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -96641,10 +94445,10 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dly" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -96751,10 +94555,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/genetics_cloning)
 "dlM" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -96788,10 +94592,10 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -96805,10 +94609,10 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -96830,8 +94634,8 @@
 	amount = 30
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dlU" = (
 /obj/structure/girder,
@@ -96848,16 +94652,12 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dlW" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dlX" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (EAST)";
@@ -96866,9 +94666,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dlY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -96878,9 +94676,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dlZ" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -96893,18 +94689,14 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dma" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dmb" = (
 /obj/structure/table/wood,
 /obj/machinery/light{
@@ -96914,9 +94706,7 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dmc" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/decal/cleanable/dirt,
@@ -96933,15 +94723,15 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dme" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96954,8 +94744,8 @@
 	pixel_x = 1;
 	pixel_y = -24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -96987,8 +94777,8 @@
 /obj/machinery/light_switch{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -97000,13 +94790,11 @@
 	},
 /obj/structure/girder,
 /obj/structure/grille,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/port_maintenance)
 "dmk" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -97014,9 +94802,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dml" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -97096,12 +94882,12 @@
 	id = "rdtoxins";
 	name = "Toxins Lab Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -97155,8 +94941,8 @@
 	},
 /obj/structure/cable/white,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dmB" = (
 /obj/machinery/holopad,
@@ -97204,8 +94990,8 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dmF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -97242,20 +95028,20 @@
 	name = "Mech Bay";
 	req_access_txt = "29"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dmJ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dmK" = (
 /turf/open/floor/plasteel/neutral,
@@ -97273,26 +95059,26 @@
 /area/assembly/chargebay)
 "dmN" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dmO" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "mechbay";
 	name = "Mech Bay Shutters"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dmP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dmQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -97432,10 +95218,10 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -97443,8 +95229,8 @@
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -97453,10 +95239,10 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -97600,9 +95386,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dnv" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/yellow/corner{
@@ -97623,9 +95407,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dnz" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -97636,9 +95418,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dnA" = (
 /obj/structure/table/wood,
 /obj/machinery/status_display{
@@ -97646,9 +95426,7 @@
 	},
 /obj/item/weapon/book/manual/wiki/engineering_hacking,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dnB" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -97663,12 +95441,12 @@
 	req_access_txt = "12"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -97678,9 +95456,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dnE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -97704,10 +95480,10 @@
 	pixel_x = -24;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -97740,19 +95516,19 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dnN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -97768,10 +95544,10 @@
 "dnP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -97784,8 +95560,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dnR" = (
 /obj/structure/cable/white{
@@ -97851,8 +95627,8 @@
 /obj/machinery/ai_status_display{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dnV" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -97873,8 +95649,8 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dnX" = (
 /obj/effect/decal/cleanable/dirt,
@@ -97902,12 +95678,12 @@
 	name = "Genetics Desk Maintenance";
 	req_access_txt = "9"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/genetics)
 "doc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -97940,12 +95716,12 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/genetics)
 "dog" = (
 /obj/structure/cable/white{
@@ -98120,9 +95896,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dox" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -98133,11 +95907,9 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "doy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -98151,18 +95923,18 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "doz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "doA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -98187,8 +95959,8 @@
 "doD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "doE" = (
 /obj/effect/decal/cleanable/dirt,
@@ -98196,20 +95968,18 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "doF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "doG" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -98222,9 +95992,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "doH" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -98237,9 +96005,7 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "doI" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -98255,15 +96021,11 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "doJ" = (
 /obj/structure/chair/stool,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "doK" = (
 /obj/structure/table/wood,
 /obj/item/device/assembly/igniter,
@@ -98274,15 +96036,13 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "doL" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98302,8 +96062,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98330,8 +96090,8 @@
 /obj/item/weapon/storage/belt/utility,
 /obj/item/weapon/reagent_containers/glass/beaker/large,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98340,8 +96100,8 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98350,8 +96110,8 @@
 /obj/item/weapon/stock_parts/console_screen,
 /obj/item/weapon/stock_parts/micro_laser,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98364,8 +96124,8 @@
 	amount = 50
 	},
 /obj/item/device/assembly/flash/handheld,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -98375,9 +96135,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "doV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -98388,9 +96146,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "doW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	tag = "icon-intact (NORTHEAST)";
@@ -98474,8 +96230,8 @@
 	icon_state = "alarm0";
 	pixel_x = -22
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -98490,8 +96246,8 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -98531,8 +96287,8 @@
 	pixel_x = -32;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dpl" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -98580,8 +96336,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dpp" = (
 /obj/structure/cable/white{
@@ -98653,8 +96409,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dpv" = (
 /obj/structure/cable/white{
@@ -98668,10 +96424,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dpw" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -98679,8 +96435,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dpx" = (
 /obj/machinery/computer/mech_bay_power_console,
@@ -98692,10 +96448,10 @@
 	icon_state = "recharge_port";
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/assembly/chargebay)
 "dpz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -98710,16 +96466,16 @@
 	pixel_x = 26;
 	pixel_y = -38
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dpA" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dpB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -98736,8 +96492,8 @@
 	pixel_x = -24;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "dpD" = (
 /obj/structure/extinguisher_cabinet{
@@ -98797,21 +96553,21 @@
 /obj/structure/noticeboard{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/medical/genetics)
 "dpK" = (
 /obj/machinery/dna_scannernew,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/medical/genetics)
 "dpL" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -98862,13 +96618,13 @@
 	pixel_x = 0
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end{
+	dir = 1
+	},
 /mob/living/carbon/monkey,
 /turf/open/floor/plasteel{
 	tag = "icon-plasteel_warn_end (NORTH)"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 1
-	},
 /area/medical/genetics)
 "dpP" = (
 /obj/structure/cable/white{
@@ -98995,10 +96751,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/surgery)
 "dqa" = (
 /obj/structure/cable/white{
@@ -99052,10 +96808,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/surgery)
 "dqe" = (
 /obj/structure/cable/white{
@@ -99107,8 +96863,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/surgery)
 "dqi" = (
 /obj/structure/cable/white{
@@ -99132,10 +96888,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/surgery)
 "dqk" = (
 /obj/structure/cable/white{
@@ -99150,11 +96906,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dql" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -99165,9 +96919,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dqm" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/yellow/corner{
@@ -99182,8 +96934,8 @@
 /obj/structure/table,
 /obj/item/device/analyzer,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dqp" = (
 /obj/effect/decal/cleanable/dirt,
@@ -99192,9 +96944,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dqq" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
@@ -99202,13 +96952,11 @@
 /obj/item/device/assembly/voice,
 /obj/item/clothing/head/welding,
 /obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dqr" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -99216,21 +96964,17 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dqs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dqt" = (
 /obj/structure/table/wood,
 /obj/machinery/newscaster{
@@ -99245,9 +96989,7 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dqu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -99257,41 +96999,35 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dqv" = (
 /turf/open/floor/wood{
 	tag = "icon-wood-broken7";
 	icon_state = "wood-broken7"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dqw" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dqx" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/item/weapon/stock_parts/cell/high,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dqy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -99299,8 +97035,8 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -99316,9 +97052,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dqB" = (
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -99397,10 +97131,10 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -99412,10 +97146,10 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -99433,10 +97167,10 @@
 	})
 "dqL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -99457,8 +97191,8 @@
 	pixel_x = -26;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dqN" = (
 /obj/structure/cable/white{
@@ -99499,8 +97233,8 @@
 	pixel_x = 5;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dqR" = (
 /obj/structure/disposalpipe/segment,
@@ -99537,18 +97271,18 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqU" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqV" = (
 /obj/effect/decal/cleanable/dirt,
@@ -99556,8 +97290,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqW" = (
 /obj/structure/cable/white{
@@ -99570,30 +97304,30 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqX" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqY" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dqZ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "dra" = (
 /obj/structure/reagent_dispensers/fueltank,
@@ -99602,8 +97336,8 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/chargebay)
 "drb" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -99647,10 +97381,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "drf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -99659,8 +97393,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "drg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -99807,13 +97541,13 @@
 	req_access_txt = "9"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
 /mob/living/carbon/monkey,
 /turf/open/floor/plasteel{
 	tag = "icon-plasteel_warn_side (NORTH)"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /area/medical/genetics)
 "drs" = (
 /obj/structure/cable/white{
@@ -99891,10 +97625,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "drx" = (
 /obj/structure/cable/white{
@@ -99976,10 +97710,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "drD" = (
 /obj/structure/cable/white{
@@ -100099,9 +97833,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "drP" = (
 /obj/structure/rack,
 /obj/machinery/light/small{
@@ -100112,22 +97844,22 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/toolbox/electrical,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "drQ" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
 /area/hallway/secondary/construction)
 "drR" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/hallway/secondary/construction)
 "drS" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/hallway/secondary/construction)
 "drT" = (
 /obj/structure/chair/office/light{
@@ -100144,8 +97876,8 @@
 /obj/item/weapon/folder/yellow,
 /obj/item/weapon/electronics/firealarm,
 /obj/item/weapon/stock_parts/console_screen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "drV" = (
 /obj/effect/decal/cleanable/dirt,
@@ -100156,20 +97888,16 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "drW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "drX" = (
 /obj/effect/landmark{
 	name = "xeno_spawn";
@@ -100179,21 +97907,17 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "drY" = (
 /obj/structure/closet/firecloset,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "drZ" = (
 /obj/structure/chair/wood/normal{
 	tag = "icon-wooden_chair (NORTH)";
@@ -100202,18 +97926,14 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dsa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dsb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -100221,46 +97941,38 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dsc" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dsd" = (
 /obj/structure/chair/stool/bar,
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dse" = (
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dsf" = (
 /obj/machinery/recharge_station,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dsg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -100278,8 +97990,8 @@
 "dsj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -100290,8 +98002,8 @@
 	})
 "dsl" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -100300,8 +98012,8 @@
 /obj/machinery/light_switch{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -100370,10 +98082,10 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -100429,12 +98141,12 @@
 	req_access_txt = "30"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/crew_quarters/hor)
 "dsx" = (
 /obj/structure/cable/white{
@@ -100453,12 +98165,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -100466,12 +98178,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -100501,12 +98213,12 @@
 	name = "Robotics Lab";
 	req_access_txt = "29"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/assembly/robotics)
 "dsE" = (
 /turf/closed/wall/r_wall,
@@ -100515,12 +98227,12 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/primary/aft)
 "dsG" = (
 /obj/structure/table/glass,
@@ -100611,10 +98323,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "dsL" = (
 /obj/structure/cable/white{
@@ -100718,12 +98430,12 @@
 	name = "'Monkey Pen";
 	req_access_txt = "9"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (NORTH)"
+	},
 /area/medical/genetics)
 "dsS" = (
 /obj/structure/cable/white{
@@ -100922,15 +98634,15 @@
 /obj/item/weapon/stock_parts/cell/high,
 /obj/item/weapon/stock_parts/cell/high,
 /obj/machinery/cell_charger,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dtk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dtl" = (
 /obj/machinery/power/apc{
@@ -100942,8 +98654,8 @@
 	tag = "icon-0-4";
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dtm" = (
 /obj/effect/decal/cleanable/dirt,
@@ -100952,23 +98664,23 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dtn" = (
 /obj/structure/table,
 /obj/item/device/flashlight/lamp,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dto" = (
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/construction)
 "dtp" = (
 /obj/effect/decal/cleanable/dirt,
@@ -100976,9 +98688,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dtq" = (
 /obj/structure/table/wood,
 /obj/machinery/newscaster{
@@ -100988,25 +98698,19 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtr" = (
 /obj/structure/table/wood/poker,
 /obj/item/device/flashlight/lamp,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dts" = (
 /obj/structure/table/wood/poker,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtt" = (
 /obj/structure/table/wood/poker,
 /obj/item/weapon/storage/box/matches{
@@ -101014,17 +98718,13 @@
 	pixel_y = 5
 	},
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtu" = (
 /obj/structure/table/wood/poker,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtv" = (
 /obj/structure/table/wood/poker,
 /obj/item/weapon/storage/fancy/cigarettes/dromedaryco{
@@ -101034,9 +98734,7 @@
 /obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtw" = (
 /obj/machinery/airalarm{
 	dir = 1;
@@ -101044,22 +98742,20 @@
 	pixel_y = -22
 	},
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dtx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dty" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101105,10 +98801,10 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101118,8 +98814,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101134,10 +98830,10 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101153,9 +98849,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dtH" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -101169,9 +98863,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dtI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -101186,9 +98878,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dtJ" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -101202,9 +98892,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dtK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -101213,9 +98901,7 @@
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dtL" = (
 /obj/machinery/portable_atmospherics/pump,
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -101270,27 +98956,27 @@
 /obj/structure/sign/fire{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dtQ" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
 "dtR" = (
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -101299,10 +98985,10 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dtT" = (
 /turf/open/floor/plasteel/whitepurple/corner{
@@ -101362,8 +99048,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dtY" = (
 /obj/item/weapon/paper_bin,
@@ -101380,13 +99066,13 @@
 	pixel_y = 7
 	},
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dtZ" = (
 /obj/machinery/mecha_part_fabricator,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dua" = (
 /obj/structure/rack,
@@ -101397,16 +99083,16 @@
 	},
 /obj/item/weapon/circuitboard/mecha/ripley/main,
 /obj/item/weapon/circuitboard/mecha/ripley/peripherals,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dub" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "duc" = (
 /obj/structure/table/reinforced,
@@ -101423,8 +99109,8 @@
 	pixel_x = 26;
 	pixel_y = 38
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dud" = (
 /obj/structure/sign/science{
@@ -101465,8 +99151,8 @@
 	},
 /obj/item/weapon/folder/white,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "dug" = (
 /obj/structure/chair/office/light{
@@ -101568,9 +99254,9 @@
 	pixel_x = 0
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end,
 /mob/living/carbon/monkey,
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/stripes/end,
 /area/medical/genetics)
 "dus" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -101671,9 +99357,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "duA" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -101684,12 +99368,12 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/hallway/secondary/construction)
 "duB" = (
 /obj/structure/cable/white{
@@ -101700,10 +99384,10 @@
 	name = "Station Intercom";
 	pixel_y = 26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "duC" = (
 /obj/machinery/power/smes,
@@ -101714,20 +99398,20 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "duD" = (
 /obj/machinery/camera{
 	c_tag = "Solar - Aft Starboard";
 	name = "solar camera"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "duE" = (
 /obj/structure/frame/machine,
@@ -101739,8 +99423,8 @@
 "duF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101751,17 +99435,17 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "duH" = (
 /obj/item/robot_suit,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -101779,17 +99463,13 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -101797,35 +99477,27 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -101838,9 +99510,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "duQ" = (
 /obj/structure/cable/white{
 	tag = "icon-0-4";
@@ -101852,8 +99522,8 @@
 	pixel_x = -26;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -101896,10 +99566,10 @@
 	dir = 8
 	},
 /obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -101918,8 +99588,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -101940,10 +99610,10 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "duZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -102004,18 +99674,18 @@
 	pixel_x = -24;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dve" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvf" = (
 /obj/effect/decal/cleanable/dirt,
@@ -102023,30 +99693,30 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvg" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvh" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvi" = (
 /obj/structure/chair/office/light{
@@ -102057,10 +99727,10 @@
 /obj/effect/landmark/start{
 	name = "Roboticist"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvj" = (
 /obj/structure/table/reinforced,
@@ -102076,8 +99746,8 @@
 	req_access_txt = "29"
 	},
 /obj/machinery/door/window/eastleft,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dvk" = (
 /obj/structure/cable/white{
@@ -102173,24 +99843,24 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/medical/genetics)
 "dvs" = (
 /obj/machinery/dna_scannernew,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/medical/genetics)
 "dvt" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -102233,8 +99903,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/genetics)
 "dvx" = (
 /obj/structure/cable/white,
@@ -102321,8 +99991,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "dvD" = (
 /obj/structure/cable/white{
@@ -102449,9 +100119,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvO" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -102465,9 +100133,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvP" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102481,9 +100147,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvQ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102494,9 +100158,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvR" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102508,9 +100170,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvS" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102521,9 +100181,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvT" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102533,9 +100191,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvU" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102550,9 +100206,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvV" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102569,9 +100223,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvW" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102587,9 +100239,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvX" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -102607,9 +100257,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvY" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102622,9 +100270,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dvZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -102636,11 +100282,9 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dwa" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Aft Starboard Solar Access";
@@ -102653,10 +100297,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/auxsolarstarboard)
 "dwb" = (
 /obj/structure/cable{
@@ -102679,9 +100323,7 @@
 /obj/machinery/chem_dispenser/drinks/beer,
 /obj/structure/table/wood/poker,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dwe" = (
 /obj/structure/table/wood/poker,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/rum{
@@ -102693,9 +100335,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dwf" = (
 /obj/machinery/vending/boozeomat{
 	req_access_txt = "0"
@@ -102706,18 +100346,14 @@
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dwg" = (
 /obj/structure/table/wood/poker,
 /obj/item/weapon/reagent_containers/food/drinks/shaker,
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,
 /obj/item/weapon/reagent_containers/dropper,
 /turf/open/floor/plating,
-/area/crew_quarters/bar{
-	name = "Abandoned Gambling Den"
-	})
+/area/crew_quarters/abandoned_gambling_den)
 "dwh" = (
 /obj/structure/table,
 /obj/item/weapon/crowbar/red,
@@ -102728,25 +100364,25 @@
 	name = "Abandoned Research Lab"
 	})
 "dwi" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dwj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
 "dwk" = (
 /obj/structure/chair/office/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -102763,9 +100399,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dwn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -102773,9 +100407,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dwo" = (
 /obj/structure/table/reinforced,
 /obj/item/device/radio/intercom{
@@ -102792,10 +100424,10 @@
 	pixel_x = -6;
 	pixel_y = -6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -102814,8 +100446,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -102830,17 +100462,17 @@
 /obj/machinery/newscaster{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dwt" = (
 /obj/machinery/light/small,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -102857,20 +100489,20 @@
 "dwv" = (
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
 "dww" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/suit_storage_unit/rd,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/hor)
 "dwx" = (
 /obj/machinery/button/door{
@@ -102957,8 +100589,8 @@
 /obj/item/device/assembly/flash/handheld,
 /obj/item/device/assembly/flash/handheld,
 /obj/item/device/assembly/flash/handheld,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dwE" = (
 /obj/structure/cable/white{
@@ -102971,10 +100603,10 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dwF" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -102985,23 +100617,23 @@
 /area/assembly/robotics)
 "dwG" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dwH" = (
 /turf/open/floor/plasteel/neutral,
 /area/assembly/robotics)
 "dwI" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dwJ" = (
 /obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dwK" = (
 /turf/closed/wall,
@@ -103017,12 +100649,12 @@
 	req_access_txt = "9"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/morgue)
 "dwM" = (
 /obj/structure/sign/nosmoking_2,
@@ -103046,12 +100678,12 @@
 	req_access_txt = "5"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/morgue)
 "dwQ" = (
 /obj/structure/table/glass,
@@ -103129,10 +100761,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -103189,9 +100821,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate{
@@ -103204,18 +100834,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxc" = (
 /obj/structure/girder,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxd" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -103226,24 +100852,18 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxe" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -103253,17 +100873,13 @@
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxh" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxi" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -103276,11 +100892,9 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (NORTHWEST)";
@@ -103288,9 +100902,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dxk" = (
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
@@ -103299,10 +100911,10 @@
 	name = "Aft Starboard Solar APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "dxl" = (
 /obj/machinery/power/solar_control{
@@ -103316,10 +100928,10 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "dxm" = (
 /obj/structure/cable{
@@ -103357,8 +100969,8 @@
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -103366,8 +100978,8 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -103376,8 +100988,8 @@
 /obj/item/weapon/clipboard,
 /obj/item/weapon/folder/white,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -103410,8 +101022,8 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Abandoned Research Lab"
 	})
@@ -103431,9 +101043,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dxx" = (
 /obj/item/device/assembly/prox_sensor{
 	pixel_x = -4;
@@ -103455,10 +101065,10 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -103481,10 +101091,10 @@
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -103513,10 +101123,10 @@
 	icon_state = "freezer";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -103541,12 +101151,12 @@
 	id = "rdtoxins";
 	name = "Toxins Lab Shutters"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/misc_lab{
 	name = "\improper Research Testing Range"
 	})
@@ -103616,10 +101226,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dxJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -103631,8 +101241,8 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dxK" = (
 /obj/effect/decal/cleanable/dirt,
@@ -103646,10 +101256,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dxL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -103707,10 +101317,10 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dxQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -103971,9 +101581,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dyq" = (
 /turf/closed/wall,
 /area/crew_quarters/theatre{
@@ -104004,12 +101612,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/security/detectives_office{
 	name = "Private Investigator's Office"
 	})
@@ -104036,18 +101644,14 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dyx" = (
 /obj/structure/closet,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Port Maintenance"
-	})
+/area/maintenance/fpmaint2/port_maintenance)
 "dyy" = (
 /obj/item/device/transfer_valve{
 	pixel_x = -5
@@ -104075,8 +101679,8 @@
 	pixel_x = -32;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104089,10 +101693,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104134,10 +101738,10 @@
 	pixel_y = 0;
 	tag = "icon-poster7_legit"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104147,8 +101751,8 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dyE" = (
 /obj/structure/cable/white{
@@ -104156,8 +101760,8 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dyF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -104165,8 +101769,8 @@
 	pixel_y = 22
 	},
 /obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dyG" = (
 /obj/item/device/radio/intercom{
@@ -104175,8 +101779,8 @@
 	pixel_y = 26
 	},
 /obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dyH" = (
 /obj/structure/table,
@@ -104190,8 +101794,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dyI" = (
 /turf/closed/wall/r_wall,
@@ -104264,8 +101868,8 @@
 /obj/item/weapon/storage/firstaid,
 /obj/item/device/paicard,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyP" = (
 /obj/structure/cable/white{
@@ -104273,39 +101877,39 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyQ" = (
 /obj/item/robot_suit,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyR" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral,
 /area/assembly/robotics)
 "dyS" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyT" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyU" = (
 /obj/machinery/computer/rdconsole/robotics,
 /obj/structure/sign/bluecross_2{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dyV" = (
 /obj/effect/landmark{
@@ -104641,18 +102245,18 @@
 	pixel_x = -26;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dzF" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104671,17 +102275,17 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dzH" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104690,8 +102294,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104706,10 +102310,10 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104730,12 +102334,12 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104766,8 +102370,8 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104779,10 +102383,10 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104811,10 +102415,10 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -104827,10 +102431,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dzS" = (
 /obj/structure/cable/white{
@@ -104842,29 +102446,29 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dzT" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dzU" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dzV" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dzW" = (
 /obj/structure/cable/white{
@@ -104984,8 +102588,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAe" = (
 /obj/structure/cable/white{
@@ -104998,30 +102602,30 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAf" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAh" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAi" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAj" = (
 /obj/machinery/r_n_d/circuit_imprinter,
@@ -105031,8 +102635,8 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dAk" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -105058,10 +102662,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/morgue)
 "dAm" = (
 /obj/effect/decal/cleanable/dirt,
@@ -105198,10 +102802,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/morgue)
 "dAw" = (
 /obj/structure/cable/white{
@@ -105273,10 +102877,10 @@
 /obj/structure/closet/secure_closet/CMO,
 /obj/item/clothing/under/rank/nursesuit,
 /obj/item/clothing/head/nursehat,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "dAC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -105319,9 +102923,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dAH" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -105331,9 +102933,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dAI" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -105527,21 +103127,21 @@
 	pixel_x = 0;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dBc" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -105596,10 +103196,10 @@
 	})
 "dBh" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -105616,20 +103216,20 @@
 "dBj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dBk" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/storage/firstaid/toxin,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -105655,10 +103255,10 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dBo" = (
 /obj/structure/cable/white{
@@ -105670,8 +103270,8 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dBp" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -105679,8 +103279,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dBq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -105688,14 +103288,14 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dBr" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dBs" = (
 /obj/structure/cable/white{
@@ -105799,8 +103399,8 @@
 /obj/machinery/newscaster{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBx" = (
 /obj/structure/cable/white{
@@ -105808,8 +103408,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBy" = (
 /obj/structure/table,
@@ -105823,13 +103423,13 @@
 	},
 /obj/item/weapon/storage/box/bodybags,
 /obj/item/borg/upgrade/rename,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBz" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBA" = (
 /obj/structure/table/reinforced,
@@ -105839,8 +103439,8 @@
 /obj/item/clothing/gloves/color/latex,
 /obj/item/weapon/surgical_drapes,
 /obj/item/weapon/cautery,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBB" = (
 /obj/machinery/holopad,
@@ -105867,8 +103467,8 @@
 /obj/machinery/ai_status_display{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dBE" = (
 /obj/machinery/firealarm{
@@ -106017,10 +103617,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "dBU" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -106065,9 +103665,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dBZ" = (
 /obj/machinery/light_switch{
 	pixel_x = -26
@@ -106185,13 +103783,13 @@
 /obj/structure/window/reinforced,
 /obj/item/target,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/end{
+	dir = 1
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_end (NORTH)";
 	icon_state = "plating_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 1
-	},
 /area/toxins/test_area)
 "dCl" = (
 /obj/machinery/button/massdriver{
@@ -106204,20 +103802,20 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dCm" = (
-/turf/open/floor/plasteel{
-	tag = "icon-warning (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-warning (EAST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106227,13 +103825,13 @@
 	icon_state = "intact";
 	dir = 5
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106244,13 +103842,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106258,13 +103856,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106276,13 +103874,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn_side (EAST)";
 	icon_state = "white_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106296,10 +103894,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106327,8 +103925,8 @@
 	},
 /obj/item/device/radio/beacon,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106366,10 +103964,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106386,8 +103984,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106445,8 +104043,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106464,10 +104062,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -106485,8 +104083,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dCD" = (
 /obj/effect/decal/cleanable/dirt,
@@ -106495,8 +104093,8 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dCE" = (
 /obj/effect/decal/cleanable/dirt,
@@ -106505,10 +104103,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dCF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -106516,16 +104114,16 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dCG" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dCH" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -106631,8 +104229,8 @@
 	pixel_x = 0;
 	pixel_y = -26
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCO" = (
 /obj/structure/cable/white{
@@ -106641,8 +104239,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCP" = (
 /obj/structure/closet/wardrobe/robotics_black,
@@ -106650,14 +104248,14 @@
 	dir = 4;
 	pixel_x = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCR" = (
 /obj/structure/table/reinforced,
@@ -106670,8 +104268,8 @@
 /obj/structure/sign/bluecross_2{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCS" = (
 /obj/machinery/computer/operating,
@@ -106703,8 +104301,8 @@
 	desc = "Mirror mirror on the wall, who is the most robust of them all?";
 	pixel_x = 28
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dCV" = (
 /obj/machinery/disposal/bin,
@@ -106802,10 +104400,10 @@
 /area/medical/morgue)
 "dDh" = (
 /obj/machinery/suit_storage_unit/cmo,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/cmo)
 "dDi" = (
 /obj/structure/table/glass,
@@ -106880,9 +104478,7 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dDq" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -106902,9 +104498,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dDr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -106919,10 +104513,10 @@
 	dir = 4
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/crew_quarters/theatre{
 	name = "Abandoned Theatre"
 	})
@@ -107085,20 +104679,20 @@
 "dDG" = (
 /obj/structure/chair,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dDH" = (
 /turf/open/floor/plating,
 /area/toxins/test_area)
 "dDI" = (
 /obj/structure/chair,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dDJ" = (
 /obj/machinery/doppler_array{
@@ -107108,10 +104702,10 @@
 	pixel_x = -26;
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107122,10 +104716,10 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107151,8 +104745,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107165,8 +104759,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107174,8 +104768,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107191,8 +104785,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107210,10 +104804,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107238,17 +104832,17 @@
 	icon_state = "manifold";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dDT" = (
 /obj/structure/tank_dispenser,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107265,8 +104859,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107282,8 +104876,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107300,8 +104894,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107322,8 +104916,8 @@
 	icon_state = "intact";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107353,8 +104947,8 @@
 	name = "science camera";
 	network = list("SS13","RD")
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -107362,20 +104956,20 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEc" = (
 /obj/machinery/portable_atmospherics/scrubber/huge,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEd" = (
 /obj/machinery/portable_atmospherics/scrubber/huge,
@@ -107387,8 +104981,8 @@
 	pixel_y = 0
 	},
 /obj/structure/cable/white,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEe" = (
 /obj/machinery/r_n_d/server/core,
@@ -107459,12 +105053,12 @@
 	req_access_txt = "29"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/assembly/robotics)
 "dEk" = (
 /obj/structure/plasticflaps{
@@ -107478,8 +105072,8 @@
 	freq = 1400;
 	location = "Robotics"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/assembly/robotics)
 "dEl" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -107504,12 +105098,12 @@
 	req_access_txt = "12"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/morgue)
 "dEn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -107527,12 +105121,12 @@
 	name = "Virology Access";
 	req_access_txt = "39"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -107624,33 +105218,33 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dEx" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dEy" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dEz" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dEA" = (
 /obj/structure/sign/vacuum,
@@ -107685,12 +105279,12 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -107706,30 +105300,30 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dEF" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEG" = (
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEH" = (
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dEI" = (
 /obj/machinery/door/firedoor,
@@ -107742,12 +105336,12 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -107761,9 +105355,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEK" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -107774,11 +105366,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -107787,17 +105377,13 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEN" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -107805,9 +105391,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEO" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	tag = "icon-manifold (NORTH)";
@@ -107818,9 +105402,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -107829,9 +105411,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dEQ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -107848,8 +105428,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dES" = (
 /obj/structure/cable/white{
@@ -107881,8 +105461,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dEV" = (
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -107896,10 +105476,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dEW" = (
 /obj/structure/cable/white{
@@ -107910,11 +105490,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/aft/Aft_Maintenance)
 "dEX" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -107924,9 +105502,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dEY" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -107937,9 +105513,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dEZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -107953,9 +105527,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFa" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -107968,9 +105540,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFb" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -107988,9 +105558,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFc" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -108009,9 +105577,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFd" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -108020,9 +105586,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFe" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -108037,9 +105601,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFf" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108053,9 +105615,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFg" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108069,11 +105629,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/aft/Aft_Maintenance)
 "dFh" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -108083,9 +105641,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -108095,9 +105651,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dFj" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
@@ -108150,9 +105704,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dFn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -108163,9 +105715,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dFo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -108175,9 +105725,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dFp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -108187,9 +105735,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dFq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -108198,9 +105744,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dFr" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -108354,41 +105898,41 @@
 /area/toxins/test_area)
 "dFH" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_side (WEST)";
 	icon_state = "plating_warn_side"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
 /area/toxins/test_area)
 "dFI" = (
+/obj/effect/turf_decal/stripes/end{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	tag = "icon-plating_warn_end (EAST)";
 	icon_state = "plating_warn_end"
 	},
-/obj/effect/turf_decal/stripes/end{
-	dir = 4
-	},
 /area/toxins/test_area)
 "dFJ" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dFK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -108403,23 +105947,23 @@
 	name = "\improper Toxins Lab"
 	})
 "dFM" = (
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
 "dFN" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (EAST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (EAST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -108429,12 +105973,12 @@
 	id = "toxinsdriver"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -108442,20 +105986,16 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFQ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -108463,18 +106003,14 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFS" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate{
@@ -108487,18 +106023,14 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFU" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -108507,36 +106039,28 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFW" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFX" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFY" = (
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dFZ" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dGa" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dGb" = (
 /obj/structure/urinal{
@@ -108633,9 +106157,7 @@
 	dir = 10;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGi" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -108646,9 +106168,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGj" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108659,9 +106179,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGk" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108671,9 +106189,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGl" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108693,11 +106209,9 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGm" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108708,9 +106222,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGn" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108720,11 +106232,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dGo" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -108737,10 +106247,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dGp" = (
 /obj/structure/cable/white{
@@ -108751,8 +106261,8 @@
 	dir = 4
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dGq" = (
 /obj/structure/cable/white{
@@ -108789,8 +106299,8 @@
 	dir = 4
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dGu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -108807,9 +106317,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
 	},
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -108819,9 +106327,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGx" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -108830,9 +106336,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
@@ -108844,26 +106348,20 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -108878,18 +106376,14 @@
 	pixel_y = -24
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGD" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -108900,9 +106394,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGE" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108912,9 +106404,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGF" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -108924,9 +106414,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -108934,25 +106422,19 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGI" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGJ" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -108963,18 +106445,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGL" = (
 /obj/structure/cable/white{
 	tag = "icon-1-4";
@@ -108985,9 +106463,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dGM" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -108997,11 +106473,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/aft/Aft_Maintenance)
 "dGN" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109014,10 +106488,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -109069,8 +106543,8 @@
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -109104,10 +106578,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -109119,11 +106593,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGT" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109133,9 +106605,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGU" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109146,9 +106616,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGV" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109159,9 +106627,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGW" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109171,9 +106637,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGX" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -109188,9 +106652,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 6
 	},
-/area/maintenance/starboard{
-	name = "Aft Starboard Maintenance"
-	})
+/area/maintenance/starboard/aft_starboard_maintenance)
 "dGY" = (
 /obj/structure/dresser,
 /obj/effect/decal/cleanable/dirt,
@@ -109327,17 +106789,17 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHo" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHp" = (
 /obj/effect/decal/cleanable/blood/old,
@@ -109346,18 +106808,18 @@
 /area/toxins/test_area)
 "dHq" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHr" = (
 /obj/structure/chair{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHs" = (
 /obj/structure/rack,
@@ -109366,9 +106828,7 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109381,9 +106841,7 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109396,9 +106854,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHv" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -109408,9 +106864,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109421,9 +106875,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109436,9 +106888,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109451,9 +106901,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHz" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -109467,9 +106915,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
@@ -109477,26 +106923,26 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dHB" = (
 /obj/machinery/portable_atmospherics/canister/toxins,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dHC" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
 	name = "Bathroom"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -109569,9 +107015,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHJ" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -109581,9 +107025,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHK" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -109596,12 +107038,12 @@
 	req_access_txt = "19"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/bridge{
 	name = "Customs"
 	})
@@ -109618,24 +107060,24 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/aft)
 "dHN" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
 	name = "Departures Lounge"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/aft)
 "dHO" = (
 /obj/machinery/door/firedoor,
@@ -109644,25 +107086,21 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/primary/aft)
 "dHP" = (
 /turf/closed/wall,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dHQ" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/aft{
-	name = "Aft Maintenance"
-	})
+/area/maintenance/aft/Aft_Maintenance)
 "dHR" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (WEST)";
@@ -109684,8 +107122,8 @@
 	dir = 8;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -109710,69 +107148,59 @@
 /obj/structure/chair{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHW" = (
 /obj/structure/chair{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dHX" = (
 /obj/machinery/door/airlock/external{
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHY" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dHZ" = (
 /obj/machinery/door/airlock/external{
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIa" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIb" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (SOUTHEAST)";
@@ -109783,11 +107211,9 @@
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dId" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -109798,11 +107224,9 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIe" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -109815,9 +107239,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIf" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /obj/structure/cable/white{
@@ -109825,35 +107247,27 @@
 	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
@@ -109861,9 +107275,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -109874,21 +107286,19 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIl" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dIm" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/toxins/storage)
 "dIn" = (
 /obj/structure/sink{
@@ -109999,9 +107409,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIv" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -110013,9 +107421,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIw" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -110102,8 +107508,8 @@
 	dir = 4;
 	name = "hallway camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dIB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -110144,8 +107550,8 @@
 	},
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dIF" = (
 /obj/machinery/light/small,
@@ -110182,27 +107588,21 @@
 	},
 /obj/item/target,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/end,
+/turf/open/floor/plating,
 /area/toxins/test_area)
 "dIJ" = (
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIK" = (
 /turf/closed/wall,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dIL" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dIM" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -110211,15 +107611,13 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/library/abandoned_library)
 "dIN" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch";
@@ -110232,30 +107630,24 @@
 	icon_state = "1-2"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/library/abandoned_library)
 "dIO" = (
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIQ" = (
 /turf/closed/wall/r_wall,
 /area/toxins/storage)
@@ -110264,12 +107656,12 @@
 /obj/machinery/door/airlock{
 	name = "Bathroom"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -110334,9 +107726,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIY" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -110349,9 +107739,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dIZ" = (
 /obj/machinery/computer/med_data,
 /obj/machinery/status_display{
@@ -110379,8 +107767,8 @@
 "dJb" = (
 /obj/machinery/holopad,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/bridge{
 	name = "Customs"
 	})
@@ -110406,8 +107794,8 @@
 	name = "Customs"
 	})
 "dJe" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dJf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -110426,8 +107814,8 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dJi" = (
 /obj/structure/grille,
@@ -110440,10 +107828,10 @@
 	icon_state = "propulsion";
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "dJk" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -110469,12 +107857,12 @@
 	name = "Virology Access";
 	req_access_txt = "39"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/medical/medbay{
 	name = "Medbay Central"
 	})
@@ -110527,18 +107915,14 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJu" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/folder,
 /obj/item/weapon/pen,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -110550,15 +107934,11 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJw" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/white{
@@ -110566,48 +107946,36 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJz" = (
 /obj/structure/table/wood,
 /obj/item/weapon/dice/d20,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJA" = (
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJB" = (
 /obj/structure/chair/office/dark,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJC" = (
 /obj/structure/chair/office/dark,
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJD" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -110617,9 +107985,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dJE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -110630,9 +107996,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -110641,9 +108005,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJG" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -110655,38 +108017,30 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJH" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJI" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJJ" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -110704,9 +108058,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
@@ -110716,9 +108068,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJM" = (
 /obj/structure/toilet{
 	tag = "icon-toilet00 (WEST)";
@@ -110740,8 +108090,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/research{
 	name = "Research Division"
 	})
@@ -110790,9 +108140,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJT" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -110803,9 +108151,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dJU" = (
 /obj/machinery/computer/card,
 /obj/structure/cable/white{
@@ -110884,21 +108230,21 @@
 	name = "Customs Desk";
 	req_access_txt = "19"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/bridge{
 	name = "Customs"
 	})
 "dJZ" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dKa" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dKb" = (
 /obj/structure/disposalpipe/segment,
@@ -110911,8 +108257,8 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dKd" = (
 /obj/structure/window/reinforced,
@@ -110921,10 +108267,10 @@
 	icon_state = "heater";
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "dKe" = (
 /obj/structure/sink{
@@ -110946,21 +108292,21 @@
 	dir = 1;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dKf" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn (NORTHWEST)";
 	icon_state = "white_warn"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
 /area/medical/virology)
 "dKg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -110969,8 +108315,8 @@
 	dir = 8;
 	name = "virology camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dKh" = (
 /obj/structure/grille,
@@ -111083,9 +108429,7 @@
 /obj/structure/table_frame/wood,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKs" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -111093,14 +108437,10 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKt" = (
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -111109,54 +108449,40 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKv" = (
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKw" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKx" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/paicard,
 /turf/open/floor/carpet,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKy" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/pill_bottle/dice,
 /turf/open/floor/carpet,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKz" = (
 /obj/structure/chair/office/dark{
 	dir = 8
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dKA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -111165,9 +108491,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKC" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 5
@@ -111177,9 +108501,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKD" = (
 /obj/machinery/atmospherics/components/trinary/filter{
 	density = 0;
@@ -111192,9 +108514,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKE" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
@@ -111205,9 +108525,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -111215,17 +108533,13 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKG" = (
 /obj/machinery/droneDispenser,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKH" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -111238,9 +108552,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKI" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -111255,21 +108567,19 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/research{
 	name = "Research Division"
 	})
 "dKJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKK" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -111279,9 +108589,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dKL" = (
 /obj/machinery/computer/crew,
 /obj/machinery/ai_status_display{
@@ -111328,8 +108636,8 @@
 	scrub_Toxins = 0
 	},
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dKQ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -111375,8 +108683,8 @@
 	on = 1;
 	scrub_Toxins = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dKW" = (
 /obj/structure/cable/white{
@@ -111386,13 +108694,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn (SOUTHWEST)";
 	icon_state = "white_warn"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
 /area/medical/virology)
 "dKX" = (
 /obj/structure/cable/white{
@@ -111404,13 +108712,13 @@
 	icon_state = "intact";
 	dir = 9
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
 /turf/open/floor/plasteel/white{
 	tag = "icon-white_warn (SOUTHEAST)";
 	icon_state = "white_warn"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
 /area/medical/virology)
 "dKY" = (
 /obj/machinery/door/firedoor,
@@ -111422,10 +108730,10 @@
 	name = "Virology Access";
 	req_access_txt = "39"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dKZ" = (
 /obj/structure/cable/white{
@@ -111440,12 +108748,12 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/virology)
 "dLa" = (
 /obj/structure/cable/white{
@@ -111463,12 +108771,12 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/virology)
 "dLb" = (
 /obj/machinery/door/firedoor,
@@ -111480,10 +108788,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dLc" = (
 /obj/structure/cable/white{
@@ -111625,47 +108933,35 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLp" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLq" = (
 /turf/open/floor/wood{
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLr" = (
 /obj/structure/bookcase,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLs" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLt" = (
 /obj/structure/chair/office/dark{
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLu" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/cas{
@@ -111677,17 +108973,13 @@
 	pixel_y = 5
 	},
 /turf/open/floor/carpet,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLv" = (
 /obj/structure/table/wood,
 /obj/item/weapon/clipboard,
 /obj/item/weapon/folder/red,
 /turf/open/floor/carpet,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLw" = (
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -111699,9 +108991,7 @@
 	pixel_x = 24
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dLx" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -111711,18 +109001,14 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -111739,9 +109025,7 @@
 	dir = 5
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLA" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111751,9 +109035,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -111764,9 +109046,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -111780,11 +109060,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLD" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111804,9 +109082,7 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLE" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111816,9 +109092,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLF" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111831,9 +109105,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLG" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111844,9 +109116,7 @@
 	},
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLH" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111861,9 +109131,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLI" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111883,9 +109151,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLJ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111896,9 +109162,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLK" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111909,9 +109173,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLL" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111925,9 +109187,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLM" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111939,9 +109199,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLN" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
@@ -111956,9 +109214,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLO" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -111969,11 +109225,9 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dLP" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light{
@@ -112029,8 +109283,8 @@
 	})
 "dLT" = (
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dLU" = (
 /obj/structure/disposalpipe/junction{
@@ -112067,8 +109321,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dLY" = (
 /obj/item/clothing/suit/hazardvest{
@@ -112147,8 +109401,8 @@
 	pixel_y = 9
 	},
 /obj/structure/closet/crate/internals,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dLZ" = (
 /turf/open/floor/plasteel/neutral/side{
@@ -112190,8 +109444,8 @@
 /obj/structure/sign/biohazard{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dMf" = (
 /obj/structure/closet/l3closet/virology,
@@ -112199,16 +109453,16 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dMg" = (
 /obj/structure/closet/emcloset,
 /obj/structure/sign/securearea{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dMh" = (
 /obj/structure/grille,
@@ -112261,10 +109515,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dMm" = (
 /obj/structure/cable/white{
@@ -112322,10 +109576,10 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dMr" = (
 /obj/structure/cable/white{
@@ -112375,15 +109629,11 @@
 /obj/structure/bookcase,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMv" = (
 /obj/structure/bookcase,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -112395,17 +109645,13 @@
 	pixel_x = -1
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMy" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (EAST)";
@@ -112418,31 +109664,23 @@
 	},
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMz" = (
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
 	name = "blobstart"
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMB" = (
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dMC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -112454,9 +109692,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -112467,9 +109703,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dME" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -112491,12 +109725,12 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/chapel/office)
 "dMG" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -112510,9 +109744,7 @@
 	dir = 4
 	},
 /turf/closed/wall,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMI" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
@@ -112520,9 +109752,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMJ" = (
 /obj/structure/closet,
 /obj/effect/landmark/costume,
@@ -112531,17 +109761,13 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dML" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -112549,11 +109775,9 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -112561,9 +109785,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/watertank,
@@ -112571,9 +109793,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dMO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -112592,12 +109812,12 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -112656,12 +109876,12 @@
 	name = "Departures Lounge"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -112670,12 +109890,12 @@
 /obj/machinery/door/airlock/glass{
 	name = "Departures Lounge"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -112896,9 +110116,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -112909,27 +110127,21 @@
 	tag = "icon-wood-broken6";
 	icon_state = "wood-broken6"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNv" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNw" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/white{
@@ -112937,9 +110149,7 @@
 	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNy" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
@@ -112947,9 +110157,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -112962,16 +110170,12 @@
 	tag = "icon-wood-broken";
 	icon_state = "wood-broken"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNA" = (
 /obj/machinery/photocopier,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNB" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
@@ -112980,27 +110184,21 @@
 	tag = "icon-wood-broken2";
 	icon_state = "wood-broken2"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dNC" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/flashlight/lamp,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dND" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dNE" = (
 /turf/closed/wall,
 /area/chapel/office)
@@ -113047,12 +110245,12 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/chapel/main)
 "dNK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -113066,8 +110264,8 @@
 	pixel_y = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113077,12 +110275,12 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn (NORTHWEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn (NORTHWEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113090,18 +110288,18 @@
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dNO" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113122,27 +110320,27 @@
 	dir = 2;
 	name = "departures camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dNQ" = (
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dNR" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113156,8 +110354,8 @@
 /obj/machinery/firealarm{
 	pixel_y = 24
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113165,15 +110363,15 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dNU" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dNV" = (
 /obj/structure/flora/ausbushes/grassybush,
@@ -113327,37 +110525,27 @@
 "dOl" = (
 /mob/living/simple_animal/cockroach,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dOm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/grimy,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dOn" = (
 /turf/open/floor/wood{
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dOo" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dOp" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dOq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -113367,9 +110555,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dOr" = (
 /obj/structure/table,
 /obj/item/weapon/storage/box/gloves{
@@ -113533,8 +110719,8 @@
 	icon_state = "plant-22"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113544,10 +110730,10 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113647,10 +110833,10 @@
 	name = "\improper Departure Lounge"
 	})
 "dOO" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113662,8 +110848,8 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113676,8 +110862,8 @@
 /turf/closed/wall/shuttle/smooth/nodiagonal,
 /area/shuttle/escape)
 "dOS" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dOT" = (
 /obj/machinery/door/airlock/glass_medical{
@@ -113685,10 +110871,10 @@
 	name = "Escape Shuttle Infirmary";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dOU" = (
 /obj/item/weapon/storage/firstaid/fire,
@@ -113795,24 +110981,18 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPd" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
 	tag = "icon-wood-broken";
 	icon_state = "wood-broken"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPe" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -113822,27 +111002,21 @@
 	tag = "icon-wood-broken5";
 	icon_state = "wood-broken5"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPg" = (
 /obj/structure/destructible/cult/tome,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPh" = (
 /obj/structure/bookcase{
 	name = "Forbidden Knowledge"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate{
@@ -113853,9 +111027,7 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dPj" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -113864,9 +111036,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dPk" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -113936,10 +111106,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/chapel/main)
 "dPt" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -113950,8 +111120,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -113963,10 +111133,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114018,8 +111188,8 @@
 	name = "\improper Departure Lounge"
 	})
 "dPA" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114032,8 +111202,8 @@
 	pixel_x = -26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dPC" = (
 /obj/structure/flora/ausbushes/grassybush,
@@ -114064,8 +111234,8 @@
 /obj/item/clothing/gloves/color/latex,
 /obj/item/device/healthanalyzer,
 /obj/item/clothing/glasses/hud/health,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPF" = (
 /obj/structure/table/glass,
@@ -114081,8 +111251,8 @@
 /obj/item/stack/sheet/mineral/plasma{
 	amount = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPG" = (
 /obj/structure/cable/white{
@@ -114090,15 +111260,15 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/computer/pandemic,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPH" = (
 /obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPI" = (
 /obj/machinery/light{
@@ -114113,8 +111283,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPJ" = (
 /obj/structure/cable/white{
@@ -114127,8 +111297,8 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPK" = (
 /obj/structure/closet/crate/freezer/blood,
@@ -114140,8 +111310,8 @@
 	c_tag = "Virology - Lab";
 	name = "virology camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dPL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -114231,18 +111401,14 @@
 /obj/structure/bookcase,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPU" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/wood{
 	tag = "icon-wood-broken6";
 	icon_state = "wood-broken6"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPV" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/blood/old,
@@ -114250,9 +111416,7 @@
 	name = "revenantspawn"
 	},
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dPW" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -114263,9 +111427,7 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dPX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -114273,9 +111435,7 @@
 	icon_state = "1-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dPY" = (
 /obj/structure/table,
 /obj/item/weapon/wrench,
@@ -114361,24 +111521,24 @@
 /obj/machinery/door/airlock/centcom{
 	name = "Chapel Hall"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/chapel/main)
 "dQi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dQj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114390,8 +111550,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114399,8 +111559,8 @@
 /obj/structure/chair{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114409,8 +111569,8 @@
 	dir = 1
 	},
 /obj/machinery/light,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114418,8 +111578,8 @@
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114464,10 +111624,10 @@
 	desc = "Used to grind things up into raw materials and liquids.";
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dQu" = (
 /obj/structure/chair/office/light{
@@ -114515,8 +111675,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dQA" = (
 /obj/structure/grille,
@@ -114562,9 +111722,9 @@
 "dQE" = (
 /obj/structure/bed/roller,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
 /mob/living/carbon/monkey,
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/bot,
 /area/medical/virology)
 "dQF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -114577,8 +111737,8 @@
 /obj/effect/landmark{
 	name = "revenantspawn"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dQH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -114587,8 +111747,8 @@
 "dQI" = (
 /obj/structure/bed/roller,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dQJ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -114599,25 +111759,19 @@
 	pixel_y = 0
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQK" = (
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQM" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -114626,9 +111780,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
@@ -114643,18 +111795,14 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQO" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/item/organ/tongue/bone{
 	origin_tech = "biotech=0"
 	},
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dQP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -114666,17 +111814,13 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dQQ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dQR" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -114762,8 +111906,8 @@
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114803,17 +111947,17 @@
 /obj/machinery/door/airlock/external{
 	name = "External Docking Port"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dRf" = (
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -114822,10 +111966,10 @@
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "dRh" = (
 /obj/structure/sign/bluecross_2,
@@ -114862,10 +112006,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/smartfridge/chemistry/virology,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dRm" = (
 /obj/structure/cable/white{
@@ -114904,8 +112048,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dRp" = (
 /obj/structure/cable/white{
@@ -114955,8 +112099,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dRs" = (
 /obj/machinery/door/firedoor,
@@ -114982,10 +112126,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dRt" = (
 /obj/structure/cable/white{
@@ -115057,12 +112201,12 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/virology)
 "dRz" = (
 /obj/structure/grille,
@@ -115079,16 +112223,12 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRB" = (
 /obj/structure/chair/office/dark,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRC" = (
 /obj/structure/chair/office/dark{
 	dir = 4
@@ -115097,9 +112237,7 @@
 	tag = "icon-wood-broken5";
 	icon_state = "wood-broken5"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRD" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
@@ -115110,17 +112248,13 @@
 	dir = 5
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRE" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRF" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -115128,18 +112262,14 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRH" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -115148,9 +112278,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/morgue{
@@ -115162,9 +112290,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (NORTHWEST)";
@@ -115172,9 +112298,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/old,
@@ -115182,9 +112306,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dRL" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -115192,9 +112314,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dRM" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap,
@@ -115299,15 +112419,15 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dRV" = (
 /obj/structure/chair,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -115315,8 +112435,8 @@
 /obj/structure/table,
 /obj/item/weapon/folder,
 /obj/item/weapon/pen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -115330,8 +112450,8 @@
 	dir = 2;
 	name = "departures camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -115348,8 +112468,8 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "dSa" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dSb" = (
 /obj/machinery/door/airlock/glass_medical{
@@ -115357,12 +112477,12 @@
 	name = "Escape Shuttle Infirmary";
 	req_access_txt = "0"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/shuttle/escape)
 "dSc" = (
 /obj/structure/table/glass,
@@ -115380,10 +112500,10 @@
 /obj/item/weapon/reagent_containers/syringe/antiviral,
 /obj/item/weapon/reagent_containers/dropper,
 /obj/item/weapon/reagent_containers/spray/cleaner,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSd" = (
 /obj/structure/chair/office/light{
@@ -115422,8 +112542,8 @@
 /area/medical/virology)
 "dSi" = (
 /obj/structure/closet/l3closet/virology,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSj" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -115516,9 +112636,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/flashlight/lamp,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSs" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -115527,9 +112645,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken5"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSt" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21";
@@ -115542,9 +112658,7 @@
 	tag = "icon-wood-broken3";
 	icon_state = "wood-broken3"
 	},
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSu" = (
 /obj/structure/table/wood,
 /obj/item/clothing/under/rank/librarian,
@@ -115553,27 +112667,21 @@
 	name = "2maintenance loot spawner"
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSv" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSx" = (
 /obj/structure/easel,
 /obj/effect/decal/cleanable/dirt,
@@ -115581,46 +112689,34 @@
 /obj/item/weapon/canvas/twentythreeXtwentythree,
 /obj/machinery/light/small,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSy" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/crayons,
 /obj/item/weapon/storage/crayons,
 /turf/open/floor/wood,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSz" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/paper_bin,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSA" = (
 /obj/structure/dresser,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSB" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/taperecorder,
 /turf/open/floor/plasteel/black,
-/area/library{
-	name = "Abandoned Library"
-	})
+/area/library/abandoned_library)
 "dSC" = (
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dSD" = (
 /obj/structure/bodycontainer/morgue,
 /obj/structure/sign/poster{
@@ -115699,8 +112795,8 @@
 "dSL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/closet/emcloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -115710,10 +112806,10 @@
 	icon_state = "manifold";
 	dir = 8
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -115795,8 +112891,8 @@
 	pixel_x = -26
 	},
 /obj/machinery/shieldgen,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dSU" = (
 /obj/structure/rack,
@@ -115812,8 +112908,8 @@
 	pixel_x = 3;
 	pixel_y = -5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dSV" = (
 /obj/structure/table/glass,
@@ -115826,10 +112922,10 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/storage/box/syringes,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSW" = (
 /obj/structure/table/glass,
@@ -115837,10 +112933,10 @@
 	pixel_y = -32
 	},
 /obj/item/weapon/paper_bin,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSX" = (
 /obj/structure/cable/white{
@@ -115851,17 +112947,17 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSY" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dSZ" = (
 /obj/machinery/light,
@@ -115874,8 +112970,8 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dTa" = (
 /obj/structure/cable/white{
@@ -115886,8 +112982,8 @@
 	dir = 1;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dTb" = (
 /obj/machinery/firealarm{
@@ -115905,8 +113001,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dTc" = (
 /obj/machinery/light{
@@ -115960,10 +113056,10 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dTg" = (
 /obj/structure/cable/white{
@@ -116005,8 +113101,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dTj" = (
 /obj/structure/cable/white{
@@ -116049,17 +113145,13 @@
 	dir = 8;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTm" = (
 /obj/structure/girder,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall,
@@ -116117,8 +113209,8 @@
 "dTt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/vending/cola,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -116137,20 +113229,20 @@
 	pixel_x = -26;
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dTw" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dTx" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dTy" = (
 /obj/structure/closet/crate/medical{
@@ -116170,13 +113262,13 @@
 	pixel_y = 3
 	},
 /obj/item/weapon/lazarus_injector,
+/obj/effect/turf_decal/bot,
 /mob/living/simple_animal/bot/medbot{
 	name = "\improper emergency medibot";
 	pixel_x = -3;
 	pixel_y = 2
 	},
 /turf/open/floor/plasteel,
-/obj/effect/turf_decal/bot,
 /area/shuttle/escape)
 "dTz" = (
 /obj/structure/grille,
@@ -116311,9 +113403,7 @@
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -116324,9 +113414,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -116336,9 +113424,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark{
@@ -116351,9 +113437,7 @@
 	dir = 1;
 	heat_capacity = 1e+006
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTO" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	tag = "icon-manifold (NORTH)";
@@ -116361,9 +113445,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116376,9 +113458,7 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dTQ" = (
 /turf/closed/wall/r_wall,
 /area/chapel/office)
@@ -116467,8 +113547,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/vending/snack,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -116479,16 +113559,16 @@
 /obj/effect/landmark/start{
 	name = "Assistant"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dUa" = (
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -116502,20 +113582,20 @@
 /area/shuttle/escape)
 "dUc" = (
 /obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dUd" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dUe" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dUf" = (
 /obj/structure/closet/crate{
@@ -116534,8 +113614,8 @@
 /obj/item/weapon/crowbar,
 /obj/item/weapon/wrench,
 /obj/item/device/radio,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dUg" = (
 /obj/structure/sign/nanotrasen{
@@ -116596,12 +113676,12 @@
 	req_access_txt = "39"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/medical/virology)
 "dUl" = (
 /obj/structure/grille,
@@ -116621,18 +113701,14 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUo" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116640,9 +113716,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116654,9 +113728,7 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plasteel/blue/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUr" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116664,9 +113736,7 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/blue/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116679,18 +113749,14 @@
 	icon_state = "2-4"
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUt" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/blue/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -116698,9 +113764,7 @@
 	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel/neutral/side,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (NORTHEAST)";
@@ -116795,15 +113859,15 @@
 "dUE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dUF" = (
 /obj/machinery/holopad,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -116812,8 +113876,8 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -116844,10 +113908,10 @@
 /obj/machinery/door/airlock/shuttle{
 	name = "Emergency Shuttle Cargo"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dUK" = (
 /obj/structure/grille,
@@ -116912,10 +113976,10 @@
 	name = "Station Intercom";
 	pixel_y = 26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dUS" = (
 /obj/machinery/power/smes,
@@ -116926,10 +113990,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dUT" = (
 /obj/structure/cable/white{
@@ -116940,10 +114004,10 @@
 	c_tag = "Solar - Aft Port";
 	name = "solar camera"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dUU" = (
 /obj/structure/sign/directions/engineering{
@@ -116965,24 +114029,18 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUW" = (
 /obj/structure/sign/electricshock,
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUX" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/cable/white,
 /obj/structure/barricade/wooden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUY" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "evashutters2";
@@ -116990,15 +114048,13 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dUZ" = (
 /obj/machinery/button/door{
 	id = "evashutters2";
@@ -117011,15 +114067,13 @@
 	name = "E.V.A. Storage Shutters"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -117033,15 +114087,13 @@
 	icon_state = "1-2"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/command{
@@ -117050,21 +114102,17 @@
 	req_access_txt = "18"
 	},
 /obj/structure/barricade/wooden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVc" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/r_wall,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVd" = (
 /obj/structure/bodycontainer/morgue,
 /obj/machinery/airalarm{
@@ -117130,8 +114178,8 @@
 	dir = 4;
 	name = "departures camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117140,16 +114188,16 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
 "dVl" = (
 /obj/structure/table,
 /obj/item/weapon/storage/pill_bottle/dice,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117159,10 +114207,10 @@
 	icon_state = "intact";
 	dir = 6
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/medical/virology)
 "dVn" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -117181,10 +114229,10 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/turf/open/floor/plating,
 /area/medical/virology)
 "dVp" = (
 /obj/machinery/iv_drip,
@@ -117274,10 +114322,10 @@
 	name = "External Solar Access";
 	req_access_txt = "10"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/portsolar)
 "dVy" = (
 /obj/effect/decal/cleanable/dirt,
@@ -117289,8 +114337,8 @@
 	tag = ""
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/maintenance/portsolar)
 "dVz" = (
 /obj/structure/cable{
@@ -117305,10 +114353,10 @@
 	pixel_x = 0;
 	tag = ""
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dVA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -117342,14 +114390,14 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /turf/open/floor/plating{
 	luminosity = 2;
 	initial_gas_mix = "o2=0.01;n2=0.01";
 	temperature = 2.7
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
 /area/maintenance/portsolar)
 "dVC" = (
 /obj/machinery/door/airlock/engineering{
@@ -117363,10 +114411,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/maintenance/portsolar)
 "dVD" = (
 /obj/structure/cable/white{
@@ -117379,35 +114427,27 @@
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVE" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVF" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVG" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVH" = (
 /obj/machinery/light{
 	dir = 1
@@ -117419,22 +114459,18 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVI" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVJ" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/clipboard,
@@ -117443,17 +114479,13 @@
 	pixel_x = 26
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVK" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dVL" = (
 /obj/structure/table,
 /obj/item/weapon/storage/box/gloves{
@@ -117546,8 +114578,8 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117556,10 +114588,10 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117623,20 +114655,20 @@
 /obj/item/weapon/tank/internals/oxygen/red,
 /obj/item/clothing/mask/gas,
 /obj/item/clothing/head/hardhat/red,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWb" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWc" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWd" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -117644,31 +114676,31 @@
 	icon_state = "inje_map";
 	dir = 1
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/medical/virology)
 "dWe" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
 /obj/structure/disposaloutlet,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/medical/virology)
 "dWf" = (
 /obj/structure/table/glass,
 /obj/item/weapon/reagent_containers/glass/beaker,
 /obj/item/weapon/reagent_containers/syringe/antiviral,
 /obj/item/weapon/reagent_containers/dropper,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dWg" = (
 /obj/structure/table/glass,
 /obj/item/weapon/folder/white,
 /obj/item/weapon/pen/red,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "dWh" = (
 /obj/machinery/power/solar_control{
@@ -117677,10 +114709,10 @@
 	track = 0
 	},
 /obj/structure/cable,
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dWi" = (
 /obj/structure/chair/office/dark{
@@ -117691,8 +114723,8 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dWj" = (
 /obj/structure/cable/white,
@@ -117702,10 +114734,10 @@
 	name = "Aft Port Solar APC";
 	pixel_y = -26
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plating,
 /area/maintenance/portsolar)
 "dWk" = (
 /obj/structure/sign/electricshock,
@@ -117726,23 +114758,17 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWm" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
-"dWn" = (
 /turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
+"dWn" = (
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWo" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -117753,11 +114779,9 @@
 	dir = 4;
 	on = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWp" = (
 /obj/structure/cable/white{
 	tag = "icon-1-8";
@@ -117769,20 +114793,16 @@
 	icon_state = "intact";
 	dir = 9
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWq" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/newscaster{
@@ -117800,9 +114820,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWs" = (
 /obj/structure/bodycontainer/morgue,
 /obj/machinery/firealarm{
@@ -117882,10 +114900,10 @@
 	icon_state = "intact";
 	dir = 5
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117893,8 +114911,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117907,8 +114925,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117918,8 +114936,8 @@
 	icon_state = "manifold";
 	dir = 1
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117937,8 +114955,8 @@
 	dir = 1;
 	name = "departures camera"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117947,8 +114965,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117958,10 +114976,10 @@
 	icon_state = "intact";
 	dir = 10
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -117981,20 +114999,20 @@
 /obj/item/weapon/folder/yellow,
 /obj/item/weapon/pen,
 /obj/item/hand_labeler_refill,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWK" = (
 /obj/machinery/recharge_station,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWL" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/item/weapon/stock_parts/cell/high,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dWM" = (
 /obj/structure/grille,
@@ -118005,35 +115023,27 @@
 /obj/machinery/shieldwallgen,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
-"dWP" = (
 /turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
+"dWP" = (
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWR" = (
 /obj/structure/rack,
 /obj/structure/cable/white{
@@ -118044,28 +115054,22 @@
 /obj/item/weapon/tank/internals/oxygen,
 /obj/item/device/radio,
 /obj/item/clothing/mask/breath,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWS" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWT" = (
 /obj/machinery/shieldwallgen,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet,
@@ -118073,11 +115077,9 @@
 	lootcount = 3;
 	name = "3maintenance loot spawner"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dWV" = (
 /obj/machinery/door/morgue{
 	name = "Relic Closet";
@@ -118121,12 +115123,12 @@
 	name = "Maintenance Hatch";
 	req_access_txt = "12"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -118141,12 +115143,12 @@
 	req_access_txt = "63"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint2)
 "dXb" = (
 /obj/structure/cable/white{
@@ -118167,12 +115169,12 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint2)
 "dXd" = (
 /obj/structure/cable/white{
@@ -118216,12 +115218,12 @@
 	name = "Holding Area";
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/security/checkpoint2)
 "dXh" = (
 /obj/structure/cable/white{
@@ -118277,21 +115279,19 @@
 	name = "Cockpit";
 	req_access_txt = "19"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/shuttle/escape)
 "dXn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/firecloset,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXo" = (
 /obj/item/clothing/suit/hazardvest{
 	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
@@ -118372,17 +115372,13 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXp" = (
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXq" = (
 /obj/structure/rack,
 /obj/structure/cable/white{
@@ -118394,18 +115390,14 @@
 /obj/item/device/radio,
 /obj/item/clothing/mask/breath,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXr" = (
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXs" = (
 /obj/item/clothing/suit/hazardvest{
 	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
@@ -118484,16 +115476,12 @@
 	},
 /obj/structure/closet/crate/internals,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXt" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dXu" = (
 /obj/structure/table/wood/fancy,
 /obj/item/weapon/spellbook/oneuse/smoke,
@@ -118597,17 +115585,17 @@
 	name = "Chapel Maintenance";
 	req_access_txt = "27"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/chapel/office)
 "dXF" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -118717,25 +115705,25 @@
 	name = "External Docking Port";
 	req_access_txt = "63"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "dXS" = (
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "dXT" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Emergency Shuttle Airlock";
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel/white,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "dXU" = (
 /turf/open/floor/plasteel/shuttle/red,
@@ -118776,21 +115764,21 @@
 /obj/structure/table,
 /obj/item/weapon/clipboard,
 /obj/item/toy/figure/ninja,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dYa" = (
 /obj/structure/chair,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dYb" = (
 /obj/structure/chair,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dYc" = (
 /obj/structure/lattice,
@@ -118813,22 +115801,18 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYe" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
 	icon_state = "2-4"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYf" = (
 /obj/structure/cable/white{
 	tag = "icon-2-4";
@@ -118838,26 +115822,22 @@
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYh" = (
 /obj/structure/cable/white,
 /obj/structure/cable/white{
@@ -118868,23 +115848,19 @@
 	tag = "icon-1-4";
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYi" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYj" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -118895,13 +115871,11 @@
 	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYk" = (
 /obj/structure/cable/white{
 	tag = "icon-2-8";
@@ -118909,9 +115883,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYl" = (
 /obj/structure/table/reinforced,
 /obj/structure/extinguisher_cabinet{
@@ -118920,9 +115892,7 @@
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/item/device/flashlight,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYm" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
@@ -118959,12 +115929,12 @@
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -119017,8 +115987,8 @@
 	tag = "icon-2-8";
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "dYv" = (
 /obj/structure/chair/office/dark{
@@ -119064,10 +116034,10 @@
 	name = "Holding Area";
 	req_access_txt = "2"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/security/checkpoint2)
 "dYz" = (
 /obj/structure/cable/white{
@@ -119176,10 +116146,10 @@
 /obj/machinery/door/airlock/external{
 	name = "Emergency Recovery Airlock"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "dYN" = (
 /obj/structure/table/reinforced,
@@ -119189,9 +116159,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYO" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -119203,13 +116171,11 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYP" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -119217,33 +116183,27 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYQ" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYR" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/machinery/light{
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYS" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -119252,9 +116212,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYT" = (
 /obj/structure/cable/white{
 	tag = "icon-1-2";
@@ -119264,13 +116222,11 @@
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYU" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/sheet/rglass{
@@ -119282,9 +116238,7 @@
 	amount = 50
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dYV" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
@@ -119418,8 +116372,8 @@
 	pixel_x = 32;
 	tag = "icon-doors"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -119596,12 +116550,12 @@
 /obj/machinery/door/airlock/external{
 	name = "Emergency Recovery Airlock"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (EAST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (EAST)"
+	},
 /area/shuttle/escape)
 "dZz" = (
 /turf/open/floor/plasteel/neutral/corner{
@@ -119629,9 +116583,7 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/cable/white,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2{
-	name = "Aft Port Maintenance"
-	})
+/area/maintenance/fpmaint2/aft_port_maintenance)
 "dZD" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -119763,12 +116715,12 @@
 	name = "External Airlock";
 	req_access_txt = "13"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (WEST)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (WEST)"
+	},
 /area/hallway/secondary/exit{
 	name = "\improper Departure Lounge"
 	})
@@ -119837,17 +116789,17 @@
 	req_access = null;
 	req_access_txt = "19"
 	},
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_side (NORTH)"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_side (NORTH)"
+	},
 /area/shuttle/escape)
 "eaa" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/shuttle/escape)
 "eab" = (
 /obj/structure/cable{
@@ -120387,8 +117339,8 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
-/turf/open/floor/plating,
 /obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating,
 /area/maintenance/auxsolarstarboard)
 "ebh" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -120592,12 +117544,12 @@
 /area/solar/starboard)
 "ebF" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel{
-	tag = "icon-plasteel_warn_end (WEST)"
-	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
 	},
+/turf/open/floor/plasteel{
+	tag = "icon-plasteel_warn_end (WEST)"
+	},
 /area/toxins/mixing{
 	name = "\improper Toxins Lab"
 	})
@@ -120638,10 +117590,10 @@
 /obj/machinery/door/airlock/external{
 	name = "External Docking Port"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/turf/open/floor/plasteel,
 /area/space)
 "ebM" = (
 /obj/structure/grille,
@@ -120657,8 +117609,8 @@
 "ebN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/fans/tiny,
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
 /area/space)
 "ebO" = (
 /obj/structure/grille,
@@ -120717,10 +117669,10 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -120730,10 +117682,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/turf/open/floor/plasteel,
 /area/engine/gravity_generator{
 	name = "Atmospherics Engine"
 	})
@@ -120762,9 +117714,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ebX" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	tag = "icon-intact (EAST)";
@@ -120772,9 +117722,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/red,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ebY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -120782,11 +117730,9 @@
 	icon_state = "intact";
 	dir = 4
 	},
-/turf/open/floor/plasteel,
 /obj/effect/turf_decal/delivery,
-/area/maintenance/starboard{
-	name = "Fore Starboard Maintenance"
-	})
+/turf/open/floor/plasteel,
+/area/maintenance/starboard/fore_starboard_maintenance)
 "ebZ" = (
 /obj/structure/cable/white{
 	tag = "icon-4-8";
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f4a914b4841..14269528671 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -21253,17 +21253,11 @@
 	})
 "aJT" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/machinery/field/generator{
-	anchored = 0;
-	state = 2
-	},
+/obj/machinery/field/generator,
 /turf/open/floor/plating,
 /area/engine/engineering)
 "aJU" = (
-/obj/machinery/field/generator{
-	anchored = 0;
-	state = 2
-	},
+/obj/machinery/field/generator,
 /turf/open/floor/plating,
 /area/engine/engineering)
 "aJV" = (
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index a50bf74d557..c85e06eb616 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -44,6 +44,7 @@
 #define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
 #define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
 #define ADMIN_BSA(user) "(<a href='?_src_=holder;BlueSpaceArtillery=\ref[user]'>BSA</a>)"
+#define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
 #define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentcommReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
 #define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm
index 762e7c38b0f..18059a60839 100644
--- a/code/__DEFINES/callbacks.dm
+++ b/code/__DEFINES/callbacks.dm
@@ -1,3 +1,4 @@
 #define GLOBAL_PROC	"some_magic_bullshit"
 
-#define CALLBACK new /datum/callback
\ No newline at end of file
+#define CALLBACK new /datum/callback
+#define INVOKE_ASYNC ImmediateInvokeAsync
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index b0c110cddc5..da3f8fcd2e5 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -69,9 +69,10 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
 	if(A == loc || (A in loc) || (A in contents))
 		// No adjacency checks
-		var/resolved = A.attackby(W,src, params)
-		if(!resolved && A && W)
-			W.afterattack(A,src,1,params)
+		if(W.pre_attackby(A,src,params))
+			var/resolved = A.attackby(W,src, params)
+			if(!resolved && A && W)
+				W.afterattack(A,src,1,params)
 		return
 
 	if(!isturf(loc))
@@ -80,9 +81,10 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
 	if(isturf(A) || isturf(A.loc))
 		if(A.Adjacent(src)) // see adjacent.dm
-			var/resolved = A.attackby(W, src, params)
-			if(!resolved && A && W)
-				W.afterattack(A, src, 1, params)
+			if(W.pre_attackby(A,src,params))
+				var/resolved = A.attackby(W, src, params)
+				if(!resolved && A && W)
+					W.afterattack(A, src, 1, params)
 			return
 		else
 			W.afterattack(A, src, 0, params)
diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm
index f20730483ad..39a79b108bc 100644
--- a/code/_onclick/hud/generic_dextrous.dm
+++ b/code/_onclick/hud/generic_dextrous.dm
@@ -28,15 +28,27 @@
 	using.screen_loc = ui_swaphand_position(owner,2)
 	static_inventory += using
 
+	if(mymob.possible_a_intents)
+		if(mymob.possible_a_intents.len == 4)
+			// All possible intents - full intent selector
+			action_intent = new /obj/screen/act_intent/segmented
+		else
+			action_intent = new /obj/screen/act_intent
+			action_intent.icon = ui_style
+		action_intent.icon_state = mymob.a_intent
+		static_inventory += action_intent
+
+
 	zone_select = new /obj/screen/zone_sel()
 	zone_select.icon = ui_style
 	zone_select.update_icon(mymob)
+	static_inventory += zone_select
 
-	using = new /obj/screen/inventory/craft
+	using = new /obj/screen/craft
 	using.icon = ui_style
 	static_inventory += using
 
-	using = new /obj/screen/inventory/area_creator
+	using = new /obj/screen/area_creator
 	using.icon = ui_style
 	static_inventory += using
 
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 2d65e033e68..09df40b8dd7 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -90,7 +90,7 @@
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
 
-	using = new /obj/screen/inventory/craft
+	using = new /obj/screen/craft
 	using.icon = ui_style
 	static_inventory += using
 
@@ -99,16 +99,15 @@
 	wheels += using
 	static_inventory += using
 
-	using = new /obj/screen/inventory/area_creator
+	using = new /obj/screen/area_creator
 	using.icon = ui_style
 	static_inventory += using
 
-	using = new /obj/screen/act_intent()
-	using.icon_state = mymob.a_intent
-	static_inventory += using
-	action_intent = using
+	action_intent = new /obj/screen/act_intent/segmented
+	action_intent.icon_state = mymob.a_intent
+	static_inventory += action_intent
 
-	using = new /obj/screen/mov_intent()
+	using = new /obj/screen/mov_intent
 	using.icon = ui_style
 	using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
 	using.screen_loc = ui_movi
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
index 28d14ad1c1f..60ee61e33da 100644
--- a/code/_onclick/hud/monkey.dm
+++ b/code/_onclick/hud/monkey.dm
@@ -3,12 +3,11 @@
 	var/obj/screen/using
 	var/obj/screen/inventory/inv_box
 
-	using = new /obj/screen/act_intent()
-	using.icon = ui_style
-	using.icon_state = mymob.a_intent
-	using.screen_loc = ui_acti
-	static_inventory += using
-	action_intent = using
+	action_intent = new /obj/screen/act_intent()
+	action_intent.icon = ui_style
+	action_intent.icon_state = mymob.a_intent
+	action_intent.screen_loc = ui_acti
+	static_inventory += action_intent
 
 	using = new /obj/screen/mov_intent()
 	using.icon = ui_style
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index 5ee83e5e98f..912d88e3a33 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -151,10 +151,9 @@
 	mymobR.thruster_button = using
 
 //Intent
-	using = new /obj/screen/act_intent/robot()
-	using.icon_state = mymob.a_intent
-	static_inventory += using
-	action_intent = using
+	action_intent = new /obj/screen/act_intent/robot()
+	action_intent.icon_state = mymob.a_intent
+	static_inventory += action_intent
 
 //Health
 	healths = new /obj/screen/healths/robot()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index fbb719a662c..b625af76b44 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -53,25 +53,25 @@
 		M.swap_hand()
 	return 1
 
-/obj/screen/inventory/craft
+/obj/screen/craft
 	name = "crafting menu"
 	icon = 'icons/mob/screen_midnight.dmi'
 	icon_state = "craft"
 	screen_loc = ui_crafting
 
-/obj/screen/inventory/craft/Click()
+/obj/screen/craft/Click()
 	var/mob/living/M = usr
 	if(isobserver(usr))
 		return
 	M.OpenCraftingMenu()
 
-/obj/screen/inventory/area_creator
+/obj/screen/area_creator
 	name = "create new area"
 	icon = 'icons/mob/screen_midnight.dmi'
 	icon_state = "area_edit"
 	screen_loc = ui_building
 
-/obj/screen/inventory/area_creator/Click()
+/obj/screen/area_creator/Click()
 	if(usr.incapacitated())
 		return 1
 	var/area/A = get_area(usr)
@@ -87,7 +87,7 @@
 	layer = HUD_LAYER
 	plane = HUD_PLANE
 
-/obj/screen/inventory/Click()
+/obj/screen/inventory/Click(location, control, params)
 	// At this point in client Click() code we have passed the 1/10 sec check and little else
 	// We don't even know if it's a middle click
 	if(world.time <= usr.next_move)
@@ -95,8 +95,14 @@
 
 	if(usr.incapacitated())
 		return 1
-	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+	if(istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
+
+	if(hud && hud.mymob && slot_id)
+		var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id)
+		if(inv_item)
+			return inv_item.Click(location, control, params)
+
 	if(usr.attack_ui(slot_id))
 		usr.update_inv_hands()
 	return 1
@@ -144,7 +150,7 @@
 			add_overlay(active_overlay)
 
 
-/obj/screen/inventory/hand/Click()
+/obj/screen/inventory/hand/Click(location, control, params)
 	// At this point in client Click() code we have passed the 1/10 sec check and little else
 	// We don't even know if it's a middle click
 	if(world.time <= usr.next_move)
@@ -154,9 +160,12 @@
 	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1
 
-	if(ismob(usr))
-		var/mob/M = usr
-		M.swap_hand(held_index)
+	if(hud.mymob.active_hand_index == held_index)
+		var/obj/item/I = hud.mymob.get_active_held_item()
+		if(I)
+			I.Click(location, control, params)
+	else
+		hud.mymob.swap_hand(held_index)
 	return 1
 
 /obj/screen/close
@@ -185,8 +194,10 @@
 	screen_loc = ui_acti
 
 /obj/screen/act_intent/Click(location, control, params)
-	if(ishuman(usr) && (usr.client.prefs.toggles & INTENT_STYLE))
+	usr.a_intent_change(INTENT_HOTKEY_RIGHT)
 
+/obj/screen/act_intent/segmented/Click(location, control, params)
+	if(usr.client.prefs.toggles & INTENT_STYLE)
 		var/_x = text2num(params2list(params)["icon-x"])
 		var/_y = text2num(params2list(params)["icon-y"])
 
@@ -201,9 +212,8 @@
 
 		else if(_x>=17 && _y>=17)
 			usr.a_intent_change(INTENT_DISARM)
-
 	else
-		usr.a_intent_change(INTENT_HOTKEY_RIGHT)
+		return ..()
 
 /obj/screen/act_intent/alien
 	icon = 'icons/mob/screen_alien.dmi'
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 7b8f3d2b722..4cd2df43e1c 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -232,6 +232,9 @@
 
 	var/list/gamemode_cache = null
 
+	var/minutetopiclimit
+	var/secondtopiclimit
+
 /datum/configuration/New()
 	gamemode_cache = typecacheof(/datum/game_mode,TRUE)
 	for(var/T in gamemode_cache)
@@ -482,7 +485,10 @@
 					config.client_error_version = text2num(value)
 				if("client_error_message")
 					config.client_error_message = value
-
+				if("minute_topic_limit")
+					config.minutetopiclimit = text2num(value)
+				if("second_topic_limit")
+					config.secondtopiclimit = text2num(value)
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 29560785e08..4afe2777096 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -314,12 +314,7 @@ var/datum/subsystem/ticker/ticker
 					sleep(35)
 					flick("station_intact",cinematic)
 					world << sound('sound/ambience/signal.ogg')
-					sleep(100)
-					if(cinematic)
-						qdel(cinematic)
-						cinematic = null
-					for(var/mob/M in mob_list)
-						M.notransform = FALSE
+					addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100)
 					return	//Faster exit, since nothing happened
 				else //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
@@ -331,26 +326,27 @@ var/datum/subsystem/ticker/ticker
 	//If its actually the end of the round, wait for it to end.
 	//Otherwise if its a verb it will continue on afterwards.
 
-	if(mode)
-		mode.explosion_in_progress = 0
-		world << "<B>The station was destoyed by the nuclear blast!</B>"
-		mode.station_was_nuked = (station_missed<2)	//station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated.
-														//kinda shit but I couldn't  get permission to do what I wanted to do.
 	var/bombloc = null
 	if(actually_blew_up)
 		if(bomb && bomb.loc)
 			bombloc = bomb.z
 		else if(!station_missed)
 			bombloc = ZLEVEL_STATION
+		
+		if(mode)
+			mode.explosion_in_progress = 0
+			world << "<B>The station was destoyed by the nuclear blast!</B>"
+			mode.station_was_nuked = (station_missed<2)	//station_missed==1 is a draw. the station becomes irradiated and needs to be evacuated.
 
-	addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc), 300)
+	addtimer(CALLBACK(src, .proc/finish_cinematic, bombloc, actually_blew_up), 300)
 
-/datum/subsystem/ticker/proc/finish_cinematic(killz)
+/datum/subsystem/ticker/proc/finish_cinematic(killz, actually_blew_up)
 	if(cinematic)
 		qdel(cinematic)		//end the cinematic
+		cinematic = null
 	for(var/mob/M in mob_list)
 		M.notransform = FALSE
-		if(!isnull(killz) && M.stat != DEAD && M.z == killz)
+		if(actually_blew_up && !isnull(killz) && M.stat != DEAD && M.z == killz)
 			M.gib()
 
 /datum/subsystem/ticker/proc/create_characters()
@@ -592,7 +588,7 @@ var/datum/subsystem/ticker/ticker
 	//map rotate chance defaults to 75% of the length of the round (in minutes)
 	if (!prob((world.time/600)*config.maprotatechancedelta))
 		return
-	addtimer(CALLBACK(GLOBAL_PROC, /.proc/maprotate), 0)
+	INVOKE_ASYNC(GLOBAL_PROC, /.proc/maprotate)
 
 
 /world/proc/has_round_started()
diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm
index c8f5906461a..f45dd509d49 100644
--- a/code/datums/antagonists/datum_clockcult.dm
+++ b/code/datums/antagonists/datum_clockcult.dm
@@ -40,7 +40,7 @@
 		ticker.mode.servants_of_ratvar += owner.mind
 		ticker.mode.update_servant_icons_added(owner.mind)
 		if(jobban_isbanned(owner, ROLE_SERVANT_OF_RATVAR))
-			addtimer(CALLBACK(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
+			INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR)
 	if(owner.mind)
 		owner.mind.special_role = "Servant of Ratvar"
 	owner.attack_log += "\[[time_stamp()]\] <font color=#BE8700>Has been converted to the cult of Ratvar!</font>"
diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm
index 4334134a955..b49cb41c78b 100644
--- a/code/datums/antagonists/datum_cult.dm
+++ b/code/datums/antagonists/datum_cult.dm
@@ -20,7 +20,7 @@
 			var/datum/game_mode/cult/C = ticker.mode
 			C.memorize_cult_objectives(owner.mind)
 		if(jobban_isbanned(owner, ROLE_CULTIST))
-			addtimer(CALLBACK(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0)
+			INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST)
 	if(owner.mind)
 		owner.mind.special_role = "Cultist"
 	owner.attack_log += "\[[time_stamp()]\] <font color=#960000>Has been converted to the cult of Nar'Sie!</font>"
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index f4c27262d32..fd4e445ded6 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -131,6 +131,6 @@
 
 /atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3)
 	var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time)
-	addtimer(CALLBACK(newbeam, /datum/beam/.proc/Start), 0)
+	INVOKE_ASYNC(newbeam, /datum/beam/.proc/Start)
 	return newbeam
 
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index 41deda63667..66c3e674067 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -14,6 +14,8 @@
 		var/result = C.Invoke(args, to, add) //additional args are added after the ones given when the callback was created
 		OR
 		var/result = C.InvokeAsync(args, to, add) //Sleeps will not block, returns . on the first sleep (then continues on in the "background" after the sleep/block ends), otherwise operates normally.
+		OR
+		INVOKE_ASYNC(<CALLBACK args>) to immediately create and call InvokeAsync
 
 	PROC TYPEPATH SHORTCUTS (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...)
 
@@ -54,37 +56,43 @@
 	if (length(args) > 2)
 		arguments = args.Copy(3)
 
+/proc/ImmediateInvokeAsync(thingtocall, proctocall, ...)
+	set waitfor = FALSE
+
+	if (!thingtocall)
+		return
+
+	var/list/calling_arguments = length(args) > 2 ? args.Copy(3) : null
+
+	if (thingtocall == GLOBAL_PROC)
+		call(proctocall)(arglist(calling_arguments))
+	else
+		call(thingtocall, proctocall)(arglist(calling_arguments))
 
 /datum/callback/proc/Invoke(...)
 	if (!object)
 		return
-
 	var/list/calling_arguments = arguments
-
 	if (length(args))
 		if (length(arguments))
 			calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean
 		else
 			calling_arguments = args
-
 	if (object == GLOBAL_PROC)
 		return call(delegate)(arglist(calling_arguments))
 	return call(object, delegate)(arglist(calling_arguments))
 
 //copy and pasted because fuck proc overhead
 /datum/callback/proc/InvokeAsync(...)
-	set waitfor = 0
+	set waitfor = FALSE
 	if (!object)
 		return
-
 	var/list/calling_arguments = arguments
-
 	if (length(args))
 		if (length(arguments))
 			calling_arguments = calling_arguments + args //not += so that it creates a new list so the arguments list stays clean
 		else
 			calling_arguments = args
-
 	if (object == GLOBAL_PROC)
 		return call(delegate)(arglist(calling_arguments))
 	return call(object, delegate)(arglist(calling_arguments))
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 46744d81b89..97da8be2edc 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -46,9 +46,9 @@
 			return
 		affected_mob.notransform = 1
 		for(var/obj/item/W in affected_mob.get_equipped_items())
-			affected_mob.unEquip(W)
+			affected_mob.dropItemToGround(W)
 		for(var/obj/item/I in affected_mob.held_items)
-			affected_mob.unEquip(I)
+			affected_mob.dropItemToGround(I)
 		var/mob/living/new_mob = new new_form(affected_mob.loc)
 		if(istype(new_mob))
 			new_mob.a_intent = INTENT_HARM
diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index f766b1992fd..8065e6e33e7 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -59,19 +59,19 @@ STI KALY - blind
 		var/mob/living/carbon/human/H = affected_mob
 		if(prob(chance))
 			if(!istype(H.head, /obj/item/clothing/head/wizard))
-				if(!H.unEquip(H.head))
+				if(!H.dropItemToGround(H.head))
 					qdel(H.head)
 				H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(H), slot_head)
 			return
 		if(prob(chance))
 			if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
-				if(!H.unEquip(H.wear_suit))
+				if(!H.dropItemToGround(H.wear_suit))
 					qdel(H.wear_suit)
 				H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(H), slot_wear_suit)
 			return
 		if(prob(chance))
 			if(!istype(H.shoes, /obj/item/clothing/shoes/sandal/magic))
-				if(!H.unEquip(H.shoes))
+				if(!H.dropItemToGround(H.shoes))
 					qdel(H.shoes)
 			H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(H), slot_shoes)
 			return
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index b7a974bbe42..b1308668679 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -82,9 +82,9 @@
 /datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound)
 	if(location)
 		if(effect)
-			addtimer(CALLBACK(src, .proc/do_effect, location, effect), 0)
+			INVOKE_ASYNC(src, .proc/do_effect, location, effect)
 		if(sound)
-			addtimer(CALLBACK(src, .proc/do_sound, location, sound), 0)
+			INVOKE_ASYNC(src, .proc/do_sound, location, sound)
 
 /datum/teleport/proc/do_effect(atom/location, datum/effect_system/effect)
 	src = null
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 9bc6802f808..cf76a3aaa77 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1237,7 +1237,7 @@
 		switch(href_list["common"])
 			if("undress")
 				for(var/obj/item/W in current)
-					current.unEquip(W, 1) //The 1 forces all items to drop, since this is an admin undress.
+					current.dropItemToGround(W, TRUE) //The 1 forces all items to drop, since this is an admin undress.
 			if("takeuplink")
 				take_uplink()
 				memory = null//Remove any memory they may have had.
@@ -1495,7 +1495,7 @@
 			if(istype(S, type))
 				continue
 		S.charge_counter = delay
-		addtimer(CALLBACK(S, /obj/effect/proc_holder/spell.proc/start_recharge), 0)
+		INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge)
 
 /datum/mind/proc/get_ghost(even_if_they_cant_reenter)
 	for(var/mob/dead/observer/G in dead_mob_list)
diff --git a/code/datums/riding.dm b/code/datums/riding.dm
index e169e4046c4..ec6db9deb99 100644
--- a/code/datums/riding.dm
+++ b/code/datums/riding.dm
@@ -230,6 +230,27 @@
 					buckled_mob.pixel_x = 10
 					buckled_mob.pixel_y = 5
 
+//SPEEDUWAGON
+
+/datum/riding/space/speedbike/speedwagon/handle_vehicle_offsets()
+	if(ridden.has_buckled_mobs())
+		for(var/m in ridden.buckled_mobs)
+			var/mob/living/buckled_mob = m
+			buckled_mob.setDir(ridden.dir)
+			switch(ridden.dir)
+				if(NORTH)
+					buckled_mob.pixel_x = -5
+					buckled_mob.pixel_y = -5
+				if(SOUTH)
+					buckled_mob.pixel_x = 5
+					buckled_mob.pixel_y = 3
+				if(EAST)
+					buckled_mob.pixel_x = -8
+					buckled_mob.pixel_y = 5
+				if(WEST)
+					buckled_mob.pixel_x = 8
+					buckled_mob.pixel_y = 5
+
 ///////////////BOATS////////////
 /datum/riding/boat
 	keytype = /obj/item/weapon/oar
@@ -275,4 +296,4 @@
 		handle_vehicle_layer()
 		handle_vehicle_offsets()
 	else
-		user << "<span class='notice'>You'll need something  to guide the [ridden.name].</span>"
\ No newline at end of file
+		user << "<span class='notice'>You'll need something  to guide the [ridden.name].</span>"
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index ad2fe9cf530..931eb89320f 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -125,6 +125,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Arrivals North Maintenance"
 	icon_state = "fpmaint"
 
+/area/maintenance/fpmaint2/port_maintenance
+	name = "Port Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/fpmaint2/fore_port_maintenance
+	name = "Arrivals North Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/fpmaint2/aft_port_maintenance
+	name = "Aft Port Maintenance"
+	icon_state = "fpmaint"
+
 /area/maintenance/fsmaint
 	name = "Dormitory Maintenance"
 	icon_state = "fsmaint"
@@ -157,6 +169,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Starboard Maintenance"
 	icon_state = "smaint"
 
+/area/maintenance/starboard/aft_starboard_maintenance
+	name = "Aft Starboard Maintenance"
+	icon_state = "smaint"
+
+/area/maintenance/starboard/fore_starboard_maintenance
+	name = "Fore Starboard Maintenance"
+	icon_state = "smaint"
+
 /area/maintenance/port
 	name = "Locker Room Maintenance"
 	icon_state = "pmaint"
@@ -165,6 +185,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Engineering Maintenance"
 	icon_state = "amaint"
 
+/area/maintenance/aft/Aft_Maintenance
+	name = "Aft Maintenance"
+	icon_state = "amaint"
+
 /area/maintenance/storage
 	name = "Atmospherics"
 	icon_state = "green"
@@ -181,6 +205,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Electrical Maintenance"
 	icon_state = "yellow"
 
+
 //Hallway
 
 /area/hallway/primary/fore
@@ -231,6 +256,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Captain's Office"
 	icon_state = "captain"
 
+/area/crew_quarters/captain/captains_quarters
+	name = "Captain's Quarters"
+	icon_state = "captain"
+
 /area/crew_quarters/courtroom
 	name = "Courtroom"
 	icon_state = "courtroom"
@@ -314,6 +343,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Bar"
 	icon_state = "bar"
 
+/area/crew_quarters/bar/atrium
+	name = "Atrium"
+	icon_state = "bar"
+
+/area/crew_quarters/electronic_marketing_den
+	name = "Electronic Marketing Den"
+	icon_state = "bar"
+
+/area/crew_quarters/abandoned_gambling_den
+	name = "Abandoned Gambling Den"
+	icon_state = "bar"
+
 /area/crew_quarters/theatre
 	name = "Theatre"
 	icon_state = "Theatre"
@@ -323,6 +364,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
  	icon_state = "library"
  	flags = NONE
 
+/area/library/abandoned_library
+ 	name = "Abandoned Library"
+ 	icon_state = "library"
+ 	flags = NONE
+
 /area/chapel
 	icon_state = "chapel"
 	ambientsounds = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
@@ -441,7 +487,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 //Teleporter
 
 /area/teleporter
-	name = "Teleporter"
+	name = "Teleporter Room"
 	icon_state = "teleporter"
 	music = "signal"
 
@@ -453,7 +499,17 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 //MedBay
 
 /area/medical/medbay
-	name = "Medbay"
+	name = "Medbay Central"
+	icon_state = "medbay"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbay/front_office
+	name = "Medbay Front Office"
+	icon_state = "medbay"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbay/lobby
+	name = "Medbay Lobby"
 	icon_state = "medbay"
 	music = 'sound/ambience/signal.ogg'
 
@@ -463,11 +519,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "medbay2"
 	music = 'sound/ambience/signal.ogg'
 
+/area/medical/medbay2/medbay_storage
+	name = "Medbay Storage"
+	icon_state = "medbay2"
+	music = 'sound/ambience/signal.ogg'
+
 /area/medical/medbay3
 	name = "Medbay"
 	icon_state = "medbay3"
 	music = 'sound/ambience/signal.ogg'
 
+/area/medical/abandoned_medbay
+	name = "Abandoned Medbay"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
 /area/medical/patients_rooms
 	name = "Patients' Rooms"
 	icon_state = "patients"
@@ -481,7 +547,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "medresearch"
 
 /area/medical/research
-	name = "Medical Research"
+	name = "Research Division"
+	icon_state = "medresearch"
+
+/area/medical/research/research_lobby
+	name = "Research Division Lobby"
+	icon_state = "medresearch"
+
+/area/medical/research/abandoned_research_lab
+	name = "Abandoned Research Lab"
 	icon_state = "medresearch"
 
 /area/medical/virology
@@ -557,6 +631,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "detective"
 	ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
 
+/area/security/detectives_office/private_investigators_office
+	name = "Private Investigator's Office"
+	icon_state = "detective"
+	ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
+
 /area/security/range
 	name = "Firing Range"
 	icon_state = "firingrange"
@@ -616,6 +695,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Delivery Office"
 	icon_state = "quartstorage"
 
+/area/quartermaster/warehouse
+	name = "Warehouse"
+	icon_state = "quartstorage"
+
 ////////////WORK IN PROGRESS//////////
 
 /area/quartermaster/office
@@ -634,9 +717,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Mining Dock"
 	icon_state = "mining"
 
+/area/quartermaster/miningoffice
+	name = "Mining Office"
+	icon_state = "mining"
+
 /area/quartermaster/miningstorage
 	name = "Mining Storage"
-	icon_state = "green"
+	icon_state = "mining"
 
 /area/quartermaster/mechbay
 	name = "Mech Bay"
@@ -651,6 +738,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Hydroponics"
 	icon_state = "hydro"
 
+/area/hydroponics/Abandoned_Garden
+	name = "Abandoned Garden"
+	icon_state = "hydro"
+
 //Toxins
 
 /area/toxins/lab
@@ -675,7 +766,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "toxtest"
 
 /area/toxins/mixing
-	name = "Toxins Mixing Room"
+	name = "Toxins Mixing Lab"
 	icon_state = "toxmix"
 
 /area/toxins/misc_lab
@@ -683,7 +774,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "toxmisc"
 
 /area/toxins/server
-	name = "Server Room"
+	name = "Research Division Server Room"
 	icon_state = "server"
 
 /area/toxins/explab
@@ -744,6 +835,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Construction Area"
 	icon_state = "yellow"
 
+/area/construction/minisat_exterior
+	name = "Minisat Exterior"
+	icon_state = "yellow"
+
 /area/mining_construction
 	name = "Auxillary Base Construction"
 	icon_state = "yellow"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index d29ea014b96..8b3b5056255 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -197,7 +197,7 @@ var/list/teleportlocs = list()
 					if(D.operating)
 						D.nextstate = CLOSED
 					else if(!D.density)
-						addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/close), 0)
+						INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/close)
 			for(var/obj/machinery/firealarm/F in RA)
 				F.update_icon()
 		for (var/obj/machinery/camera/C in RA)
@@ -223,7 +223,7 @@ var/list/teleportlocs = list()
 					if(D.operating)
 						D.nextstate = OPEN
 					else if(D.density)
-						addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/open), 0)
+						INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/open)
 			for(var/obj/machinery/firealarm/F in RA)
 				F.update_icon()
 
@@ -294,7 +294,7 @@ var/list/teleportlocs = list()
 				if(D.operating)
 					D.nextstate = OPEN
 				else if(D.density)
-					addtimer(CALLBACK(D, /obj/machinery/door/firedoor.proc/open), 0)
+					INVOKE_ASYNC(D, /obj/machinery/door/firedoor.proc/open)
 
 /area/proc/updateicon()
 	if ((fire || eject || party) && (!requires_power||power_environ))//If it doesn't require power, can still activate this proc.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index b56a36785a9..dab8a2ad0a2 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -109,8 +109,9 @@
 			var/atom/movable/M = A
 			if(isliving(M.loc))
 				var/mob/living/L = M.loc
-				L.unEquip(M)
-			M.loc = src
+				L.transferItemToLoc(M, src)
+			else
+				M.forceMove(src)
 
 /atom/proc/assume_air(datum/gas_mixture/giver)
 	qdel(giver)
diff --git a/code/game/gamemodes/changeling/powers/biodegrade.dm b/code/game/gamemodes/changeling/powers/biodegrade.dm
index 6fd219064dc..68b05b839d5 100644
--- a/code/game/gamemodes/changeling/powers/biodegrade.dm
+++ b/code/game/gamemodes/changeling/powers/biodegrade.dm
@@ -59,16 +59,12 @@
 
 /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_handcuffs(mob/living/carbon/human/user, obj/O)
 	if(O && user.handcuffed == O)
-		user.unEquip(O)
-		O.visible_message("<span class='warning'>[O] dissolves into a puddle of sizzling goop.</span>")
-		O.loc = get_turf(user)
+		visible_message("<span class='warning'>[O] dissolves into a puddle of sizzling goop.</span>")
 		qdel(O)
 
 /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S)
 	if(S && user.wear_suit == S)
-		user.unEquip(S)
-		S.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")
-		S.loc = get_turf(user)
+		visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")
 		qdel(S)
 
 /obj/effect/proc_holder/changeling/biodegrade/proc/open_closet(mob/living/carbon/human/user, obj/structure/closet/C)
diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm
index 2a6139351f4..89e05977df1 100644
--- a/code/game/gamemodes/changeling/powers/fleshmend.dm
+++ b/code/game/gamemodes/changeling/powers/fleshmend.dm
@@ -36,7 +36,7 @@
 			by quick repeated use!</span>"
 
 	recent_uses++
-	addtimer(CALLBACK(src, .proc/fleshmend, user), 0)
+	INVOKE_ASYNC(src, .proc/fleshmend, user)
 
 	feedback_add_details("changeling_powers","RR")
 	return 1
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 304fd36d66e..1b3e59e5189 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -29,7 +29,7 @@
 
 /obj/effect/proc_holder/changeling/weapon/proc/check_weapon(mob/user, obj/item/hand_item)
 	if(istype(hand_item, weapon_type))
-		user.unEquip(hand_item, 1) //DROPDEL will delete the item
+		user.temporarilyRemoveItemFromInventory(hand_item, TRUE) //DROPDEL will delete the item
 		if(!silent)
 			playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
 			user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
@@ -89,8 +89,8 @@
 	var/mob/living/carbon/human/H = user
 	if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type))
 		H.visible_message("<span class='warning'>[H] casts off their [suit_name_simple]!</span>", "<span class='warning'>We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]</span>", "<span class='italics'>You hear the organic matter ripping and tearing!</span>")
-		H.unEquip(H.head, TRUE) //The qdel on dropped() takes care of it
-		H.unEquip(H.wear_suit, TRUE)
+		H.temporarilyRemoveItemFromInventory(H.head, TRUE) //The qdel on dropped() takes care of it
+		H.temporarilyRemoveItemFromInventory(H.wear_suit, TRUE)
 		H.update_inv_wear_suit()
 		H.update_inv_head()
 		H.update_hair()
@@ -117,8 +117,8 @@
 		user << "\the [user.head] is stuck on your head, you cannot grow a [helmet_name_simple] over it!"
 		return
 
-	user.unEquip(user.head)
-	user.unEquip(user.wear_suit)
+	user.dropItemToGround(user.head)
+	user.dropItemToGround(user.wear_suit)
 
 	user.equip_to_slot_if_possible(new suit_type(user), slot_wear_suit, 1, 1, 1)
 	user.equip_to_slot_if_possible(new helmet_type(user), slot_head, 1, 1, 1)
@@ -312,7 +312,7 @@
 
 /obj/item/projectile/tentacle/on_hit(atom/target, blocked = 0)
 	var/mob/living/carbon/human/H = firer
-	H.unEquip(source.gun,1) //Unequip thus delete the tentacle on hit
+	H.dropItemToGround(source.gun, TRUE) //Unequip thus delete the tentacle on hit
 	if(blocked >= 100)
 		return 0
 	if(istype(target, /obj/item))
@@ -414,7 +414,6 @@
 		if(ishuman(loc))
 			var/mob/living/carbon/human/H = loc
 			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms his shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
-			H.unEquip(src, 1)
 		qdel(src)
 		return 0
 	else
diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
index 16f0202320e..3eaf2701c5f 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
@@ -307,7 +307,7 @@
 				L.visible_message("<span class='warning'>[L] collapses in on [L.p_them()]self as [src] flares bright blue!</span>")
 				L << "<span class='inathneq_large'>\"[text2ratvar("Your life will not be wasted.")]\"</span>"
 				for(var/obj/item/W in L)
-					if(!L.unEquip(W))
+					if(!L.dropItemToGround(W))
 						qdel(W)
 				L.dust()
 			else
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
index 293f277c0e2..46940eb421b 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
@@ -214,7 +214,7 @@
 	if(reinf)
 		prosel_cost -= POWER_ROD
 	for(var/obj/structure/grille/G in get_turf(src))
-		addtimer(CALLBACK(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user), 0)
+		INVOKE_ASYNC(proselytizer, /obj/item/clockwork/clockwork_proselytizer.proc/proselytize, G, user)
 	return list("operation_time" = prosel_time, "new_obj_type" = windowtype, "power_cost" = prosel_cost, "spawn_dir" = dir, "dir_in_new" = new_dir)
 
 /obj/structure/window/reinforced/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
@@ -363,14 +363,14 @@
 /mob/living/silicon/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
 	. = TRUE
 	if(proselytizer_heal(user, proselytizer) && user)
-		user.visible_message("<span class='notice'>[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] [src] with glowing orange energy.</span>", \
+		user.visible_message("<span class='notice'>[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.</span>", \
 		"<span class='alloy'>You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at <b>[abs(HEALTH_THRESHOLD_DEAD - health)]/[abs(HEALTH_THRESHOLD_DEAD - maxHealth)]</b> health.</span>")
 
 //Same with clockwork mobs.
 /mob/living/simple_animal/hostile/clockwork/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
 	. = TRUE
 	if(proselytizer_heal(user, proselytizer) && user)
-		user.visible_message("<span class='notice'>[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] [src] with glowing orange energy.</span>", \
+		user.visible_message("<span class='notice'>[user]'s [proselytizer.name] stops coverin[src == user ? "g [user.p_them()]" : "g [src]"] with glowing orange energy.</span>", \
 		"<span class='alloy'>You finish repairin[src == user ? "g yourself. You are":"g [src]. [p_they(TRUE)] [p_are()]"] now at <b>[health]/[maxHealth]</b> health.</span>")
 
 //Cogscarabs get special interaction because they're drones and have innate self-heals/revives.
diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
index 9a091fe3ee7..9a215c7e6c3 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm
@@ -16,9 +16,8 @@
 		if(user.mind && user.mind.isholy)
 			user << "<span class='boldannounce'>The power of your faith melts away the [src]!</span>"
 			var/obj/item/weapon/ore/slag/wrath = new /obj/item/weapon/ore/slag
-			user.unEquip(src)
-			user.put_in_active_hand(wrath)
 			qdel(src)
+			user.put_in_active_hand(wrath)
 	if(is_servant_of_ratvar(user) && prob(20))
 		var/pickedmessage = pick(servant_of_ratvar_messages)
 		user << "<span class='[message_span]'>[servant_of_ratvar_messages[pickedmessage] ? "[text2ratvar(pickedmessage)]" : pickedmessage]</span>"
diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
index d4d6aeb853c..1c90cb96f30 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
@@ -44,7 +44,7 @@
 			user.emote("scream")
 			user.apply_damage(30, BRUTE, "head")
 			user.adjustBrainLoss(30)
-		addtimer(CALLBACK(user, /mob/living.proc/unEquip), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
+		addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround), src, 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
 
 /obj/item/clothing/head/helmet/clockwork/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
 	if(equipper && !is_servant_of_ratvar(equipper))
@@ -106,7 +106,7 @@
 			user.apply_damage(15, BURN, "chest")
 			user.adjust_fire_stacks(2)
 			user.IgniteMob()
-		addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1)
+		addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
 
 /obj/item/clothing/gloves/clockwork
 	name = "clockwork gauntlets"
@@ -166,7 +166,7 @@
 			user.emote("scream")
 			user.apply_damage(7, BRUTE, "l_arm")
 			user.apply_damage(7, BRUTE, "r_arm")
-		addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1)
+		addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
 
 /obj/item/clothing/shoes/clockwork
 	name = "clockwork treads"
@@ -213,4 +213,4 @@
 			user.emote("scream")
 			user.apply_damage(7, BURN, "l_leg")
 			user.apply_damage(7, BURN, "r_leg")
-		addtimer(CALLBACK(user, /mob/living.proc/unEquip, src, 1), 1)
+		addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
index a6210fd4b22..831faf71dbf 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
@@ -450,7 +450,7 @@
 		if("toggle")
 			recollecting = !recollecting
 		if("recite")
-			addtimer(CALLBACK(src, .proc/recite_scripture, text2path(params["category"]), usr, FALSE), 0)
+			INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["category"]), usr, FALSE)
 		if("select")
 			selected_scripture = params["category"]
 		if("component")
diff --git a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm
index 647e88e64f0..3dcf0d88284 100644
--- a/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm
@@ -131,7 +131,7 @@
 				continue
 			V.recharging = TRUE //To prevent exploiting multiple visors to bypass the cooldown
 			V.update_status()
-			addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor), (ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2, ranged_ability_user)
+			addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), (ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2)
 		clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!"))
 		ranged_ability_user.visible_message("<span class='warning'>[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!</span>", "<span class='heavy_brass'>You direct [visor]'s power to [target]. You must wait for some time before doing this again.</span>")
 		var/turf/targetturf = get_turf(target)
@@ -139,7 +139,7 @@
 		add_logs(ranged_ability_user, targetturf, "created a judicial marker")
 		ranged_ability_user.update_action_buttons_icon()
 		ranged_ability_user.update_inv_glasses()
-		addtimer(CALLBACK(visor, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor), ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown, ranged_ability_user)//Cooldown is reduced by 10x if Ratvar is up
+		addtimer(CALLBACK(visor, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown)//Cooldown is reduced by 10x if Ratvar is up
 		remove_ranged_ability()
 
 		return TRUE
@@ -160,7 +160,7 @@
 	..()
 	SetLuminosity(4, 3)
 	user = caster
-	addtimer(CALLBACK(src, .proc/judicialblast), 0)
+	INVOKE_ASYNC(src, .proc/judicialblast)
 
 /obj/effect/clockwork/judicial_marker/proc/judicialblast()
 	playsound(src, 'sound/magic/MAGIC_MISSILE.ogg', 50, 1, 1, 1)
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm
index 5befd739a8e..3c52900a47c 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm
@@ -38,5 +38,5 @@
 
 //Volt Void, but with a different quickbind desc
 /datum/clockwork_scripture/channeled/volt_void/cyborg
-	quickbind_desc = "Allows you to fire energy rays at target locations using your own power.<br><b>Maximum 5 chants.</b>"
+	quickbind_desc = "Allows you to fire energy rays at target locations using your own power. Failing to fire causes backlash.<br><b>Maximum 4 chants.</b>"
 	tier = SCRIPTURE_PERIPHERAL
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
index fdca397c392..3f5347593fb 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
@@ -156,7 +156,7 @@
 	desc = "Grants the invoker the ability to call forth a powerful Ratvarian spear every three minutes. The spear will deal significant damage to Nar-Sie's dogs and silicon lifeforms, but will \
 	vanish three minutes after being summoned."
 	invocations = list("Grant me...", "...the might of brass!")
-	channel_time = 2
+	channel_time = 20
 	consumed_components = list(REPLICANT_ALLOY = 1, HIEROPHANT_ANSIBLE = 1)
 	whispered = TRUE
 	usage_tip = "You can impale human targets with the spear by pulling them, then attacking. Throwing the spear at a mob will do massive damage and stun them, but break the spear."
@@ -264,19 +264,19 @@
 /datum/clockwork_scripture/channeled/volt_void
 	descname = "Channeled, Targeted Energy Blasts"
 	name = "Volt Void" //Alternative name: "On all levels but physical, I am a power sink"
-	desc = "Allows you to fire energy rays at target locations; more power consumed causes more damage. Channeled every fourth of a second for a maximum of ten seconds."
-	channel_time = 20
+	desc = "Allows you to fire energy rays at target locations; more power consumed causes more damage. Channeled every fifth of a second for a maximum of ten seconds."
+	channel_time = 30
 	invocations = list("Amperage...", "...grant me your power!")
 	chant_invocations = list("Use charge to kill!", "Slay with power!", "Hunt with energy!")
-	chant_amount = 5
-	chant_interval = 4
+	chant_amount = 4
+	chant_interval = 5
 	consumed_components = list(GEIS_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 1)
 	usage_tip = "Though it requires you to stand still, this scripture can do massive damage."
 	tier = SCRIPTURE_SCRIPT
 	primary_component = HIEROPHANT_ANSIBLE
 	sort_priority = 10
 	quickbind = TRUE
-	quickbind_desc = "Allows you to fire energy rays at target locations. Failing to fire causes backlash.<br><b>Maximum 5 chants.</b>"
+	quickbind_desc = "Allows you to fire energy rays at target locations. Failing to fire causes backlash.<br><b>Maximum 4 chants.</b>"
 	var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.",
 	"Boss says </span><span class='heavy_brass'>\"Click something, you idiot!\"</span><span class='nzcrentr'>.", "Stop wasting components if you can't aim.")
 
@@ -288,13 +288,20 @@
 	var/turf/T = get_turf(invoker)
 	if(!ray.run_scripture() && slab && invoker)
 		if(can_recite() && T == get_turf(invoker))
-			if(!ratvar_awakens && !iscyborg(invoker) && !isclockmob(invoker) && !isdrone(invoker))
+			if(!ratvar_awakens)
 				var/obj/structure/destructible/clockwork/powered/volt_checker/VC = new/obj/structure/destructible/clockwork/powered/volt_checker(get_turf(invoker))
-				var/multiplier = 0.4
+				var/multiplier = 0.5
 				var/usable_power = min(Floor(VC.total_accessable_power() * 0.2, MIN_CLOCKCULT_POWER), 1000)
 				if(VC.try_use_power(usable_power))
-					multiplier += (usable_power * 0.0004) //at maximum power, should be 0.8 multiplier
+					multiplier += (usable_power * 0.0005) //at maximum power, should be 1 multiplier
 				qdel(VC)
+				if(iscyborg(invoker))
+					var/mob/living/silicon/robot/C = invoker
+					if(C.cell)
+						var/prev_power = usable_power //we don't want to increase the multiplier past 1
+						usable_power = min(Floor(C.cell.charge * 0.2, MIN_CLOCKCULT_POWER), 1000) - prev_power
+						if(usable_power > 0 && C.cell.use(usable_power))
+							multiplier += (usable_power * 0.0005)
 				var/obj/effect/overlay/temp/ratvar/volt_hit/VH = new /obj/effect/overlay/temp/ratvar/volt_hit(get_turf(invoker), null, multiplier)
 				invoker.visible_message("<span class='warning'>[invoker] is struck by [invoker.p_their()] own [VH.name]!</span>", "<span class='userdanger'>You're struck by your own [VH.name]!</span>")
 				invoker.adjustFireLoss(VH.damage) //you have to fail all five blasts to die to this
@@ -315,7 +322,7 @@
 	ranged_type = /obj/effect/proc_holder/slab/volt
 	ranged_message = "<span class='nzcrentr_small'><i>You charge the clockwork slab with shocking might.</i>\n\
 	<b>Left-click a target to fire, quickly!</b></span>"
-	timeout_time = 16
+	timeout_time = 20
 
 /obj/structure/destructible/clockwork/powered/volt_checker
 	invisibility = INVISIBILITY_ABSTRACT
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
index 059169c591d..f123579e34d 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -23,7 +23,7 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/New()
 	..()
-	addtimer(CALLBACK(src, .proc/spawn_animation), 0)
+	INVOKE_ASYNC(src, .proc/spawn_animation)
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/spawn_animation()
 	var/turf/T = get_turf(src)
@@ -215,7 +215,7 @@
 					sleep(3)
 					new/obj/structure/destructible/clockwork/massive/ratvar(startpoint)
 				else
-					addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0), 0) //call the shuttle immediately
+					INVOKE_ASYNC(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 0) //call the shuttle immediately
 					sleep(3)
 					send_to_playing_players("<span class='ratvar'>\"[text2ratvar("Behold")]!\"</span>\n<span class='inathneq_large'>\"[text2ratvar("See Engine's mercy")]!\"</span>\n\
 					<span class='sevtug_large'>\"[text2ratvar("Observe Engine's design skills")]!\"</span>\n<span class='nezbere_large'>\"[text2ratvar("Behold Engine's light")]!!\"</span>\n\
diff --git a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
index 9da7519a53a..041a99c19a9 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
@@ -41,7 +41,7 @@
 		var/image/GB = new('icons/effects/clockwork_effects.dmi', src, "geisbinding_top", M.layer + 0.01)
 		add_overlay(GB)
 		for(var/obj/item/I in M.held_items)
-			M.unEquip(I)
+			M.dropItemToGround(I)
 		for(var/i in M.get_empty_held_indexes())
 			var/obj/item/geis_binding/B = new(M)
 			M.put_in_hands(B, i)
@@ -61,7 +61,7 @@
 		animate(T, transform = matrix()*2, alpha = 0, time = 8, easing = EASE_OUT)
 		M.visible_message("<span class='warning'>[src] snaps into glowing pieces and dissipates!</span>")
 		for(var/obj/item/geis_binding/GB in M.held_items)
-			M.unEquip(GB, TRUE)
+			M.dropItemToGround(GB, TRUE)
 
 /obj/structure/destructible/clockwork/geis_binding/relaymove(mob/user, direction)
 	if(isliving(user) && can_resist)
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 6d7aca5a289..f67b7fbb511 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -15,7 +15,7 @@
 /obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user)
 	if(!iscultist(user))
 		user.Weaken(5)
-		user.unEquip(src, 1)
+		user.dropItemToGround(src, TRUE)
 		user.visible_message("<span class='warning'>A powerful force shoves [user] away from [target]!</span>", \
 							 "<span class='cultlarge'>\"You shouldn't play with sharp things. You'll poke someone's eye out.\"</span>")
 		if(ishuman(user))
@@ -38,7 +38,7 @@
 			user << "<span class='userdanger'>A horrible force yanks at your arm!</span>"
 			user.emote("scream")
 			user.apply_damage(30, BRUTE, pick("l_arm", "r_arm"))
-			user.unEquip(src)
+			user.dropItemToGround(src)
 
 /obj/item/weapon/melee/cultblade/dagger
 	name = "sacrificial dagger"
@@ -179,7 +179,7 @@
 		if(!is_servant_of_ratvar(user))
 			user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
 			user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
-			user.unEquip(src, 1)
+			user.dropItemToGround(src, TRUE)
 			user.Dizzy(30)
 			user.Weaken(5)
 		else
@@ -187,7 +187,7 @@
 			user << "<span class='userdanger'>The armor squeezes at your body!</span>"
 			user.emote("scream")
 			user.adjustBruteLoss(25)
-			user.unEquip(src, 1)
+			user.dropItemToGround(src, TRUE)
 
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands)
 	if(current_charges)
@@ -231,7 +231,7 @@
 		if(!is_servant_of_ratvar(user))
 			user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
 			user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
-			user.unEquip(src, 1)
+			user.dropItemToGround(src, TRUE)
 			user.Dizzy(30)
 			user.Weaken(5)
 		else
@@ -239,7 +239,7 @@
 			user << "<span class='userdanger'>The robes squeeze at your body!</span>"
 			user.emote("scream")
 			user.adjustBruteLoss(25)
-			user.unEquip(src, 1)
+			user.dropItemToGround(src, TRUE)
 
 /obj/item/clothing/glasses/night/cultblind
 	desc = "May nar-sie guide you through the darkness and shield you from the light."
@@ -253,7 +253,7 @@
 	..()
 	if(!iscultist(user))
 		user << "<span class='cultlarge'>\"You want to be blind, do you?\"</span>"
-		user.unEquip(src, 1)
+		user.dropItemToGround(src, TRUE)
 		user.Dizzy(30)
 		user.Weaken(5)
 		user.blind_eyes(30)
@@ -274,7 +274,7 @@
 
 /obj/item/device/shuttle_curse/attack_self(mob/user)
 	if(!iscultist(user))
-		user.unEquip(src, 1)
+		user.dropItemToGround(src, TRUE)
 		user.Weaken(5)
 		user << "<span class='warning'>A powerful force shoves you away from [src]!</span>"
 		return
@@ -327,7 +327,7 @@
 		user << "<span class='warning'>\The [src] is dull and unmoving in your hands.</span>"
 		return
 	if(!iscultist(user))
-		user.unEquip(src, 1)
+		user.dropItemToGround(src, TRUE)
 		step(src, pick(alldirs))
 		user << "<span class='warning'>\The [src] flickers out of your hands, your connection to this dimension is too strong!</span>"
 		return
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 0ff4991e4bc..719854d9474 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -221,8 +221,7 @@ This file contains the arcane tome files.
 			A = get_area(src)
 			if(!check_rune_turf(Turf, user) || (loc.z && loc.z != ZLEVEL_STATION)|| !A.blob_allowed)
 				return
-			var/locname = initial(A.name)
-			priority_announce("Figments from an eldritch god are being summoned by [user] into [locname] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg')
+			priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensionsal Affairs", 'sound/AI/spanomalies.ogg')
 			for(var/B in spiral_range_turfs(1, user, 1))
 				var/obj/structure/emergency_shield/sanguine/N = new(B)
 				shields += N
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 9c93e97a863..65cfd923e08 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -1004,5 +1004,5 @@ var/list/wall_runes = list()
 		new_human.visible_message("<span class='warning'>[new_human] suddenly dissolves into bones and ashes.</span>", \
 								  "<span class='cultlarge'>Your link to the world fades. Your form breaks apart.</span>")
 		for(var/obj/I in new_human)
-			new_human.unEquip(I)
+			new_human.dropItemToGround(I)
 		new_human.dust()
diff --git a/code/game/gamemodes/devil/true_devil/inventory.dm b/code/game/gamemodes/devil/true_devil/inventory.dm
index 52feb42e289..a4af9484973 100644
--- a/code/game/gamemodes/devil/true_devil/inventory.dm
+++ b/code/game/gamemodes/devil/true_devil/inventory.dm
@@ -1,5 +1,5 @@
-/mob/living/carbon/true_devil/unEquip(obj/item/I, force)
-	if(..(I,force))
+/mob/living/carbon/true_devil/doUnEquip(obj/item/I, force)
+	if(..())
 		update_inv_hands()
 		return 1
 	return 0
@@ -55,4 +55,4 @@
 /mob/living/carbon/true_devil/apply_overlay(cache_index)
 	var/image/I = devil_overlays[cache_index]
 	if(I)
-		add_overlay(I)
\ No newline at end of file
+		add_overlay(I)
diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm
index 5955138789a..8d6709b1e2a 100644
--- a/code/game/gamemodes/gang/gang.dm
+++ b/code/game/gamemodes/gang/gang.dm
@@ -179,7 +179,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple"
 
 	G.add_gang_hud(gangster_mind)
 	if(jobban_isbanned(gangster_mind.current, ROLE_GANG))
-		addtimer(CALLBACK(src, /datum/game_mode.proc/replace_jobbaned_player, gangster_mind.current, ROLE_GANG, ROLE_GANG), 0)
+		INVOKE_ASYNC(src, /datum/game_mode.proc/replace_jobbaned_player, gangster_mind.current, ROLE_GANG, ROLE_GANG)
 	return 2
 ////////////////////////////////////////////////////////////////////
 //Deals with players reverting to neutral (Not a gangster anymore)//
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index ca15a7ba8aa..220b2be20dd 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -165,7 +165,7 @@
 	for(var/obj/machinery/door/D in airlocks)
 		if(D.z != ZLEVEL_STATION)
 			continue
-		addtimer(CALLBACK(D, /obj/machinery/door.proc/hostile_lockdown, src), 0)
+		INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, src)
 		addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900)
 
 	var/obj/machinery/computer/communications/C = locate() in machines
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 68727883752..4ff1d23f596 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -194,7 +194,7 @@
 /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
 	if(attempt_cast(user))
 		for(var/turf/T in targets)
-			addtimer(CALLBACK(src, .proc/overload, T, user), 0)
+			INVOKE_ASYNC(src, .proc/overload, T, user)
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload(turf/T, mob/user)
 	for(var/obj/machinery/light/L in T)
@@ -234,7 +234,7 @@
 /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
 	if(attempt_cast(user))
 		for(var/turf/T in targets)
-			addtimer(CALLBACK(src, .proc/defile, T), 0)
+			INVOKE_ASYNC(src, .proc/defile, T)
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T)
 	if(T.flags & NOJAUNT)
@@ -281,7 +281,7 @@
 /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
 	if(attempt_cast(user))
 		for(var/turf/T in targets)
-			addtimer(CALLBACK(src, .proc/malfunction, T, user), 0)
+			INVOKE_ASYNC(src, .proc/malfunction, T, user)
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/proc/malfunction(turf/T, mob/user)
 	for(var/mob/living/simple_animal/bot/bot in T)
@@ -325,7 +325,7 @@
 /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
 	if(attempt_cast(user))
 		for(var/turf/T in targets)
-			addtimer(CALLBACK(src, .proc/blight, T, user), 0)
+			INVOKE_ASYNC(src, .proc/blight, T, user)
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/proc/blight(turf/T, mob/user)
 	for(var/mob/living/mob in T)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 1199b72c374..4b182214daa 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -21,8 +21,8 @@ var/bomb_set
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 	var/timer_set = 60
-	var/default_timer_set = 60
-	var/minimum_timer_set = 60
+	var/default_timer_set = 90
+	var/minimum_timer_set = 90
 	var/maximum_timer_set = 3600
 	var/ui_style = "nanotrasen"
 
@@ -557,12 +557,11 @@ This is here to make the tiles around the station mininuke change when it's arme
 
 	if(ismob(loc))
 		var/mob/M = loc
-		M.remove_from_mob(src)
-	if(istype(loc, /obj/item/weapon/storage))
+		M.transferItemToLoc(src, targetturf, TRUE)	//nodrops disks when?
+	else if(istype(loc, /obj/item/weapon/storage))
 		var/obj/item/weapon/storage/S = loc
 		S.remove_from_storage(src, targetturf)
 	// move the disc, so ghosts remain orbiting it even if it's "destroyed"
-	forceMove(targetturf)
 	return targetturf
 
 /obj/item/weapon/disk/nuclear/Destroy(force)
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 5fa6edb28dc..be32c62fab1 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -275,7 +275,7 @@
 	rev_mind.special_role = "Revolutionary"
 	update_rev_icons_added(rev_mind)
 	if(jobban_isbanned(rev_mind.current, ROLE_REV))
-		addtimer(CALLBACK(src, .proc/replace_jobbaned_player), 0, rev_mind.current, ROLE_REV, ROLE_REV)
+		INVOKE_ASYNC(src, .proc/replace_jobbaned_player, rev_mind.current, ROLE_REV, ROLE_REV)
 	return 1
 //////////////////////////////////////////////////////////////////////////////
 //Deals with players being converted from the revolution (Not a rev anymore)//  // Modified to handle borged MMIs.  Accepts another var if the target is being borged at the time  -- Polymorph.
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 580de6de3c3..fa48e0c6fa4 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -182,7 +182,7 @@
 //Funny gimmick, skeletons always seem to wear roman/ancient armour
 /obj/item/device/necromantic_stone/proc/equip_roman_skeleton(mob/living/carbon/human/H)
 	for(var/obj/item/I in H)
-		H.unEquip(I)
+		H.dropItemToGround(I)
 
 	var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire)
 	H.equip_to_slot_or_del(new hat(H), slot_head)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index d5d7b88848a..45f00fa7fc3 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -125,7 +125,7 @@
 			var/mob/living/carbon/T = target
 			if(T.client != null)
 				for(var/obj/item/W in T)
-					T.unEquip(W)
+					T.dropItemToGround(W)
 				init_shade(T, user)
 				return 1
 			else
@@ -149,7 +149,7 @@
 						getCultGhost(T,user)
 					else
 						for(var/obj/item/W in T)
-							T.unEquip(W)
+							T.dropItemToGround(W)
 						init_shade(T, user, vic = 1)
 						qdel(T)
 				else
@@ -258,7 +258,7 @@
 		return 0
 	T.ckey = chosen_ghost.ckey
 	for(var/obj/item/W in T)
-		T.unEquip(W)
+		T.dropItemToGround(W)
 	init_shade(T, U)
 	qdel(T)
 	return 1
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index e93e4967af1..e40f5cd9370 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -881,7 +881,7 @@
 		magichead.flags |= NODROP		//curses!
 		magichead.flags_inv &= ~HIDEFACE //so you can still see their face
 		magichead.voicechange = 1	//NEEEEIIGHH
-		if(!user.unEquip(user.wear_mask))
+		if(!user.dropItemToGround(user.wear_mask))
 			qdel(user.wear_mask)
 		user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
 		qdel(src)
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 0978d9434e7..e2296f498a3 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -138,7 +138,6 @@
 	qdel(wizard_mob.head)
 	qdel(wizard_mob.shoes)
 	for(var/obj/item/I in wizard_mob.held_items)
-		wizard_mob.unEquip(I)
 		qdel(I)
 	qdel(wizard_mob.r_store)
 	qdel(wizard_mob.l_store)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 0435ba143e8..a6400e2ea6e 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -145,7 +145,7 @@
 	if(!materials.has_space(material_amount))
 		user << "<span class='warning'>The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.</span>"
 		return 1
-	if(!user.unEquip(O))
+	if(!user.temporarilyRemoveItemFromInventory(O))
 		user << "<span class='warning'>\The [O] is stuck to you and cannot be placed into the autolathe.</span>"
 		return 1
 
@@ -159,10 +159,15 @@
 				flick("autolathe_r",src)//plays glass insertion animation
 			user << "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.</span>"
 			use_power(inserted*100)
+			if(!qdeleted(O))
+				user.put_in_active_hand(O)
 		else
 			user << "<span class='notice'>You insert a material total of [inserted] to the autolathe.</span>"
 			use_power(max(500,inserted/10))
 			qdel(O)
+	else
+		user.put_in_active_hand(O)
+
 	busy = 0
 	updateUsrDialog()
 	return 1
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 101700d6c05..22965fa1d64 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -68,18 +68,16 @@
 
 	if(panel_open)
 		if(!device && istype(W, /obj/item/device/assembly))
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				user << "<span class='warning'>\The [W] is stuck to you!</span>"
 				return
-			W.loc = src
 			device = W
 			user << "<span class='notice'>You add [W] to the button.</span>"
 
 		if(!board && istype(W, /obj/item/weapon/electronics/airlock))
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				user << "<span class='warning'>\The [W] is stuck to you!</span>"
 				return
-			W.loc = src
 			board = W
 			if(board.one_access)
 				req_one_access = board.accesses
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index cbef0094a2b..9ea6df97316 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -136,7 +136,7 @@
 		if(!G)
 			return FALSE
 	if(clonemind.damnation_type) //Can't clone the damned.
-		addtimer(CALLBACK(src, .proc/horrifyingsound), 0)
+		INVOKE_ASYNC(src, .proc/horrifyingsound)
 		mess = 1
 		icon_state = "pod_g"
 		update_icon()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 1b0ecc7dc31..de94bbbc85a 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -94,7 +94,7 @@
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(door.density)
 			continue
-		addtimer(CALLBACK(door, /obj/machinery/door/window/brigdoor.proc/close), 0)
+		INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/close)
 
 	for(var/obj/structure/closet/secure_closet/brig/C in targets)
 		if(C.broken)
@@ -123,7 +123,7 @@
 	for(var/obj/machinery/door/window/brigdoor/door in targets)
 		if(!door.density)
 			continue
-		addtimer(CALLBACK(door, /obj/machinery/door/window/brigdoor.proc/open), 0)
+		INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/open)
 
 	for(var/obj/structure/closet/secure_closet/brig/C in targets)
 		if(C.broken)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 774e0cf2273..39969b140fa 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -186,7 +186,7 @@
 
 /obj/machinery/door/emp_act(severity)
 	if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) )
-		addtimer(CALLBACK(src, .proc/open), 0)
+		INVOKE_ASYNC(src, .proc/open)
 	if(prob(40/severity))
 		if(secondsElectrified == 0)
 			secondsElectrified = -1
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 6b97027fbca..30965729f40 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -30,9 +30,9 @@
 /obj/machinery/door/poddoor/shuttledock/proc/check()
 	var/turf/T = get_step(src, checkdir)
 	if(!istype(T, turftype))
-		addtimer(CALLBACK(src, .proc/open), 0, TIMER_UNIQUE)
+		INVOKE_ASYNC(src, .proc/open)
 	else
-		addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE)
+		INVOKE_ASYNC(src, .proc/close)
 
 /obj/machinery/door/poddoor/Bumped(atom/AM)
 	if(density)
diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm
index a72eff26c00..f879f4b4c48 100644
--- a/code/game/machinery/gulag_teleporter.dm
+++ b/code/game/machinery/gulag_teleporter.dm
@@ -137,7 +137,7 @@ The console is located at computer/gulag_teleporter.dm
 	if(linked_reclaimer)
 		linked_reclaimer.stored_items[occupant] = list()
 	for(var/obj/item/W in occupant)
-		if(!is_type_in_typecache(W, required_items) && occupant.unEquip(W))
+		if(!is_type_in_typecache(W, required_items) && occupant.temporarilyRemoveItemFromInventory(W))
 			if(istype(W, /obj/item/weapon/restraints/handcuffs))
 				W.forceMove(get_turf(src))
 				continue
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 9d296c6bd33..473ed97e0c6 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -134,7 +134,7 @@
 				on = !on
 
 				if(on)
-					addtimer(CALLBACK(src, .proc/magnetic_process), 0)
+					INVOKE_ASYNC(src, .proc/magnetic_process)
 
 
 
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index ac5f7ac4d65..c7cad0458f4 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -183,7 +183,7 @@ var/const/SAFETY_COOLDOWN = 100
 	// Remove and recycle the equipped items
 	if(eat_victim_items)
 		for(var/obj/item/I in L.get_equipped_items())
-			if(L.unEquip(I))
+			if(L.dropItemToGround(I))
 				eat(I, sound=FALSE)
 
 	// Instantly lie down, also go unconscious from the pain, before you die.
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index b076c8c9b7b..803ee10603d 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -11,8 +11,8 @@
 	layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
-	var/minimum_timer = 60
-	var/timer_set = 60
+	var/minimum_timer = 90
+	var/timer_set = 90
 	var/maximum_timer = 60000
 
 	var/can_unanchor = TRUE
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index a5f43c7e753..d618b4167e6 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -39,10 +39,9 @@
 	if(istype(I, /obj/item/device/gps))
 		var/obj/item/device/gps/L = I
 		if(L.locked_location && !(stat & (NOPOWER|BROKEN)))
-			if(!user.unEquip(L))
+			if(!user.transferItemToLoc(L, src))
 				user << "<span class='warning'>\the [I] is stuck to your hand, you cannot put it in \the [src]!</span>"
 				return
-			L.loc = src
 			locked = L
 			user << "<span class='caution'>You insert the GPS device into the [name]'s slot.</span>"
 	else
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index a7f9125cd22..b35a1f67a0e 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -207,13 +207,12 @@
 			user << "<span class='warning'>The washing machine is full!</span>"
 			return 1
 
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			user << "<span class='warning'>\The [W] is stuck to your hand, you cannot put it in the washing machine!</span>"
 			return 1
 
 		if(istype(W,/obj/item/toy/crayon) || istype(W,/obj/item/weapon/stamp))
 			color_source = W
-		W.loc = src
 		update_icon()
 
 	else
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 04ba104c143..3f937cf1806 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -444,7 +444,7 @@
 		if(!materials.has_space(material_amount))
 			user << "<span class='warning'>\The [src] is full. Please remove some materials from [src] in order to insert more.</span>"
 			return 1
-		if(!user.unEquip(W))
+		if(!user.temporarilyRemoveItemFromInventory(W))
 			user << "<span class='warning'>\The [W] is stuck to you and cannot be placed into [src].</span>"
 			return 1
 
@@ -452,6 +452,7 @@
 		if(inserted)
 			user << "<span class='notice'>You insert [inserted] sheet\s into [src].</span>"
 			if(W && W.materials.len)
+				user.put_in_active_hand(W)
 				var/mat_overlay = "fab-load-[material2name(W.materials[1])]"
 				add_overlay(mat_overlay)
 				sleep(10)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 03eff51f755..0df72c79ca9 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -892,15 +892,14 @@
 		else if(mmi_as_oc.brainmob.stat)
 			user << "<span class='warning'>Beta-rhythm below acceptable level!</span>"
 			return 0
-		if(!user.unEquip(mmi_as_oc))
+		if(!user.transferItemToLoc(mmi_as_oc, src))
 			user << "<span class='warning'>\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]!</span>"
 			return
 		var/mob/brainmob = mmi_as_oc.brainmob
 		occupant = brainmob
-		brainmob.loc = src //should allow relaymove
+		brainmob.forceMove(src) //should allow relaymove
 		brainmob.reset_perspective(src)
 		brainmob.canmove = 1
-		mmi_as_oc.loc = src
 		mmi_as_oc.mecha = src
 		icon_state = initial(icon_state)
 		setDir(dir_in)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 17a28beec44..4a0e3012492 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -481,8 +481,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs scanner module to the [holder].", "<span class='notice'>You install scanner module to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "gygax11"
 			else
 				user.visible_message("[user] unfastens the weapon control module.", "<span class='notice'>You unfasten the weapon control module.</span>")
@@ -500,8 +499,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs capacitor to the [holder].", "<span class='notice'>You install capacitor to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "gygax13"
 			else
 				user.visible_message("[user] unfastens the  scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
@@ -1068,8 +1066,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs scanner module to the [holder].", "<span class='notice'>You install phasic scanner module to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "durand11"
 			else
 				user.visible_message("[user] unfastens the weapon control module.", "<span class='notice'>You unfasten the weapon control module.</span>")
@@ -1087,8 +1084,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs capacitor to the [holder].", "<span class='notice'>You install capacitor to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "durand13"
 			else
 				user.visible_message("[user] unfastens the scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
@@ -1375,8 +1371,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs phasic scanner module to the [holder].", "<span class='notice'>You install scanner module to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "phazon11"
 			else
 				user.visible_message("[user] unfastens the weapon control module.", "<span class='notice'>You unfasten the weapon control module.</span>")
@@ -1394,8 +1389,7 @@
 			if(diff==FORWARD)
 				user.visible_message("[user] installs super capacitor to the [holder].", "<span class='notice'>You install capacitor to the [holder].</span>")
 				var/obj/item/I = used_atom
-				user.unEquip(I)
-				I.loc = holder
+				user.transferItemToLoc(I, holder, TRUE)
 				holder.icon_state = "phazon13"
 			else
 				user.visible_message("[user] unfastens the phasic scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 2a27a20cde4..4a0c38514d5 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -258,10 +258,9 @@
 		return 1
 
 	else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			user << "<span class='warning'>\the [W] is stuck to your hand, you cannot put it in \the [src]!</span>"
 			return
-		W.forceMove(src)
 		trackers += W
 		user.visible_message("[user] attaches [W] to [src].", "<span class='notice'>You attach [W] to [src].</span>")
 		diag_hud_set_mechtracking()
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index eb8f575efb8..39ebc92df0d 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -51,7 +51,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	for(var/i in 1 to number)
 		if(total_effects > 20)
 			return
-		addtimer(CALLBACK(src, .proc/generate_effect), 0)
+		INVOKE_ASYNC(src, .proc/generate_effect)
 
 /datum/effect_system/proc/generate_effect()
 	if(holder)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 351ac8122c8..0ec7e137bb6 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -42,7 +42,7 @@
 
 /obj/effect/particle_effect/smoke/proc/kill_smoke()
 	STOP_PROCESSING(SSobj, src)
-	addtimer(CALLBACK(src, .proc/fade_out), 0)
+	INVOKE_ASYNC(src, .proc/fade_out)
 	QDEL_IN(src, 10)
 
 /obj/effect/particle_effect/smoke/process()
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index fb2ab81eeb6..b375ba5d0c2 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -317,7 +317,7 @@
 	duration = 5
 	icon_state = "volt_hit"
 	var/mob/user
-	var/damage = 25
+	var/damage = 20
 
 /obj/effect/overlay/temp/ratvar/volt_hit/New(loc, caster, multiplier)
 	if(multiplier)
@@ -333,7 +333,7 @@
 		var/matrix/M = new
 		M.Turn(Get_Angle(src, user))
 		transform = M
-	addtimer(CALLBACK(src, .proc/volthit), 0)
+	INVOKE_ASYNC(src, .proc/volthit)
 
 /obj/effect/overlay/temp/ratvar/volt_hit/proc/volthit()
 	if(user)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 8cb17c6357b..758dffe0c80 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -107,9 +107,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 	actions_types = null
 
 /obj/item/Destroy()
+	flags &= ~DROPDEL	//prevent reqdels
 	if(ismob(loc))
 		var/mob/m = loc
-		m.unEquip(src, 1)
+		m.temporarilyRemoveItemFromInventory(src, TRUE)
 	for(var/X in actions)
 		qdel(X)
 	return ..()
@@ -235,7 +236,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 
 	throwing = 0
 	if(loc == user)
-		if(!user.unEquip(src))
+		if(!user.dropItemToGround(src))
 			return
 
 	pickup(user)
@@ -256,7 +257,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 
 	throwing = 0
 	if(loc == user)
-		if(!user.unEquip(src))
+		if(!user.dropItemToGround(src))
 			return
 
 	pickup(user)
@@ -269,7 +270,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 
 	if(!A.has_fine_manipulation)
 		if(src in A.contents) // To stop Aliens having items stuck in their pockets
-			A.unEquip(src)
+			A.dropItemToGround(src)
 		user << "<span class='warning'>Your claws aren't capable of such fine manipulation!</span>"
 		return
 	attack_paw(A)
@@ -342,8 +343,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 		var/datum/action/A = X
 		A.Remove(user)
 	if(DROPDEL & flags)
-		//Prevents infinite loops where Destroy() calls an objects dropped() function
-		flags &= ~DROPDEL
 		qdel(src)
 
 // called just as an item is picked up (loc is not yet changed)
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index 54b2fc86b85..e89a4df3a47 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -20,14 +20,14 @@
 	owner.status_flags |= XENO_HOST
 	START_PROCESSING(SSobj, src)
 	owner.med_hud_set_status()
-	addtimer(CALLBACK(src, .proc/AddInfectionImages, owner), 0)
+	INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
 
 /obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
 	STOP_PROCESSING(SSobj, src)
 	if(owner)
 		owner.status_flags &= ~(XENO_HOST)
 		owner.med_hud_set_status()
-		addtimer(CALLBACK(src, .proc/RemoveInfectionImages, owner), 0)
+		INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
 	..()
 
 /obj/item/organ/body_egg/process()
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index e9fc4c85629..742edcbe8e1 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -58,9 +58,6 @@
 		wax--
 	if(!wax)
 		new/obj/item/trash/candle(src.loc)
-		if(istype(src.loc, /mob))
-			var/mob/M = src.loc
-			M.unEquip(src, 1) //src is being deleted anyway
 		qdel(src)
 	update_icon()
 	open_flame()
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index bee90b89cc8..83ed5db715e 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -761,10 +761,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				I = C
 
 	if(I && I.registered_name)
-		if(!user.unEquip(I))
+		if(!user.transferItemToLoc(I, src))
 			return 0
 		var/obj/old_id = id
-		I.forceMove(src)
 		id = I
 		if(old_id)
 			user.put_in_hands(old_id)
@@ -774,10 +773,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 // access to status display signals
 /obj/item/device/pda/attackby(obj/item/C, mob/user, params)
 	if(istype(C, /obj/item/weapon/cartridge) && !cartridge)
-		if(!user.unEquip(C))
+		if(!user.transferItemToLoc(C, src))
 			return
 		cartridge = C
-		cartridge.loc = src
 		user << "<span class='notice'>You insert [cartridge] into [src].</span>"
 		if(cartridge.radio)
 			cartridge.radio.hostpda = src
@@ -803,9 +801,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			return	//Return in case of failed check or when successful.
 		updateSelfDialog()//For the non-input related code.
 	else if(istype(C, /obj/item/device/paicard) && !src.pai)
-		if(!user.unEquip(C))
+		if(!user.transferItemToLoc(C, src))
 			return
-		C.loc = src
 		pai = C
 		user << "<span class='notice'>You slot \the [C] into [src].</span>"
 		update_icon()
@@ -814,9 +811,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(inserted_item)
 			user << "<span class='warning'>There is already \a [inserted_item] in \the [src]!</span>"
 		else
-			if(!user.unEquip(C))
+			if(!user.transferItemToLoc(C, src))
 				return
-			C.forceMove(src)
 			user << "<span class='notice'>You slide \the [C] into \the [src].</span>"
 			inserted_item = C
 			update_icon()
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index f31ba845a36..72c957f82d9 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -41,9 +41,8 @@
 /obj/item/device/laser_pointer/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/stock_parts/micro_laser))
 		if(!diode)
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			diode = W
 			user << "<span class='notice'>You install a [diode.name] in [src].</span>"
 		else
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 7af4de841c6..a4825e904e8 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -93,7 +93,7 @@
 		if(uses >= max_uses)
 			user << "<span class='warning'>[src.name] is full.</span>"
 			return
-		if(!user.unEquip(W))
+		if(!user.temporarilyRemoveItemFromInventory(W))
 			return
 		AddUses(round(increment*0.75))
 		user << "<span class='notice'>You insert a shard of glass into the [src.name]. You have [uses] light\s remaining.</span>"
@@ -104,12 +104,12 @@
 		var/obj/item/weapon/light/L = W
 		if(L.status == 0) // LIGHT OKAY
 			if(uses < max_uses)
-				if(!user.unEquip(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				AddUses(1)
 				qdel(L)
 		else
-			if(!user.unEquip(W))
+			if(!user.temporarilyRemoveItemFromInventory(W))
 				return
 			user << "<span class='notice'>You insert the [L.name] into the [src.name]</span>"
 			AddShards(1, user)
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 87c97636ab5..2f0a8fe924f 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -39,15 +39,13 @@
 		var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
 		A.icon = 'icons/obj/assemblies.dmi'
 
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, A))
 			user << "<span class='warning'>[W] is stuck to your hand, you cannot attach it to [src]!</span>"
 			return
-		W.loc = A
 		W.master = A
 		A.part1 = W
 
-		user.unEquip(src)
-		loc = A
+		user.transferItemToLoc(src, A, TRUE)
 		master = A
 		A.part2 = src
 
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 082536c038b..dfcf3642a6c 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -246,15 +246,13 @@
 			return
 
 		if(!keyslot)
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			keyslot = W
 
 		else
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			keyslot2 = W
 
 
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 1a9bbeba017..a1d71960879 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -196,7 +196,7 @@
 				. = TRUE
 
 /obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans)
-	addtimer(CALLBACK(src, .proc/talk_into_impl, M, message, channel, spans), 0)
+	INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans)
 	return ITALICS | REDUCE_RANGE
 
 /obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans)
@@ -581,9 +581,8 @@
 			return
 
 		if(!keyslot)
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			keyslot = W
 
 		recalculateChannels()
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index fbada58249a..81ec8249361 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -32,9 +32,8 @@
 
 /obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params)
 	if(!mytape && istype(I, /obj/item/device/tape))
-		if(!user.unEquip(I))
+		if(!user.transferItemToLoc(I,src))
 			return
-		I.loc = src
 		mytape = I
 		user << "<span class='notice'>You insert [I] into [src].</span>"
 		update_icon()
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index fe25907e07d..4f6ee0d9b4a 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -22,18 +22,16 @@
 			return
 
 		if(!tank_one)
-			if(!user.unEquip(item))
+			if(!user.transferItemToLoc(item, src))
 				return
 			tank_one = item
-			item.loc = src
 			user << "<span class='notice'>You attach the tank to the transfer valve.</span>"
 			if(item.w_class > w_class)
 				w_class = item.w_class
 		else if(!tank_two)
-			if(!user.unEquip(item))
+			if(!user.transferItemToLoc(item, src))
 				return
 			tank_two = item
-			item.loc = src
 			user << "<span class='notice'>You attach the tank to the transfer valve.</span>"
 			if(item.w_class > w_class)
 				w_class = item.w_class
@@ -48,9 +46,9 @@
 		if(attached_device)
 			user << "<span class='warning'>There is already a device attached to the valve, remove it first!</span>"
 			return
-		user.remove_from_mob(item)
+		if(!user.transferItemToLoc(item, src))
+			return
 		attached_device = A
-		A.loc = src
 		user << "<span class='notice'>You attach the [item] to the valve controls and secure it.</span>"
 		A.holder = src
 		A.toggle_secure()	//this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
diff --git a/code/game/objects/items/nuke_tools.dm b/code/game/objects/items/nuke_tools.dm
index 9f9a76f604f..7fe512bfaf1 100644
--- a/code/game/objects/items/nuke_tools.dm
+++ b/code/game/objects/items/nuke_tools.dm
@@ -39,7 +39,7 @@
 /obj/item/nuke_core_container/proc/load(obj/item/nuke_core/ncore, mob/user)
 	if(core || !istype(ncore))
 		return 0
-	ncore.loc = src
+	ncore.forceMove(src)
 	core = ncore
 	icon_state = "core_container_loaded"
 	user << "<span class='warning'>Container is sealing...</span>"
@@ -56,7 +56,7 @@
 
 /obj/item/nuke_core_container/attackby(obj/item/nuke_core/core, mob/user)
 	if(istype(core))
-		if(!user.unEquip(core))
+		if(!user.temporarilyRemoveItemFromInventory(core))
 			user << "<span class='warning'>The [core] is stuck to your hand!</span>"
 			return
 		else
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index d0c2878a990..78308b5fcdd 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -71,19 +71,18 @@
 				var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly
 				B.loc = get_turf(src)
 				user << "<span class='notice'>You arm the robot frame.</span>"
-				if (user.get_inactive_held_item()==src)
-					user.unEquip(src)
-					user.put_in_inactive_hand(B)
+				var/holding_this = user.get_inactive_held_item()==src
 				qdel(src)
+				if (holding_this)
+					user.put_in_inactive_hand(B)
 			else
 				user << "<span class='warning'>You need one sheet of metal to start building ED-209!</span>"
 				return
 	else if(istype(W, /obj/item/bodypart/l_leg/robot))
 		if(src.l_leg)
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.forceMove(src)
 		W.icon_state = initial(W.icon_state)
 		W.cut_overlays()
 		src.l_leg = W
@@ -92,9 +91,8 @@
 	else if(istype(W, /obj/item/bodypart/r_leg/robot))
 		if(src.r_leg)
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.forceMove(src)
 		W.icon_state = initial(W.icon_state)
 		W.cut_overlays()
 		src.r_leg = W
@@ -103,9 +101,8 @@
 	else if(istype(W, /obj/item/bodypart/l_arm/robot))
 		if(src.l_arm)
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.forceMove(src)
 		W.icon_state = initial(W.icon_state)
 		W.cut_overlays()
 		src.l_arm = W
@@ -114,9 +111,8 @@
 	else if(istype(W, /obj/item/bodypart/r_arm/robot))
 		if(src.r_arm)
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.forceMove(src)
 		W.icon_state = initial(W.icon_state)//in case it is a dismembered robotic limb
 		W.cut_overlays()
 		src.r_arm = W
@@ -127,9 +123,8 @@
 		if(src.chest)
 			return
 		if(CH.wired && CH.cell)
-			if(!user.unEquip(CH))
+			if(!user.transferItemToLoc(CH, src))
 				return
-			CH.forceMove(src)
 			CH.icon_state = initial(CH.icon_state) //in case it is a dismembered robotic limb
 			CH.cut_overlays()
 			src.chest = CH
@@ -148,9 +143,8 @@
 		if(src.head)
 			return
 		if(HD.flash2 && HD.flash1)
-			if(!user.unEquip(HD))
+			if(!user.transferItemToLoc(HD, src))
 				return
-			HD.loc = src
 			HD.icon_state = initial(HD.icon_state)//in case it is a dismembered robotic limb
 			HD.cut_overlays()
 			src.head = HD
@@ -191,7 +185,7 @@
 				user << "<span class='warning'>This [M.name] does not seem to fit!</span>"
 				return
 
-			if(!user.unEquip(W))
+			if(!user.temporarilyRemoveItemFromInventory(W))
 				return
 
 			var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc))
@@ -235,7 +229,7 @@
 			O.cell = chest.cell
 			chest.cell.loc = O
 			chest.cell = null
-			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
+			W.forceMove(O)//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
 			if(O.mmi) //we delete the mmi created by robot/New()
 				qdel(O.mmi)
 			O.mmi = W //and give the real mmi to the borg.
@@ -243,7 +237,7 @@
 
 			feedback_inc("cyborg_birth",1)
 
-			src.loc = O
+			forceMove(O)
 			O.robot_suit = src
 
 			if(!locomotion)
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 10132b4d423..969ebe3d9dd 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -22,7 +22,6 @@
 		var/obj/item/stack/sheet/glass/G = new (user.loc)
 		G.add_fingerprint(user)
 		if(amount <= 0)
-			user.unEquip(src, 1)
 			qdel(src)
 
 	else if(istype(O, /obj/item/stack/sheet/metal))
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index f3dc16cba93..35c37e03fe1 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -137,6 +137,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("picture frame", /obj/item/weapon/picture_frame, 1, time = 10),\
 	new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \
 	new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 1f585f3eecc..682060e0b6a 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -25,7 +25,6 @@
 		amount--
 		new/obj/item/stack/light_w(user.loc)
 		if(amount <= 0)
-			user.unEquip(src, 1)
 			qdel(src)
 	else
 		return ..()
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm
index 784219fe9a6..d743f96ea56 100644
--- a/code/game/objects/items/stacks/wrap.dm
+++ b/code/game/objects/items/stacks/wrap.dm
@@ -59,7 +59,7 @@
 		if(!I.can_be_package_wrapped())
 			return
 		if(user.is_holding(I))
-			if(!user.unEquip(I))
+			if(!user.dropItemToGround(I))
 				return
 		else if(!isturf(I.loc))
 			return
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 544967eab0f..73a75a4f7cd 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -249,8 +249,6 @@
 			if(hacked) // That's right, we'll only check the "original" "sword".
 				newSaber.hacked = 1
 				newSaber.item_color = "rainbow"
-			user.unEquip(W)
-			user.unEquip(src)
 			qdel(W)
 			qdel(src)
 	else if(istype(W, /obj/item/device/multitool))
@@ -733,7 +731,7 @@
 	if(istype(I, /obj/item/toy/cards/singlecard))
 		var/obj/item/toy/cards/singlecard/SC = I
 		if(SC.parentdeck == src)
-			if(!user.unEquip(SC))
+			if(!user.temporarilyRemoveItemFromInventory(SC))
 				user << "<span class='warning'>The card is stuck to your hand, you can't add it to the deck!</span>"
 				return
 			cards += SC.cardname
@@ -745,7 +743,7 @@
 	else if(istype(I, /obj/item/toy/cards/cardhand))
 		var/obj/item/toy/cards/cardhand/CH = I
 		if(CH.parentdeck == src)
-			if(!user.unEquip(CH))
+			if(!user.temporarilyRemoveItemFromInventory(CH))
 				user << "<span class='warning'>The hand of cards is stuck to your hand, you can't add it to the deck!</span>"
 				return
 			cards += CH.currenthand
@@ -769,8 +767,10 @@
 		else if(istype(over_object, /obj/screen/inventory/hand))
 			var/obj/screen/inventory/hand/H = over_object
 			if(!remove_item_from_storage(M))
-				M.unEquip(src)
-			M.put_in_hand(src, H.held_index)
+				M.temporarilyRemoveItemFromInventory(src, TRUE)
+			if(!M.put_in_hand(src, H.held_index))
+				qdel(src)
+				return
 			usr << "<span class='notice'>You pick up the deck.</span>"
 
 	else
@@ -834,20 +834,19 @@
 				N.parentdeck = src.parentdeck
 				N.cardname = src.currenthand[1]
 				N.apply_card_vars(N,O)
-				cardUser.unEquip(src)
+				qdel(src)
 				N.pickup(cardUser)
 				cardUser.put_in_hands(N)
 				cardUser << "<span class='notice'>You also take [currenthand[1]] and hold it.</span>"
 				cardUser << browse(null, "window=cardhand")
-				qdel(src)
 		return
 
 /obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
 	if(istype(C))
 		if(C.parentdeck == src.parentdeck)
 			src.currenthand += C.cardname
-			user.unEquip(C)
 			user.visible_message("[user] adds a card to [user.p_their()] hand.", "<span class='notice'>You add the [C.cardname] to your hand.</span>")
+			qdel(C)
 			interact(user)
 			if(currenthand.len > 4)
 				src.icon_state = "[deckstyle]_hand5"
@@ -855,7 +854,6 @@
 				src.icon_state = "[deckstyle]_hand4"
 			else if(currenthand.len > 2)
 				src.icon_state = "[deckstyle]_hand3"
-			qdel(C)
 		else
 			user << "<span class='warning'>You can't mix cards from other decks!</span>"
 	else
@@ -923,12 +921,11 @@
 			H.currenthand += src.cardname
 			H.parentdeck = C.parentdeck
 			H.apply_card_vars(H,C)
-			user.unEquip(C)
-			H.pickup(user)
-			user.put_in_active_hand(H)
 			user << "<span class='notice'>You combine the [C.cardname] and the [src.cardname] into a hand.</span>"
 			qdel(C)
 			qdel(src)
+			H.pickup(user)
+			user.put_in_active_hand(H)
 		else
 			user << "<span class='warning'>You can't mix cards from other decks!</span>"
 
@@ -936,8 +933,8 @@
 		var/obj/item/toy/cards/cardhand/H = I
 		if(H.parentdeck == parentdeck)
 			H.currenthand += cardname
-			user.unEquip(src)
 			user.visible_message("[user] adds a card to [user.p_their()] hand.", "<span class='notice'>You add the [cardname] to your hand.</span>")
+			qdel(src)
 			H.interact(user)
 			if(H.currenthand.len > 4)
 				H.icon_state = "[deckstyle]_hand5"
@@ -945,7 +942,6 @@
 				H.icon_state = "[deckstyle]_hand4"
 			else if(H.currenthand.len > 2)
 				H.icon_state = "[deckstyle]_hand3"
-			qdel(src)
 		else
 			user << "<span class='warning'>You can't mix cards from other decks!</span>"
 	else
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 8fbaba9b2d3..4b84a0b529f 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -263,8 +263,6 @@ RCD
 		if((matter + R.ammoamt) > max_matter)
 			user << "<span class='warning'>The RCD can't hold any more matter-units!</span>"
 			return
-		if(!user.unEquip(W))
-			return
 		qdel(W)
 		matter += R.ammoamt
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
@@ -280,24 +278,16 @@ RCD
 		return ..()
 
 /obj/item/weapon/rcd/proc/loadwithsheets(obj/item/stack/sheet/S, value, mob/user)
-    var/maxsheets = round((max_matter-matter)/value)    //calculate the max number of sheets that will fit in RCD
-    if(maxsheets > 0)
-        if(S.amount > maxsheets)
-            //S.amount -= maxsheets
-            S.use(maxsheets)
-            matter += value*maxsheets
-            playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-            user << "<span class='notice'>You insert [maxsheets] [S.name] sheets into the RCD. </span>"
-        else
-            matter += value*(S.amount)
-            user.unEquip()
-            playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-            user << "<span class='notice'>You insert [S.amount] [S.name] sheets into the RCD. </span>"
-            S.use(S.amount)
-
-        return 1
-    user << "<span class='warning'>You can't insert any more [S.name] sheets into the RCD!"
-    return 0
+	var/maxsheets = round((max_matter-matter)/value)    //calculate the max number of sheets that will fit in RCD
+	if(maxsheets > 0)
+		var/amount_to_use = min(S.amount, maxsheets)
+		S.use(amount_to_use)
+		matter += value*amount_to_use
+		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+		user << "<span class='notice'>You insert [amount_to_use] [S.name] sheets into the RCD. </span>"
+		return 1
+	user << "<span class='warning'>You can't insert any more [S.name] sheets into the RCD!"
+	return 0
 
 /obj/item/weapon/rcd/attack_self(mob/user)
 	//Change the mode
diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm
index 6120cdf397b..520323abcc3 100644
--- a/code/game/objects/items/weapons/airlock_painter.dm
+++ b/code/game/objects/items/weapons/airlock_painter.dm
@@ -109,9 +109,8 @@
 		if(ink)
 			user << "<span class='notice'>[src] already contains \a [ink].</span>"
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.loc = src
 		user << "<span class='notice'>You install [W] into [src].</span>"
 		ink = W
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 14afba478b0..2a12e095430 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -163,18 +163,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		var/datum/effect_system/reagents_explosion/e = new()
 		e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
 		e.start()
-		if(ismob(loc))
-			var/mob/M = loc
-			M.unEquip(src, 1)
 		qdel(src)
 		return
 	if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
 		var/datum/effect_system/reagents_explosion/e = new()
 		e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
 		e.start()
-		if(ismob(loc))
-			var/mob/M = loc
-			M.unEquip(src, 1)
 		qdel(src)
 		return
 	// allowing reagents to react after being lit
@@ -217,7 +211,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		new type_butt(location)
 		if(ismob(loc))
 			M << "<span class='notice'>Your [name] goes out.</span>"
-			M.unEquip(src, 1)	//un-equip it so the overlays can update //Force the un-equip so the overlays update
 		qdel(src)
 		return
 	open_flame()
@@ -566,16 +559,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown))
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target
 		if(O.dry)
-			user.unEquip(target, 1)
-			user.unEquip(src, 1)
 			var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
 			R.chem_volume = target.reagents.total_volume
 			target.reagents.trans_to(R, R.chem_volume)
+			qdel(target)
+			qdel(src)
 			user.put_in_active_hand(R)
 			user << "<span class='notice'>You roll the [target.name] into a rolling paper.</span>"
 			R.desc = "Dried [target.name] rolled up in a thin piece of paper."
-			qdel(target)
-			qdel(src)
 		else
 			user << "<span class='warning'>You need to dry this first!</span>"
 	else
@@ -707,9 +698,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 					var/datum/effect_system/reagents_explosion/e = new()
 					e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
 					e.start()
-					if(ismob(loc))
-						var/mob/M = loc
-						M.unEquip(src, 1)
 					qdel(src)
 				return
 		reagents.remove_any(REAGENTS_METABOLISM)
@@ -744,7 +732,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(prob(5))//small chance for the vape to break and deal damage if it's emagged
 			playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0)
 			M.apply_damage(20, BURN, "head")
-			M.unEquip(src, 1)
 			M.Weaken(15, 1, 0)
 			qdel(src)
 			var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index c907ecaee25..d13d469812f 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -95,9 +95,10 @@
 		var/mob/M = src.loc
 		if(istype(over_object, /obj/screen/inventory/hand))
 			var/obj/screen/inventory/hand/H = over_object
-			if(!M.unEquip(src))
+			if(!M.temporarilyRemoveItemFromInventory(src))
 				return
-			M.put_in_hand(src, H.held_index)
+			if(!M.put_in_hand(src, H.held_index))
+				qdel(src)	//wewie
 
 
 /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
@@ -112,9 +113,8 @@
 			if(C.maxcharge < paddles.revivecost)
 				user << "<span class='notice'>[src] requires a higher capacity cell.</span>"
 				return
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			bcell = W
 			user << "<span class='notice'>You install a cell in [src].</span>"
 			update_icon()
@@ -191,7 +191,7 @@
 /obj/item/weapon/defibrillator/proc/remove_paddles(mob/user) //this fox the bug with the paddles when other player stole you the defib when you have the paddles equiped
 	if(ismob(paddles.loc))
 		var/mob/M = paddles.loc
-		M.unEquip(paddles,1)
+		M.dropItemToGround(paddles, TRUE)
 	return
 
 /obj/item/weapon/defibrillator/Destroy()
@@ -337,7 +337,6 @@
 	if(!req_defib)
 		return 1 //If it doesn't need a defib, just say it exists
 	if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator))	//To avoid weird issues from admin spawns
-		M.unEquip(O)
 		qdel(O)
 		return 0
 	else
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 2b0b7fd82ca..8c967290645 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -82,10 +82,10 @@
 	user << "<span class='notice'>You start planting the bomb...</span>"
 
 	if(do_after(user, 50, target = AM))
-		if(!user.unEquip(src))
+		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
-		loc = null
+		forceMove(null)
 
 		var/message = "[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [timer] second fuse"
 		bombers += message
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 5bf785c330f..c5b1ccdceb3 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -98,9 +98,8 @@
 			return
 		if(igniter)
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		I.loc = src
 		igniter = I
 		update_icon()
 		return
@@ -109,10 +108,9 @@
 		if(ptank)
 			user << "<span class='notice'>There is already a plasma tank loaded in [src]!</span>"
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
 		ptank = W
-		W.loc = src
 		update_icon()
 		return
 
diff --git a/code/game/objects/items/weapons/gift.dm b/code/game/objects/items/weapons/gift.dm
index 439ce64ea74..4da249cd4d5 100644
--- a/code/game/objects/items/weapons/gift.dm
+++ b/code/game/objects/items/weapons/gift.dm
@@ -75,9 +75,7 @@
 	if(!ispath(gift_type,/obj/item))
 		return
 
-	var/obj/item/I = new gift_type(M)
-	M.unEquip(src, 1)
-	M.put_in_hands(I)
-	I.add_fingerprint(M)
 	qdel(src)
-	return
+	var/obj/item/I = new gift_type(M)
+	M.put_in_hands(I)
+	I.add_fingerprint(M)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 461dd4e9fa6..552709d3491 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -71,10 +71,9 @@
 			return
 		else
 			if(I.reagents.total_volume)
-				if(!user.unEquip(I))
+				if(!user.transferItemToLoc(I, src))
 					return
 				user << "<span class='notice'>You add [I] to the [initial(name)] assembly.</span>"
-				I.loc = src
 				beakers += I
 			else
 				user << "<span class='warning'>[I] is empty!</span>"
@@ -84,12 +83,11 @@
 		var/obj/item/device/assembly_holder/A = I
 		if(isigniter(A.a_left) == isigniter(A.a_right))	//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
 			return
-		if(!user.unEquip(I))
+		if(!user.transferItemToLoc(I, src))
 			return
 
 		nadeassembly = A
 		A.master = src
-		A.loc = src
 		assemblyattacher = user.ckey
 
 		stage_change(WIRED)
@@ -229,10 +227,9 @@
 	//make a special case you might as well do it explicitly. -Sayu
 /obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/slime_extract) && stage == WIRED)
-		if(!user.unEquip(I))
+		if(!user.transferItemToLoc(I, src))
 			return
 		user << "<span class='notice'>You add [I] to the [initial(name)] assembly.</span>"
-		I.loc = src
 		beakers += I
 	else
 		return ..()
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index a9eaf6eec58..93f70405fb4 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -71,7 +71,7 @@
 /obj/item/weapon/grenade/proc/update_mob()
 	if(ismob(loc))
 		var/mob/M = loc
-		M.unEquip(src)
+		M.dropItemToGround(src)
 
 
 /obj/item/weapon/grenade/attackby(obj/item/weapon/W, mob/user, params)
diff --git a/code/game/objects/items/weapons/grenades/plastic.dm b/code/game/objects/items/weapons/grenades/plastic.dm
index cbd62293a6e..6f6cb133612 100644
--- a/code/game/objects/items/weapons/grenades/plastic.dm
+++ b/code/game/objects/items/weapons/grenades/plastic.dm
@@ -24,11 +24,10 @@
 /obj/item/weapon/grenade/plastic/attackby(obj/item/I, mob/user, params)
 	if(!nadeassembly && istype(I, /obj/item/device/assembly_holder))
 		var/obj/item/device/assembly_holder/A = I
-		if(!user.unEquip(I))
+		if(!user.transferItemToLoc(I, src))
 			return ..()
 		nadeassembly = A
 		A.master = src
-		A.loc = src
 		assemblyattacher = user.ckey
 		user << "<span class='notice'>You add [A] to the [name].</span>"
 		playsound(src, 'sound/weapons/tap.ogg', 20, 1)
@@ -36,7 +35,7 @@
 		return
 	if(nadeassembly && istype(I, /obj/item/weapon/wirecutters))
 		playsound(src, I.usesound, 20, 1)
-		nadeassembly.loc = get_turf(src)
+		nadeassembly.forceMove(get_turf(src))
 		nadeassembly.master = null
 		nadeassembly = null
 		update_icon()
@@ -70,13 +69,14 @@
 		return
 	if (ismob(AM))
 		return
+
 	user << "<span class='notice'>You start planting the [src]. The timer is set to [det_time]...</span>"
 
 	if(do_after(user, 50, target = AM))
-		if(!user.unEquip(src))
+		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
-		loc = null
+		forceMove(null)	//Yep
 
 		message_admins("[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse",0,1)
 		log_game("[key_name(user)] planted [name] on [target.name] at [COORD(src)] with [det_time] second fuse")
@@ -85,6 +85,8 @@
 		if(!nadeassembly)
 			user << "<span class='notice'>You plant the bomb. Timer counting down from [det_time].</span>"
 			addtimer(CALLBACK(src, .proc/prime), det_time*10)
+		else
+			qdel(src)	//How?
 
 /obj/item/weapon/grenade/plastic/suicide_act(mob/user)
 	message_admins("[key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) suicided with [src] at ([user.x],[user.y],[user.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",0,1)
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index 15afa53eb65..46bcde50083 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -46,7 +46,7 @@
 		if(isfloorturf(T))
 			var/turf/open/floor/F = T
 			F.wet = TURF_WET_PERMAFROST
-			addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry), rand(3000, 3100), TURF_WET_PERMAFROST)
+			addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry, TURF_WET_PERMAFROST), rand(3000, 3100))
 			for(var/mob/living/carbon/L in T)
 				L.adjustStaminaLoss(stamina_damage)
 				L.bodytemperature -= 230
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index f09b2847b9d..1bed868084a 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -29,13 +29,13 @@
 		user << "<span class='warning'>Uh... how do those things work?!</span>"
 		apply_cuffs(user,user)
 		return
-		
+
 	// chance of monkey retaliation
 	if(istype(C, /mob/living/carbon/monkey) && prob(MONKEY_CUFF_RETALIATION_PROB))
 		var/mob/living/carbon/monkey/M
 		M = C
 		M.retaliate(user)
-		
+
 	if(!C.handcuffed)
 		if(C.get_num_arms() >= 2 || C.get_arm_ignore())
 			C.visible_message("<span class='danger'>[user] is trying to put [src.name] on [C]!</span>", \
@@ -165,8 +165,7 @@
 		var/obj/item/stack/rods/R = I
 		if (R.use(1))
 			var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod
-			if(!remove_item_from_storage(user))
-				user.unEquip(src)
+			remove_item_from_storage(user)
 			user.put_in_hands(W)
 			user << "<span class='notice'>You wrap the cable restraint around the top of the rod.</span>"
 			qdel(src)
@@ -186,8 +185,7 @@
 			M.use(6)
 			user.put_in_hands(S)
 			user << "<span class='notice'>You make some weights out of [I] and tie them to [src].</span>"
-			if(!remove_item_from_storage(user))
-				user.unEquip(src)
+			remove_item_from_storage(user)
 			qdel(src)
 	else
 		return ..()
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 2bdfb032548..06fae51dbde 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -49,9 +49,8 @@
 
 	if(holy_weapon)
 		holy_weapon.reskinned = TRUE
-		M.unEquip(src)
-		M.put_in_active_hand(holy_weapon)
 		qdel(src)
+		M.put_in_active_hand(holy_weapon)
 
 /obj/item/weapon/nullrod/godhand
 	icon_state = "disintegrate"
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index b528d583f0b..cf190988edf 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -35,9 +35,8 @@
 /obj/item/weapon/implantpad/attackby(obj/item/weapon/implantcase/C, mob/user, params)
 	if(istype(C, /obj/item/weapon/implantcase))
 		if(!case)
-			if(!user.unEquip(C))
+			if(!user.transferItemToLoc(C, src))
 				return
-			C.loc = src
 			case = C
 		update_icon()
 	else
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index fa401363cc1..650b551f50a 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/code/game/objects/items/weapons/implants/implantuplink.dm
@@ -4,10 +4,11 @@
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "radio"
 	origin_tech = "materials=4;magnets=4;programming=4;biotech=4;syndicate=5;bluespace=5"
+	var/starting_tc = 0
 
 /obj/item/weapon/implant/uplink/New()
 	hidden_uplink = new(src)
-	hidden_uplink.telecrystals = 10
+	hidden_uplink.telecrystals = starting_tc
 	..()
 
 /obj/item/weapon/implant/uplink/implant(mob/living/target, mob/user, silent = 0)
@@ -29,18 +30,17 @@
 
 /obj/item/weapon/implanter/uplink
 	name = "implanter (uplink)"
-	persistence_replacement = /obj/item/weapon/implanter/weakuplink
 
 /obj/item/weapon/implanter/uplink/New()
 	imp = new /obj/item/weapon/implant/uplink(src)
 	..()
-/obj/item/weapon/implanter/weakuplink
+
+/obj/item/weapon/implanter/uplink/precharged
 	name = "implanter (uplink)"
 
-/obj/item/weapon/implanter/weakuplink/New()
-	imp = new /obj/item/weapon/implant/uplink/weak(src)
+/obj/item/weapon/implanter/uplink/New()
+	imp = new /obj/item/weapon/implant/uplink/precharged(src)
 	..()
 
-/obj/item/weapon/implant/uplink/weak/New()
-	..()
-	hidden_uplink.telecrystals = 5
\ No newline at end of file
+/obj/item/weapon/implant/uplink/precharged
+	starting_tc = 10
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 004e797d031..f7a99fa1fbd 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -193,8 +193,6 @@
 		if(hacked || other_esword.hacked)
 			newSaber.hacked = TRUE
 			newSaber.item_color = "rainbow"
-		user.unEquip(W)
-		user.unEquip(src)
 		qdel(W)
 		qdel(src)
 		user.put_in_hands(newSaber)
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index badd8097791..a89accdaf61 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -61,12 +61,11 @@
 		if(IW.w_class > src.w_class)
 			user << "<span class='warning'>\The [IW] is too large to fit into \the [src]!</span>"
 			return
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
 		user << "<span class='notice'>You load \the [IW] into \the [src].</span>"
 		loadedItems.Add(IW)
 		loadedWeightClass += IW.w_class
-		IW.loc = src
 
 
 
@@ -147,11 +146,10 @@
 		if(src.tank)
 			user << "<span class='warning'>\The [src] already has a tank.</span>"
 			return
-		if(!user.unEquip(thetank))
+		if(!user.transferItemToLoc(thetank, src))
 			return
 		user << "<span class='notice'>You hook \the [thetank] up to \the [src].</span>"
 		src.tank = thetank
-		thetank.loc = src
 	src.update_icons()
 
 /obj/item/weapon/pneumatic_cannon/proc/update_icons()
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 3c6b809ec7b..f6f4325b574 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -63,11 +63,10 @@
 		if(tank)
 			user << "<span class='warning'>\The [src] already has a tank.</span>"
 			return
-		if(!user.unEquip(thetank))
+		if(!user.transferItemToLoc(thetank, src))
 			return
 		user << "<span class='notice'>You hook \the [thetank] up to \the [src].</span>"
 		tank = thetank
-		thetank.forceMove(src)
 
 
 /obj/item/weapon/melee/powerfist/attack(mob/living/target, mob/living/user)
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 0e92e0c4314..2577e3f0b8e 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -194,7 +194,7 @@
 			break
 
 	if(!inserted || !S.amount)
-		usr.unEquip(S)
+		usr.dropItemToGround(S)
 		if (usr.client && usr.s_active != src)
 			usr.client.screen -= S
 		S.dropped(usr)
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index f8606ae6de9..ebdf0bc3d48 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -140,9 +140,11 @@
 			return ..()
 		if(!M.restrained() && !M.stat && istype(over_object, /obj/screen/inventory/hand))
 			var/obj/screen/inventory/hand/H = over_object
-			if(!M.unEquip(src))
+			if(!M.temporarilyRemoveItemFromInventory(src))
+				return
+			if(!M.put_in_hand(src,H.held_index))
+				qdel(src)
 				return
-			M.put_in_hand(src,H.held_index)
 			src.add_fingerprint(usr)
 			return
 		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 067dd23ce35..b9169e8e05b 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -57,9 +57,11 @@
 
 			if(istype(over_object, /obj/screen/inventory/hand))
 				var/obj/screen/inventory/hand/H = over_object
-				if(!M.unEquip(src))
+				if(!M.temporarilyRemoveItemFromInventory(src))
+					return
+				if(!M.put_in_hand(src,H.held_index))
+					qdel(src)
 					return
-				M.put_in_hand(src,H.held_index)
 
 			add_fingerprint(usr)
 
@@ -303,13 +305,14 @@
 	if(!istype(W))
 		return 0
 	if(usr)
-		if(!usr.unEquip(W))
+		if(!usr.transferItemToLoc(W, src))
 			return 0
+	else
+		W.forceMove(src)
 	if(silent)
 		prevent_warning = 1
 	if(W.pulledby)
 		W.pulledby.stop_pulling()
-	W.loc = src
 	W.on_enter_storage(src)
 	if(usr)
 		if(usr.client && usr.s_active != src)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index e2d6a191b36..3faebc908e7 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -16,7 +16,6 @@
 			new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
 			new /obj/item/device/flashlight/emp(src) // 2 tc
 			new /obj/item/device/chameleon(src) // 7 tc
-			return
 
 		if("stealth") // 31 tc
 			new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
@@ -25,7 +24,6 @@
 			new /obj/item/device/chameleon(src)
 			new /obj/item/weapon/soap/syndie(src)
 			new /obj/item/clothing/glasses/thermal/syndi(src)
-			return
 
 		if("bond") // 29 tc
 			new /obj/item/weapon/gun/ballistic/automatic/pistol(src)
@@ -36,8 +34,6 @@
 			new /obj/item/weapon/card/id/syndicate(src)
 			new /obj/item/weapon/reagent_containers/syringe/stimulants(src)
 
-			return
-
 		if("screwed") // 29 tc
 			new /obj/item/device/sbeacondrop/bomb(src)
 			new /obj/item/weapon/grenade/syndieminibomb(src)
@@ -45,7 +41,6 @@
 			new /obj/item/clothing/suit/space/syndicate/black/red(src)
 			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 			new /obj/item/device/encryptionkey/syndicate(src)
-			return
 
 		if("guns") // 28 tc now
 			new /obj/item/weapon/gun/ballistic/revolver(src)
@@ -56,7 +51,6 @@
 			new /obj/item/clothing/gloves/color/latex/nitrile(src)
 			new /obj/item/clothing/mask/gas/clown_hat(src)
 			new /obj/item/clothing/under/suit_jacket/really_black(src)
-			return
 
 		if("murder") // 28 tc now
 			new /obj/item/weapon/melee/energy/sword/saber(src)
@@ -65,16 +59,14 @@
 			new /obj/item/clothing/shoes/chameleon(src)
 			new /obj/item/device/encryptionkey/syndicate(src)
 			new /obj/item/weapon/grenade/syndieminibomb(src)
-			return
 
 		if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
 			new /obj/item/weapon/implanter/freedom(src)
-			new /obj/item/weapon/implanter/uplink(src)
+			new /obj/item/weapon/implanter/uplink/precharged(src)
 			new /obj/item/weapon/implanter/emp(src)
 			new /obj/item/weapon/implanter/adrenalin(src)
 			new /obj/item/weapon/implanter/explosive(src)
 			new /obj/item/weapon/implanter/storage(src)
-			return
 
 		if("hacker") // 26 tc
 			new /obj/item/weapon/aiModule/syndicate(src)
@@ -82,14 +74,12 @@
 			new /obj/item/device/encryptionkey/binary(src)
 			new /obj/item/weapon/aiModule/toyAI(src)
 			new /obj/item/device/multitool/ai_detect(src)
-			return
 
 		if("lordsingulo") // 24 tc
 			new /obj/item/device/sbeacondrop(src)
 			new /obj/item/clothing/suit/space/syndicate/black/red(src)
 			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 			new /obj/item/weapon/card/emag(src)
-			return
 
 		if("sabotage") // 26 tc now
 			new /obj/item/weapon/grenade/plastic/c4 (src)
@@ -110,7 +100,6 @@
 			new /obj/item/weapon/card/id/syndicate(src)
 			new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
 			new /obj/item/weapon/spellbook/oneuse/summonitem(src)
-			return
 
 		if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
 			new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
@@ -119,7 +108,6 @@
 			new /obj/item/clothing/gloves/color/latex/nitrile(src)
 			new /obj/item/clothing/mask/gas/clown_hat(src)
 			new /obj/item/clothing/under/suit_jacket/really_black(src)
-			return
 
 		if("metaops") // 30 tc
 			new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
@@ -130,7 +118,6 @@
 			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
 			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
 			new /obj/item/weapon/card/emag(src) // 6 tc
-			return
 
 		if("ninja") // 33 tc worth
 			new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
@@ -158,15 +145,6 @@
 	var/obj/item/weapon/implanter/O = new(src)
 	O.imp = new /obj/item/weapon/implant/freedom(O)
 	O.update_icon()
-	return
-
-/*/obj/item/weapon/storage/box/syndie_kit/imp_compress
-	name = "Compressed Matter Implant (with injector)"
-/obj/item/weapon/storage/box/syndie_kit/imp_compress/New()
-	new /obj/item/weapon/implanter/compressed(src)
-	..()
-	return
-*/
 
 /obj/item/weapon/storage/box/syndie_kit/imp_microbomb
 	name = "Microbomb Implant (with injector)"
@@ -176,7 +154,6 @@
 	O.imp = new /obj/item/weapon/implant/explosive(O)
 	O.update_icon()
 	..()
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/imp_macrobomb
 	name = "Macrobomb Implant (with injector)"
@@ -186,7 +163,6 @@
 	O.imp = new /obj/item/weapon/implant/explosive/macro(O)
 	O.update_icon()
 	..()
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/imp_uplink
 	name = "boxed uplink implant (with injector)"
@@ -196,7 +172,6 @@
 	var/obj/item/weapon/implanter/O = new(src)
 	O.imp = new /obj/item/weapon/implant/uplink(O)
 	O.update_icon()
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/bioterror
 	name = "bioterror syringe box"
@@ -205,7 +180,6 @@
 	..()
 	for(var/i in 1 to 7)
 		new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/imp_adrenal
 	name = "boxed adrenal implant (with injector)"
@@ -215,7 +189,6 @@
 	var/obj/item/weapon/implanter/O = new(src)
 	O.imp = new /obj/item/weapon/implant/adrenalin(O)
 	O.update_icon()
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/imp_storage
 	name = "boxed storage implant (with injector)"
@@ -223,7 +196,6 @@
 /obj/item/weapon/storage/box/syndie_kit/imp_storage/New()
 	..()
 	new /obj/item/weapon/implanter/storage(src)
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/space
 	name = "boxed space suit and helmet"
@@ -234,7 +206,6 @@
 	..()
 	new /obj/item/clothing/suit/space/syndicate/black/red(src) // Black and red is so in right now
 	new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/emp
 	name = "boxed EMP kit"
@@ -267,7 +238,6 @@
 	new /obj/item/weapon/reagent_containers/glass/bottle/curare(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/amanitin(src)
 	new /obj/item/weapon/reagent_containers/syringe(src)
-	return
 
 /obj/item/weapon/storage/box/syndie_kit/nuke
 	name = "box"
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 8e2c05d5ac4..77e34871406 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -73,9 +73,8 @@
 			if(C.maxcharge < hitcost)
 				user << "<span class='notice'>[src] requires a higher capacity cell.</span>"
 				return
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			bcell = W
 			user << "<span class='notice'>You install a cell in [src].</span>"
 			update_icon()
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 6ad20fc8f42..9617f8820a5 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -95,10 +95,10 @@
 		var/obj/item/weapon/flamethrower/F = W
 		if ((!F.status)||(F.ptank))
 			return
+		if(!user.transferItemToLoc(src, F))
+			return
 		src.master = F
 		F.ptank = src
-		user.unEquip(src)
-		src.loc = F
 		F.update_icon()
 	else
 		return ..()
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 4c2f7c5a5d7..d1025186ed6 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -118,7 +118,7 @@
 	playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
 	if (H && !qdeleted(H))
 		for(var/obj/item/W in H)
-			H.unEquip(W)
+			H.dropItemToGround(W)
 			if(prob(50))
 				step(W, pick(alldirs))
 		H.hair_style = "Bald"
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index d944ab6f5c0..f6900215f43 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -67,14 +67,12 @@
 /obj/item/weapon/watertank/proc/remove_noz()
 	if(ismob(noz.loc))
 		var/mob/M = noz.loc
-		M.unEquip(noz, 1)
+		M.temporarilyRemoveItemFromInventory(noz, TRUE)
 	return
 
 /obj/item/weapon/watertank/Destroy()
 	if (on)
-		remove_noz()
 		qdel(noz)
-		noz = null
 	return ..()
 
 /obj/item/weapon/watertank/attack_hand(mob/user)
@@ -87,7 +85,7 @@
 	var/mob/M = src.loc
 	if(istype(M) && istype(over_object, /obj/screen/inventory/hand))
 		var/obj/screen/inventory/hand/H = over_object
-		if(!M.unEquip(src))
+		if(!M.temporarilyRemoveItemFromInventory(src))
 			return
 		M.put_in_hand(src, H.held_index)
 
@@ -138,8 +136,7 @@
 
 /proc/check_tank_exists(parent_tank, mob/living/carbon/human/M, obj/O)
 	if (!parent_tank || !istype(parent_tank, /obj/item/weapon/watertank))	//To avoid weird issues from admin spawns
-		M.unEquip(O)
-		qdel(0)
+		qdel(O)
 		return 0
 	else
 		return 1
diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index c827ee91e73..7736dc2ff2c 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -30,13 +30,11 @@
 	if(istype(I, /obj/item/weapon/ore/bluespace_crystal))
 		if(!bcell)
 			var/obj/item/weapon/melee/baton/cattleprod/teleprod/S = new /obj/item/weapon/melee/baton/cattleprod/teleprod
-			if(!remove_item_from_storage(user))
-				user.unEquip(src)
-			user.unEquip(I)
+			remove_item_from_storage(user)
+			qdel(src)
+			qdel(I)
 			user.put_in_hands(S)
 			user << "<span class='notice'>You place the bluespace crystal firmly into the igniter.</span>"
-			qdel(I)
-			qdel(src)
 		else
 			user.visible_message("<span class='warning'>You can't put the crystal onto the stunprod while it has a power cell installed!</span>")
 	else
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index faf292516e5..c2467177804 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -73,9 +73,8 @@
 	playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
 	var/obj/item/weapon/wirecutters/power/s_drill = new /obj/item/weapon/screwdriver/power
 	user << "<span class='notice'>You attach the screw driver bit to [src].</span>"
-	user.unEquip(src)
-	user.put_in_active_hand(s_drill)
 	qdel(src)
+	user.put_in_active_hand(s_drill)
 
 /obj/item/weapon/wrench/power/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -106,7 +105,7 @@
 		return
 
 	for(var/obj/item/W in user)
-		user.unEquip(W)
+		user.dropItemToGround(W)
 
 	var/obj/item/weapon/wrench/medical/W = new /obj/item/weapon/wrench/medical(loc)
 	W.add_fingerprint(user)
@@ -203,9 +202,8 @@
 	playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
 	var/obj/item/weapon/wrench/power/b_drill = new /obj/item/weapon/wrench/power
 	user << "<span class='notice'>You attach the bolt driver bit to [src].</span>"
-	user.unEquip(src)
-	user.put_in_active_hand(b_drill)
 	qdel(src)
+	user.put_in_active_hand(b_drill)
 
 /obj/item/weapon/screwdriver/cyborg
 	name = "powered screwdriver"
@@ -302,9 +300,8 @@
 	playsound(get_turf(user),"sound/items/change_jaws.ogg",50,1)
 	var/obj/item/weapon/crowbar/power/pryjaws = new /obj/item/weapon/crowbar/power
 	user << "<span class='notice'>You attach the pry jaws to [src].</span>"
-	user.unEquip(src)
-	user.put_in_active_hand(pryjaws)
 	qdel(src)
+	user.put_in_active_hand(pryjaws)
 /*
  * Welding Tool
  */
@@ -561,8 +558,7 @@
 		if (R.use(1))
 			var/obj/item/weapon/flamethrower/F = new /obj/item/weapon/flamethrower(user.loc)
 			if(!remove_item_from_storage(F))
-				user.unEquip(src)
-				loc = F
+				user.transferItemToLoc(src, F, TRUE)
 			F.weldtool = src
 			add_fingerprint(user)
 			user << "<span class='notice'>You add a rod to a welder, starting to build a flamethrower.</span>"
@@ -742,6 +738,5 @@
 	playsound(get_turf(user),"sound/items/change_jaws.ogg",50,1)
 	var/obj/item/weapon/wirecutters/power/cutjaws = new /obj/item/weapon/wirecutters/power
 	user << "<span class='notice'>You attach the cutting jaws to [src].</span>"
-	user.unEquip(src)
-	user.put_in_active_hand(cutjaws)
 	qdel(src)
+	user.put_in_active_hand(cutjaws)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index a83d3d48f1a..45e969fe5ac 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -182,13 +182,13 @@
 /obj/item/weapon/twohanded/required/wield(mob/living/carbon/user)
 	..()
 	if(!wielded)
-		user.unEquip(src)
+		user.dropItemToGround(src)
 
 /obj/item/weapon/twohanded/required/unwield(mob/living/carbon/user, show_message = TRUE)
 	if(show_message)
 		user << "<span class='notice'>You drop [src].</span>"
 	..(user, FALSE)
-	user.unEquip(src)
+	user.dropItemToGround(src)
 
 /*
  * Fireaxe
@@ -286,7 +286,7 @@
 		impale(user)
 		return
 	if((wielded) && prob(50))
-		addtimer(CALLBACK(src, .proc/jedi_spin, user), 0, TIMER_UNIQUE)
+		INVOKE_ASYNC(src, .proc/jedi_spin, user)
 
 /obj/item/weapon/twohanded/dualsaber/proc/jedi_spin(mob/living/user)
 	for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2))
@@ -354,7 +354,7 @@
 	playsound(loc, hitsound, get_clamped_volume(), 1, -1)
 	add_fingerprint(user)
 	// Light your candles while spinning around the room
-	addtimer(CALLBACK(src, .proc/jedi_spin, user), 0, TIMER_UNIQUE)
+	INVOKE_ASYNC(src, .proc/jedi_spin, user)
 
 /obj/item/weapon/twohanded/dualsaber/green/New()
 	item_color = "green"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 9f5a5fca8a8..4d4c51ee9bf 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -219,26 +219,24 @@ var/highlander_claymores = 0
 	if(istype(I, /obj/item/weapon/shard))
 		var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear
 
-		if(!remove_item_from_storage(user))
-			user.unEquip(src)
-		user.unEquip(I)
+		remove_item_from_storage(user)
+		qdel(I)
+		qdel(src)
 
 		user.put_in_hands(S)
 		user << "<span class='notice'>You fasten the glass shard to the top of the rod with the cable.</span>"
-		qdel(I)
-		qdel(src)
 
 	else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP))
 		var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
 
-		if(!remove_item_from_storage(user))
-			user.unEquip(src)
-		user.unEquip(I)
+		remove_item_from_storage(user)
 
-		user.put_in_hands(P)
 		user << "<span class='notice'>You fasten [I] to the top of the rod with the cable.</span>"
+
 		qdel(I)
 		qdel(src)
+
+		user.put_in_hands(P)
 	else
 		return ..()
 
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 2a5b1040936..ad1bc4ebd7e 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -177,8 +177,8 @@
 /obj/structure/alien/weeds/node/New()
 	icon = 'icons/obj/smooth_structures/alien/weednode.dmi'
 	..()
-	var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds)
-	if(W)
+	var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) in loc
+	if(W && W != src)
 		qdel(W)
 	START_PROCESSING(SSobj, src)
 
@@ -284,7 +284,7 @@
 /obj/structure/alien/egg/Moved(oldloc)
 	remove_from_proximity_list(oldloc, 1)
 	if(status == GROWN)
-		add_to_proximity_list(src, 1)	
+		add_to_proximity_list(src, 1)
 	return ..()
 
 /obj/structure/alien/egg/deconstruct()
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 07e16b77988..b4e80bf9dad 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -19,7 +19,7 @@
 /obj/structure/easel/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/canvas))
 		var/obj/item/weapon/canvas/C = I
-		user.unEquip(C)
+		user.dropItemToGround(C)
 		painting = C
 		C.loc = get_turf(src)
 		C.layer = layer+0.1
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 02d4b072fc4..b16d566d82e 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -254,7 +254,6 @@
 	if(remaining_mats)
 		for(var/M=1 to remaining_mats)
 			new stack_type(get_turf(loc))
-	user.unEquip(src,1) //Even NODROP chairs are destroyed.
 	qdel(src)
 
 
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index fac248ed1da..8c724c77c77 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -213,8 +213,7 @@
 	else if(istype(I, /obj/item/weapon/electronics/airlock))
 		user << "<span class='notice'>You start installing the electronics into [src]...</span>"
 		playsound(src.loc, I.usesound, 50, 1)
-		if(user.unEquip(I) && do_after(user, 30, target = src))
-			I.loc = src
+		if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src))
 			electronics = I
 			user << "<span class='notice'>You install the airlock electronics.</span>"
 
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 061599ae73c..07f9e27036d 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -29,9 +29,8 @@
 			user << "<span class='info'>You are not authorized to add notices</span>"
 			return
 		if(notices < 5)
-			if(!user.unEquip(O))
+			if(!user.transferItemToLoc(O, src))
 				return
-			O.loc = src
 			notices++
 			icon_state = "nboard0[notices]"
 			user << "<span class='notice'>You pin the [O] to the noticeboard.</span>"
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index fbd7a9707c6..102bb762b09 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -102,7 +102,7 @@
 	if(isturf(target) && proximity)
 		var/turf/T = target
 		user.visible_message("<span class='notice'>[user] fastens [src] to [T].</span>", \
-							 "<span class='notice'>You attach a blank sign to [T].</span>")
+							 "<span class='notice'>You attach the sign to [T].</span>")
 		playsound(T, 'sound/items/Deconstruct.ogg', 50, 1)
 		new sign_path(T)
 		user.drop_item()
diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm
index 1309f964856..55910cd00e9 100644
--- a/code/game/turfs/simulated/chasm.dm
+++ b/code/game/turfs/simulated/chasm.dm
@@ -28,7 +28,7 @@
 	for(var/thing in thing_to_check)
 		if(droppable(thing))
 			. = 1
-			addtimer(CALLBACK(src, .proc/drop, thing), 0)
+			INVOKE_ASYNC(src, .proc/drop, thing)
 
 /turf/open/chasm/proc/droppable(atom/movable/AM)
 	if(!isliving(AM) && !isobj(AM))
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 86a1ff5dfe7..e0f3eb437bf 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -419,7 +419,7 @@
 					var/forename = names.len > 1 ? names[2] : names[1]
 					var/newname = "[forename]-[pick(honorifics["[H.gender]"])]"
 					H.fully_replace_character_name(H.real_name,newname)
-					H.unEquip(H.w_uniform)
+					H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE)
 					H.equip_to_slot_or_del(I, slot_w_uniform)
 					I.flags |= NODROP
 				else
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 1b7cc509f99..00a3202b1fe 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1347,12 +1347,7 @@
 			return
 
 		for(var/obj/item/I in M)
-			M.unEquip(I)
-			if(I)
-				I.loc = M.loc
-				I.layer = initial(I.layer)
-				I.plane = initial(I.plane)
-				I.dropped(M)
+			M.dropItemToGround(I, TRUE)
 
 		M.Paralyse(5)
 		sleep(5)
@@ -1378,12 +1373,7 @@
 			return
 
 		for(var/obj/item/I in M)
-			M.unEquip(I)
-			if(I)
-				I.loc = M.loc
-				I.layer = initial(I.layer)
-				I.plane = initial(I.plane)
-				I.dropped(M)
+			M.dropItemToGround(I, TRUE)
 
 		M.Paralyse(5)
 		sleep(5)
@@ -1432,12 +1422,7 @@
 			return
 
 		for(var/obj/item/I in M)
-			M.unEquip(I)
-			if(I)
-				I.loc = M.loc
-				I.layer = initial(I.layer)
-				I.plane = initial(I.plane)
-				I.dropped(M)
+			M.dropItemToGround(I, TRUE)
 
 		if(ishuman(M))
 			var/mob/living/carbon/human/observer = M
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 3b4c5066d03..9a332042e8d 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -101,7 +101,7 @@ var/highlander = FALSE
 		var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id)
 		qdel(slot_item_ID)
 		var/obj/item/slot_item_hand = H.get_item_for_held_index(2)
-		H.unEquip(slot_item_hand)
+		H.dropItemToGround(slot_item_hand)
 
 		var /obj/item/weapon/multisword/multi = new(H)
 		H.put_in_hands_or_del(multi)
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 530f249c23e..5169fd490b8 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -10,7 +10,7 @@
 		return
 
 	for(var/obj/item/W in M)
-		if(!M.unEquip(W))
+		if(!M.dropItemToGround(W))
 			qdel(W)
 			M.regenerate_icons()
 
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 192a1712b0d..96f3bddba2d 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -91,8 +91,9 @@
 
 	var/obj/item/device/onetankbomb/R = new /obj/item/device/onetankbomb(loc)
 
-	M.remove_from_mob(src)	//Remove the tank from your character,in case you were holding it
-	M.put_in_hands(R)		//Equips the bomb if possible, or puts it on the floor.
+	M.temporarilyRemoveItemFromInventory(src, TRUE)	//Remove the tank from your character,in case you were holding it
+	if(!M.put_in_hands(R))		//Equips the bomb if possible, or puts it on the floor.
+		forceMove(M.loc)
 
 	R.bombassembly = S	//Tell the bomb about its assembly part
 	S.master = R		//Tell the assembly about its new owner
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index 2d5fbb80976..98664cf42da 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -72,7 +72,7 @@
 				D.safe = !D.safe
 
 	for(var/D in open_or_close)
-		addtimer(CALLBACK(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open), 0)
+		INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open)
 
 	sleep(10)
 	cooldown = 0
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index b2ed47d2eb4..da49525d3f1 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -26,8 +26,9 @@
 /obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
 	if(!A.remove_item_from_storage(src))
 		if(user)
-			user.remove_from_mob(A)
-		A.loc = src
+			user.transferItemToLoc(A, src)
+		else
+			A.forceMove(src)
 	A.holder = src
 	A.toggle_secure()
 	if(!a_left)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index dd48e73391e..081a9661358 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -78,7 +78,7 @@
 /obj/item/device/assembly/prox_sensor/dropped()
 	..()
 	if(scanning)
-		addtimer(CALLBACK(src, .proc/sense), 0)
+		INVOKE_ASYNC(src, .proc/sense)
 
 /obj/item/device/assembly/prox_sensor/Destroy()
 	if(scanning)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index ac72db5df55..b1ce7612734 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -691,7 +691,7 @@
 				return
 		if(0)
 			if(istype(W, /obj/item/weapon/electronics/airalarm))
-				if(user.unEquip(W))
+				if(user.temporarilyRemoveItemFromInventory(W))
 					user << "<span class='notice'>You insert the circuit.</span>"
 					buildstage = 1
 					update_icon()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 7e4183d908c..9d6ca79d735 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -181,6 +181,7 @@
 		if(isliving(M))
 			var/mob/living/L = M
 			L.update_canmove()
+	occupant = null
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user)
 	if((isnull(user) || istype(user)) && state_open && !panel_open)
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 0c9a98397dc..c9bdd58a301 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -55,7 +55,7 @@
 		user << "You can't move your own flag!"
 		return
 	if(loc == user)
-		if(!user.unEquip(src))
+		if(!user.dropItemToGround(src))
 			return
 	anchored = FALSE
 	pickup(user)
@@ -249,8 +249,7 @@
 	if(istype(I, /obj/item/weapon/twohanded/ctf))
 		var/obj/item/weapon/twohanded/ctf/flag = I
 		if(flag.team != src.team)
-			user.unEquip(flag)
-			flag.loc = get_turf(flag.reset)
+			user.transferItemToLoc(flag, get_turf(flag.reset), TRUE)
 			points++
 			for(var/mob/M in player_list)
 				var/area/mob_area = get_area(M)
@@ -266,7 +265,7 @@
 			M << "<span class='narsie'>[team] team wins!</span>"
 			M << "<span class='userdanger'>The game has been reset! Teams have been cleared. The machines will be active again in 30 seconds.</span>"
 			for(var/obj/item/weapon/twohanded/ctf/W in M)
-				M.unEquip(W)
+				M.dropItemToGround(W)
 			M.dust()
 	for(var/obj/machinery/control_point/control in machines)
 		control.icon_state = "dominator"
@@ -563,7 +562,6 @@
 			var/outfit = CTF.ctf_gear
 			var/datum/outfit/O = new outfit
 			for(var/obj/item/weapon/gun/G in M)
-				M.unEquip(G)
 				qdel(G)
 			O.equip(M)
 			M << "<span class='notice'>Ammunition reloaded!</span>"
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 7c18b69d356..9b9adff580b 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -59,4 +59,7 @@
 	var/avgping = 0
 	var/connection_time //world.time they connected
 	var/connection_realtime //world.realtime they connected
-	var/connection_timeofday //world.timeofday they connected
\ No newline at end of file
+	var/connection_timeofday //world.timeofday they connected
+
+	var/inprefs = FALSE
+	var/list/topiclimiter
\ No newline at end of file
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index c292196e069..cd5d28757fb 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -3,6 +3,12 @@
 	////////////
 #define UPLOAD_LIMIT		1048576	//Restricts client uploads to the server to 1MB //Could probably do with being lower.
 
+#define LIMITER_SIZE	5
+#define CURRENT_SECOND	1
+#define SECOND_COUNT	2
+#define CURRENT_MINUTE	3
+#define MINUTE_COUNT	4
+#define ADMINSWARNED_AT	5
 	/*
 	When somebody clicks a link in game, this Topic is called first.
 	It does the stuff in this proc and  then is redirected to the Topic() proc for the src=[0xWhatever]
@@ -18,16 +24,55 @@
 		- If so, is there any protection against somebody spam-clicking a link?
 	If you have any  questions about this stuff feel free to ask. ~Carn
 	*/
-/client/var/inprefs = FALSE
+
 /client/Topic(href, href_list, hsrc)
 	if(!usr || usr != mob)	//stops us calling Topic for somebody else's client. Also helps prevent usr=null
 		return
+
 	// asset_cache
 	if(href_list["asset_cache_confirm_arrival"])
 		//src << "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED."
 		var/job = text2num(href_list["asset_cache_confirm_arrival"])
-		completed_asset_jobs += job
-		return
+		//because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us
+		//	into letting append to a list without limit.
+		if (job && job <= last_asset_job && !(job in completed_asset_jobs))
+			completed_asset_jobs += job
+			return
+
+	if (!holder && config.minutetopiclimit)
+		var/minute = round(world.time, 600)
+		if (!topiclimiter)
+			topiclimiter = new(LIMITER_SIZE)
+		if (minute != topiclimiter[CURRENT_MINUTE])
+			topiclimiter[CURRENT_MINUTE] = minute
+			topiclimiter[MINUTE_COUNT] = 0
+		topiclimiter[MINUTE_COUNT] += 1
+		if (topiclimiter[MINUTE_COUNT] > config.minutetopiclimit)
+			var/msg = "Your previous action was ignored because you've done too many in a minute."
+			if (minute != topiclimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them)
+				topiclimiter[ADMINSWARNED_AT] = minute
+				msg += " Administrators have been informed."
+				log_game("[key_name(src)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute")
+				message_admins("[key_name_admin(src)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [config.minutetopiclimit] topic calls in a given game minute")
+			src << "<span class='danger'>[msg]</span>"
+			return
+
+	if (!holder && config.secondtopiclimit)
+		var/second = round(world.time, 10)
+		if (!topiclimiter)
+			topiclimiter = new(LIMITER_SIZE)
+		if (second != topiclimiter[CURRENT_SECOND])
+			topiclimiter[CURRENT_SECOND] = second
+			topiclimiter[SECOND_COUNT] = 0
+		topiclimiter[SECOND_COUNT] += 1
+		if (topiclimiter[SECOND_COUNT] > config.secondtopiclimit)
+			src << "<span class='danger'>Your previous action was ignored because you've done too many in a second</span>"
+			return
+
+	//Logs all hrefs
+	if(config && config.log_hrefs && href_logfile)
+		href_logfile << "<small>[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
+
 	// Admin PM
 	if(href_list["priv_msg"])
 		if (href_list["ahelp_reply"])
@@ -36,10 +81,6 @@
 		cmd_admin_pm(href_list["priv_msg"],null)
 		return
 
-	//Logs all hrefs
-	if(config && config.log_hrefs && href_logfile)
-		href_logfile << "<small>[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
-
 	switch(href_list["_src_"])
 		if("holder")
 			hsrc = holder
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index dd14b2f6b37..5a5ffe2e5fc 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -59,7 +59,7 @@
 	if(new_headgear)
 		// Force drop the item in the headslot, even though
 		// it's NODROP
-		D.unEquip(target, 1)
+		D.dropItemToGround(target, TRUE)
 		qdel(old_headgear)
 		// where is `slot_head` defined? WHO KNOWS
 		D.equip_to_slot(new_headgear, slot_head)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index ae1aef243a6..3df446c4c8b 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -46,9 +46,11 @@
 
 	if(!M.restrained() && !M.stat && loc == M && istype(over_object, /obj/screen/inventory/hand))
 		var/obj/screen/inventory/hand/H = over_object
-		if(!M.unEquip(src))
+		if(!M.temporarilyRemoveItemFromInventory(src))
+			return
+		if(!M.put_in_hand(src, H.held_index))
+			qdel(src)
 			return
-		M.put_in_hand(src, H.held_index)
 		add_fingerprint(usr)
 
 /obj/item/clothing/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 597876fb4ae..464319f3c8f 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -248,12 +248,23 @@
 
 /obj/item/clothing/glasses/thermal/syndi	//These are now a traitor item, concealed as mesons.	-Pete
 	name = "Chameleon Thermals"
-	desc = "A pair of thermal optic goggles with an onboard chameleon generator. Toggle to disguise."
+	desc = "A pair of thermal optic goggles with an onboard chameleon generator."
 	origin_tech = "magnets=3;syndicate=4"
 	flash_protect = -1
 
-/obj/item/clothing/glasses/thermal/syndi/attack_self(mob/user)
-	chameleon(user)
+	var/datum/action/item_action/chameleon/change/chameleon_action
+
+/obj/item/clothing/glasses/thermal/syndi/New()
+	..()
+	chameleon_action = new(src)
+	chameleon_action.chameleon_type = /obj/item/clothing/glasses
+	chameleon_action.chameleon_name = "Glasses"
+	chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE)
+	chameleon_action.initialize_disguises()
+
+/obj/item/clothing/glasses/thermal/syndi/emp_act(severity)
+	..()
+	chameleon_action.emp_randomise()
 
 /obj/item/clothing/glasses/thermal/monocle
 	name = "Thermoncle"
@@ -318,58 +329,6 @@
 		qdel(src)
 	..()
 
-/obj/item/clothing/glasses/proc/chameleon(var/mob/user)
-	var/input_glasses = input(user, "Choose a piece of eyewear to disguise as.", "Choose glasses style.") as null|anything in list("Sunglasses", "Medical HUD", "Mesons", "Science Goggles", "Glasses", "Security Sunglasses","Eyepatch","Welding","Gar")
-
-	if(user && src in user.contents)
-		switch(input_glasses)
-			if("Sunglasses")
-				desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
-				name = "sunglasses"
-				icon_state = "sun"
-				item_state = "sunglasses"
-			if("Medical HUD")
-				name = "Health Scanner HUD"
-				desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
-				icon_state = "healthhud"
-				item_state = "healthhud"
-			if("Mesons")
-				name = "Optical Meson Scanner"
-				desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
-				icon_state = "meson"
-				item_state = "meson"
-			if("Science Goggles")
-				name = "Science Goggles"
-				desc = "A pair of snazzy goggles used to protect against chemical spills."
-				icon_state = "purple"
-				item_state = "glasses"
-			if("Glasses")
-				name = "Prescription Glasses"
-				desc = "Made by Nerd. Co."
-				icon_state = "glasses"
-				item_state = "glasses"
-			if("Security Sunglasses")
-				name = "HUDSunglasses"
-				desc = "Sunglasses with a HUD."
-				icon_state = "sunhud"
-				item_state = "sunglasses"
-			if("Eyepatch")
-				name = "eyepatch"
-				desc = "Yarr."
-				icon_state = "eyepatch"
-				item_state = "eyepatch"
-			if("Welding")
-				name = "welding goggles"
-				desc = "Protects the eyes from welders; approved by the mad scientist association."
-				icon_state = "welding-g"
-				item_state = "welding-g"
-			if("Gar")
-				desc = "Just who the hell do you think I am?!"
-				name = "gar glasses"
-				icon_state = "gar"
-				item_state = "gar"
-
-
 /obj/item/clothing/glasses/AltClick(mob/user)
 	if(glass_colour_type && ishuman(user))
 		var/mob/living/carbon/human/H = user
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 2d43948031c..72586756390 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -74,11 +74,24 @@
 
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "Chameleon Security HUD"
-	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Toggle to disguise the HUD. Provides flash protection."
+	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."
 	flash_protect = 1
 
-/obj/item/clothing/glasses/hud/security/chameleon/attack_self(mob/user)
-	chameleon(user)
+	// Yes this code is the same as normal chameleon glasses, but we don't
+	// have multiple inheritance, okay?
+	var/datum/action/item_action/chameleon/change/chameleon_action
+
+/obj/item/clothing/glasses/hud/security/chameleon/New()
+	..()
+	chameleon_action = new(src)
+	chameleon_action.chameleon_type = /obj/item/clothing/glasses
+	chameleon_action.chameleon_name = "Glasses"
+	chameleon_action.chameleon_blacklist = typecacheof(/obj/item/clothing/glasses/changeling, only_root_path = TRUE)
+	chameleon_action.initialize_disguises()
+
+/obj/item/clothing/glasses/hud/security/chameleon/emp_act(severity)
+	. = ..()
+	chameleon_action.emp_randomise()
 
 
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 78e5c03e526..7da319ce6e8 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -246,13 +246,12 @@
 		var/obj/item/device/flashlight/seclite/S = I
 		if(can_flashlight)
 			if(!F)
-				if(!user.unEquip(S))
+				if(!user.transferItemToLoc(S, src))
 					return
 				user << "<span class='notice'>You click [S] into place on [src].</span>"
 				if(S.on)
 					SetLuminosity(0)
 				F = S
-				S.loc = src
 				update_icon()
 				update_helmlight(user)
 				verbs += /obj/item/clothing/head/helmet/proc/toggle_helmlight
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
index 0167f9f8347..64cc93517dd 100644
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -41,7 +41,7 @@
 	if(!bananium.get_item_material_amount(O))
 		user << "<span class='notice'>This item has no bananium!</span>"
 		return
-	if(!user.unEquip(O))
+	if(!user.dropItemToGround(O))
 		user << "<span class='notice'>You can't drop [O]!</span>"
 		return
 
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index a0475112582..46ac98b2246 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -128,7 +128,7 @@
 		exposed += user.held_items
 		for(var/exposed_item in exposed)
 			var/obj/item/exposed_I = exposed_item
-			if(exposed_I && !(exposed_I.type in chronosafe_items) && user.unEquip(exposed_I))
+			if(exposed_I && !(exposed_I.type in chronosafe_items) && user.dropItemToGround(exposed_I))
 				user << "<span class='notice'>Your [exposed_I.name] got left behind.</span>"
 
 		user.ExtinguishMob()
diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index 16d0d9381e6..fe099ed9a91 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -796,43 +796,38 @@
 		var/obj/item/weapon/stock_parts/S = I
 		if(istype(S, /obj/item/weapon/stock_parts/manipulator))
 			usermessage("[I] has been sucessfully installed into systems.")
-			if(user.unEquip(I))
+			if(user.transferItemToLoc(I, src))
 				if(part_manip)
 					part_manip.forceMove(get_turf(src))
 					part_manip = null
-				I.loc = src
 				part_manip = I
 		if(istype(S, /obj/item/weapon/stock_parts/scanning_module))
 			usermessage("[I] has been sucessfully installed into systems.")
-			if(user.unEquip(I))
+			if(user.transferItemToLoc(I, src))
 				if(part_scan)
 					part_scan.forceMove(get_turf(src))
 					part_scan = null
-				I.loc = src
 				part_scan = I
 		if(istype(S, /obj/item/weapon/stock_parts/micro_laser))
 			usermessage("[I] has been sucessfully installed into systems.")
-			if(user.unEquip(I))
+			if(user.transferItemToLoc(I, src))
 				if(part_laser)
 					part_laser.forceMove(get_turf(src))
 					part_laser = null
-				I.loc = src
 				part_laser = I
 		if(istype(S, /obj/item/weapon/stock_parts/matter_bin))
 			usermessage("[I] has been sucessfully installed into systems.")
-			if(user.unEquip(I))
+			if(user.transferItemToLoc(I, src))
 				if(part_bin)
 					part_bin.forceMove(get_turf(src))
 					part_bin = null
-				I.loc = src
 				part_bin = I
 		if(istype(S, /obj/item/weapon/stock_parts/capacitor))
 			usermessage("[I] has been sucessfully installed into systems.")
-			if(user.unEquip(I))
+			if(user.transferItemToLoc(I, src))
 				if(part_cap)
 					part_cap.forceMove(get_turf(src))
 					part_cap = null
-				I.loc = src
 				part_cap = I
 	update_parts()
 	..()
@@ -1084,7 +1079,7 @@
 		pack.flags &= ~NODROP
 		resync()
 		if(user)
-			user.unEquip(pack, 1)
+			user.transferItemToLoc(pack, src, TRUE)
 			user.update_inv_wear_suit()
 			user.visible_message("<span class='notice'>[user]'s [pack.name] detaches from their back and retracts into their [src]!</span>")
 	pack.loc = src
@@ -1115,7 +1110,7 @@
 	shoes.flags &= ~NODROP
 	playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
 	if(user)
-		user.unEquip(shoes, 1)
+		user.transferItemToLoc(shoes, src, TRUE)
 		user.update_inv_wear_suit()
 		user.visible_message("<span class='notice'>[user]'s [shoes.name] retracts back into their [name]!</span>")
 	shoes.loc = src
@@ -1151,7 +1146,7 @@
 	usermessage("You detach the flightpack.")
 
 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_pack(obj/item/device/flightpack/F)
-	F.loc = src
+	F.forceMove(src)
 	pack = F
 	pack.relink_suit(src)
 	usermessage("You attach and fasten the flightpack.")
@@ -1163,7 +1158,7 @@
 	usermessage("You detach the flight shoes.")
 
 /obj/item/clothing/suit/space/hardsuit/flightsuit/proc/attach_shoes(obj/item/clothing/shoes/flightshoes/S)
-	S.loc = src
+	S.forceMove(src)
 	shoes = S
 	shoes.relink_suit(src)
 	usermessage("You attach and fasten a pair of flight shoes.")
@@ -1229,14 +1224,14 @@
 			addmsg += english_list(addmsglist)
 			usermessage("The flightpack you are trying to install is not fully assembled and operational![addmsg].", 1)
 			return FALSE
-		if(user.unEquip(F))
+		if(user.temporarilyRemoveItemFromInventory(F))
 			attach_pack(F)
 	if(istype(I, /obj/item/clothing/shoes/flightshoes))
 		var/obj/item/clothing/shoes/flightshoes/S = I
 		if(shoes)
 			usermessage("There are already shoes installed!", 1)
 			return FALSE
-		if(user.unEquip(S))
+		if(user.temporarilyRemoveItemFromInventory(S))
 			attach_shoes(S)
 	..()
 
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index ca4687e27ea..775245d678b 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -103,9 +103,8 @@
 			user << "<span class='warning'>You cannot install the upgrade to [src] while wearing it.</span>"
 			return
 
-		if(user.unEquip(I))
+		if(user.transferItemToLoc(I, src))
 			jetpack = I
-			I.loc = src
 			user << "<span class='notice'>You successfully install the jetpack into [src].</span>"
 
 	else if(istype(I, /obj/item/weapon/screwdriver))
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 32ed6b1ae1c..a643d83149e 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -37,9 +37,10 @@
 	suittoggled = 0
 	if(ishuman(hood.loc))
 		var/mob/living/carbon/H = hood.loc
-		H.unEquip(hood, 1)
+		H.transferItemToLoc(hood, src, TRUE)
 		H.update_inv_wear_suit()
-	hood.loc = src
+	else
+		hood.forceMove(src)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
@@ -163,11 +164,12 @@
 		var/mob/living/carbon/H = helmet.loc
 		if(helmet.on)
 			helmet.attack_self(H)
-		H.unEquip(helmet, 1)
+		H.transferItemToLoc(helmet, src, TRUE)
 		H.update_inv_wear_suit()
 		H << "<span class='notice'>The helmet on the hardsuit disengages.</span>"
 		playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
-	helmet.loc = src
+	else
+		helmet.forceMove(src)
 
 /obj/item/clothing/suit/space/hardsuit/dropped()
 	..()
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index cd4d7feddbc..27a1110328c 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -38,7 +38,7 @@
 			var/obj/item/weapon/storage/U = I.loc
 			U.remove_from_storage(I, src)
 		if(user.is_holding(I))
-			user.unEquip(I)
+			user.dropItemToGround(I)
 		else
 			return
 
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 5e01aff6eee..2989cc81c50 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -11,7 +11,7 @@
 
 /datum/round_event/ghost_role/blob
 	announceWhen	= 12
-	role_name = "blob_overmind"
+	role_name = "blob overmind"
 	var/new_rate = 2
 
 /datum/round_event/ghost_role/blob/New(my_processing = TRUE, set_point_rate)
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index 099639d202b..593ad93d8a9 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -49,7 +49,7 @@
 			if(loadout[i])
 				var/obj/item/J = loadout[i]
 				var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
-				H.unEquip(slots[i])
+				H.temporarilyRemoveItemFromInventory(slots[i], TRUE)
 				H.equip_to_slot_or_del(I, wearslots[i])
 				I.flags |= NODROP
 				I.name = "cursed " + I.name
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 3e17659d2ab..c609bbed30c 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -400,7 +400,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
 	my_target = T
 	QDEL_IN(src, 300)
 	step_away(src,my_target,2)
-	addtimer(CALLBACK(src, .proc/attack_loop), 0)
+	INVOKE_ASYNC(src, .proc/attack_loop)
 
 
 /obj/effect/fake_attacker/proc/updateimage()
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 9d5a63a9e4d..492a95831be 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -46,12 +46,11 @@
 		else if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom) || istype(I, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom))
 			user << "<span class='warning'>Adding [I.name] to [src] would make a mess.</span>"
 		else
-			if(!user.unEquip(I))
+			if(!user.transferItemToLoc(I, src))
 				return
 			if(S.trash)
 				S.generate_trash(get_turf(user))
 			ingredients += S
-			S.loc = src
 			mix_filling_color(S)
 			S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
 			update_overlays(S)
@@ -86,7 +85,6 @@
 		contents += O
 	if(I && user)
 		attackby(I, user)
-	user.unEquip(BASE)
 	qdel(BASE)
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/proc/mix_filling_color(obj/item/weapon/reagent_containers/food/snacks/S)
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 937a2d5f4da..7ad3b82c426 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -25,10 +25,9 @@
 	if(!usr)
 		return
 	if(!reagents.total_volume)
-		usr.unEquip(src)	//so icons update :[
 		var/obj/item/trash_item = generate_trash(usr)
-		usr.put_in_hands(trash_item)
 		qdel(src)
+		usr.put_in_hands(trash_item)
 
 
 /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user)
@@ -42,7 +41,6 @@
 		eatverb = pick("bite","chew","nibble","gnaw","gobble","chomp")
 	if(!reagents.total_volume)						//Shouldn't be needed but it checks to see if it has anything left in it.
 		user << "<span class='notice'>None of [src] left, oh no!</span>"
-		M.unEquip(src)	//so icons update :[
 		qdel(src)
 		return 0
 	if(iscarbon(M))
@@ -318,7 +316,7 @@
 			user << "<span class='warning'>[src] is full.</span>"
 			return 0
 		user << "<span class='notice'>You slip [W] inside [src].</span>"
-		user.unEquip(W)
+		user.transferItemToLoc(W, src)
 		add_fingerprint(user)
 		contents += W
 		stored_item = 1
diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
index b732e1bf4dc..a2ed2fd1415 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -46,10 +46,9 @@
 		if (beaker)
 			return 1
 		else
-			if(!user.unEquip(O))
+			if(!user.transferItemToLoc(O, src))
 				user << "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>"
 				return 0
-			O.loc = src
 			beaker = O
 			src.verbs += /obj/machinery/juicer/verb/detach
 			update_icon()
@@ -58,10 +57,9 @@
 	if (!is_type_in_list(O, allowed_items))
 		user << "This object contains no fluid or extractable reagents."
 		return 1
-	if(!user.unEquip(O))
+	if(!user.transferItemToLoc(O, src))
 		user << "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>"
 		return 0
-	O.loc = src
 	src.updateUsrDialog()
 	return 0
 
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 20c2c28515d..7b5699b8a82 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -147,14 +147,14 @@
 /obj/machinery/smartfridge/proc/load(obj/item/O)
 	if(istype(O.loc,/mob))
 		var/mob/M = O.loc
-		if(!M.unEquip(O))
+		if(!M.transferItemToLoc(O, src))
 			usr << "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>"
 			return
-	else if(istype(O.loc,/obj/item/weapon/storage))
-		var/obj/item/weapon/storage/S = O.loc
-		S.remove_from_storage(O,src)
-
-	O.loc = src
+	else
+		if(istype(O.loc,/obj/item/weapon/storage))
+			var/obj/item/weapon/storage/S = O.loc
+			S.remove_from_storage(O,src)
+		O.forceMove(src)
 
 /obj/machinery/smartfridge/attack_paw(mob/user)
 	return src.attack_hand(user)
diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm
index f1becca5ae6..2ea54b4bdf5 100644
--- a/code/modules/games/cas.dm
+++ b/code/modules/games/cas.dm
@@ -80,7 +80,7 @@ var/global/list/cards_against_space
 /obj/item/toy/cards/deck/cas/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/toy/cards/singlecard/cas))
 		var/obj/item/toy/cards/singlecard/cas/SC = I
-		if(!user.unEquip(SC))
+		if(!user.temporarilyRemoveItemFromInventory(SC))
 			user << "<span class='warning'>The card is stuck to your hand, you can't add it to the deck!</span>"
 			return
 		var/datum/playingcard/RC // replace null datum for the re-added card
diff --git a/code/modules/holodeck/computer_funcs.dm b/code/modules/holodeck/computer_funcs.dm
index 33edb15d605..682dd22a581 100644
--- a/code/modules/holodeck/computer_funcs.dm
+++ b/code/modules/holodeck/computer_funcs.dm
@@ -102,18 +102,10 @@
 		return
 	var/turf/T = get_turf(obj)
 	for(var/atom/movable/AM in obj.contents) // these should be derezed if they were generated
-		AM.loc = T							// otherwise make sure they are dropped
-
-	if(istype(obj))
-		var/mob/M = obj.loc
-		if(ismob(M))
-			M.unEquip(obj, 1) //Holoweapons should always drop.
-
-	for(var/mob/M in obj.contents)
-		M.loc = obj.loc
-		silent = 0
+		AM.loc = T
+		if(ismob(AM))
+			silent = FALSE					// otherwise make sure they are dropped
 
 	if(!silent)
-		var/obj/oldobj = obj
-		visible_message("The [oldobj.name] fades away!")
+		visible_message("The [obj.name] fades away!")
 	qdel(obj)
\ No newline at end of file
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index fec53b66fa3..29dd541ca1f 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -146,8 +146,8 @@
 		var/obj/item/honey_frame/HF = I
 		if(honey_frames.len < BEEBOX_MAX_FRAMES)
 			visible_message("<span class='notice'>[user] adds a frame to the apiary.</span>")
-			user.unEquip(HF)
-			HF.loc = src
+			if(!user.transferItemToLoc(HF, src))
+				return
 			honey_frames += HF
 		else
 			user << "<span class='warning'>There's no room for anymore frames in the apiary!</span>"
@@ -162,9 +162,9 @@
 			return
 
 		var/obj/item/queen_bee/qb = I
-		user.unEquip(qb)
+		user.temporarilyRemoveItemFromInventory(qb)
 
-		qb.queen.loc = src
+		qb.queen.forceMove(src)
 		bees += qb.queen
 		queen_bee = qb.queen
 		qb.queen = null
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 3dc0194d40c..d8e32671cac 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -147,9 +147,8 @@
 		if(i >= max_items)
 			user << "<span class='warning'>The biogenerator is full! Activate it.</span>"
 		else
-			user.unEquip(O)
-			O.loc = src
-			user << "<span class='info'>You put [O.name] in [src.name]</span>"
+			if(user.transferItemToLoc(O, src))
+				user << "<span class='info'>You put [O.name] in [src.name]</span>"
 		return 1 //no afterattack
 	else if (istype(O, /obj/item/weapon/disk/design_disk))
 		user.visible_message("[user] begins to load \the [O] in \the [src]...",
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index bd8cfb4cd3a..b839cbe0d96 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -61,20 +61,12 @@
 		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.\n"
 		if(seed)
 			msg += seed.get_analyzer_text()
-		msg += "\n- Nutritional value: [reagents.get_reagent_amount("nutriment")]\n"
-		msg += "- Other substances: [reagents.total_volume-reagents.get_reagent_amount("nutriment")]\n"
-		msg += "*---------*</span>"
-
-		var/list/scannable_reagents = list("charcoal" = "Anti-Toxin", "morphine" = "Morphine", "amatoxin" = "Amatoxins",
-			"toxin" = "Toxins", "mushroomhallucinogen" = "Mushroom Hallucinogen", "condensedcapsaicin" = "Condensed Capsaicin",
-			"capsaicin" = "Capsaicin", "frostoil" = "Frost Oil", "gold" = "Mineral Content", "glycerol" = "Glycerol",
-			"radium" = "Highly Radioactive Material", "uranium" = "Radioactive Material")
 		var/reag_txt = ""
 		if(seed)
-			for(var/reagent_id in scannable_reagents)
-				if(reagent_id in seed.reagents_add)
-					var/amt = reagents.get_reagent_amount(reagent_id)
-					reag_txt += "\n<span class='info'>- [scannable_reagents[reagent_id]]: [amt*100/reagents.maximum_volume]%</span>"
+			for(var/reagent_id in seed.reagents_add)
+				var/datum/reagent/R  = chemical_reagents_list[reagent_id]
+				var/amt = reagents.get_reagent_amount(reagent_id)
+				reag_txt += "\n<span class='info'>- [R.name]: [amt]</span>"
 
 		if(reag_txt)
 			msg += reag_txt
@@ -170,9 +162,10 @@
 
 // For item-containing growns such as eggy or gatfruit
 /obj/item/weapon/reagent_containers/food/snacks/grown/shell/attack_self(mob/user)
-	user.unEquip(src)
+	var/obj/item/T
+	if(trash)
+		T = generate_trash()
+	qdel(src)
 	if(trash)
-		var/obj/item/T = generate_trash()
 		user.put_in_hands(T)
 		user << "<span class='notice'>You open [src]\'s shell, revealing \a [T].</span>"
-	qdel(src)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 0bba7389254..3a7ce53d163 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -126,7 +126,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/proc/update_mob()
 	if(ismob(loc))
 		var/mob/M = loc
-		M.unEquip(src)
+		M.dropItemToGround(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
 	qdel(src) //Ensuring that it's deleted by its own explosion
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 76b5f1152ec..3c2169ddfee 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -39,9 +39,7 @@
 	if(W.is_sharp())
 		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
 		new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
-		user.unEquip(src)
 		qdel(src)
-		return
 	else
 		return ..()
 
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 984b005781d..8f2147d29ee 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -192,7 +192,6 @@
 		force -= rand(1, (force / 3) + 1)
 	else
 		usr << "<span class='warning'>All the petals have fallen off the [name] from violent whacking!</span>"
-		usr.unEquip(src)
 		qdel(src)
 
 /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user)
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index f6248c64c4e..1c9738fa44d 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -68,7 +68,6 @@
 		force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
 	else
 		usr << "All the leaves have fallen off the nettle from violent whacking."
-		usr.unEquip(src)
 		qdel(src)
 
 /obj/item/weapon/grown/nettle/basic
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 83b51102b53..8164f5f162a 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -39,10 +39,9 @@
 	if(W.is_sharp())
 		user << "<span class='notice'>You cut the potato into wedges with [W].</span>"
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
-		if(!remove_item_from_storage(user))
-			user.unEquip(src)
-		user.put_in_hands(Wedges)
+		remove_item_from_storage(user)
 		qdel(src)
+		user.put_in_hands(Wedges)
 	else
 		return ..()
 
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 6b3510b5477..753b9a287a8 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -26,10 +26,9 @@
 	if(I.is_sharp())
 		user << "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>"
 		var/obj/item/weapon/kitchen/knife/carrotshiv/Shiv = new /obj/item/weapon/kitchen/knife/carrotshiv
-		if(!remove_item_from_storage(user))
-			user.unEquip(src)
-		user.put_in_hands(Shiv)
+		remove_item_from_storage(user)
 		qdel(src)
+		user.put_in_hands(Shiv)
 	else
 		return ..()
 
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index c8d4db730dd..cdab5f9e155 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -138,6 +138,4 @@
 			K.move_to_delay -= round(seed.production / 50)
 			K.health = K.maxHealth
 			K.visible_message("<span class='notice'>The Killer Tomato growls as it suddenly awakens.</span>")
-			if(user)
-				user.unEquip(src)
 			qdel(src)
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index fdb03e3041a..1a24a761512 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -71,7 +71,7 @@
 		if(leaf.dry)
 			user.show_message("<span class='notice'>You wrap \the [W] around the log, turning it into a torch!</span>")
 			var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
-			usr.unEquip(W)
+			usr.dropItemToGround(W)
 			usr.put_in_active_hand(T)
 			qdel(leaf)
 			qdel(src)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 711fc6782d0..f132af1a445 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -772,14 +772,14 @@
 		if(!myseed)
 			if(istype(O, /obj/item/seeds/kudzu))
 				investigate_log("had Kudzu planted in it by [user.ckey]([user]) at ([x],[y],[z])","kudzu")
-			user.unEquip(O)
+			if(!user.transferItemToLoc(O, src))
+				return
 			user << "<span class='notice'>You plant [O].</span>"
 			dead = 0
 			myseed = O
 			age = 1
 			plant_health = myseed.endurance
 			lastcycle = world.time
-			O.forceMove(src)
 			update_icon()
 		else
 			user << "<span class='warning'>[src] already has seeds in it!</span>"
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 74dbbb98f89..79516b6179f 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -290,6 +290,12 @@
 	text += "- Weed Vulnerability: [weed_chance]\n"
 	if(rarity)
 		text += "- Species Discovery Value: [rarity]\n"
+	var/all_traits = ""
+	for(var/datum/plant_gene/trait/traits in genes)
+		if(istype(traits, /datum/plant_gene/trait/plant_type))
+			continue
+		all_traits += " [traits.get_name()]"
+	text += "- Plant Traits:[all_traits]\n"
 
 	text += "*---------*"
 
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 0a5d447f72a..ccec533563d 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -9,6 +9,7 @@
 	var/tool_speed = 50
 	var/remaining_uses = 3
 
+	var/non_dull_name
 	var/w_engrave = "engrave"
 	var/w_engraving = "engraving"
 	var/w_chipping = "chipping"
@@ -39,19 +40,28 @@
 
 /obj/item/soapstone/examine(mob/user)
 	. = ..()
-	user << "It has [remaining_uses] uses left."
+	if(remaining_uses != -1)
+		user << "It has [remaining_uses] uses left."
+	else
+		user << "It looks like it can be used an unlimited number of times."
 
 /obj/item/soapstone/afterattack(atom/target, mob/user, proximity)
 	var/turf/T = get_turf(target)
 	if(!proximity)
 		return
 
-	if(!remaining_uses)
-		// The dull chisel is dull.
-		user << "<span class='warning'>[src] is [w_dull].</span>"
 
 	var/obj/structure/chisel_message/already_message = locate(/obj/structure/chisel_message) in T
 
+	var/our_message = FALSE
+	if(already_message)
+		our_message = already_message.creator_key == user.ckey
+
+	if(!remaining_uses && !our_message)
+		// The dull chisel is dull.
+		user << "<span class='warning'>[src] is [w_dull].</span>"
+		return
+
 	if(!good_chisel_message_location(T))
 		user << "<span class='warning'>It's not appropriate to [w_engrave] on [T].</span>"
 		return
@@ -60,11 +70,17 @@
 		user.visible_message("<span class='notice'>[user] starts erasing [already_message].</span>", "<span class='notice'>You start erasing [already_message].</span>", "<span class='italics'>You hear a [w_chipping] sound.</span>")
 		playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
 
-		if(do_after(user, tool_speed, target=target) && spend_use())
+		// Removing our own messages refunds a charge
+
+		if((our_message || can_use()) && do_after(user, tool_speed, target=target) && (our_message || can_use()))
 			user.visible_message("<span class='notice'>[user] has erased [already_message].</span>", "<span class='notice'>You erased [already_message].</span>")
 			already_message.persists = FALSE
 			qdel(already_message)
 			playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
+			if(our_message)
+				refund_use()
+			else
+				remove_use()
 		return
 
 	var/message = stripped_input(user, "What would you like to [w_engrave]?", "[name] Message")
@@ -78,21 +94,38 @@
 
 	playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
 	user.visible_message("<span class='notice'>[user] starts [w_engraving] a message into [T].</span>", "You start [w_engraving] a message into [T].", "<span class='italics'>You hear a [w_chipping] sound.</span>")
-	if(do_after(user, tool_speed, target=T))
-		if(!locate(/obj/structure/chisel_message in T) && spend_use())
+	if(can_use() && do_after(user, tool_speed, target=T) && can_use())
+		if(!locate(/obj/structure/chisel_message in T))
 			user << "You [w_engrave] a message into [T]."
 			playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
 			var/obj/structure/chisel_message/M = new(T)
 			M.register(user, message)
+			remove_use()
 
-/obj/item/soapstone/proc/spend_use(mob/user)
-	if(!remaining_uses)
-		. = FALSE
-	else
-		remaining_uses--
-		if(!remaining_uses)
-			name = "[w_dull] [name]"
+/obj/item/soapstone/proc/can_use()
+	if(remaining_uses == -1 || remaining_uses >= 0)
 		. = TRUE
+	else
+		. = FALSE
+
+/obj/item/soapstone/proc/remove_use()
+	if(remaining_uses <= 0)
+		// -1 == unlimited, 0 == empty
+		return
+
+	remaining_uses--
+	if(!remaining_uses)
+		non_dull_name = name
+		name = "[w_dull] [name]"
+
+/obj/item/soapstone/proc/refund_use()
+	if(remaining_uses == -1)
+		return
+	var/was_dull = remaining_uses
+	remaining_uses++
+
+	if(was_dull)
+		name = non_dull_name
 
 /* Persistent engraved messages, etched onto the station turfs to serve
    as instructions and/or memes for the next generation of spessmen.
@@ -101,6 +134,9 @@
    but only permamently removed with the librarian's soapstone.
 */
 
+/obj/item/soapstone/infinite
+	remaining_uses = -1
+
 /proc/good_chisel_message_location(turf/T)
 	if(!T)
 		. = FALSE
@@ -141,8 +177,8 @@
 
 /obj/structure/chisel_message/proc/register(mob/user, newmessage)
 	hidden_message = newmessage
-	creator_name = user.name
-	creator_key = user.key
+	creator_name = user.real_name
+	creator_key = user.ckey
 	realdate = world.timeofday
 	map = MAP_NAME
 	update_icon()
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 154aea5418b..b8b83f7cfdb 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -339,9 +339,11 @@
 
 			if(istype(over_object, /obj/screen/inventory/hand))
 				var/obj/screen/inventory/hand/H = over_object
-				if(!M.unEquip(src))
+				if(!M.temporarilyRemoveItemFromInventory(src))
 					return
-				M.put_in_hand(src, H.held_index)
+				if(!M.put_in_hand(src, H.held_index))
+					qdel(src)
+					return //fuck these things
 
 			add_fingerprint(usr)
 
@@ -797,11 +799,11 @@
 	calculate_anger_mod(user)
 	timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown
 	if(proximity_flag)
-		addtimer(CALLBACK(src, .proc/aoe_burst, T, user), 0)
+		INVOKE_ASYNC(src, .proc/aoe_burst, T, user)
 		add_logs(user, target, "fired 3x3 blast at", src)
 	else
 		if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it)
-			addtimer(CALLBACK(src, .proc/cardinal_blasts, T, user), 0)
+			INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user)
 			timer = world.time + cooldown_time
 		else if(target in view(5, get_turf(user))) //if the target is in view, hit it
 			timer = world.time + cooldown_time
@@ -810,12 +812,12 @@
 				new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, chaser_speed, friendly_fire_check)
 				add_logs(user, target, "fired a chaser at", src)
 			else
-				addtimer(CALLBACK(src, .proc/cardinal_blasts, T, user), 0) //otherwise, just do cardinal blast
+				INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
 				add_logs(user, target, "fired cardinal blast at", src)
 		else
 			user << "<span class='warning'>That target is out of range!</span>" //too far away
 			timer = world.time
-	addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+	INVOKE_ASYNC(src, .proc/prepare_icon_update)
 
 /obj/item/weapon/hierophant_club/proc/calculate_anger_mod(mob/user) //we get stronger as the user loses health
 	chaser_cooldown = initial(chaser_cooldown)
@@ -858,7 +860,7 @@
 			user.visible_message("<span class='hierophant_warning'>[user] starts fiddling with [src]'s pommel...</span>", \
 			"<span class='notice'>You start detaching the hierophant beacon...</span>")
 			timer = world.time + 51
-			addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			if(do_after(user, 50, target = user) && !beacon)
 				var/turf/T = get_turf(user)
 				playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
@@ -870,7 +872,7 @@
 				<span class='notice'>You can remove the beacon to place it again by striking it with the club.</span>")
 			else
 				timer = world.time
-				addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+				INVOKE_ASYNC(src, .proc/prepare_icon_update)
 		else
 			user << "<span class='warning'>You need to be on solid ground to detach the beacon!</span>"
 		return
@@ -887,7 +889,7 @@
 	user.update_action_buttons_icon()
 	user.visible_message("<span class='hierophant_warning'>[user] starts to glow faintly...</span>")
 	timer = world.time + 50
-	addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+	INVOKE_ASYNC(src, .proc/prepare_icon_update)
 	beacon.icon_state = "hierophant_tele_on"
 	var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE1 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(user.loc)
 	var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE2 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(beacon.loc)
@@ -899,7 +901,7 @@
 			user << "<span class='warning'>The beacon is blocked by something, preventing teleportation!</span>"
 			user.update_action_buttons_icon()
 			timer = world.time
-			addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			beacon.icon_state = "hierophant_tele_off"
 			return
 		new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
@@ -911,7 +913,7 @@
 			if(user)
 				user.update_action_buttons_icon()
 			timer = world.time
-			addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			if(beacon)
 				beacon.icon_state = "hierophant_tele_off"
 			return
@@ -920,7 +922,7 @@
 			user << "<span class='warning'>The beacon is blocked by something, preventing teleportation!</span>"
 			user.update_action_buttons_icon()
 			timer = world.time
-			addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+			INVOKE_ASYNC(src, .proc/prepare_icon_update)
 			beacon.icon_state = "hierophant_tele_off"
 			return
 		add_logs(user, beacon, "teleported self from ([source.x],[source.y],[source.z]) to")
@@ -933,7 +935,7 @@
 			var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
 			B.damage = 30
 		for(var/mob/living/L in range(1, source))
-			addtimer(CALLBACK(src, .proc/teleport_mob, source, L, T, user), 0) //regardless, take all mobs near us along
+			INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
 		sleep(6) //at this point the blasts detonate
 		if(beacon)
 			beacon.icon_state = "hierophant_tele_off"
@@ -941,7 +943,7 @@
 		qdel(TE1)
 		qdel(TE2)
 		timer = world.time
-		addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
+		INVOKE_ASYNC(src, .proc/prepare_icon_update)
 	if(beacon)
 		beacon.icon_state = "hierophant_tele_off"
 	teleporting = FALSE
@@ -980,7 +982,7 @@
 	sleep(2)
 	new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check)
 	for(var/d in cardinal)
-		addtimer(CALLBACK(src, .proc/blast_wall, T, d, user), 0)
+		INVOKE_ASYNC(src, .proc/blast_wall, T, d, user)
 
 /obj/item/weapon/hierophant_club/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
 	if(!T)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 1aa26092f02..1fb4b3786bf 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -200,11 +200,9 @@
 	if(istype(W,/obj/item/weapon/ore/glass))
 		user << "<span class='notice'>You fill the sandbag.</span>"
 		var/obj/item/stack/sheet/mineral/sandbags/I = new /obj/item/stack/sheet/mineral/sandbags
-		user.unEquip(src)
+		qdel(src)
 		user.put_in_hands(I)
 		qdel(W)
-		qdel(src)
-		return
 	else
 		return ..()
 
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
index 2d96883a554..77d669dbfaa 100644
--- a/code/modules/mob/interactive.dm
+++ b/code/modules/mob/interactive.dm
@@ -527,7 +527,7 @@
 		if(BP.can_be_inserted(I,0))
 			BP.handle_item_insertion(I,0)
 	else
-		unEquip(I,TRUE)
+		dropItemToGround(I,TRUE)
 	update_hands = 1
 
 /mob/living/carbon/human/interactive/proc/targetRange(towhere)
@@ -678,7 +678,7 @@
 					take_to_slot(C,1)
 					if(!equip_to_appropriate_slot(C))
 						var/obj/item/I = get_item_by_slot(C)
-						unEquip(I)
+						dropItemToGround(I)
 						spawn(5)
 							equip_to_appropriate_slot(C)
 				update_hands = 1
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 7b17e260006..9ca2d1d0e48 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -236,14 +236,14 @@
 	if(!loc || !loc.allow_drop())
 		return
 	for(var/obj/item/I in held_items)
-		unEquip(I)
+		dropItemToGround(I)
 
 //Drops the item in our active hand.
 /mob/proc/drop_item()
 	if(!loc || !loc.allow_drop())
 		return
 	var/obj/item/held = get_active_held_item()
-	return unEquip(held)
+	return dropItemToGround(held)
 
 
 //Here lie drop_from_inventory and before_item_take, already forgotten and not missed.
@@ -255,7 +255,27 @@
 		return FALSE
 	return TRUE
 
-/mob/proc/unEquip(obj/item/I, force) //Force overrides NODROP for things like wizarditis and admin undress.
+//The following functions are the same save for one small difference
+
+//for when you want the item to end up on the ground
+//will force move the item to the ground and call the turf's Entered
+/mob/proc/dropItemToGround(obj/item/I, force = FALSE)
+	return doUnEquip(I, force, loc, FALSE)
+
+//for when the item will be immediately placed in a loc other than the ground
+/mob/proc/transferItemToLoc(obj/item/I, newloc = null, force = FALSE)
+	return doUnEquip(I, force, newloc, FALSE)
+
+//visibly unequips I but it is NOT MOVED AND REMAINS IN SRC
+//item MUST BE FORCEMOVE'D OR QDEL'D
+/mob/proc/temporarilyRemoveItemFromInventory(obj/item/I, force = FALSE)
+	return doUnEquip(I, force, null, TRUE)
+
+//DO NOT CALL THIS PROC
+//use one of the above 2 helper procs
+//you may override it, but do not modify the args
+/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move) //Force overrides NODROP for things like wizarditis and admin undress.
+													//Use no_move if the item is just gonna be immediately moved afterward
 	if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP.
 		return TRUE
 
@@ -272,18 +292,11 @@
 		I.layer = initial(I.layer)
 		I.plane = initial(I.plane)
 		I.appearance_flags &= ~NO_CLIENT_COLOR
-		I.forceMove(loc)
+		if(!no_move && !(I.flags & DROPDEL))	//item may be moved/qdel'd immedietely, don't bother moving it
+			I.forceMove(newloc)
 		I.dropped(src)
 	return TRUE
 
-
-//Attemps to remove an object on a mob.  Will not move it to another area or such, just removes from the mob.
-/mob/proc/remove_from_mob(var/obj/item/I)
-	unEquip(I)
-	I.screen_loc = null
-	return TRUE
-
-
 //Outdated but still in use apparently. This should at least be a human proc.
 //Daily reminder to murder this - Remie.
 /mob/living/proc/get_equipped_items()
@@ -385,7 +398,7 @@
 /mob/proc/change_number_of_hands(amt)
 	if(amt < held_items.len)
 		for(var/i in held_items.len to amt step -1)
-			unEquip(held_items[i])
+			dropItemToGround(held_items[i])
 	held_items.len = amt
 
 	if(hud_used)
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index e6d569c7f9c..3a601a8711c 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -168,7 +168,6 @@
 		var/mob/living/carbon/C = src
 		for(var/obj/item/weapon/bloodcrawl/BC in C)
 			BC.flags = null
-			C.unEquip(BC)
 			qdel(BC)
 	qdel(src.holder)
 	src.holder = null
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index f26894fd167..ae0d8a618f5 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -53,7 +53,7 @@
 			user << "<span class='warning'>You aren't sure where this brain came from, but you're pretty sure it's a useless brain!</span>"
 			return
 
-		if(!user.unEquip(O))
+		if(!user.transferItemToLoc(O, src))
 			return
 		var/mob/living/brain/B = newbrain.brainmob
 		if(!B.key)
@@ -70,7 +70,6 @@
 			living_mob_list += brainmob
 
 		brainmob.reset_perspective()
-		newbrain.loc = src //P-put your brain in it
 		brain = newbrain
 
 		name = "Man-Machine Interface: [brainmob.real_name]"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 3c8a0cb0bc7..103ace63e79 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -63,7 +63,7 @@ Doesn't work on other aliens/AI.*/
 
 /obj/effect/proc_holder/alien/plant/fire(mob/living/carbon/user)
 	if(locate(/obj/structure/alien/weeds/node) in get_turf(user))
-		src << "There's already a weed node here."
+		user << "There's already a weed node here."
 		return 0
 	user.visible_message("<span class='alertalien'>[user] has planted some alien weeds!</span>")
 	new/obj/structure/alien/weeds/node(user.loc)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 856376c3f26..5ebb00e0092 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -3,6 +3,7 @@
 	icon_state = "alien"
 	pass_flags = PASSTABLE
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
+	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
 	limb_destroyer = 1
 	var/obj/item/r_store = null
 	var/obj/item/l_store = null
@@ -65,8 +66,8 @@
 			visible_message("<span class='danger'>[usr] tries to empty [src]'s pouches.</span>", \
 							"<span class='userdanger'>[usr] tries to empty [src]'s pouches.</span>")
 			if(do_mob(usr, src, POCKET_STRIP_DELAY * 0.5))
-				unEquip(r_store)
-				unEquip(l_store)
+				dropItemToGround(r_store)
+				dropItemToGround(l_store)
 
 /mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
 	playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1)  //Alien roars when starting to break free
diff --git a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
index a085a66055d..1248861062c 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/inventory.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/humanoid/unEquip(obj/item/I)
+/mob/living/carbon/alien/humanoid/doUnEquip(obj/item/I)
 	. = ..()
 	if(!. || !I)
 		return
diff --git a/code/modules/mob/living/carbon/alien/larva/inventory.dm b/code/modules/mob/living/carbon/alien/larva/inventory.dm
index 3cb46a54b2e..239d21e7f5d 100644
--- a/code/modules/mob/living/carbon/alien/larva/inventory.dm
+++ b/code/modules/mob/living/carbon/alien/larva/inventory.dm
@@ -1,3 +1,3 @@
 //can't unequip since it can't equip anything
-/mob/living/carbon/alien/larva/unEquip(obj/item/W)
+/mob/living/carbon/alien/larva/doUnEquip(obj/item/W)
 	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 9098171b8bf..8c63836c783 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -55,8 +55,8 @@ var/const/MAX_ACTIVE_TIME = 400
 
 /obj/item/clothing/mask/facehugger/attack(mob/living/M, mob/user)
 	..()
-	user.unEquip(src)
-	Attach(M)
+	if(user.temporarilyRemoveItemFromInventory(src))
+		Attach(M)
 
 /obj/item/clothing/mask/facehugger/examine(mob/user)
 	..()
@@ -157,7 +157,7 @@ var/const/MAX_ACTIVE_TIME = 400
 			if(W.flags & NODROP)
 				return FALSE
 			if(!istype(W,/obj/item/clothing/mask/facehugger))
-				target.unEquip(W)
+				target.dropItemToGround(W)
 				target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
 									"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
 
@@ -168,7 +168,7 @@ var/const/MAX_ACTIVE_TIME = 400
 									"<span class='userdanger'>[src] smashes against [H]'s [H.head]!</span>")
 				Die()
 				return FALSE
-		src.loc = target
+		forceMove(target)
 		target.equip_to_slot_if_possible(src, slot_wear_mask, 0, 1, 1)
 	// early returns and validity checks done: attach.
 	attached++
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a9b4e7ad4ba..772b8bc54d7 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -157,7 +157,7 @@
 
 	else if(!(I.flags & (NODROP|ABSTRACT)))
 		thrown_thing = I
-		unEquip(I)
+		dropItemToGround(I)
 
 	if(thrown_thing)
 		visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
@@ -381,8 +381,7 @@
 			update_inv_legcuffed()
 			return
 		else
-			unEquip(I)
-			I.dropped()
+			dropItemToGround(I)
 			return
 		return TRUE
 
@@ -400,7 +399,7 @@
 	if(!I || (I.flags & (NODROP|ABSTRACT)))
 		return
 
-	unEquip(I)
+	dropItemToGround(I)
 
 	var/modifier = 0
 	if(disabilities & CLUMSY)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 40eec866a24..fb01950fa5e 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,6 +1,7 @@
 /mob/living/carbon
 	gender = MALE
 	pressure_resistance = 15
+	possible_a_intents = list(INTENT_HELP, INTENT_HARM)
 	var/list/stomach_contents		= list()
 	var/list/internal_organs		= list()	//List of /obj/item/organ in the mob. They don't go in the contents for some reason I don't want to know.
 	var/list/internal_organs_slot	= list()	//Same as above, but stores "slot ID" - "organ" pairs for easy access.
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 1e50d17e408..cd3c9a533ac 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -33,7 +33,7 @@
 	if(ticker && ticker.mode)
 		sql_report_death(src)
 	if(mind && mind.devilinfo)
-		addtimer(CALLBACK(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src), 0)
+		INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)
 
 /mob/living/carbon/human/proc/makeSkeleton()
 	status_flags |= DISFIGURED
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 9c33fad855c..0671dd11ff0 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -267,11 +267,13 @@
 			if(do_mob(usr, src, POCKET_STRIP_DELAY/delay_denominator)) //placing an item into the pocket is 4 times faster
 				if(pocket_item)
 					if(pocket_item == (pocket_id == slot_r_store ? r_store : l_store)) //item still in the pocket we search
-						unEquip(pocket_item)
+						dropItemToGround(pocket_item)
 				else
 					if(place_item)
-						usr.unEquip(place_item)
-						equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
+						if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE))
+							usr.temporarilyRemoveItemFromInventory(place_item, TRUE)
+							equip_to_slot(place_item, pocket_id, TRUE)
+						//do nothing otherwise
 
 				// Update strip window
 				if(usr.machine == src && in_range(src, usr))
@@ -625,7 +627,7 @@
 /mob/living/carbon/human/singularity_pull(S, current_size)
 	if(current_size >= STAGE_THREE)
 		for(var/obj/item/hand in held_items)
-			if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2)  && unEquip(hand))
+			if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2)  && dropItemToGround(hand))
 				step_towards(hand, src)
 				src << "<span class='warning'>\The [S] pulls \the [hand] from your grip!</span>"
 	rad_act(current_size * 3)
@@ -696,10 +698,10 @@
 	if(dna && dna.check_mutation(HULK))
 		say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 		if(..(I, cuff_break = FAST_CUFFBREAK))
-			unEquip(I)
+			dropItemToGround(I)
 	else
 		if(..())
-			unEquip(I)
+			dropItemToGround(I)
 
 /mob/living/carbon/human/clean_blood()
 	var/mob/living/carbon/human/H = src
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index abf9dffc00c..6bd8d9cef98 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -3,6 +3,7 @@ var/global/default_martial_art = new/datum/martial_art
 	languages_spoken = HUMAN
 	languages_understood = HUMAN
 	hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD)
+	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
 	pressure_resistance = 25
 	//Hair colour and style
 	var/hair_color = "000"
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 75ef76eb08e..66e3b28331d 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -141,14 +141,14 @@
 
 	return not_handled //For future deeper overrides
 
-/mob/living/carbon/human/unEquip(obj/item/I)
+/mob/living/carbon/human/doUnEquip(obj/item/I, force)
 	. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
 	if(!. || !I)
 		return
 
 	if(I == wear_suit)
 		if(s_store)
-			unEquip(s_store, 1) //It makes no sense for your suit storage to stay on you if you drop your suit.
+			dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
 		if(wear_suit.breakouttime) //when unequipping a straightjacket
 			update_action_buttons_icon() //certain action buttons may be usable again.
 		wear_suit = null
@@ -157,13 +157,13 @@
 		update_inv_wear_suit()
 	else if(I == w_uniform)
 		if(r_store)
-			unEquip(r_store, 1) //Again, makes sense for pockets to drop.
+			dropItemToGround(r_store, TRUE) //Again, makes sense for pockets to drop.
 		if(l_store)
-			unEquip(l_store, 1)
+			dropItemToGround(l_store, TRUE)
 		if(wear_id)
-			unEquip(wear_id)
+			dropItemToGround(wear_id)
 		if(belt)
-			unEquip(belt)
+			dropItemToGround(belt)
 		w_uniform = null
 		update_suit_sensors()
 		update_inv_w_uniform()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 2071e7486f3..9718465ad06 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -106,7 +106,7 @@
 	for(var/slot_id in no_equip)
 		var/obj/item/thing = C.get_item_by_slot(slot_id)
 		if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception)))
-			C.unEquip(thing)
+			C.dropItemToGround(thing)
 
 	var/obj/item/organ/heart/heart = C.getorganslot("heart")
 	var/obj/item/organ/lungs/lungs = C.getorganslot("lungs")
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 7b133bda11c..c91b7e370ba 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -236,7 +236,7 @@
 /datum/species/golem/sand/spec_death(gibbed, mob/living/carbon/human/H)
 	H.visible_message("<span class='danger'>[H] turns into a pile of sand!</span>")
 	for(var/obj/item/W in H)
-		H.unEquip(W)
+		H.dropItemToGround(W)
 	for(var/i=1, i <= rand(3,5), i++)
 		new /obj/item/weapon/ore/glass(get_turf(H))
 	qdel(H)
@@ -266,7 +266,7 @@
 	playsound(H, "shatter", 70, 1)
 	H.visible_message("<span class='danger'>[H] shatters!</span>")
 	for(var/obj/item/W in H)
-		H.unEquip(W)
+		H.dropItemToGround(W)
 	for(var/i=1, i <= rand(3,5), i++)
 		new /obj/item/weapon/shard(get_turf(H))
 	qdel(H)
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index f4fd85f5eb5..abd080bfaef 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -32,7 +32,7 @@
 	for(var/V in C.held_items)
 		var/obj/item/I = V
 		if(istype(I))
-			if(C.unEquip(I))
+			if(C.dropItemToGround(I))
 				var/obj/item/zombie_hand/zh = new /obj/item/zombie_hand()
 				C.put_in_hands(zh)
 		else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
@@ -49,7 +49,7 @@
 	. = ..()
 	for(var/obj/item/I in C.held_items)
 		if(istype(I, /obj/item/zombie_hand))
-			C.unEquip(I, TRUE)
+			qdel(I)
 
 
 // Your skin falls off
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 7910244db72..a69f0714f51 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -136,9 +136,9 @@ There are several things that need to be remembered:
 		overlays_standing[UNIFORM_LAYER]	= standing
 
 	else if(!(dna && dna.species.nojumpsuit))
-		// Automatically drop anything in store / id / belt if you're not wearing a uniform.
-		for(var/obj/item/thing in list(r_store, l_store, wear_id, belt))
-			unEquip(thing)
+		// Automatically drop anything in store / id / belt if you're not wearing a uniform.	//CHECK IF NECESARRY
+		for(var/obj/item/thing in list(r_store, l_store, wear_id, belt))						//
+			dropItemToGround(thing)
 
 	apply_overlay(UNIFORM_LAYER)
 	update_mutant_bodyparts()
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index bb7ff6f45b6..3ef5d6e8178 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -88,7 +88,7 @@
 
 	return not_handled
 
-/mob/living/carbon/unEquip(obj/item/I)
+/mob/living/carbon/doUnEquip(obj/item/I)
 	. = ..() //Sets the default return value to what the parent returns.
 	if(!. || !I) //We don't want to set anything to null if the parent returned 0.
 		return
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 8ebd2216186..a3fd57f9c5e 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -149,7 +149,7 @@
 
 		// next to target
 		if(Adjacent(pickupTarget) || Adjacent(pickupTarget.loc))
-			addtimer(CALLBACK(src, .proc/walk2derpless, pickupTarget.loc), 0)
+			INVOKE_ASYNC(src, .proc/walk2derpless, pickupTarget.loc)
 
 			// who cares about these items, i want that one!
 			drop_all_held_items()
@@ -166,7 +166,7 @@
 				if(!pickpocketing)
 					pickpocketing = TRUE
 					M.visible_message("[src] starts trying to take [pickupTarget] from [M]", "[src] tries to take [pickupTarget]!")
-					addtimer(CALLBACK(src, .proc/pickpocket, M), 0)
+					INVOKE_ASYNC(src, .proc/pickpocket, M)
 
 		else
 			if(pickupTimer >= 8)
@@ -174,7 +174,7 @@
 				pickupTarget = null
 				pickupTimer = 0
 			else
-				addtimer(CALLBACK(src, .proc/walk2derpless, pickupTarget.loc), 0)
+				INVOKE_ASYNC(src, .proc/walk2derpless, pickupTarget.loc)
 
 		return TRUE
 
@@ -229,7 +229,7 @@
 				return TRUE
 
 			if(target != null)
-				addtimer(CALLBACK(src, .proc/walk2derpless, target), 0)
+				INVOKE_ASYNC(src, .proc/walk2derpless, target)
 
 			// pickup any nearby weapon
 			if(!pickupTarget && prob(MONKEY_WEAPON_PROB))
@@ -308,7 +308,7 @@
 
 			if(target.pulledby != src && !istype(target.pulledby, /mob/living/carbon/monkey/))
 
-				addtimer(CALLBACK(src, .proc/walk2derpless, target.loc), 0)
+				INVOKE_ASYNC(src, .proc/walk2derpless, target.loc)
 
 				if(Adjacent(target) && isturf(target.loc))
 					a_intent = INTENT_GRAB
@@ -321,7 +321,7 @@
 						frustration = 0
 
 			else if(!disposing_body)
-				addtimer(CALLBACK(src, .proc/walk2derpless, bodyDisposal.loc), 0)
+				INVOKE_ASYNC(src, .proc/walk2derpless, bodyDisposal.loc)
 
 				if(Adjacent(bodyDisposal))
 					disposing_body = TRUE
@@ -345,8 +345,7 @@
 		for(var/obj/item/I in M.held_items)
 			if(I == pickupTarget)
 				M.visible_message("<span class='danger'>[src] snatches [pickupTarget] from [M].</span>", "<span class='userdanger'>[src] snatched [pickupTarget]!</span>")
-				M.unEquip(pickupTarget)
-				if(!qdeleted(pickupTarget))
+				if(M.temporarilyRemoveItemFromInventory(pickupTarget) && !qdeleted(pickupTarget))
 					equip_item(pickupTarget)
 	pickpocketing = FALSE
 	pickupTarget = null
@@ -453,5 +452,5 @@
 
 /mob/living/carbon/monkey/proc/monkeyDrop(var/obj/item/A)
 	if(A)
-		unEquip(A, 1)
+		dropItemToGround(A, TRUE)
 		update_icons()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 76677b2ac95..db95437256d 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -627,11 +627,11 @@
 			if(islist(where))
 				var/list/L = where
 				if(what == who.get_item_for_held_index(L[2]))
-					who.unEquip(what)
-					add_logs(src, who, "stripped", addition="of [what]")
+					if(who.dropItemToGround(what))
+						add_logs(src, who, "stripped", addition="of [what]")
 			if(what == who.get_item_by_slot(where))
-				who.unEquip(what)
-				add_logs(src, who, "stripped", addition="of [what]")
+				if(who.dropItemToGround(what))
+					add_logs(src, who, "stripped", addition="of [what]")
 
 // The src mob is trying to place an item on someone
 // Override if a certain mob should be behave differently when placing items (can't, for example)
@@ -642,25 +642,26 @@
 		return
 	if(what)
 		var/list/where_list
+		var/final_where
+
 		if(islist(where))
 			where_list = where
-			if(!what.mob_can_equip(who, src, where[1], 1))
-				src << "<span class='warning'>\The [what.name] doesn't fit in that place!</span>"
-				return
+			final_where = where[1]
 		else
-			if(!what.mob_can_equip(who, src, where, 1))
-				src << "<span class='warning'>\The [what.name] doesn't fit in that place!</span>"
-				return
+			final_where = where
+
+		if(!what.mob_can_equip(who, src, final_where, TRUE))
+			src << "<span class='warning'>\The [what.name] doesn't fit in that place!</span>"
+			return
+
 		visible_message("<span class='notice'>[src] tries to put [what] on [who].</span>")
 		if(do_mob(src, who, what.put_on_delay))
-			if(what && Adjacent(who))
-				unEquip(what)
-				if(where_list)
-					who.put_in_hand(what, where_list[2])
-				else
-					who.equip_to_slot_if_possible(what, where, 0, 1)
-				add_logs(src, who, "equipped", what)
-
+			if(what && Adjacent(who) && what.mob_can_equip(who, src, final_where, TRUE))
+				if(temporarilyRemoveItemFromInventory(what))
+					if(where_list)
+						who.put_in_hand(what, where_list[2])
+					else
+						who.equip_to_slot(what, where, TRUE)
 
 /mob/living/singularity_pull(S, current_size)
 	if(current_size >= STAGE_SIX)
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index cab2148d475..50758e00c5f 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -26,12 +26,10 @@
 		P.visible_message("<span class='notice'>[src] ejects itself from [P]!</span>")
 	if(istype(card.loc, /mob/living))
 		var/mob/living/L = card.loc
-		if(!L.unEquip(card))
+		if(!L.transferItemToLoc(card, src))
 			src << "<span class='warning'>Error: Unable to expand to mobile form. Chassis is restrained by some device or person.</span>"
 			return FALSE
-	var/turf/T = get_turf(card)
-	forceMove(T)
-	card.forceMove(src)
+	forceMove(get_turf(card))
 	if(client)
 		client.perspective = EYE_PERSPECTIVE
 		client.eye = src
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index a15d335cff2..1266afa7960 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -5,7 +5,7 @@
 		user << "<span class='notice'>You begin to place [I] on [src]'s head...</span>"
 		src << "<span class='notice'>[user] is placing [I] on your head...</span>"
 		if(do_after(user, 30, target = src))
-			user.unEquip(I, 1)
+			user.temporarilyRemoveItemFromInventory(I, TRUE)
 			place_on_head(I)
 			return
 	if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt.
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 95bd7d599c8..f1ca05a1230 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -178,7 +178,7 @@
 	R.module = RM
 	R.update_module_innate()
 	RM.rebuild_modules()
-	addtimer(CALLBACK(RM, .proc/do_transform_animation), 0)
+	INVOKE_ASYNC(RM, .proc/do_transform_animation)
 	qdel(src)
 	return RM
 
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 79ee8f69265..8c39bc1d938 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -11,6 +11,7 @@
 	see_in_dark = 8
 	bubble_icon = "machine"
 	weather_immunities = list("ash")
+	possible_a_intents = list(INTENT_HELP, INTENT_HARM)
 
 	var/syndicate = 0
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index c156cf1fe38..98f055c476e 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -16,14 +16,13 @@
 /obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/bodypart/l_arm/robot) || istype(W, /obj/item/bodypart/r_arm/robot))
-		if(!user.unEquip(W))
+		if(!user.temporarilyRemoveItemFromInventory(W))
 			return
 		qdel(W)
 		var/turf/T = get_turf(loc)
 		var/mob/living/simple_animal/bot/cleanbot/A = new /mob/living/simple_animal/bot/cleanbot(T)
 		A.name = created_name
 		user << "<span class='notice'>You add the robot arm to the bucket and sensor assembly. Beep boop!</span>"
-		user.unEquip(src, 1)
 		qdel(src)
 
 	else if(istype(W, /obj/item/weapon/pen))
@@ -61,7 +60,7 @@
 	switch(build_step)
 		if(0,1)
 			if(istype(W, /obj/item/bodypart/l_leg/robot) || istype(W, /obj/item/bodypart/r_leg/robot))
-				if(!user.unEquip(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				qdel(W)
 				build_step++
@@ -81,7 +80,7 @@
 			else if(istype(W, /obj/item/clothing/suit/bluetag))
 				newcolor = "b"
 			if(newcolor || istype(W, /obj/item/clothing/suit/armor/vest))
-				if(!user.unEquip(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				lasercolor = newcolor
 				qdel(W)
@@ -112,7 +111,7 @@
 					if(!istype(W, /obj/item/clothing/head/helmet))
 						return
 
-			if(!user.unEquip(W))
+			if(!user.temporarilyRemoveItemFromInventory(W))
 				return
 			qdel(W)
 			build_step++
@@ -123,7 +122,7 @@
 
 		if(5)
 			if(isprox(W))
-				if(!user.unEquip(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				qdel(W)
 				build_step++
@@ -163,7 +162,7 @@
 					newname = "taser ED-209 assembly"
 				else
 					return
-			if(!user.unEquip(W))
+			if(!user.temporarilyRemoveItemFromInventory(W))
 				return
 			name = newname
 			build_step++
@@ -183,14 +182,13 @@
 
 		if(9)
 			if(istype(W, /obj/item/weapon/stock_parts/cell))
-				if(!user.unEquip(W))
+				if(!user.temporarilyRemoveItemFromInventory(W))
 					return
 				build_step++
 				user << "<span class='notice'>You complete the ED-209.</span>"
 				var/turf/T = get_turf(src)
 				new /mob/living/simple_animal/bot/ed209(T,created_name,lasercolor)
 				qdel(W)
-				user.unEquip(src, 1)
 				qdel(src)
 
 //Floorbot assemblies
@@ -231,7 +229,6 @@
 		var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
 		user.put_in_hands(B)
 		user << "<span class='notice'>You add the tiles into the empty toolbox. They protrude from the top.</span>"
-		user.unEquip(src, 1)
 		qdel(src)
 	else
 		user << "<span class='warning'>You need 10 floor tiles to start building a floorbot!</span>"
@@ -245,7 +242,6 @@
 		B.created_name = created_name
 		user.put_in_hands(B)
 		user << "<span class='notice'>You add the sensor to the toolbox and tiles.</span>"
-		user.unEquip(src, 1)
 		qdel(src)
 
 	else if(istype(W, /obj/item/weapon/pen))
@@ -265,7 +261,6 @@
 		var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T)
 		A.name = created_name
 		user << "<span class='notice'>You add the robot arm to the odd looking toolbox assembly. Boop beep!</span>"
-		user.unEquip(src, 1)
 		qdel(src)
 	else if(istype(W, /obj/item/weapon/pen))
 		var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
@@ -316,7 +311,6 @@
 	qdel(S)
 	user.put_in_hands(A)
 	user << "<span class='notice'>You add the robot arm to the first aid kit.</span>"
-	user.unEquip(src, 1)
 	qdel(src)
 
 
@@ -333,7 +327,7 @@
 		switch(build_step)
 			if(0)
 				if(istype(W, /obj/item/device/healthanalyzer))
-					if(!user.unEquip(W))
+					if(!user.temporarilyRemoveItemFromInventory(W))
 						return
 					qdel(W)
 					build_step++
@@ -343,7 +337,7 @@
 
 			if(1)
 				if(isprox(W))
-					if(!user.unEquip(W))
+					if(!user.temporarilyRemoveItemFromInventory(W))
 						return
 					qdel(W)
 					build_step++
@@ -352,7 +346,6 @@
 					var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T)
 					S.skin = skin
 					S.name = created_name
-					user.unEquip(src, 1)
 					qdel(src)
 
 //Secbot Assembly
@@ -383,7 +376,6 @@
 		var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
 		user.put_in_hands(A)
 		user << "<span class='notice'>You add the signaler to the helmet.</span>"
-		user.unEquip(src, 1)
 		qdel(src)
 	else
 		return
@@ -405,7 +397,7 @@
 				user << "<span class='notice'>You weld the hole in [src] shut!</span>"
 
 	else if(isprox(I) && (build_step == 1))
-		if(!user.unEquip(I))
+		if(!user.temporarilyRemoveItemFromInventory(I))
 			return
 		build_step++
 		user << "<span class='notice'>You add the prox sensor to [src]!</span>"
@@ -414,7 +406,7 @@
 		qdel(I)
 
 	else if(((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot))) && (build_step == 2))
-		if(!user.unEquip(I))
+		if(!user.temporarilyRemoveItemFromInventory(I))
 			return
 		build_step++
 		user << "<span class='notice'>You add the robot arm to [src]!</span>"
@@ -423,7 +415,7 @@
 		qdel(I)
 
 	else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3))
-		if(!user.unEquip(I))
+		if(!user.temporarilyRemoveItemFromInventory(I))
 			return
 		build_step++
 		user << "<span class='notice'>You complete the Securitron! Beep boop.</span>"
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index eac1dcd042a..77311e79241 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -306,13 +306,13 @@ Auto Patrol[]"},
 	target = null
 	last_found = world.time
 	frustration = 0
-	addtimer(CALLBACK(src, .proc/handle_automated_action), 0) //ensure bot quickly responds
+	INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
 
 /mob/living/simple_animal/bot/ed209/proc/back_to_hunt()
 	anchored = 0
 	frustration = 0
 	mode = BOT_HUNT
-	addtimer(CALLBACK(src, .proc/handle_automated_action), 0) //ensure bot quickly responds
+	INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
 
 // look for a criminal in view of the bot
 
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index f344613cef5..8e6a6296fe4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -130,9 +130,9 @@
 /mob/living/simple_animal/drone/death(gibbed)
 	..(gibbed)
 	if(internal_storage)
-		unEquip(internal_storage)
+		dropItemToGround(internal_storage)
 	if(head)
-		unEquip(head)
+		dropItemToGround(head)
 
 	alert_drones(DRONE_NET_DISCONNECT)
 
@@ -142,9 +142,9 @@
 
 /mob/living/simple_animal/drone/ratvar_act()
 	if(internal_storage)
-		unEquip(internal_storage)
+		dropItemToGround(internal_storage)
 	if(head)
-		unEquip(head)
+		dropItemToGround(head)
 	var/mob/living/simple_animal/drone/cogscarab/ratvar/R = new /mob/living/simple_animal/drone/cogscarab/ratvar(loc)
 	R.setDir(dir)
 	if(mind)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index 61e29c0c76a..d75b7230c9f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -60,7 +60,7 @@
 		L << "<span class='warning'>[drone] is trying to escape!</span>"
 		if(!do_after(drone, 50, target = L))
 			return
-		L.unEquip(src)
+		L.dropItemToGround(src)
 
 	contents -= drone
 	drone.loc = get_turf(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 1437e77e56e..eeacd3ab97d 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -6,7 +6,7 @@
 //Drone hands
 
 
-/mob/living/simple_animal/drone/unEquip(obj/item/I, force)
+/mob/living/simple_animal/drone/doUnEquip(obj/item/I, force)
 	if(..(I,force))
 		update_inv_hands()
 		if(I == head)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 7b49e29ad1c..af3001c2ecf 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -136,7 +136,7 @@ var/global/list/parasites = list() //all currently existing/living guardians
 			visible_message("<span class='danger'><B>\The [src] dies along with its user!</B></span>")
 			summoner.visible_message("<span class='danger'><B>[summoner]'s body is completely consumed by the strain of sustaining [src]!</B></span>")
 			for(var/obj/item/W in summoner)
-				if(!summoner.unEquip(W))
+				if(!summoner.dropItemToGround(W))
 					qdel(W)
 			summoner.dust()
 			death(TRUE)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
index ed24b79cd12..dbfd48502aa 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/dextrous.dm
@@ -22,7 +22,7 @@
 /mob/living/simple_animal/hostile/guardian/dextrous/death(gibbed)
 	..()
 	if(internal_storage)
-		unEquip(internal_storage)
+		dropItemToGround(internal_storage)
 
 /mob/living/simple_animal/hostile/guardian/dextrous/examine(mob/user)
 	if(dextrous)
@@ -58,7 +58,7 @@
 		..() //lose items, then return
 
 //SLOT HANDLING BULLSHIT FOR INTERNAL STORAGE
-/mob/living/simple_animal/hostile/guardian/dextrous/unEquip(obj/item/I, force)
+/mob/living/simple_animal/hostile/guardian/dextrous/doUnEquip(obj/item/I, force)
 	if(..(I,force))
 		update_inv_hands()
 		if(I == internal_storage)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 7244788cd5e..6623271f951 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -88,19 +88,19 @@ Difficulty: Hard
 
 	var/warped = FALSE
 	if(!try_bloodattack())
-		addtimer(CALLBACK(src, .proc/blood_spray), 0)
+		INVOKE_ASYNC(src, .proc/blood_spray)
 		warped = blood_warp()
 		if(warped && prob(100 - anger_modifier))
 			return
 
 	if(prob(90 - anger_modifier) || slaughterlings())
 		if(health > maxHealth * 0.5)
-			addtimer(CALLBACK(src, .proc/charge), 0)
+			INVOKE_ASYNC(src, .proc/charge)
 		else
 			if(prob(70) || warped)
-				addtimer(CALLBACK(src, .proc/triple_charge), 0)
+				INVOKE_ASYNC(src, .proc/triple_charge)
 			else
-				addtimer(CALLBACK(src, .proc/warp_charge), 0)
+				INVOKE_ASYNC(src, .proc/warp_charge)
 
 
 /mob/living/simple_animal/hostile/megafauna/bubblegum/New()
@@ -201,7 +201,7 @@ Difficulty: Hard
 /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack()
 	var/list/targets = get_mobs_on_blood()
 	if(targets.len)
-		addtimer(CALLBACK(src, .proc/bloodattack, targets, prob(50)), 0)
+		INVOKE_ASYNC(src, .proc/bloodattack, targets, prob(50))
 
 		return TRUE
 	return FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index b0d7639d224..df86bd8e931 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -77,7 +77,7 @@ Difficulty: Very Hard
 			double_spiral()
 		else
 			visible_message("<span class='colossus'>\"<b>Judgement.</b>\"</span>")
-			addtimer(CALLBACK(src, .proc/spiral_shoot, rand(0, 1)), 0)
+			INVOKE_ASYNC(src, .proc/spiral_shoot, rand(0, 1))
 
 	else if(prob(20))
 		ranged_cooldown = world.time + 30
@@ -88,7 +88,7 @@ Difficulty: Very Hard
 			blast()
 		else
 			ranged_cooldown = world.time + 40
-			addtimer(CALLBACK(src, .proc/alternating_dir_shots), 0)
+			INVOKE_ASYNC(src, .proc/alternating_dir_shots)
 
 
 /mob/living/simple_animal/hostile/megafauna/colossus/New()
@@ -108,7 +108,7 @@ Difficulty: Very Hard
 /obj/effect/overlay/temp/at_shield/New(new_loc, new_target)
 	..()
 	target = new_target
-	addtimer(CALLBACK(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE), 0)
+	INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE)
 
 /mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P)
 	if(!stat)
@@ -139,8 +139,8 @@ Difficulty: Very Hard
 	visible_message("<span class='colossus'>\"<b>Die.</b>\"</span>")
 
 	sleep(10)
-	addtimer(CALLBACK(src, .proc/spiral_shoot), 0)
-	addtimer(CALLBACK(src, .proc/spiral_shoot, 1), 0)
+	INVOKE_ASYNC(src, .proc/spiral_shoot)
+	INVOKE_ASYNC(src, .proc/spiral_shoot, 1)
 
 /mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = 0, counter_start = 1)
 	var/counter = counter_start
@@ -438,7 +438,7 @@ Difficulty: Very Hard
 	if(..() && ishuman(user) && !(user in affected_targets))
 		var/mob/living/carbon/human/H = user
 		for(var/obj/item/W in H)
-			H.unEquip(W)
+			H.dropItemToGround(W)
 		var/datum/job/clown/C = new /datum/job/clown()
 		C.equip(H)
 		qdel(C)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index 7cf9de1a960..78c3bf3e2d1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -123,7 +123,7 @@ Difficulty: Medium
 
 /obj/effect/overlay/temp/target/New(loc)
 	..()
-	addtimer(CALLBACK(src, .proc/fall), 0)
+	INVOKE_ASYNC(src, .proc/fall)
 
 /obj/effect/overlay/temp/target/proc/fall()
 	var/turf/T = get_turf(src)
@@ -141,15 +141,15 @@ Difficulty: Medium
 
 	if(prob(15 + anger_modifier) && !client)
 		if(health < maxHealth/2)
-			addtimer(CALLBACK(src, .proc/swoop_attack, 1), 0)
+			INVOKE_ASYNC(src, .proc/swoop_attack, 1)
 		else
 			fire_rain()
 
 	else if(prob(10+anger_modifier) && !client)
 		if(health > maxHealth/2)
-			addtimer(CALLBACK(src, .proc/swoop_attack), 0)
+			INVOKE_ASYNC(src, .proc/swoop_attack)
 		else
-			addtimer(CALLBACK(src, .proc/triple_swoop), 0)
+			INVOKE_ASYNC(src, .proc/triple_swoop)
 	else
 		fire_walls()
 
@@ -163,7 +163,7 @@ Difficulty: Medium
 	playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
 
 	for(var/d in cardinal)
-		addtimer(CALLBACK(src, .proc/fire_wall, d), 0)
+		INVOKE_ASYNC(src, .proc/fire_wall, d)
 
 /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir)
 	var/list/hit_things = list(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 4c537c32fb3..ad104e56778 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -114,7 +114,7 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/devour(mob/living/L)
 	for(var/obj/item/W in L)
-		if(!L.unEquip(W))
+		if(!L.dropItemToGround(W))
 			qdel(W)
 	visible_message(
 		"<span class='hierophant_warning'>\"[pick(kill_phrases)]\"\n[src] annihilates [L]!</span>",
@@ -139,7 +139,7 @@ Difficulty: Hard
 /mob/living/simple_animal/hostile/megafauna/hierophant/AttackingTarget()
 	if(!blinking)
 		if(target && isliving(target))
-			addtimer(CALLBACK(src, .proc/melee_blast, get_turf(target)), 0) //melee attacks on living mobs produce a 3x3 blast
+			INVOKE_ASYNC(src, .proc/melee_blast, get_turf(target)) //melee attacks on living mobs produce a 3x3 blast
 		..()
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/DestroySurroundings()
@@ -229,9 +229,9 @@ Difficulty: Hard
 						cross_counter--
 						var/delay = 7
 						if(prob(60))
-							addtimer(CALLBACK(src, .proc/cardinal_blasts, target), 0)
+							INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
 						else
-							addtimer(CALLBACK(src, .proc/diagonal_blasts, target), 0)
+							INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
 							delay = 5 //this one isn't so mean, so do the next one faster(if there is one)
 						sleep(delay)
 					animate(src, color = oldcolor, time = 8)
@@ -268,18 +268,18 @@ Difficulty: Hard
 	else if(prob(70 - anger_modifier)) //a cross blast of some type
 		if(prob(anger_modifier)) //at us?
 			if(prob(anger_modifier * 2) && health < maxHealth * 0.5) //we're super angry do it at all dirs
-				addtimer(CALLBACK(src, .proc/alldir_blasts, src), 0)
+				INVOKE_ASYNC(src, .proc/alldir_blasts, src)
 			else if(prob(60))
-				addtimer(CALLBACK(src, .proc/cardinal_blasts, src), 0)
+				INVOKE_ASYNC(src, .proc/cardinal_blasts, src)
 			else
-				addtimer(CALLBACK(src, .proc/diagonal_blasts, src), 0)
+				INVOKE_ASYNC(src, .proc/diagonal_blasts, src)
 		else //at them?
 			if(prob(anger_modifier * 2) && health < maxHealth * 0.5 && !target_is_slow) //we're super angry do it at all dirs
-				addtimer(CALLBACK(src, .proc/alldir_blasts, target), 0)
+				INVOKE_ASYNC(src, .proc/alldir_blasts, target)
 			else if(prob(60))
-				addtimer(CALLBACK(src, .proc/cardinal_blasts, target), 0)
+				INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
 			else
-				addtimer(CALLBACK(src, .proc/diagonal_blasts, target), 0)
+				INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
 	else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
 		var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
 		chaser_cooldown = world.time + initial(chaser_cooldown)
@@ -288,7 +288,7 @@ Difficulty: Hard
 			OC.moving = 4
 			OC.moving_dir = pick(cardinal - C.moving_dir)
 	else //just release a burst of power
-		addtimer(CALLBACK(src, .proc/burst, get_turf(src)), 0)
+		INVOKE_ASYNC(src, .proc/burst, get_turf(src))
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/diagonal_blasts(mob/victim) //fire diagonal cross blasts with a delay
 	var/turf/T = get_turf(victim)
@@ -299,7 +299,7 @@ Difficulty: Hard
 	sleep(2)
 	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
 	for(var/d in diagonals)
-		addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
+		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/cardinal_blasts(mob/victim) //fire cardinal cross blasts with a delay
 	var/turf/T = get_turf(victim)
@@ -310,7 +310,7 @@ Difficulty: Hard
 	sleep(2)
 	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
 	for(var/d in cardinal)
-		addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
+		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/alldir_blasts(mob/victim) //fire alldir cross blasts with a delay
 	var/turf/T = get_turf(victim)
@@ -321,7 +321,7 @@ Difficulty: Hard
 	sleep(2)
 	new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
 	for(var/d in alldirs)
-		addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
+		INVOKE_ASYNC(src, .proc/blast_wall, T, d)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blast_wall(turf/T, set_dir) //make a wall of blasts beam_range tiles long
 	var/range = beam_range
@@ -340,13 +340,13 @@ Difficulty: Hard
 		return
 	arena_cooldown = world.time + initial(arena_cooldown)
 	for(var/d in cardinal)
-		addtimer(CALLBACK(src, .proc/arena_squares, T, d), 0)
+		INVOKE_ASYNC(src, .proc/arena_squares, T, d)
 	for(var/t in RANGE_TURFS(11, T))
 		if(t && get_dist(t, T) == 11)
 			new /obj/effect/overlay/temp/hierophant/wall(t)
 			new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
 	if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you!
-		addtimer(CALLBACK(src, .proc/blink, T), 0)
+		INVOKE_ASYNC(src, .proc/blink, T)
 
 /mob/living/simple_animal/hostile/megafauna/hierophant/proc/arena_squares(turf/T, set_dir) //make a fancy effect extending from the arena target
 	var/turf/previousturf = T
@@ -567,7 +567,7 @@ Difficulty: Hard
 	if(ismineralturf(loc)) //drill mineral turfs
 		var/turf/closed/mineral/M = loc
 		M.gets_drilled(caster)
-	addtimer(CALLBACK(src, .proc/blast), 0)
+	INVOKE_ASYNC(src, .proc/blast)
 
 /obj/effect/overlay/temp/hierophant/blast/proc/blast()
 	var/turf/T = get_turf(src)
@@ -629,7 +629,7 @@ Difficulty: Hard
 		if(H.beacon == src)
 			user << "<span class='notice'>You start removing your hierophant beacon...</span>"
 			H.timer = world.time + 51
-			addtimer(CALLBACK(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update), 0)
+			INVOKE_ASYNC(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update)
 			if(do_after(user, 50, target = src))
 				playsound(src,'sound/magic/Blind.ogg', 200, 1, -4)
 				new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user)
@@ -639,7 +639,7 @@ Difficulty: Hard
 				qdel(src)
 			else
 				H.timer = world.time
-				addtimer(CALLBACK(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update), 0)
+				INVOKE_ASYNC(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update)
 		else
 			user << "<span class='hierophant_warning'>You touch the beacon with the club, but nothing happens.</span>"
 	else
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 52558ca647d..1a7e7e2355f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -728,9 +728,8 @@
 				break
 
 		if(stolen_item)
-			C.unEquip(stolen_item)
+			C.transferItemToLoc(stolen_item, src, TRUE)
 			held_item = stolen_item
-			stolen_item.loc = src
 			visible_message("[src] grabs [held_item] out of [C]'s hand!", "<span class='notice'>You snag [held_item] out of [C]'s hand!</span>", "<span class='italics'>You hear the sounds of wings flapping furiously.</span>")
 			return held_item
 
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index d700f83b35c..2b61f578c97 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -393,7 +393,7 @@
 				else if(canmove && isturf(loc) && prob(33))
 					step(src, pick(cardinal))
 		else if(!AIproc)
-			addtimer(CALLBACK(src, .proc/AIprocess), 0)
+			INVOKE_ASYNC(src, .proc/AIprocess)
 
 /mob/living/simple_animal/slime/handle_automated_movement()
 	return //slime random movement is currently handled in handle_targets()
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 19df9da0c51..f316a4d23a4 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -222,7 +222,7 @@ var/list/slime_colours = list("rainbow", "grey", "purple", "metal", "orange",
 			Feedon(Food)
 	..()
 
-/mob/living/simple_animal/slime/unEquip(obj/item/W)
+/mob/living/simple_animal/slime/doUnEquip(obj/item/W)
 	return
 
 /mob/living/simple_animal/slime/start_pulling(atom/movable/AM)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 184f4b7bbb6..e55963b7ec7 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -73,6 +73,7 @@
 	var/weakened = 0
 	var/losebreath = 0//Carbon
 	var/a_intent = INTENT_HELP//Living
+	var/list/possible_a_intents = null//Living
 	var/m_intent = MOVE_INTENT_RUN//Living
 	var/lastKnownIP = null
 	var/atom/movable/buckled = null//Living
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 82cc250500b..2624ba4deaa 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -291,49 +291,34 @@ var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace o
 	set name = "a-intent"
 	set hidden = 1
 
-	if(ishuman(src) || isalienadult(src) || isbrain(src))
-		switch(input)
-			if(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
-				a_intent = input
-			if(INTENT_HOTKEY_RIGHT)
-				switch (a_intent)
-					if(INTENT_HELP)
-						a_intent = INTENT_DISARM
-					if(INTENT_DISARM)
-						a_intent = INTENT_GRAB
-					if(INTENT_GRAB)
-						a_intent = INTENT_HARM
-					if(INTENT_HARM)
-						a_intent = INTENT_HELP
-			if(INTENT_HOTKEY_LEFT)
-				switch (a_intent)
-					if(INTENT_HELP)
-						a_intent = INTENT_HARM
-					if(INTENT_DISARM)
-						a_intent = INTENT_HELP
-					if(INTENT_GRAB)
-						a_intent = INTENT_DISARM
-					if(INTENT_HARM)
-						a_intent = INTENT_GRAB
+	if(!possible_a_intents || !possible_a_intents.len)
+		return
 
-		if(hud_used && hud_used.action_intent)
-			hud_used.action_intent.icon_state = "[a_intent]"
+	if(input in possible_a_intents)
+		a_intent = input
+	else
+		var/current_intent = possible_a_intents.Find(a_intent)
 
-	else if(iscyborg(src) || ismonkey(src) || islarva(src))
-		switch(input)
-			if(INTENT_HELP)
-				a_intent = INTENT_HELP
-			if(INTENT_HARM)
-				a_intent = INTENT_HARM
-			if(INTENT_HOTKEY_RIGHT, INTENT_HOTKEY_LEFT)
-				switch (a_intent)
-					if(INTENT_HELP)
-						a_intent = INTENT_HARM
-					if(INTENT_HARM)
-						a_intent = INTENT_HELP
+		if(!current_intent)
+			// Failsafe. Just in case some badmin was playing with VV.
+			current_intent = 1
+
+		if(input == INTENT_HOTKEY_RIGHT)
+			current_intent += 1
+		if(input == INTENT_HOTKEY_LEFT)
+			current_intent -= 1
+
+		// Handle looping
+		if(current_intent < 1)
+			current_intent = possible_a_intents.len
+		if(current_intent > possible_a_intents.len)
+			current_intent = 1
+
+		a_intent = possible_a_intents[current_intent]
+
+	if(hud_used && hud_used.action_intent)
+		hud_used.action_intent.icon_state = "[a_intent]"
 
-		if(hud_used && hud_used.action_intent)
-			hud_used.action_intent.icon_state = "[a_intent]"
 
 /proc/is_blind(A)
 	if(ismob(A))
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index a3f12c4d174..12df41b4288 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -12,7 +12,7 @@
 			return 1
 	return (!mover.density || !density || lying)
 
-
+
 //The byond version of these verbs wait for the next tick before acting.
 //	instant verbs however can run mid tick or even during the time between ticks.
 /client/verb/moveup()
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 5fe7e06b5ca..02f0821bd54 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -32,7 +32,7 @@
 		var/Itemlist = get_equipped_items()
 		Itemlist += held_items
 		for(var/obj/item/W in Itemlist)
-			unEquip(W)
+			dropItemToGround(W)
 
 	//Make mob invisible and spawn animation
 	notransform = 1
@@ -174,14 +174,9 @@
 		var/Itemlist = get_equipped_items()
 		Itemlist += held_items
 		for(var/obj/item/W in Itemlist)
-			unEquip(W)
+			dropItemToGround(W, TRUE)
 			if (client)
 				client.screen -= W
-			if (W)
-				W.loc = loc
-				W.dropped(src)
-				W.layer = initial(W.layer)
-				W.plane = initial(W.plane)
 
 
 
@@ -308,7 +303,7 @@
 	if (notransform)
 		return
 	for(var/obj/item/W in src)
-		unEquip(W)
+		dropItemToGround(W)
 	regenerate_icons()
 	notransform = 1
 	canmove = 0
@@ -352,7 +347,7 @@
 		if(delete_items)
 			qdel(W)
 		else
-			unEquip(W)
+			dropItemToGround(W)
 	regenerate_icons()
 	notransform = 1
 	canmove = 0
@@ -403,7 +398,7 @@
 	if (notransform)
 		return
 	for(var/obj/item/W in src)
-		unEquip(W)
+		dropItemToGround(W)
 	regenerate_icons()
 	notransform = 1
 	canmove = 0
@@ -433,7 +428,7 @@
 	if (notransform)
 		return
 	for(var/obj/item/W in src)
-		unEquip(W)
+		dropItemToGround(W)
 	regenerate_icons()
 	notransform = 1
 	canmove = 0
@@ -475,7 +470,7 @@
 	if (notransform)
 		return
 	for(var/obj/item/W in src)
-		unEquip(W)
+		dropItemToGround(W)
 	regenerate_icons()
 	notransform = 1
 	canmove = 0
@@ -504,7 +499,7 @@
 	if(notransform)
 		return
 	for(var/obj/item/W in src)
-		unEquip(W)
+		dropItemToGround(W)
 
 	regenerate_icons()
 	notransform = 1
diff --git a/code/modules/modular_computers/computers/item/computer_components.dm b/code/modules/modular_computers/computers/item/computer_components.dm
index 0f27580a27f..be032a3ec5b 100644
--- a/code/modules/modular_computers/computers/item/computer_components.dm
+++ b/code/modules/modular_computers/computers/item/computer_components.dm
@@ -17,13 +17,12 @@
 	if(!can_install_component(H, user))
 		return FALSE
 
-	if(user && !user.unEquip(H))
+	if(user && !user.transferItemToLoc(H, src))
 		return FALSE
 
 	all_components[H.device_type] = H
 
 	user << "<span class='notice'>You install \the [H] into \the [src].</span>"
-	H.forceMove(src)
 	H.holder = src
 	H.on_install(src, user)
 
diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm
index 9e27b433c7a..63b6a33e56e 100644
--- a/code/modules/modular_computers/hardware/ai_slot.dm
+++ b/code/modules/modular_computers/hardware/ai_slot.dm
@@ -32,13 +32,10 @@
 	if(stored_card)
 		user << "<span class='warning'>You try to insert \the [I] into \the [src], but the slot is occupied.</span>"
 		return FALSE
-	if(user && !user.unEquip(I))
+	if(user && !user.transferItemToLoc(I, src))
 		return FALSE
 
-
 	stored_card = I
-
-	I.forceMove(src)
 	user << "<span class='notice'>You insert \the [I] into \the [src].</span>"
 
 	return TRUE
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index ea61fc4ba19..92df5dfde8a 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -28,11 +28,10 @@
 		user << "<span class='warning'>This power cell is too large for \the [holder]!</span>"
 		return FALSE
 
-	if(user && !user.unEquip(I))
+	if(user && !user.transferItemToLoc(I, src))
 		return FALSE
 
 	battery = I
-	I.forceMove(src)
 	user << "<span class='notice'>You connect \the [I] to \the [src].</span>"
 
 	return TRUE
diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm
index e865353d21e..c038fd09b39 100644
--- a/code/modules/modular_computers/hardware/card_slot.dm
+++ b/code/modules/modular_computers/hardware/card_slot.dm
@@ -46,14 +46,13 @@
 	if(stored_card && stored_card2)
 		user << "<span class='warning'>You try to insert \the [I] into \the [src], but its slots are occupied.</span>"
 		return FALSE
-	if(user && !user.unEquip(I))
+	if(user && !user.transferItemToLoc(I, src))
 		return FALSE
 
 	if(!stored_card)
 		stored_card = I
 	else
 		stored_card2 = I
-	I.forceMove(src)
 	user << "<span class='notice'>You insert \the [I] into \the [src].</span>"
 
 	return TRUE
diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm
index 6aedcea72e1..294ed329b08 100644
--- a/code/modules/modular_computers/hardware/printer.dm
+++ b/code/modules/modular_computers/hardware/printer.dm
@@ -40,13 +40,12 @@
 
 /obj/item/weapon/computer_hardware/printer/try_insert(obj/item/I, mob/living/user = null)
 	if(istype(I, /obj/item/weapon/paper))
-		if(user && !user.unEquip(I))
-			return FALSE
-
 		if(stored_paper >= max_paper)
 			user << "<span class='warning'>You try to add \the [I] into [src], but its paper bin is full!</span>"
 			return FALSE
 
+		if(user && !user.temporarilyRemoveItemFromInventory(I))
+			return FALSE
 		user << "<span class='notice'>You insert \the [I] into [src]'s paper recycler.</span>"
 		qdel(I)
 		stored_paper++
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index 1ef1d02a533..1b1abe220f1 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -69,7 +69,7 @@ It is possible to destroy the net by the occupant or someone else.
 					continue//So all they're left with are shoes and uniform.
 				if(W == H.shoes)
 					continue
-			M.unEquip(W)
+			M.dropItemToGround(W)
 
 		playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
 		new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(M), M.dir)
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm
index de1e78e16d6..bba75d59005 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_sword_recall.dm
@@ -26,13 +26,13 @@
 	if(!ninjacost(cost))
 		if(istype(energyKatana.loc, /mob/living/carbon))
 			var/mob/living/carbon/C = energyKatana.loc
-			C.unEquip(energyKatana)
+			C.transferItemToLoc(energyKatana, get_turf(energyKatana), TRUE)
 
 			//Somebody swollowed my sword, probably the clown doing a circus act.
 			if(energyKatana in C.stomach_contents)
 				C.stomach_contents -= energyKatana
-
-		energyKatana.loc = get_turf(energyKatana)
+		else
+			energyKatana.forceMove(get_turf(energyKatana))
 
 		if(inview) //If we can see the katana, throw it towards ourselves, damaging people as we go.
 			energyKatana.spark_system.start()
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 2944e345900..4b596241853 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -29,9 +29,8 @@
 
 /obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/paper))
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.loc = src
 		toppaper = W
 		user << "<span class='notice'>You clip the paper onto \the [src].</span>"
 		update_icon()
@@ -79,9 +78,8 @@
 				var/obj/item/held = usr.get_active_held_item()
 				if(istype(held, /obj/item/weapon/pen))
 					var/obj/item/weapon/pen/W = held
-					if(!usr.unEquip(W))
+					if(!usr.transferItemToLoc(W, src))
 						return
-					W.loc = src
 					haspen = W
 					usr << "<span class='notice'>You slot [W] into [src].</span>"
 
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 383bc0fe595..3798adac0e0 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -32,9 +32,8 @@
 
 /obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents))
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
-		W.loc = src
 		user << "<span class='notice'>You put [W] into [src].</span>"
 		update_icon()
 	else if(istype(W, /obj/item/weapon/pen))
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 5af98751ff3..12148c61294 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -83,12 +83,9 @@
 /obj/item/weapon/hand_labeler/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/hand_labeler_refill))
-		if(!user.unEquip(I))
-			return
 		user << "<span class='notice'>You insert [I] into [src].</span>"
 		qdel(I)
-		labels_left = initial(labels_left)
-		return
+		labels_left = initial(labels_left)	//Yes, it's capped at its initial value
 
 /obj/item/weapon/hand_labeler/borg
 	name = "cyborg-hand labeler"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 43a3db65dff..ca8e06860d2 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -325,7 +325,7 @@
 		if(user.disabilities & CLUMSY && prob(10))
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 								"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
-			user.unEquip(P)
+			user.dropItemToGround(P)
 			user.adjust_fire_stacks(1)
 			user.IgniteMob()
 			return
@@ -333,7 +333,7 @@
 		if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper
 			return
 
-		user.unEquip(src)
+		user.dropItemToGround(src)
 		user.visible_message("<span class='danger'>[user] lights [src] ablaze with [P]!</span>", "<span class='danger'>You light [src] on fire!</span>")
 		fire_act()
 
diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm
index 3d61ae7c687..becfab8b41b 100644
--- a/code/modules/paperwork/paper_cutter.dm
+++ b/code/modules/paperwork/paper_cutter.dm
@@ -101,9 +101,10 @@
 	else if(istype(over_object, /obj/screen/inventory/hand))
 		var/obj/screen/inventory/hand/H = over_object
 		if(!remove_item_from_storage(M))
-			if(!M.unEquip(src))
-				return
-		M.put_in_hand(src, H.held_index)
+			M.temporarilyRemoveItemFromInventory(src, TRUE)
+		if(!M.put_in_hand(src, H.held_index))
+			qdel(src)	//rip
+			return
 	add_fingerprint(M)
 
 
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 79878af7a21..9969e51110c 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -1,142 +1,141 @@
-/obj/item/weapon/paper_bin
-	name = "paper bin"
-	desc = "Contains all the paper you'll never need."
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "paper_bin1"
-	item_state = "sheet-metal"
-	throwforce = 0
-	w_class = WEIGHT_CLASS_NORMAL
-	throw_speed = 3
-	throw_range = 7
-	pressure_resistance = 8
-	var/total_paper = 30
-	var/list/papers = list()
-	var/obj/item/weapon/pen/bin_pen
-
-/obj/item/weapon/paper_bin/Initialize(mapload)
-	..()
-	if(!mapload)
-		return
-	var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc
-	if(P && !bin_pen)
-		P.loc = src
-		bin_pen = P
-		update_icon()
-		var/static/warned = FALSE
-		if(!warned)
-			warning("one or more paperbins ate a pen duing initialize()")
-			warned = TRUE
-
-/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
-	if(!total_paper)
-		return
-	..()
-
-/obj/item/weapon/paper_bin/Destroy()
-	if(papers)
-		for(var/i in papers)
-			qdel(i)
-		papers = null
-	. = ..()
-
-/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
-	if(total_paper)
-		total_paper = 0
-		update_icon()
-	..()
-
-/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
-	var/mob/living/M = usr
-	if(!istype(M) || M.incapacitated() || !Adjacent(M))
-		return
-
-	if(over_object == M)
-		M.put_in_hands(src)
-
-	else if(istype(over_object, /obj/screen/inventory/hand))
-		var/obj/screen/inventory/hand/H = over_object
-		if(!remove_item_from_storage(M))
-			if(!M.unEquip(src))
-				return
-		M.put_in_hand(src, H.held_index)
-
-	add_fingerprint(M)
-
-
-/obj/item/weapon/paper_bin/attack_paw(mob/user)
-	return attack_hand(user)
-
-
-/obj/item/weapon/paper_bin/attack_hand(mob/user)
-	if(user.lying)
-		return
-	user.changeNext_move(CLICK_CD_MELEE)
-	if(bin_pen)
-		var/obj/item/weapon/pen/P = bin_pen
-		P.loc = user.loc
-		user.put_in_hands(P)
-		user << "<span class='notice'>You take [P] out of \the [src].</span>"
-		bin_pen = null
-		update_icon()
-	else if(total_paper >= 1)
-		total_paper--
-		update_icon()
-		// If there's any custom paper on the stack, use that instead of creating a new paper.
-		var/obj/item/weapon/paper/P
-		if(papers.len > 0)
-			P = papers[papers.len]
-			papers.Remove(P)
-		else
-			P = new /obj/item/weapon/paper
-			if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
-				if(prob(30))
-					P.info = "<font face=\"[CRAYON_FONT]\" color=\"red\"><b>HONK HONK HONK HONK HONK HONK HONK<br>HOOOOOOOOOOOOOOOOOOOOOONK<br>APRIL FOOLS</b></font>"
-					P.rigged = 1
-					P.updateinfolinks()
-
-		P.loc = user.loc
-		user.put_in_hands(P)
-		user << "<span class='notice'>You take [P] out of \the [src].</span>"
-	else
-		user << "<span class='warning'>[src] is empty!</span>"
-
-	add_fingerprint(user)
-
-
-/obj/item/weapon/paper_bin/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/paper))
-		var/obj/item/weapon/paper/P = I
-		if(!user.unEquip(P))
-			return
-		P.loc = src
-		user << "<span class='notice'>You put [P] in [src].</span>"
-		papers.Add(P)
-		total_paper++
-		update_icon()
-	else if(istype(I, /obj/item/weapon/pen))
-		var/obj/item/weapon/pen/P = I
-		if(!user.unEquip(P))
-			return
-		P.loc = src
-		user << "<span class='notice'>You put [P] in [src].</span>"
-		bin_pen = P
-		update_icon()
-	else
-		return ..()
-
-/obj/item/weapon/paper_bin/examine(mob/user)
-	..()
-	if(total_paper)
-		user << "It contains " + (total_paper > 1 ? "[total_paper] papers" : " one paper")+"."
-	else
-		user << "It doesn't contain anything."
-
-
-/obj/item/weapon/paper_bin/update_icon()
-	if(total_paper < 1)
-		icon_state = "paper_bin0"
-	else
-		icon_state = "paper_bin1"
-	cut_overlays()
-	if(bin_pen)
-		add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state))
+/obj/item/weapon/paper_bin
+	name = "paper bin"
+	desc = "Contains all the paper you'll never need."
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "paper_bin1"
+	item_state = "sheet-metal"
+	throwforce = 0
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 3
+	throw_range = 7
+	pressure_resistance = 8
+	var/total_paper = 30
+	var/list/papers = list()
+	var/obj/item/weapon/pen/bin_pen
+
+/obj/item/weapon/paper_bin/Initialize(mapload)
+	..()
+	if(!mapload)
+		return
+	var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc
+	if(P && !bin_pen)
+		P.loc = src
+		bin_pen = P
+		update_icon()
+		var/static/warned = FALSE
+		if(!warned)
+			warning("one or more paperbins ate a pen duing initialize()")
+			warned = TRUE
+
+/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
+	if(!total_paper)
+		return
+	..()
+
+/obj/item/weapon/paper_bin/Destroy()
+	if(papers)
+		for(var/i in papers)
+			qdel(i)
+		papers = null
+	. = ..()
+
+/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
+	if(total_paper)
+		total_paper = 0
+		update_icon()
+	..()
+
+/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
+	var/mob/living/M = usr
+	if(!istype(M) || M.incapacitated() || !Adjacent(M))
+		return
+
+	if(over_object == M)
+		M.put_in_hands(src)
+
+	else if(istype(over_object, /obj/screen/inventory/hand))
+		var/obj/screen/inventory/hand/H = over_object
+		if(!remove_item_from_storage(M))
+			M.temporarilyRemoveItemFromInventory(src, TRUE)
+		if(!M.put_in_hand(src, H.held_index))
+			qdel(src)
+			return
+
+	add_fingerprint(M)
+
+
+/obj/item/weapon/paper_bin/attack_paw(mob/user)
+	return attack_hand(user)
+
+
+/obj/item/weapon/paper_bin/attack_hand(mob/user)
+	if(user.lying)
+		return
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(bin_pen)
+		var/obj/item/weapon/pen/P = bin_pen
+		P.loc = user.loc
+		user.put_in_hands(P)
+		user << "<span class='notice'>You take [P] out of \the [src].</span>"
+		bin_pen = null
+		update_icon()
+	else if(total_paper >= 1)
+		total_paper--
+		update_icon()
+		// If there's any custom paper on the stack, use that instead of creating a new paper.
+		var/obj/item/weapon/paper/P
+		if(papers.len > 0)
+			P = papers[papers.len]
+			papers.Remove(P)
+		else
+			P = new /obj/item/weapon/paper
+			if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
+				if(prob(30))
+					P.info = "<font face=\"[CRAYON_FONT]\" color=\"red\"><b>HONK HONK HONK HONK HONK HONK HONK<br>HOOOOOOOOOOOOOOOOOOOOOONK<br>APRIL FOOLS</b></font>"
+					P.rigged = 1
+					P.updateinfolinks()
+
+		P.loc = user.loc
+		user.put_in_hands(P)
+		user << "<span class='notice'>You take [P] out of \the [src].</span>"
+	else
+		user << "<span class='warning'>[src] is empty!</span>"
+
+	add_fingerprint(user)
+
+
+/obj/item/weapon/paper_bin/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/paper))
+		var/obj/item/weapon/paper/P = I
+		if(!user.transferItemToLoc(P, src))
+			return
+		user << "<span class='notice'>You put [P] in [src].</span>"
+		papers.Add(P)
+		total_paper++
+		update_icon()
+	else if(istype(I, /obj/item/weapon/pen))
+		var/obj/item/weapon/pen/P = I
+		if(!user.transferItemToLoc(P, src))
+			return
+		user << "<span class='notice'>You put [P] in [src].</span>"
+		bin_pen = P
+		update_icon()
+	else
+		return ..()
+
+/obj/item/weapon/paper_bin/examine(mob/user)
+	..()
+	if(total_paper)
+		user << "It contains " + (total_paper > 1 ? "[total_paper] papers" : " one paper")+"."
+	else
+		user << "It doesn't contain anything."
+
+
+/obj/item/weapon/paper_bin/update_icon()
+	if(total_paper < 1)
+		icon_state = "paper_bin0"
+	else
+		icon_state = "paper_bin1"
+	cut_overlays()
+	if(bin_pen)
+		add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state))
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index b29e0400933..a2726173966 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -47,9 +47,8 @@
 
 /obj/item/weapon/paperplane/attack_self(mob/user)
 	user << "<span class='notice'>You unfold [src].</span>"
-	user.unEquip(src)
-	user.put_in_hands(internalPaper)
 	qdel(src)
+	user.put_in_hands(internalPaper)
 
 /obj/item/weapon/paperplane/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
 	..()
@@ -73,14 +72,14 @@
 		if(user.disabilities & CLUMSY && prob(10))
 			user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
 				"<span class='userdanger'>You miss the [src] and accidentally light yourself on fire!</span>")
-			user.unEquip(P)
+			user.dropItemToGround(P)
 			user.adjust_fire_stacks(1)
 			user.IgniteMob()
 			return
 
 		if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper
 			return
-		user.unEquip(src)
+		user.dropItemToGround(src)
 		user.visible_message("<span class='danger'>[user] lights [src] ablaze with [P]!</span>", "<span class='danger'>You light [src] on fire!</span>")
 		fire_act()
 
@@ -108,7 +107,7 @@
 		if( (!in_range(src, user)) || user.stat || user.restrained() )
 			return
 		user << "<span class='notice'>You fold [src] into the shape of a plane!</span>"
-		user.unEquip(src)
+		user.temporarilyRemoveItemFromInventory(src)
 		I = new /obj/item/weapon/paperplane(loc, src)
 		user.put_in_hands(I)
 	else
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 55eb7d59da7..00210dbc749 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -4,6 +4,7 @@
  *		Camera Film
  *		Photos
  *		Photo Albums
+ *		Picture Frames
  *		AI Photography
  */
 
@@ -53,7 +54,7 @@
 /obj/item/weapon/photo/examine(mob/user)
 	..()
 
-	if(in_range(user, src))
+	if(in_range(src, user))
 		show(user)
 	else
 		user << "<span class='warning'>You need to get closer to get a good look at this photo!</span>"
@@ -168,7 +169,7 @@
 		if(pictures_left)
 			user << "<span class='notice'>[src] still has some film in it!</span>"
 			return
-		if(!user.unEquip(I))
+		if(!user.temporarilyRemoveItemFromInventory(I))
 			return
 		user << "<span class='notice'>You insert [I] into [src].</span>"
 		qdel(I)
@@ -303,7 +304,7 @@
 
 /obj/item/device/camera/proc/printpicture(mob/user, icon/temp, mobs, flag) //Normal camera proc for creating photos
 	var/obj/item/weapon/photo/P = new/obj/item/weapon/photo(get_turf(src))
-	if(Adjacent(user)) //needed because of TK
+	if(in_range(src, user)) //needed because of TK
 		user.put_in_hands(P)
 	var/icon/small_img = icon(temp)
 	var/icon/ic = icon('icons/obj/items.dmi',"photo")
@@ -484,3 +485,124 @@
 	C.toner -= 20	 //Cyborgs are very ineffeicient at printing an image
 	visible_message("[C.name] spits out a photograph from a narrow slot on its chassis.")
 	usr << "<span class='notice'>You print a photograph.</span>"
+
+// Picture frames
+
+/obj/item/weapon/picture_frame
+	name = "picture frame"
+	desc = "The perfect showcase for your favorite deathtrap memories."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "frame-empty"
+	var/obj/item/weapon/photo/displayed
+
+/obj/item/weapon/picture_frame/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/photo))
+		if(!displayed)
+			var/obj/item/weapon/photo/P = I
+			user.unEquip(P)
+			P.forceMove(src)
+			displayed = P
+			update_icon()
+		else
+			user << "<span class=notice>\The [src] already contains a photo.</span>"
+
+	..()
+
+/obj/item/weapon/picture_frame/attack_hand(mob/user)
+	if(user.get_inactive_held_item() != src)
+		..()
+		return
+	if(contents.len)
+		var/obj/item/I = pick(contents)
+		user.put_in_hands(I)
+		user << "<span class='notice'>You carefully remove the photo from \the [src].</span>"
+		displayed = null
+		update_icon()
+
+/obj/item/weapon/picture_frame/attack_self(mob/user)
+	user.examinate(src)
+
+/obj/item/weapon/picture_frame/examine(mob/user)
+	if(user.is_holding(src) && displayed)
+		displayed.show(user)
+	else
+		..()
+
+/obj/item/weapon/picture_frame/update_icon()
+	overlays.Cut()
+	if(displayed)
+		overlays |= getFlatIcon(displayed)
+	else
+		icon_state = initial(icon_state)
+
+/obj/item/weapon/picture_frame/afterattack(atom/target, mob/user, proximity)
+	var/turf/T = target
+	if(!iswallturf(T))
+		return
+	user.visible_message("<span class='notice'>[user] fastens [src] to [T].</span>", \
+						 "<span class='notice'>You attach the sign to [T].</span>")
+	playsound(T, 'sound/items/Deconstruct.ogg', 50, 1)
+	var/obj/structure/sign/picture_frame/PF = new /obj/structure/sign/picture_frame(T)
+	PF.overlays = overlays.Copy()
+	if(displayed)
+		PF.framed = displayed
+	if(contents.len)
+		var/obj/item/I = pick(contents)
+		I.forceMove(PF)
+	qdel(src)
+
+/obj/structure/sign/picture_frame
+	name = "picture frame"
+	desc = "Every time you look it makes you laugh."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "frame-empty"
+	var/obj/item/weapon/photo/framed
+
+/obj/structure/sign/picture_frame/examine(mob/user)
+	if(in_range(src, user) && framed)
+		framed.show(user)
+	else
+		..()
+
+/obj/structure/sign/picture_frame/attackby(obj/item/O, mob/user, params)
+	if(istype(O, /obj/item/weapon/screwdriver))
+		user.visible_message("<span class='notice'>[user] starts removing [src]...</span>", \
+							 "<span class='notice'>You start unfastening [src].</span>")
+		playsound(src, O.usesound, 50, 1)
+		if(!do_after(user, 30*O.toolspeed, target = src))
+			return
+		playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
+		user.visible_message("<span class='notice'>[user] unfastens [src].</span>", \
+							 "<span class='notice'>You unfasten [src].</span>")
+		var/obj/item/weapon/picture_frame/F = new /obj/item/weapon/picture_frame(get_turf(user))
+		if(framed)
+			F.displayed = framed
+			framed = null
+		if(contents.len)
+			var/obj/item/I = pick(contents)
+			I.forceMove(F)
+		F.update_icon()
+		qdel(src)
+
+	else if(istype(O, /obj/item/weapon/photo))
+		if(!framed)
+			var/obj/item/weapon/photo/P = O
+			user.unEquip(P)
+			P.forceMove(src)
+			framed = P
+			update_icon()
+		else
+			user << "<span class=notice>\The [src] already contains a photo.</span>"
+
+	..()
+
+/obj/structure/sign/picture_frame/attack_hand(mob/user)
+	if(framed)
+		framed.show()
+
+/obj/structure/sign/picture_frame/update_icon()
+	overlays.Cut()
+	if(framed)
+		overlays |= getFlatIcon(framed)
+	else
+		icon_state = initial(icon_state)
\ No newline at end of file
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 485165fa681..a5a69a1bf21 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -181,10 +181,9 @@
 			user << "<span class='warning'>There is already a [fueljar] inside!</span>"
 			return
 
-		if(!user.unEquip(W))
+		if(!user.transferItemToLoc(W, src))
 			return
 		fueljar = W
-		W.forceMove(src)
 		user.visible_message("[user.name] loads an [W.name] into the [src.name].", \
 				"<span class='notice'>You load an [W.name].</span>", \
 				"<span class='italics'>You hear a thunk.</span>")
diff --git a/code/modules/projectiles/ammunition/caseless.dm b/code/modules/projectiles/ammunition/caseless.dm
index aa6c47e855c..67c2745a37f 100644
--- a/code/modules/projectiles/ammunition/caseless.dm
+++ b/code/modules/projectiles/ammunition/caseless.dm
@@ -87,9 +87,8 @@
 	else if (istype(A, /obj/item/weapon/pen))
 		if(modified)
 			if(!FD.pen)
-				if(!user.unEquip(A))
+				if(!user.transferItemToLoc(A, FD))
 					return
-				A.forceMove(FD)
 				FD.pen = A
 				FD.damage = 5
 				FD.nodamage = 0
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index a0fae47ea8f..bc2a1f045cb 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -279,13 +279,12 @@
 		if(istype(I, /obj/item/device/flashlight/seclite))
 			var/obj/item/device/flashlight/seclite/S = I
 			if(!gun_light)
-				if(!user.unEquip(I))
+				if(!user.transferItemToLoc(I, src))
 					return
 				user << "<span class='notice'>You click [S] into place on [src].</span>"
 				if(S.on)
 					SetLuminosity(0)
 				gun_light = S
-				I.loc = src
 				update_icon()
 				update_gunlight(user)
 				verbs += /obj/item/weapon/gun/proc/toggle_gunlight
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index a8dd8f9bcbe..ee0744b2753 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -56,21 +56,23 @@
 	if (istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
 		if (!magazine && istype(AM, mag_type))
-			user.remove_from_mob(AM)
-			magazine = AM
-			magazine.forceMove(src)
-			user << "<span class='notice'>You load a new magazine into \the [src].</span>"
-			chamber_round()
-			A.update_icon()
-			update_icon()
-			return 1
+			if(user.transferItemToLoc(AM, src))
+				magazine = AM
+				user << "<span class='notice'>You load a new magazine into \the [src].</span>"
+				chamber_round()
+				A.update_icon()
+				update_icon()
+				return 1
+			else
+				user << "<span class='warning'>You cannot seem to get \the [src] out of your hands!</span>"
+				return
 		else if (magazine)
 			user << "<span class='notice'>There's already a magazine in \the [src].</span>"
 	if(istype(A, /obj/item/weapon/suppressor))
 		var/obj/item/weapon/suppressor/S = A
 		if(can_suppress)
 			if(!suppressed)
-				if(!user.unEquip(A))
+				if(!user.transferItemToLoc(A, src))
 					return
 				user << "<span class='notice'>You screw [S] onto [src].</span>"
 				suppressed = A
@@ -78,7 +80,6 @@
 				S.initial_w_class = w_class
 				fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
 				w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
-				A.loc = src
 				update_icon()
 				return
 			else
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index c53332c22ad..f7337e4ee19 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -34,21 +34,22 @@
 	if(istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
 		if(istype(AM, mag_type))
-			if(magazine)
-				user << "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>"
-				magazine.dropped()
-				magazine.forceMove(get_turf(src.loc))
-				magazine.update_icon()
-				magazine = null
+			var/obj/item/ammo_box/magazine/oldmag = magazine
+			if(user.transferItemToLoc(AM, src))
+				magazine = AM
+				if(oldmag)
+					user << "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>"
+					oldmag.dropped()
+					oldmag.forceMove(get_turf(src.loc))
+					oldmag.update_icon()
+				else
+					user << "<span class='notice'>You insert the magazine into \the [src].</span>"
+				chamber_round()
+				A.update_icon()
+				update_icon()
+				return 1
 			else
-				user << "<span class='notice'>You insert the magazine into \the [src].</span>"
-			user.remove_from_mob(AM)
-			magazine = AM
-			magazine.loc = src
-			chamber_round()
-			A.update_icon()
-			update_icon()
-			return 1
+				user << "<span class='warning'>You cannot seem to get \the [src] out of your hands!</span>"
 
 /obj/item/weapon/gun/ballistic/automatic/ui_action_click()
 	burst_select()
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index dd656687c71..8f8585c29af 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -46,13 +46,13 @@
 
 /obj/item/weapon/minigunpack/attackby(obj/item/weapon/W, mob/user, params)
 	if(W == gun) //Don't need armed check, because if you have the gun assume its armed.
-		user.unEquip(gun,1)
+		user.dropItemToGround(gun, TRUE)
 	else
 		..()
 
 /obj/item/weapon/minigunpack/dropped(mob/user)
 	if(armed)
-		user.unEquip(gun,1)
+		user.dropItemToGround(gun, TRUE)
 
 /obj/item/weapon/minigunpack/MouseDrop(atom/over_object)
 	if(armed)
@@ -67,9 +67,10 @@
 
 			if(istype(over_object, /obj/screen/inventory/hand))
 				var/obj/screen/inventory/hand/H = over_object
-				if(!M.unEquip(src))
+				if(!M.temporarilyRemoveItemFromInventory(src))
 					return
-				M.put_in_hand(src, H.held_index)
+				if(!M.put_in_hand(src, H.held_index))
+					qdel(src)
 
 
 /obj/item/weapon/minigunpack/update_icon()
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index a28f1f0b64d..19f8fbffb2a 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -67,10 +67,9 @@
 	user << "<span class='notice'>As you try to pick up [src], it slips out of your grip..</span>"
 	if(prob(50))
 		user << "<span class='notice'>..and vanishes from your vision! Where the hell did it go?</span>"
-		user.unEquip(src)
 		qdel(src)
 		user.update_icons()
 	else
 		user << "<span class='notice'>..and falls into view. Whew, that was a close one.</span>"
-		user.unEquip(src)
+		user.dropItemToGround(src)
 
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index f1aee97eb44..e4aae72ca6b 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -108,7 +108,7 @@
 			playsound(user, fire_sound, 50, 1)
 			user << "<span class='userdanger'>[src] blows up in your face!</span>"
 			user.take_bodypart_damage(0,20)
-			user.unEquip(src)
+			user.dropItemToGround(src)
 			return 0
 	..()
 
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 1d0dc72e1f6..df867c4444e 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -253,10 +253,10 @@
 				break
 	if(KA.get_remaining_mod_capacity() >= cost)
 		if(.)
+			if(!user.transferItemToLoc(src, KA))
+				return
 			user << "<span class='notice'>You install the modkit.</span>"
 			playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
-			user.unEquip(src)
-			forceMove(KA)
 			KA.modkits += src
 		else
 			user << "<span class='notice'>The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.</span>"
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
index 6972e1adc91..7f44205eca6 100644
--- a/code/modules/projectiles/guns/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -20,9 +20,8 @@
 
 	if((istype(I, /obj/item/weapon/grenade)))
 		if(grenades.len < max_grenades)
-			if(!user.unEquip(I))
+			if(!user.transferItemToLoc(I, src))
 				return
-			I.loc = src
 			grenades += I
 			user << "<span class='notice'>You put the grenade in the grenade launcher.</span>"
 			user << "<span class='notice'>[grenades.len] / [max_grenades] Grenades.</span>"
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 33c45537095..d2281350777 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -53,7 +53,7 @@
 	current_target = target
 	active = TRUE
 	current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
-	addtimer(CALLBACK(current_beam, /datum/beam.proc/Start), 0)
+	INVOKE_ASYNC(current_beam, /datum/beam.proc/Start)
 
 	feedback_add_details("gun_fired","[src.type]")
 
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 3aae4b7e168..8da5ef5aecd 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -52,11 +52,10 @@
 /obj/item/weapon/gun/syringe/attackby(obj/item/A, mob/user, params, show_msg = 1)
 	if(istype(A, /obj/item/weapon/reagent_containers/syringe))
 		if(syringes.len < max_syringes)
-			if(!user.unEquip(A))
+			if(!user.transferItemToLoc(A, src))
 				return
 			user << "<span class='notice'>You load [A] into \the [src].</span>"
 			syringes.Add(A)
-			A.forceMove(src)
 			recharge_newshot()
 			return 1
 		else
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 97b3b0bfb70..c460400839b 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -31,7 +31,7 @@
 				user << "<span class ='notice'>You remove [G]'s old pin.</span>"
 
 			if(!G.pin)
-				if(!user.unEquip(src))
+				if(!user.temporarilyRemoveItemFromInventory(src))
 					return
 				gun_insert(user, G)
 				user << "<span class ='notice'>You insert [src] into [G].</span>"
@@ -45,7 +45,7 @@
 
 /obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G)
 	gun = G
-	loc = gun
+	forceMove(gun)
 	gun.pin = src
 	return
 
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 961aa9a2a08..04a83ca3c05 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -173,7 +173,7 @@
 		Robot.notify_ai(1)
 	else
 		for(var/obj/item/W in contents)
-			if(!M.unEquip(W))
+			if(!M.dropItemToGround(W))
 				qdel(W)
 
 	var/mob/living/new_mob
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 16bfa2674fd..7993e9fe90f 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -255,7 +255,6 @@
 	else if(isprox(O))
 		user << "<span class='notice'>You add [O] to [src].</span>"
 		qdel(O)
-		user.unEquip(src)
 		qdel(src)
 		user.put_in_hands(new /obj/item/weapon/bucket_sensor)
 	else
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9520ec001be..9bd316d467e 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -43,19 +43,12 @@
 							"<span class='userdanger'>[user] forces [M] to [apply_method] [src].</span>")
 
 
-	user.unEquip(src) //icon update
 	add_logs(user, M, "fed", reagentlist(src))
-	loc = M //Put the pill inside the mob. This fixes the issue where the pill appears to drop to the ground after someone eats it.
-
 	if(reagents.total_volume)
 		reagents.reaction(M, apply_type)
 		reagents.trans_to(M, reagents.total_volume)
-		qdel(src)
-		return 1
-	else
-		qdel(src)
-		return 1
-	return 0
+	qdel(src)
+	return 1
 
 
 /obj/item/weapon/reagent_containers/pill/afterattack(obj/target, mob/user , proximity)
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index dd001cfa404..11bba1f0d25 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -396,7 +396,7 @@
 	updateDialog()
 
 	if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power
-		addtimer(CALLBACK(src, .proc/flush), 0)
+		INVOKE_ASYNC(src, .proc/flush)
 
 	if(stat & NOPOWER) // won't charge if no power
 		return
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 9feb23f4e47..876309b60ee 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -82,7 +82,7 @@
 		AM.ex_act()
 
 /obj/item/smallDelivery/attack_self(mob/user)
-	user.unEquip(src)
+	user.temporarilyRemoveItemFromInventory(src, TRUE)
 	for(var/X in contents)
 		var/atom/movable/AM = X
 		user.put_in_hands(AM)
@@ -92,7 +92,7 @@
 /obj/item/smallDelivery/attack_self_tk(mob/user)
 	if(ismob(loc))
 		var/mob/M = loc
-		M.unEquip(src)
+		M.temporarilyRemoveItemFromInventory(src, TRUE)
 		for(var/X in contents)
 			var/atom/movable/AM = X
 			M.put_in_hands(AM)
diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
index 475f80a2425..c59850198e3 100644
--- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
@@ -29,7 +29,7 @@
 			else
 				meat_counter ++
 			for(var/obj/item/W in H)
-				H.unEquip(W)
+				H.dropItemToGround(W)
 			H.gib()
 			adjustHealth(-maxHealth * 0.05)//restores 5% hp of tendril
 
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 58479c0ff55..ee88e2e79cc 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -18,10 +18,10 @@
 	. = ..()
 	if(!.)
 		return
-	addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE)
+	INVOKE_ASYNC(src, .proc/close)
 	// Close any attached airlocks as well
 	for(var/obj/machinery/door/D in orange(1, src))
-		addtimer(CALLBACK(src, .proc/close), 0, TIMER_UNIQUE)
+		INVOKE_ASYNC(src, .proc/close)
 
 /obj/machinery/door/airlock/onShuttleMove()
 	shuttledocked = 0
diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm
index a63d91c6437..0603fe2fc46 100644
--- a/code/modules/spells/spell_types/barnyard.dm
+++ b/code/modules/spells/spell_types/barnyard.dm
@@ -42,7 +42,7 @@
 	magichead.flags_inv = null
 	target.visible_message("<span class='danger'>[target]'s face lights up in fire, and after the event a barnyard animal's head takes it's place!</span>", \
 						   "<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a barnyard animal!</span>")
-	if(!target.unEquip(target.wear_mask))
+	if(!target.dropItemToGround(target.wear_mask))
 		qdel(target.wear_mask)
 	target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
 	playsound(get_turf(target), mSounds[randM], 50, 1)
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index cbc87cd40ff..d4232fb4471 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -20,7 +20,7 @@
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets,mob/user = usr) //magnets, so mostly hardcoded
 	playsound(get_turf(user), 'sound/magic/Ethereal_Enter.ogg', 50, 1, -1)
 	for(var/mob/living/target in targets)
-		addtimer(CALLBACK(src, .proc/do_jaunt, target), 0)
+		INVOKE_ASYNC(src, .proc/do_jaunt, target)
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target)
 	target.notransform = 1
diff --git a/code/modules/spells/spell_types/knock.dm b/code/modules/spells/spell_types/knock.dm
index 0deacc1c075..af70ed52b17 100644
--- a/code/modules/spells/spell_types/knock.dm
+++ b/code/modules/spells/spell_types/knock.dm
@@ -16,9 +16,9 @@
 	user << sound("sound/magic/Knock.ogg")
 	for(var/turf/T in targets)
 		for(var/obj/machinery/door/door in T.contents)
-			addtimer(CALLBACK(src, .proc/open_door, door), 0)
+			INVOKE_ASYNC(src, .proc/open_door, door)
 		for(var/obj/structure/closet/C in T.contents)
-			addtimer(CALLBACK(src, .proc/open_closet, C), 0)
+			INVOKE_ASYNC(src, .proc/open_closet, C)
 
 /obj/effect/proc_holder/spell/aoe_turf/knock/proc/open_door(var/obj/machinery/door/door)
 	if(istype(door, /obj/machinery/door/airlock))
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 1e7fc5ee7f8..aad30a2b469 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -91,7 +91,7 @@
 				if(iscarbon(old_body))
 					var/mob/living/carbon/C = old_body
 					for(var/obj/item/W in C)
-						C.unEquip(W)
+						C.dropItemToGround(W)
 					for(var/X in C.internal_organs)
 						var/obj/item/organ/I = X
 						I.Remove(C)
@@ -134,7 +134,7 @@
 			current_body = M.mind.current
 			if(ishuman(M))
 				var/mob/living/carbon/human/H = M
-				H.unEquip(H.wear_suit)
-				H.unEquip(H.head)
+				H.dropItemToGround(H.wear_suit)
+				H.dropItemToGround(H.head)
 				H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
 				H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
diff --git a/code/modules/spells/spell_types/spacetime_distortion.dm b/code/modules/spells/spell_types/spacetime_distortion.dm
index 8d772a26738..63dae70ac10 100644
--- a/code/modules/spells/spell_types/spacetime_distortion.dm
+++ b/code/modules/spells/spell_types/spacetime_distortion.dm
@@ -82,10 +82,9 @@
 
 /obj/effect/cross_action/spacetime_dist/proc/get_walker(atom/movable/AM)
 	busy = TRUE
-	if(linked_dist)
-		flick("purplesparkles", src)
-		AM.forceMove(get_turf(src))
-		playsound(get_turf(src),sound,70,0)
+	flick("purplesparkles", src)
+	AM.forceMove(get_turf(src))
+	playsound(get_turf(src),sound,70,0)
 	busy = FALSE
 
 /obj/effect/cross_action/spacetime_dist/Crossed(atom/movable/AM)
@@ -93,7 +92,7 @@
 		walk_link(AM)
 
 /obj/effect/cross_action/spacetime_dist/attackby(obj/item/W, mob/user, params)
-	if(user.unEquip(W))
+	if(user.temporarilyRemoveItemFromInventory(W))
 		walk_link(W)
 	else
 		walk_link(user)
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index d082668630e..dd55a88bdb5 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -70,7 +70,7 @@
 							M.loc.visible_message("<span class='caution'>[M] suddenly appears!</span>")
 							item_to_retrieve = null
 							break
-						M.unEquip(item_to_retrieve)
+						M.dropItemToGround(item_to_retrieve)
 
 						if(iscarbon(M)) //Edge case housekeeping
 							var/mob/living/carbon/C = M
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index 44af9335068..979f2623f41 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -67,7 +67,7 @@
 				else
 					H.visible_message("<span class='warning'>[user] jams [src] into [H]'s empty socket!</span>",\
 					"<span class='notice'>[user] forces [src] into your empty socket, and it locks into place!</span>")
-				user.unEquip(src,1)
+				user.temporarilyRemoveItemFromInventory(src, TRUE)
 				attach_limb(C)
 				return
 	..()
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 32bff216855..7cd553c5931 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -85,7 +85,7 @@
 	update_limb(1)
 	C.bodyparts -= src
 	if(held_index)
-		C.unEquip(owner.get_item_for_held_index(held_index), 1)
+		C.dropItemToGround(owner.get_item_for_held_index(held_index), 1)
 		C.hand_bodyparts[held_index] = null
 
 	owner = null
@@ -162,7 +162,7 @@
 			if(R)
 				R.update_icon()
 		if(C.gloves)
-			C.unEquip(C.gloves, 1)
+			C.dropItemToGround(C.gloves, TRUE)
 		C.update_inv_gloves() //to remove the bloody hands overlay
 
 
@@ -180,32 +180,30 @@
 			if(L)
 				L.update_icon()
 		if(C.gloves)
-			C.unEquip(C.gloves, 1)
+			C.dropItemToGround(C.gloves, TRUE)
 		C.update_inv_gloves() //to remove the bloody hands overlay
 
 
 /obj/item/bodypart/r_leg/drop_limb(special)
 	if(owner && !special)
-		owner.Weaken(2)
 		if(owner.legcuffed)
 			owner.legcuffed.loc = owner.loc
 			owner.legcuffed.dropped(owner)
 			owner.legcuffed = null
 			owner.update_inv_legcuffed()
 		if(owner.shoes)
-			owner.unEquip(owner.shoes, 1)
+			owner.dropItemToGround(owner.shoes, TRUE)
 	..()
 
 /obj/item/bodypart/l_leg/drop_limb(special) //copypasta
 	if(owner && !special)
-		owner.Weaken(2)
 		if(owner.legcuffed)
 			owner.legcuffed.loc = owner.loc
 			owner.legcuffed.dropped(owner)
 			owner.legcuffed = null
 			owner.update_inv_legcuffed()
 		if(owner.shoes)
-			owner.unEquip(owner.shoes, 1)
+			owner.dropItemToGround(owner.shoes, TRUE)
 	..()
 
 /obj/item/bodypart/head/drop_limb(special)
@@ -213,7 +211,7 @@
 		//Drop all worn head items
 		for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head))
 			var/obj/item/I = X
-			owner.unEquip(I, 1)
+			owner.dropItemToGround(I, TRUE)
 	name = "[owner.real_name]'s head"
 	..()
 
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index 85d4e87055f..2bc650656f5 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -270,4 +270,4 @@
 					U.adjusted = DIGITIGRADE_STYLE
 				H.update_inv_w_uniform()
 		if(H.shoes && !swap_back)
-			H.unEquip(H.shoes)
+			H.dropItemToGround(H.shoes)
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 24a9622a33d..6d0001c4211 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -61,9 +61,8 @@
 			user << "<span class='warning'>You have already inserted a cell!</span>"
 			return
 		else
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(W, src))
 				return
-			W.loc = src
 			src.cell = W
 			user << "<span class='notice'>You insert the cell.</span>"
 	else if(istype(W, /obj/item/stack/cable_coil))
@@ -118,9 +117,8 @@
 			user << "<span class='warning'>You can't use a broken flash!</span>"
 			return
 		else
-			if(!user.unEquip(W))
+			if(!user.transferItemToLoc(F, src))
 				return
-			F.loc = src
 			if(src.flash1)
 				src.flash2 = F
 			else
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index a9dcf674556..86e497f1511 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -72,8 +72,7 @@
 		var/obj/item/device/assembly/flash/F = holder
 		F.SetLuminosity(0)
 
-	owner.unEquip(holder, 1)
-	holder.forceMove(src)
+	owner.transferItemToLoc(holder, src, TRUE)
 	holder = null
 	playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
 
@@ -96,7 +95,7 @@
 	var/obj/item/arm_item = owner.get_active_held_item()
 
 	if(arm_item)
-		if(!owner.unEquip(arm_item))
+		if(!owner.dropItemToGround(arm_item))
 			owner << "<span class='warning'>Your [arm_item] interferes with [src]!</span>"
 			return
 		else
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index da3c36dd687..e37e99ffeef 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -60,7 +60,6 @@
 	else
 		target.regenerate_limb(target_zone)
 		user.visible_message("[user] finishes attaching [tool]!", "<span class='notice'>You attach [tool].</span>")
-		user.unEquip(tool)
 		qdel(tool)
 		if(istype(tool, /obj/item/weapon/twohanded/required/chainsaw))
 			var/obj/item/weapon/mounted_chainsaw/new_arm = new(target)
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 2bd0ee63d95..c2944a52b36 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -26,7 +26,6 @@
 	new /obj/effect/particle_effect/sparks(loc)
 	playsound(src.loc, "sparks", 50, 1)
 	blink_mob(user)
-	user.unEquip(src)
 	qdel(src)
 
 /obj/item/weapon/ore/bluespace_crystal/proc/blink_mob(mob/living/L)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 9ddd993c7e6..da73a5935cd 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -68,9 +68,9 @@
 		updateDialog()
 	else if(istype(W, /obj/item/device/gps))
 		if(!inserted_gps)
+			if(!user.transferItemToLoc(W, src))
+				return
 			inserted_gps = W
-			user.unEquip(W)
-			W.loc = src
 			user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "<span class='notice'>You insert [W] into \the [src]'s GPS device slot.</span>")
 	else if(istype(W, /obj/item/device/multitool))
 		var/obj/item/device/multitool/M = W
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index fca574fd09e..2ecd1e92112 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -1076,10 +1076,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
 
 /datum/uplink_item/implants/uplink
 	name = "Uplink Implant"
-	desc = "An implant injected into the body, and later activated at the user's will. It will open a separate uplink \
-			with 10 telecrystals. Undetectable, and excellent for escaping confinement."
+	desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals, must be charged by the use of physical telecrystals. Undetectable (except via surgery), and excellent for escaping confinement."
 	item = /obj/item/weapon/storage/box/syndie_kit/imp_uplink
-	cost = 14
+	cost = 4
+	// An empty uplink is kinda useless.
 	surplus = 0
 
 /datum/uplink_item/implants/adrenal
diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm
index 24c6ecbec74..020369b2ace 100644
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -35,3 +35,28 @@
 /obj/vehicle/space/speedbike/red
 	icon_state = "speedbike_red"
 	overlay_state = "cover_red"
+
+//BM SPEEDWAGON
+
+/obj/vehicle/space/speedbike/speedwagon
+	name = "BM Speedwagon"
+	desc = "Push it to the limit, walk along the razor's edge."
+	icon = 'icons/obj/bike.dmi'
+	icon_state = "speedwagon"
+	layer = LYING_MOB_LAYER
+	overlay_state = "speedwagon_cover"
+
+/obj/vehicle/space/speedbike/speedwagon/Bump(mob/living/A)
+	. = ..()
+	if(A.density && has_buckled_mobs() && (istype(A, /mob/living/carbon/human) && has_buckled_mobs()))
+		var/atom/throw_target = get_edge_target_turf(A, pick(cardinal))
+		A.throw_at(throw_target, 4, 3)
+		A.Weaken(5)
+		A.adjustStaminaLoss(30)
+		A.apply_damage(rand(20,35), BRUTE)
+		visible_message("<span class='danger'>[src] crashes into [A]!</span>")
+		playsound(src, 'sound/effects/bang.ogg', 50, 1)
+
+/obj/vehicle/space/speedbike/speedwagon/buckle_mob(mob/living/M, force = 0, check_loc = 1)
+ 	. = ..()
+		riding_datum = new/datum/riding/space/speedbike/speedwagon
diff --git a/config/config.txt b/config/config.txt
index a0b7c6854b2..fe8764358c5 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -297,3 +297,13 @@ ANNOUNCE_ADMIN_LOGOUT
 #CLIENT_WARN_MESSAGE Byond is really close to releasing 510 beta as the stable release, please take this time to try it out. Reports are that the client preforms better then the version you are using, and also handles network lag better. Shortly after it's release we will end up using 510 client features and you will be forced to update.
 #CLIENT_ERROR_VERSION 509
 #CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade.
+
+## TOPIC RATE LIMITING
+## This allows you to limit how many topic calls (clicking on a interface window) the client can do in any given game second and/or game minute.
+## Admins are exempt from these limits.
+## Hitting the minute limit notifies admins.
+## Set to 0 or comment out to disable.
+SECOND_TOPIC_LIMIT 10
+
+MINUTE_TOPIC_LIMIT 100
+
diff --git a/html/changelog.html b/html/changelog.html
index 6d2f6dd84a9..ab5ad7e1c4c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">30 January 2017</h2>
+			<h3 class="author">MrStonedOne updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Because of abuse, actions on interfaces are throttled. Some bursting is allowed. You will get a message if an action is ignored. Server operators can configure this in config.dm</li>
+			</ul>
+
 			<h2 class="date">29 January 2017</h2>
 			<h3 class="author">BASILMAN YOUR MAIN MAN updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dea5427860f..0877443db23 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9130,3 +9130,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: The SRM-8 Rocket Pods have been loaded with new explosives designed to
       do maximum damage to terrain. These explosives are less effective on people,
       however.
+2017-01-30:
+  MrStonedOne:
+  - rscadd: Because of abuse, actions on interfaces are throttled. Some bursting is
+      allowed. You will get a message if an action is ignored. Server operators can
+      configure this in config.dm
diff --git a/html/changelogs/AutoChangeLog-pr-23168.yml b/html/changelogs/AutoChangeLog-pr-23168.yml
new file mode 100644
index 00000000000..b51a2df26af
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23168.yml
@@ -0,0 +1,4 @@
+author: "bgobandit"
+delete-after: True
+changes: 
+  - rscadd: "Nanotrasen supports the arts. We now offer picture frames!"
diff --git a/html/changelogs/AutoChangeLog-pr-23226.yml b/html/changelogs/AutoChangeLog-pr-23226.yml
new file mode 100644
index 00000000000..60f4a73b40b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23226.yml
@@ -0,0 +1,4 @@
+author: "Joan"
+delete-after: True
+changes: 
+  - rscdel: "Cutting off legs no longer stuns."
diff --git a/html/changelogs/AutoChangeLog-pr-23275.yml b/html/changelogs/AutoChangeLog-pr-23275.yml
new file mode 100644
index 00000000000..497f2141985
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23275.yml
@@ -0,0 +1,7 @@
+author: "coiax"
+delete-after: True
+changes: 
+  - rscdel: "The Syndicate \"Uplink Implant\" now has no TC precharged. You can
+charge it with the use of physical telecrystals. The price has been
+reduced from 14TC to 4TC accordingly. (The uplink implant in the implant
+bundle still has 10TC)."
diff --git a/html/changelogs/AutoChangeLog-pr-23311.yml b/html/changelogs/AutoChangeLog-pr-23311.yml
new file mode 100644
index 00000000000..53a5de2ed1d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23311.yml
@@ -0,0 +1,4 @@
+author: "BASILMAN YOUR MAIN MAN"
+delete-after: True
+changes: 
+  - rscadd: "Added BM SPEEDWAGON THE BEST (AND ONLY) SPACE CAR ON THE MARKET."
diff --git a/html/changelogs/AutoChangeLog-pr-23381.yml b/html/changelogs/AutoChangeLog-pr-23381.yml
new file mode 100644
index 00000000000..9825be7fe6a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23381.yml
@@ -0,0 +1,4 @@
+author: "CoreOverload"
+delete-after: True
+changes: 
+  - tweak: "Clicking item slot now clicks the item in it."
diff --git a/html/changelogs/AutoChangeLog-pr-23424.yml b/html/changelogs/AutoChangeLog-pr-23424.yml
new file mode 100644
index 00000000000..49b6cd6926e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23424.yml
@@ -0,0 +1,6 @@
+author: "Cyberboss"
+delete-after: True
+changes: 
+  - bugfix: "Judicial visors now recharge properly"
+  - bugfix: "Gluon grenades now properly freeze turfs"
+  - bugfix: "Revs are now properly jobbanned"
diff --git a/html/changelogs/AutoChangeLog-pr-23426.yml b/html/changelogs/AutoChangeLog-pr-23426.yml
new file mode 100644
index 00000000000..067b3931734
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23426.yml
@@ -0,0 +1,4 @@
+author: "coiax"
+delete-after: True
+changes: 
+  - rscadd: "Syndicate bombs and nuclear devices now have a minimum timer of 90 seconds."
diff --git a/html/changelogs/AutoChangeLog-pr-23434.yml b/html/changelogs/AutoChangeLog-pr-23434.yml
new file mode 100644
index 00000000000..d771f89fa17
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23434.yml
@@ -0,0 +1,7 @@
+author: "coiax"
+delete-after: True
+changes: 
+  - rscadd: "Camoflaged HUDs given to head revolutionaries now function the same
+as chameleon glasses in the chameleon kit bundle, giving them an action
+button and far more disguise options."
+  - rscadd: "Syndicate thermals are also now more like chameleon glasses as well."
diff --git a/html/changelogs/AutoChangeLog-pr-23444.yml b/html/changelogs/AutoChangeLog-pr-23444.yml
new file mode 100644
index 00000000000..38b47c3539c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23444.yml
@@ -0,0 +1,5 @@
+author: "Joan"
+delete-after: True
+changes: 
+  - tweak: "Volt Void now only allows you to fire 4 volt rays instead of 5, and the damage of each ray has been reduced to 20, from 25."
+  - rscdel: "Cyborgs using Volt Void now take damage if they fail to fire."
diff --git a/html/changelogs/AutoChangeLog-pr-23446.yml b/html/changelogs/AutoChangeLog-pr-23446.yml
new file mode 100644
index 00000000000..1f6e00be5ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23446.yml
@@ -0,0 +1,11 @@
+author: "coiax"
+delete-after: True
+changes: 
+  - rscadd: "You can regain a use of a soapstone by erasing one of your own
+messages. (This means you can remove a message if you don't like the
+colour and want to try rephrasing it to get a better colour). Erasing
+someone else's message still uses a charge."
+  - bugfix: "Fixes bugs where you'd spend a charge without engraving anything."
+  - bugfix: "Fixes a bug where the wrong ckey was entered in the engraving,
+you won't be able to take advantage of the \"recharging\" on messages made
+before this change."
diff --git a/html/changelogs/AutoChangeLog-pr-23452.yml b/html/changelogs/AutoChangeLog-pr-23452.yml
new file mode 100644
index 00000000000..6991abaf5d7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23452.yml
@@ -0,0 +1,5 @@
+author: "Tofa01"
+delete-after: True
+changes: 
+  - bugfix: "[Delta] Fixes area names for Deltastation"
+  - bugfix: "[Delta] Fixes custodial closet being cold all the time on Deltastation"
diff --git a/html/changelogs/AutoChangeLog-pr-23453.yml b/html/changelogs/AutoChangeLog-pr-23453.yml
new file mode 100644
index 00000000000..87045e0c651
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-23453.yml
@@ -0,0 +1,5 @@
+author: "Fox McCloud"
+delete-after: True
+changes: 
+  - tweak: "Plant analyzers will now display plant traits"
+  - tweak: "Plant analyzers will now display all of a grown's genetic reagents"
diff --git a/icons/obj/bike.dmi b/icons/obj/bike.dmi
index db4cb6d1aa0..aa6cbfc30a2 100644
Binary files a/icons/obj/bike.dmi and b/icons/obj/bike.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index cc0f39f5454..45113b60eee 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ