diff --git a/_maps/map_files/Cerestation/cerestation.dmm.rej b/_maps/map_files/Cerestation/cerestation.dmm.rej
deleted file mode 100644
index 21b3032100..0000000000
--- a/_maps/map_files/Cerestation/cerestation.dmm.rej
+++ /dev/null
@@ -1,161 +0,0 @@
-diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm	(rejected hunks)
-@@ -8756,7 +8756,7 @@
- /turf/closed/wall/r_wall{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "arL" = (
- /obj/machinery/vending/cigarette{
- 	extended_inventory = 1
-@@ -9169,7 +9169,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "asG" = (
- /obj/machinery/light_switch{
- 	pixel_y = 25
-@@ -9177,26 +9177,26 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "asH" = (
- /obj/structure/table/wood,
- /obj/item/device/modular_computer/laptop/preset/civillian,
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "asI" = (
- /obj/structure/table/wood,
- /obj/item/weapon/paper_bin,
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "asJ" = (
- /turf/closed/wall{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "asK" = (
- /obj/machinery/vending/boozeomat,
- /turf/open/floor/carpet{
-@@ -9739,12 +9739,12 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "atO" = (
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "atP" = (
- /obj/structure/chair{
- 	dir = 1
-@@ -9752,14 +9752,14 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "atQ" = (
- /obj/structure/table/wood,
- /obj/item/device/flashlight/lamp,
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "atR" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/closed/wall{
-@@ -10213,7 +10213,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "auN" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
-@@ -10221,7 +10221,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "auO" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
-@@ -10229,7 +10229,7 @@
- /turf/closed/wall{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "auP" = (
- /obj/structure/table/wood,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-@@ -10937,13 +10937,13 @@
- /turf/open/floor/plating{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awa" = (
- /obj/structure/dresser,
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awb" = (
- /obj/structure/closet{
- 	icon_door = "blue";
-@@ -10958,7 +10958,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awc" = (
- /obj/machinery/light/small,
- /obj/machinery/atmospherics/components/unary/vent_pump{
-@@ -10968,7 +10968,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awd" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 4
-@@ -10976,7 +10976,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awe" = (
- /obj/machinery/door/airlock/medical{
- 	name = "Chief Medical Officer's Personal Quarters";
-@@ -10988,7 +10988,7 @@
- /turf/open/floor/carpet{
- 	baseturf = /turf/open/floor/plating/asteroid/airless
- 	},
--/area/medical/cmo/private)
-+/area/crew_quarters/heads/cmo/private)
- "awf" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plasteel/black{
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm.rej b/_maps/map_files/Deltastation/DeltaStation2.dmm.rej
deleted file mode 100644
index a25e1aef35..0000000000
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm.rej
+++ /dev/null
@@ -1,2429 +0,0 @@
-diff a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm	(rejected hunks)
-@@ -13148,12 +13148,12 @@
- /area/maintenance/solars/port/fore)
- "aBZ" = (
- /turf/closed/wall/r_wall,
--/area/maintenance/incinerator)
-+/area/maintenance/disposal/incinerator)
- "aCa" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/maintenance/incinerator)
-+/area/maintenance/disposal/incinerator)
- "aCb" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/tank/internals/plasma,
-@@ -71136,15 +71120,11 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "cJO" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/closed/wall/r_wall,
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "cJP" = (
- /turf/closed/wall/r_wall,
- /area/security/checkpoint/science/research)
-@@ -71974,9 +71924,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "cLv" = (
- /turf/closed/wall,
- /area/security/checkpoint/science/research)
-@@ -80792,20 +80540,20 @@
- /area/crew_quarters/abandoned_gambling_den)
- "dcE" = (
- /turf/closed/wall,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dcF" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /obj/structure/cable/white,
- /obj/structure/barricade/wooden,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dcG" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /obj/structure/barricade/wooden,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dcH" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -81434,14 +81160,14 @@
- 	pixel_y = 3
- 	},
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "ddX" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-22"
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "ddY" = (
- /obj/structure/table/reinforced,
- /obj/machinery/light/small{
-@@ -81454,7 +81180,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "ddZ" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/storage/toolbox/emergency{
-@@ -81468,13 +81194,13 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dea" = (
- /obj/structure/table/reinforced,
- /obj/machinery/cell_charger,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "deb" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-22"
-@@ -81482,7 +81208,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dec" = (
- /obj/machinery/light/small{
- 	dir = 1
-@@ -81497,20 +81223,20 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "ded" = (
- /obj/structure/table,
- /obj/item/weapon/folder/white,
- /obj/item/weapon/pen,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dee" = (
- /obj/structure/table,
- /obj/item/device/flashlight/lamp,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "def" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-@@ -82399,17 +82101,17 @@
- /obj/item/device/assembly/timer,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfO" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfP" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfQ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -82417,27 +82119,27 @@
- 	dir = 1
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfR" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 1
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfS" = (
- /obj/structure/chair/office/light{
- 	dir = 1
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfT" = (
- /obj/structure/table,
- /obj/item/weapon/paper_bin,
- /obj/item/weapon/pen,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dfU" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -82561,7 +82257,7 @@
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dgj" = (
- /obj/machinery/door/firedoor,
- /obj/structure/cable/white{
-@@ -82579,7 +82275,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dgk" = (
- /obj/structure/cable/white{
- 	icon_state = "0-8"
-@@ -82587,7 +82283,7 @@
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dgl" = (
- /obj/structure/sign/nanotrasen,
- /turf/closed/wall/r_wall,
-@@ -82905,13 +82597,13 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dgY" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dgZ" = (
- /obj/structure/frame/machine,
- /obj/item/stack/cable_coil/white,
-@@ -82920,14 +82612,14 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dha" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 1
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhb" = (
- /obj/structure/frame/machine,
- /obj/effect/decal/cleanable/dirt,
-@@ -82935,30 +82627,30 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhc" = (
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 4
- 	},
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhd" = (
- /obj/effect/decal/cleanable/oil,
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhe" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhf" = (
- /obj/structure/rack,
- /obj/item/weapon/storage/toolbox/electrical,
- /obj/item/device/multitool,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dhg" = (
- /obj/machinery/light/small{
- 	dir = 8
-@@ -83114,7 +82796,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dhw" = (
- /obj/structure/cable/white{
- 	icon_state = "2-4"
-@@ -83130,7 +82812,7 @@
- 	dir = 1
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dhx" = (
- /obj/item/stack/rods{
- 	amount = 50
-@@ -83159,7 +82841,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dhy" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/folder/white,
-@@ -83776,7 +83456,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diN" = (
- /obj/structure/frame/computer,
- /obj/effect/decal/cleanable/dirt,
-@@ -83784,11 +83464,11 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diO" = (
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diP" = (
- /obj/structure/frame/machine,
- /obj/item/stack/cable_coil/white,
-@@ -83797,13 +83477,13 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diQ" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 4
- 	},
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diR" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/components/unary/vent_pump{
-@@ -83812,17 +83492,17 @@
- 	},
- /obj/effect/landmark/xeno_spawn,
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diS" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diT" = (
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diU" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/button/door{
-@@ -83831,7 +83511,7 @@
- 	pixel_x = 26
- 	},
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "diV" = (
- /obj/machinery/door/poddoor/preopen{
- 	id = "maintrobotics";
-@@ -84105,7 +83775,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "djp" = (
- /obj/machinery/holopad,
- /obj/structure/cable/white{
-@@ -84120,7 +83790,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "djq" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -84133,7 +83803,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "djr" = (
- /obj/structure/cable/white{
- 	d2 = 2;
-@@ -84713,7 +84377,7 @@
- /obj/item/weapon/stock_parts/console_screen,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkC" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -84721,15 +84385,15 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkD" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkE" = (
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkF" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -84737,7 +84401,7 @@
- 	},
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkG" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -84748,7 +84412,7 @@
- 	},
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkH" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -84761,7 +84425,7 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkI" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -84772,7 +84436,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkJ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -84791,7 +84455,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dkK" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/door/poddoor/preopen{
-@@ -85022,7 +84676,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dle" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -85037,7 +84691,7 @@
- 	},
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dlf" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -85045,7 +84699,7 @@
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dlg" = (
- /obj/machinery/door/firedoor,
- /obj/structure/cable/white{
-@@ -85501,7 +85149,7 @@
- /obj/structure/filingcabinet/chestdrawer,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmd" = (
- /obj/machinery/light/small,
- /obj/item/weapon/twohanded/required/kirbyplants{
-@@ -85513,12 +85161,12 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dme" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmf" = (
- /obj/structure/cable/white,
- /obj/machinery/power/apc{
-@@ -85530,11 +85178,11 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmg" = (
- /obj/machinery/light/small,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmh" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-22"
-@@ -85542,7 +85190,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmi" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -85557,7 +85205,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dmj" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/door/poddoor/preopen{
-@@ -85598,39 +85246,39 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/explab)
-+/area/science/explab)
- "dmn" = (
- /obj/structure/sign/securearea,
- /turf/closed/wall/r_wall,
--/area/toxins/explab)
-+/area/science/explab)
- "dmo" = (
- /obj/machinery/status_display,
- /turf/closed/wall/r_wall,
--/area/toxins/explab)
-+/area/science/explab)
- "dmp" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/toxins/explab)
-+/area/science/explab)
- "dmq" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/toxins/explab)
-+/area/science/explab)
- "dmr" = (
- /obj/structure/sign/nanotrasen,
- /turf/closed/wall/r_wall,
--/area/toxins/explab)
-+/area/science/explab)
- "dms" = (
- /turf/closed/wall/r_wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dmt" = (
- /obj/structure/sign/fire,
- /turf/closed/wall/r_wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dmu" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/structure/grille,
-@@ -85640,7 +85288,7 @@
- 	name = "Toxins Lab Shutters"
- 	},
- /turf/open/floor/plating,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dmv" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/machinery/door/airlock/research{
-@@ -85655,11 +85303,11 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dmw" = (
- /obj/structure/sign/biohazard,
- /turf/closed/wall/r_wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dmx" = (
- /obj/structure/window/reinforced{
- 	dir = 1
-@@ -85667,7 +85315,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dmy" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -85676,14 +85324,14 @@
- 	name = "Shooting Range"
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dmz" = (
- /obj/structure/window/reinforced{
- 	dir = 1
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dmA" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -86171,7 +85813,7 @@
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dnC" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/door/airlock/maintenance_hatch{
-@@ -86183,7 +85825,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dnD" = (
- /obj/structure/girder,
- /obj/effect/decal/cleanable/dirt,
-@@ -86218,23 +85860,23 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dnJ" = (
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dnK" = (
- /turf/open/floor/plasteel/whitepurple/side{
- 	icon_state = "whitepurple";
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dnL" = (
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dnM" = (
- /obj/structure/closet/bombcloset,
- /obj/machinery/light_switch{
-@@ -86245,20 +85887,20 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dnN" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 8
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dnO" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dnP" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-@@ -86266,7 +85908,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dnQ" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -86731,14 +86371,14 @@
- /obj/item/weapon/hand_labeler,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doM" = (
- /obj/machinery/light/small{
- 	dir = 1
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doN" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -86748,20 +86388,20 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doO" = (
- /obj/structure/table/reinforced,
- /obj/item/device/mmi,
- /obj/item/device/assembly/prox_sensor,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doP" = (
- /obj/structure/frame/machine,
- /obj/item/stack/cable_coil/white,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doQ" = (
- /obj/structure/rack,
- /obj/item/weapon/book/manual/robotics_cyborgs,
-@@ -86770,7 +86410,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doR" = (
- /obj/machinery/mecha_part_fabricator,
- /obj/machinery/light/small{
-@@ -86778,7 +86418,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doS" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/stock_parts/console_screen,
-@@ -86786,7 +86426,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doT" = (
- /obj/structure/table/reinforced,
- /obj/item/stack/sheet/metal{
-@@ -86798,7 +86438,7 @@
- /obj/item/device/assembly/flash/handheld,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "doU" = (
- /obj/structure/reagent_dispensers/fueltank,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-@@ -86894,10 +86534,10 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dpg" = (
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dph" = (
- /obj/item/device/radio/intercom{
- 	name = "Station Intercom";
-@@ -86906,7 +86546,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dpi" = (
- /obj/machinery/light{
- 	icon_state = "tube1";
-@@ -86917,7 +86557,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dpj" = (
- /obj/machinery/light{
- 	icon_state = "tube1";
-@@ -86926,7 +86566,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dpk" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/clipboard,
-@@ -87622,7 +87256,7 @@
- /obj/item/weapon/stock_parts/cell/high,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dqy" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -87630,14 +87264,14 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dqz" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/paper_bin,
- /obj/item/weapon/pen,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dqA" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -87686,7 +87320,7 @@
- 	icon_state = "escape";
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dqF" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	icon_state = "intact";
-@@ -87695,11 +87329,11 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dqG" = (
- /obj/machinery/atmospherics/components/unary/vent_pump,
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dqH" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	icon_state = "intact";
-@@ -87708,7 +87342,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dqI" = (
- /obj/machinery/atmospherics/components/unary/thermomachine/heater{
- 	icon_state = "heater";
-@@ -87719,7 +87353,7 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dqJ" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/machinery/camera{
-@@ -87732,7 +87366,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dqK" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -87741,14 +87375,14 @@
- /turf/open/floor/plating{
- 	icon_state = "panelscorched"
- 	},
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dqL" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dqM" = (
- /obj/structure/table/reinforced,
- /obj/machinery/light,
-@@ -88483,7 +88113,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsg" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -88491,28 +88121,28 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsh" = (
- /turf/open/floor/circuit/green,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsi" = (
- /obj/machinery/computer/mech_bay_power_console,
- /turf/open/floor/circuit/green,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsj" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsk" = (
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsl" = (
- /obj/effect/decal/cleanable/oil,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsm" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/light_switch{
-@@ -88520,7 +88150,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dsn" = (
- /obj/machinery/portable_atmospherics/scrubber,
- /obj/machinery/light{
-@@ -88537,7 +88167,7 @@
- 	icon_state = "escape";
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dso" = (
- /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- 	icon_state = "manifold";
-@@ -88546,12 +88176,12 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dsp" = (
- /obj/effect/landmark/start/scientist,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dsq" = (
- /obj/machinery/atmospherics/pipe/manifold/general/visible{
- 	dir = 8
-@@ -88559,7 +88189,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dsr" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible{
- 	icon_state = "connector_map";
-@@ -88577,7 +88207,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dss" = (
- /obj/machinery/atmospherics/components/unary/vent_scrubber{
- 	dir = 1;
-@@ -88585,14 +88215,14 @@
- 	scrub_Toxins = 0
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dst" = (
- /obj/machinery/atmospherics/components/unary/vent_pump{
- 	dir = 1;
- 	on = 1
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dsu" = (
- /turf/closed/wall,
- /area/crew_quarters/heads/hor)
-@@ -89179,19 +88805,19 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dty" = (
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtz" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/mech_bay_recharge_floor,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtA" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtB" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/components/unary/vent_pump{
-@@ -89200,14 +88826,14 @@
- 	},
- /obj/effect/landmark/xeno_spawn,
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtC" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
- 	dir = 8
- 	},
- /turf/open/floor/plasteel/neutral,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtD" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -89217,7 +88843,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtE" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -89225,7 +88851,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtF" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -89240,7 +88866,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dtG" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -89306,7 +88932,7 @@
- 	icon_state = "arrival";
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dtM" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -89315,14 +88941,14 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dtN" = (
- /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
- 	icon_state = "manifold";
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dtO" = (
- /obj/machinery/atmospherics/pipe/manifold/general/visible{
- 	dir = 8
-@@ -89331,7 +88957,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dtP" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible{
- 	icon_state = "connector_map";
-@@ -89344,20 +88970,20 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dtQ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 9
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dtR" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 5
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dtS" = (
- /obj/structure/closet/secure_closet/RD,
- /obj/machinery/computer/security/telescreen/entertainment{
-@@ -89779,13 +89405,13 @@
- /obj/structure/frame/machine,
- /obj/item/weapon/circuitboard/machine/cyborgrecharger,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "duF" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "duG" = (
- /obj/machinery/mech_bay_recharge_port{
- 	icon_state = "recharge_port";
-@@ -89796,17 +89422,17 @@
- 	dir = 6
- 	},
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "duH" = (
- /obj/item/robot_suit,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "duI" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "duJ" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -89871,7 +89497,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "duR" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -89880,14 +89506,14 @@
- /turf/open/floor/plasteel/whitepurple/side{
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "duS" = (
- /obj/structure/cable/white{
- 	icon_state = "2-8"
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "duT" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	dir = 5
-@@ -89895,7 +89521,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "duU" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible{
- 	icon_state = "connector_map";
-@@ -89906,13 +89532,13 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "duV" = (
- /turf/open/floor/plating,
- /turf/open/floor/plating{
- 	icon_state = "platingdmg2"
- 	},
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "duW" = (
- /obj/item/target/syndicate,
- /obj/effect/decal/cleanable/dirt,
-@@ -89921,10 +89547,10 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "duX" = (
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "duY" = (
- /obj/machinery/light{
- 	icon_state = "tube1";
-@@ -90597,31 +90223,31 @@
- /obj/item/weapon/wrench,
- /obj/item/clothing/mask/gas,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dwi" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dwj" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dwk" = (
- /obj/structure/chair/office/light,
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dwl" = (
- /obj/structure/rack,
- /obj/item/weapon/storage/toolbox/mechanical,
- /obj/item/clothing/head/welding,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dwm" = (
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 8
-@@ -90655,13 +90281,13 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dwp" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plasteel/whitepurple/side{
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dwq" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -90670,33 +90296,33 @@
- /obj/machinery/holopad,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dwr" = (
- /turf/open/floor/plasteel/whitepurple/side{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dws" = (
- /obj/machinery/newscaster{
- 	pixel_x = 32
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dwt" = (
- /obj/machinery/light/small,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 10
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dwu" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dwv" = (
- /obj/machinery/light/small,
- /obj/effect/decal/cleanable/dirt,
-@@ -90704,7 +90330,7 @@
- 	dir = 6
- 	},
- /turf/open/floor/plating,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dww" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/suit_storage_unit/rd,
-@@ -91136,7 +90760,7 @@
- /obj/item/device/flashlight/seclite,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxo" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -91146,21 +90770,21 @@
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxp" = (
- /obj/machinery/light/small,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxq" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-22"
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxr" = (
- /obj/structure/table,
- /obj/item/weapon/clipboard,
-@@ -91168,7 +90792,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxs" = (
- /obj/structure/frame/computer,
- /obj/effect/decal/cleanable/dirt,
-@@ -91178,14 +90802,14 @@
- 	pixel_y = -22
- 	},
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxt" = (
- /obj/structure/frame/machine,
- /obj/machinery/light/small,
- /obj/item/weapon/stock_parts/console_screen,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxu" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -91196,14 +90820,14 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxv" = (
- /obj/structure/table,
- /obj/item/clothing/gloves/color/black,
- /obj/item/weapon/storage/toolbox/electrical,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/medical/research/abandoned_research_lab)
-+/area/science/research/abandoned)
- "dxw" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -91236,7 +90860,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dxy" = (
- /obj/item/device/assembly/timer{
- 	pixel_x = 5;
-@@ -91260,21 +90884,21 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dxz" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dxA" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	icon_state = "intact";
- 	dir = 6
- 	},
- /turf/open/floor/plasteel/whitepurple/corner,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dxB" = (
- /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- 	icon_state = "freezer";
-@@ -91284,11 +90908,11 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dxC" = (
- /obj/structure/sign/fire,
- /turf/closed/wall/r_wall,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dxD" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/structure/cable/white{
-@@ -91307,10 +90931,10 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dxE" = (
- /turf/closed/wall/r_wall,
--/area/toxins/misc_lab/range)
-+/area/science/misc_lab/range)
- "dxF" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/structure/grille,
-@@ -91747,7 +91367,7 @@
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dyw" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/neutral/side{
-@@ -91792,7 +91412,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dyz" = (
- /obj/structure/chair/office/light{
- 	dir = 8
-@@ -91805,7 +91425,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dyA" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -91818,13 +91438,13 @@
- 	scrub_Toxins = 0
- 	},
- /turf/open/floor/plasteel/neutral,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dyB" = (
- /obj/machinery/atmospherics/pipe/manifold/general/visible{
- 	dir = 8
- 	},
- /turf/open/floor/plasteel/whitepurple/corner,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dyD" = (
- /obj/structure/filingcabinet/chestdrawer,
- /obj/machinery/light{
-@@ -91875,10 +91495,10 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/storage)
-+/area/science/storage)
- "dyI" = (
- /turf/closed/wall/r_wall,
--/area/toxins/server)
-+/area/science/server)
- "dyJ" = (
- /obj/machinery/airalarm{
- 	dir = 4;
-@@ -91895,7 +91515,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dyK" = (
- /obj/machinery/atmospherics/components/unary/vent_scrubber{
- 	dir = 4;
-@@ -91905,7 +91525,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dyL" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
-@@ -91918,14 +91538,14 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dyM" = (
- /obj/structure/sign/securearea,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
- 	},
- /turf/closed/wall/r_wall,
--/area/toxins/server)
-+/area/science/server)
- "dyN" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
-@@ -92265,13 +91885,13 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzF" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzG" = (
- /obj/structure/table,
- /obj/effect/decal/cleanable/dirt,
-@@ -92289,14 +91909,14 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzH" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzI" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible,
- /obj/machinery/light{
-@@ -92304,7 +91924,7 @@
- 	},
- /obj/effect/turf_decal/stripes/line,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzJ" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible,
- /obj/machinery/newscaster{
-@@ -92320,10 +91940,10 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzK" = (
- /turf/closed/wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzL" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -92339,11 +91959,11 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzM" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/closed/wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzN" = (
- /obj/item/device/assembly/signaler{
- 	pixel_x = 0;
-@@ -92367,7 +91987,7 @@
- 	},
- /obj/effect/turf_decal/stripes/corner,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzO" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/wrench,
-@@ -92380,14 +92000,14 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzP" = (
- /obj/machinery/atmospherics/pipe/manifold/general/visible{
- 	dir = 8
- 	},
- /obj/machinery/meter,
- /turf/open/floor/plasteel/whitepurple/corner,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzQ" = (
- /obj/machinery/atmospherics/components/unary/portables_connector/visible{
- 	icon_state = "connector_map";
-@@ -92407,7 +92027,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dzR" = (
- /obj/structure/extinguisher_cabinet{
- 	pixel_x = -26
-@@ -92468,7 +92088,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dzX" = (
- /obj/machinery/atmospherics/components/unary/vent_pump{
- 	dir = 4;
-@@ -92483,7 +92103,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dzY" = (
- /obj/machinery/atmospherics/pipe/simple/general/hidden,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -92495,7 +92115,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dzZ" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 4
-@@ -92511,7 +92131,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dAa" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -93025,12 +92639,12 @@
- /area/solar/starboard/aft)
- "dAZ" = (
- /turf/closed/wall/r_wall,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dBa" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/tinted/fulltile,
- /turf/open/floor/plating,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dBb" = (
- /obj/structure/table/reinforced,
- /obj/machinery/computer/security/telescreen{
-@@ -93046,14 +92660,14 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBc" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBd" = (
- /obj/machinery/atmospherics/components/unary/vent_pump{
- 	dir = 2;
-@@ -93064,7 +92678,7 @@
- 	dir = 1;
- 	heat_capacity = 1e+006
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBe" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	dir = 5
-@@ -93073,7 +92687,7 @@
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBf" = (
- /obj/machinery/atmospherics/components/trinary/filter{
- 	density = 0;
-@@ -93083,7 +92697,7 @@
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBg" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	dir = 9
-@@ -93091,21 +92705,21 @@
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBh" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBi" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel/neutral/side,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBj" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-@@ -93113,7 +92727,7 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBk" = (
- /obj/structure/table/reinforced,
- /obj/item/weapon/storage/firstaid/toxin,
-@@ -93121,19 +92735,19 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBl" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBm" = (
- /obj/machinery/atmospherics/pipe/simple/general/visible{
- 	dir = 5
- 	},
- /turf/open/floor/plasteel/whitepurple/corner,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dBn" = (
- /obj/structure/cable/white{
- 	icon_state = "2-4"
-@@ -93185,7 +92799,7 @@
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/plating,
--/area/toxins/server)
-+/area/science/server)
- "dBt" = (
- /obj/machinery/door/firedoor,
- /obj/machinery/atmospherics/pipe/simple/general/hidden{
-@@ -93205,7 +92819,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dBu" = (
- /obj/structure/cable/white{
- 	icon_state = "0-8"
-@@ -93217,7 +92831,7 @@
- 	dir = 9
- 	},
- /turf/open/floor/plating,
--/area/toxins/server)
-+/area/science/server)
- "dBv" = (
- /obj/machinery/atmospherics/components/unary/vent_scrubber{
- 	dir = 8;
-@@ -93613,13 +93225,13 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCm" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCn" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	icon_state = "intact";
-@@ -93629,7 +93241,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCo" = (
- /obj/effect/landmark/start/scientist,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -93639,7 +93251,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCp" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 4
-@@ -93648,7 +93260,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCq" = (
- /obj/machinery/light_switch{
- 	pixel_x = 26;
-@@ -93661,7 +93273,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCr" = (
- /obj/machinery/door/firedoor,
- /obj/effect/decal/cleanable/dirt,
-@@ -93676,7 +93288,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCs" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 4
-@@ -93684,7 +93296,7 @@
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 4
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCt" = (
- /obj/structure/cable/white{
- 	icon_state = "1-4"
-@@ -93697,7 +93309,7 @@
- /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCu" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -93710,7 +93322,7 @@
- 	dir = 8;
- 	heat_capacity = 1e+006
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCv" = (
- /obj/machinery/door/firedoor,
- /obj/structure/cable/white{
-@@ -93732,7 +93344,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCw" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -93747,7 +93359,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCx" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -93759,7 +93371,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 8
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCy" = (
- /obj/structure/cable/white{
- 	icon_state = "1-8"
-@@ -93772,7 +93384,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
- /turf/open/floor/plasteel/whitepurple/side,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCz" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -93781,7 +93393,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/whitepurple/corner,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCA" = (
- /obj/structure/cable/white{
- 	icon_state = "4-8"
-@@ -93792,7 +93404,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCB" = (
- /obj/machinery/door/firedoor/heavy,
- /obj/machinery/door/airlock/research{
-@@ -93814,7 +93426,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dCC" = (
- /obj/structure/cable/white{
- 	icon_state = "1-8"
-@@ -93876,7 +93488,7 @@
- 	name = "Mainframe Base";
- 	initial_gas_mix = "n2=100;TEMP=80"
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dCI" = (
- /obj/machinery/atmospherics/pipe/simple/general/hidden,
- /turf/open/floor/plasteel/vault{
-@@ -93884,7 +93496,7 @@
- 	initial_gas_mix = "n2=100;TEMP=80";
- 	temperature = 80
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dCJ" = (
- /obj/machinery/atmospherics/components/unary/vent_pump{
- 	dir = 2;
-@@ -93906,7 +93518,7 @@
- 	name = "Mainframe Base";
- 	initial_gas_mix = "n2=100;TEMP=80"
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dCK" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/structure/extinguisher_cabinet{
-@@ -94353,7 +93959,7 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDK" = (
- /obj/machinery/light,
- /obj/machinery/atmospherics/components/unary/vent_scrubber{
-@@ -94365,7 +93971,7 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDL" = (
- /obj/item/stack/rods{
- 	amount = 50
-@@ -94390,7 +93996,7 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDM" = (
- /obj/structure/table,
- /obj/effect/decal/cleanable/dirt,
-@@ -94402,14 +94008,14 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDN" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDO" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/firealarm{
-@@ -94423,13 +94029,13 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDP" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
- 	},
- /turf/closed/wall/r_wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDQ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/light/small,
-@@ -94440,7 +94046,7 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDR" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -94452,7 +94058,7 @@
- /turf/open/floor/plasteel/neutral/side{
- 	dir = 1
- 	},
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDS" = (
- /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- 	icon_state = "manifold";
-@@ -94462,12 +94068,12 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDT" = (
- /obj/structure/tank_dispenser,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDU" = (
- /obj/structure/rack,
- /obj/structure/extinguisher_cabinet{
-@@ -94482,7 +94088,7 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDV" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -94495,7 +94101,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDW" = (
- /obj/machinery/disposal/bin,
- /obj/effect/decal/cleanable/dirt,
-@@ -94510,7 +94116,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDY" = (
- /obj/structure/sign/securearea,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-@@ -94518,7 +94124,7 @@
- 	dir = 8
- 	},
- /turf/closed/wall/r_wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dDZ" = (
- /obj/structure/table,
- /obj/item/weapon/paper_bin,
-@@ -94579,7 +94185,7 @@
- 	name = "Mainframe Base";
- 	initial_gas_mix = "n2=100;TEMP=80"
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dEf" = (
- /obj/machinery/atmospherics/pipe/manifold/general/hidden,
- /turf/open/floor/plasteel/vault{
-@@ -94587,7 +94193,7 @@
- 	initial_gas_mix = "n2=100;TEMP=80";
- 	temperature = 80
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dEg" = (
- /obj/machinery/r_n_d/server/robotics,
- /obj/machinery/atmospherics/pipe/simple/general/hidden{
-@@ -94598,7 +94204,7 @@
- 	name = "Mainframe Base";
- 	initial_gas_mix = "n2=100;TEMP=80"
- 	},
--/area/toxins/server)
-+/area/science/server)
- "dEh" = (
- /obj/item/weapon/twohanded/required/kirbyplants{
- 	icon_state = "plant-21";
-@@ -94794,15 +94396,15 @@
- 	dir = 5
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dEA" = (
- /obj/structure/sign/vacuum,
- /turf/closed/wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dEB" = (
- /obj/structure/sign/securearea,
- /turf/closed/wall,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dEC" = (
- /obj/machinery/door/window/southleft{
- 	name = "Mass Driver Door";
-@@ -94810,7 +94412,7 @@
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/loadingarea,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dED" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -94825,7 +94427,7 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dEE" = (
- /obj/structure/cable/white{
- 	icon_state = "1-2"
-@@ -94841,23 +94443,23 @@
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dEF" = (
- /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/storage)
-+/area/science/storage)
- "dEG" = (
- /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/storage)
-+/area/science/storage)
- "dEH" = (
- /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/toxins/storage)
-+/area/science/storage)
- "dEI" = (
- /obj/machinery/door/firedoor,
- /obj/machinery/door/airlock/research{
-@@ -95349,7 +94949,7 @@
- /area/solar/starboard/aft)
- "dFD" = (
- /turf/closed/indestructible/opshuttle,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFE" = (
- /obj/item/target,
- /obj/effect/decal/cleanable/dirt,
-@@ -95367,42 +94967,42 @@
- 	use_power = 0
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFF" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFG" = (
- /obj/item/device/radio/beacon,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFH" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 2
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFI" = (
- /obj/effect/turf_decal/stripes/end{
- 	dir = 4
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/test_area)
-+/area/science/test_area)
- "dFJ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/line{
- 	dir = 8
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFK" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 4
- 	},
- /turf/open/floor/plating/airless,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFL" = (
- /obj/machinery/door/poddoor{
- 	id = "toxinsdriver";
-@@ -95410,20 +95010,20 @@
- 	},
- /obj/structure/fans/tiny,
- /turf/open/floor/plating,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFM" = (
- /obj/effect/turf_decal/stripes/line{
- 	dir = 2
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFN" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/stripes/end{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFO" = (
- /obj/machinery/mass_driver{
- 	dir = 8;
-@@ -95434,7 +95034,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "dFP" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/reagent_dispensers/fueltank,
-@@ -105769,7 +105307,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "ebG" = (
- /turf/open/floor/engine,
- /area/engine/supermatter)
-@@ -107400,7 +106934,7 @@
- 	pixel_x = 32
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "egs" = (
- /obj/structure/sign/poster/official/report_crimes{
- 	pixel_y = 32
-@@ -107455,7 +106989,7 @@
- 	pixel_y = -32
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/mixing)
-+/area/science/mixing)
- "egw" = (
- /obj/structure/table/wood,
- /obj/item/weapon/storage/box/donkpockets,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm.rej b/_maps/map_files/MetaStation/MetaStation.dmm.rej
deleted file mode 100644
index f09cf8816d..0000000000
--- a/_maps/map_files/MetaStation/MetaStation.dmm.rej
+++ /dev/null
@@ -1,22 +0,0 @@
-diff a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm	(rejected hunks)
-@@ -19704,17 +19704,17 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 1
- 	},
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "aJf" = (
- /obj/structure/disposalpipe/segment,
- /turf/open/floor/plasteel,
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "aJg" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 2
- 	},
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "aJh" = (
- /turf/closed/wall,
- /area/hydroponics/garden)
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm.rej b/_maps/map_files/OmegaStation/OmegaStation.dmm.rej
deleted file mode 100644
index 5d95d0778a..0000000000
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm.rej
+++ /dev/null
@@ -1,1129 +0,0 @@
-diff a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm	(rejected hunks)
-@@ -25105,7 +25105,7 @@
- /area/engine/engineering)
- "aOH" = (
- /turf/closed/wall/r_wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOI" = (
- /obj/structure/cable/white{
- 	tag = "icon-2-4";
-@@ -25116,7 +25116,7 @@
- 	},
- /obj/effect/decal/cleanable/cobweb,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOJ" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -25126,7 +25126,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/neutral/corner,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOK" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -25140,7 +25140,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOL" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -25155,7 +25155,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOM" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -25171,7 +25171,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aON" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -25190,7 +25190,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aOO" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
-@@ -25963,7 +25963,7 @@
- 	dir = 6
- 	},
- /turf/closed/wall/r_wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPP" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -25978,7 +25978,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPQ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/closet,
-@@ -25995,7 +25995,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPR" = (
- /obj/structure/girder,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-@@ -26004,7 +26004,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPS" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/closet/firecloset,
-@@ -26017,7 +26017,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPT" = (
- /obj/structure/rack,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,
-@@ -26031,7 +26031,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPU" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/rack,
-@@ -26045,13 +26045,13 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPV" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
- 	},
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aPW" = (
- /obj/machinery/vending/snack,
- /obj/machinery/firealarm{
-@@ -26594,7 +26594,7 @@
- "aQU" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/closed/wall/r_wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aQV" = (
- /obj/structure/cable/white{
- 	tag = "icon-1-2";
-@@ -26604,7 +26604,7 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 1
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aQW" = (
- /turf/closed/wall,
- /area/library)
-@@ -27090,7 +27090,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aRT" = (
- /obj/structure/table/wood,
- /obj/item/device/flashlight/lamp,
-@@ -27725,7 +27725,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aTc" = (
- /obj/structure/chair/office/dark{
- 	dir = 8
-@@ -28237,7 +28237,7 @@
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/landmark/blobstart,
- /turf/open/floor/plasteel/neutral/corner,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aUc" = (
- /obj/machinery/power/apc{
- 	dir = 8;
-@@ -29117,7 +29117,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aVN" = (
- /obj/structure/table/wood,
- /obj/item/weapon/storage/bag/books,
-@@ -29830,7 +29830,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel/neutral/corner,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aXe" = (
- /obj/structure/table/wood,
- /obj/machinery/computer/libraryconsole/bookmanagement,
-@@ -30698,7 +30698,7 @@
- 	dir = 6
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYA" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -30711,7 +30711,7 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 1
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYB" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -30724,7 +30724,7 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYC" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -30735,7 +30735,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYD" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -30747,7 +30747,7 @@
- 	},
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYE" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-@@ -30761,7 +30761,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYF" = (
- /obj/structure/cable/white{
- 	tag = "icon-2-8";
-@@ -30774,7 +30774,7 @@
- 	dir = 6
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aYG" = (
- /obj/structure/table/glass,
- /obj/item/weapon/storage/firstaid/fire{
-@@ -31055,12 +31055,12 @@
- "aZo" = (
- /obj/structure/girder,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZp" = (
- /obj/structure/table/wood,
- /obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZq" = (
- /obj/structure/table/wood,
- /obj/item/clothing/gloves/color/black,
-@@ -31074,7 +31074,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZr" = (
- /obj/structure/rack,
- /obj/item/weapon/storage/briefcase{
-@@ -31087,12 +31087,12 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 4
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZs" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/structure/sign/poster/contraband/random,
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZt" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -31104,7 +31104,7 @@
- 	dir = 1
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZu" = (
- /obj/structure/table/wood,
- /obj/item/weapon/paper_bin,
-@@ -31156,20 +31156,20 @@
- 	dir = 8;
- 	heat_capacity = 1e+006
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZy" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 6
- 	},
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZz" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	dir = 4
- 	},
- /obj/structure/sign/poster/contraband/random,
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZA" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/barricade/wooden,
-@@ -31186,7 +31186,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZB" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	tag = "icon-intact (SOUTHWEST)";
-@@ -31194,7 +31194,7 @@
- 	dir = 10
- 	},
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "aZC" = (
- /obj/structure/table/glass,
- /obj/item/weapon/storage/firstaid/brute{
-@@ -31639,12 +31639,12 @@
- /area/maintenance/starboard)
- "baj" = (
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bak" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/black,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bal" = (
- /obj/effect/landmark/xeno_spawn,
- /obj/machinery/atmospherics/components/unary/vent_pump{
-@@ -31655,13 +31655,13 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bam" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/black,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "ban" = (
- /obj/machinery/door/airlock/maintenance_hatch{
- 	name = "Maintenance Hatch";
-@@ -31676,7 +31676,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bao" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -31690,11 +31690,11 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bap" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "baq" = (
- /obj/structure/table/wood,
- /obj/item/clothing/suit/syndicatefake,
-@@ -31702,10 +31702,10 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/cobweb,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bar" = (
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bas" = (
- /obj/structure/dresser,
- /obj/effect/decal/cleanable/dirt,
-@@ -31715,7 +31715,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 1
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bat" = (
- /obj/structure/table/glass,
- /obj/item/weapon/storage/firstaid/o2{
-@@ -32138,19 +32138,19 @@
- /obj/structure/table/wood,
- /obj/item/device/flashlight/lamp,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbd" = (
- /obj/structure/table/wood,
- /obj/item/weapon/paper_bin,
- /obj/item/weapon/pen,
- /turf/open/floor/plasteel/black,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbe" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbf" = (
- /obj/structure/cable/white{
- 	tag = "icon-1-4";
-@@ -32161,7 +32161,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbg" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -32171,7 +32171,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbh" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -32183,7 +32183,7 @@
- 	},
- /obj/effect/landmark/blobstart,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbi" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -32196,7 +32196,7 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbj" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -32209,7 +32209,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbk" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -32223,7 +32223,7 @@
- 	dir = 5
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbl" = (
- /obj/structure/table/wood,
- /obj/item/weapon/clipboard,
-@@ -32232,12 +32232,12 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 1
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbm" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/landmark/revenantspawn,
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbn" = (
- /obj/machinery/vending/autodrobe{
- 	req_access_txt = "0"
-@@ -32246,7 +32246,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 4
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbo" = (
- /obj/machinery/door/airlock/maintenance_hatch{
- 	name = "Maintenance Hatch";
-@@ -32263,7 +32263,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbp" = (
- /obj/machinery/light{
- 	dir = 8
-@@ -32576,16 +32576,16 @@
- /turf/open/floor/wood{
- 	icon_state = "wood-broken5"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbR" = (
- /turf/open/floor/wood,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbS" = (
- /turf/open/floor/wood{
- 	tag = "icon-wood-broken6";
- 	icon_state = "wood-broken6"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbT" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	tag = "icon-intact (NORTHEAST)";
-@@ -32593,7 +32593,7 @@
- 	dir = 5
- 	},
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbU" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/barricade/wooden,
-@@ -32611,7 +32611,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbV" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
-@@ -32620,7 +32620,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbW" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/barricade/wooden,
-@@ -32639,7 +32639,7 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbX" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- 	tag = "icon-intact (NORTHWEST)";
-@@ -32647,11 +32647,11 @@
- 	dir = 9
- 	},
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbY" = (
- /obj/machinery/computer/security/telescreen/entertainment,
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bbZ" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/barricade/wooden,
-@@ -32666,11 +32666,11 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bca" = (
- /obj/structure/sign/poster/contraband/random,
- /turf/closed/wall,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcb" = (
- /obj/structure/cable/white{
- 	tag = "icon-1-2";
-@@ -32679,7 +32679,7 @@
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcc" = (
- /obj/structure/reagent_dispensers/watertank,
- /obj/effect/decal/cleanable/cobweb/cobweb2,
-@@ -32687,7 +32687,7 @@
- 	dir = 9
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcd" = (
- /obj/item/weapon/retractor,
- /obj/item/weapon/hemostat,
-@@ -32951,30 +32951,30 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcG" = (
- /obj/structure/chair/stool/bar,
- /turf/open/floor/wood,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcH" = (
- /obj/effect/decal/cleanable/blood/splatter,
- /turf/open/floor/wood,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcI" = (
- /turf/open/floor/wood{
- 	tag = "icon-wood-broken2";
- 	icon_state = "wood-broken2"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcJ" = (
- /obj/structure/chair/stool/bar,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcK" = (
- /obj/machinery/computer/slot_machine,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcL" = (
- /obj/machinery/vending/cigarette,
- /obj/effect/decal/cleanable/dirt,
-@@ -32982,7 +32982,7 @@
- 	pixel_x = -32
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcM" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-@@ -32990,7 +32990,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcN" = (
- /obj/structure/chair/comfy/black{
- 	dir = 4
-@@ -32999,7 +32999,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcO" = (
- /obj/structure/window/reinforced{
- 	dir = 8
-@@ -33008,21 +33008,21 @@
- 	pixel_y = 32
- 	},
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcP" = (
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcQ" = (
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcR" = (
- /obj/structure/table/wood,
- /obj/item/device/instrument/guitar,
- /obj/effect/decal/cleanable/cobweb/cobweb2,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcS" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -33037,7 +33037,7 @@
- /obj/effect/landmark/blobstart,
- /obj/effect/turf_decal/bot,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcT" = (
- /obj/structure/rack,
- /obj/item/weapon/storage/toolbox/mechanical,
-@@ -33060,7 +33060,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bcU" = (
- /obj/item/weapon/circular_saw,
- /obj/item/weapon/surgicaldrill{
-@@ -33471,21 +33471,21 @@
- /obj/structure/table/wood,
- /obj/item/weapon/storage/briefcase,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdE" = (
- /obj/structure/chair/stool/bar,
- /obj/effect/landmark/revenantspawn,
- /turf/open/floor/wood{
- 	icon_state = "wood-broken"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdF" = (
- /obj/structure/chair/stool/bar,
- /turf/open/floor/wood{
- 	tag = "icon-wood-broken5";
- 	icon_state = "wood-broken5"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdG" = (
- /obj/structure/chair/stool/bar,
- /obj/effect/landmark/revenantspawn,
-@@ -33493,7 +33493,7 @@
- 	tag = "icon-wood-broken2";
- 	icon_state = "wood-broken2"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdH" = (
- /obj/structure/table/wood,
- /obj/item/toy/cards/deck/syndicate{
-@@ -33505,7 +33505,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdI" = (
- /obj/structure/table/wood,
- /obj/item/weapon/wrench,
-@@ -33521,7 +33521,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdJ" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden{
- 	dir = 5
-@@ -33529,7 +33529,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdK" = (
- /obj/structure/chair/comfy/black{
- 	dir = 4
-@@ -33542,7 +33542,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdL" = (
- /obj/structure/window/reinforced{
- 	dir = 8
-@@ -33551,7 +33551,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdM" = (
- /obj/effect/landmark/xeno_spawn,
- /obj/machinery/atmospherics/components/unary/vent_pump{
-@@ -33559,7 +33559,7 @@
- 	on = 1
- 	},
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdN" = (
- /obj/structure/table/wood,
- /obj/item/clothing/suit/justice,
-@@ -33577,7 +33577,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdO" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -33587,7 +33587,7 @@
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdP" = (
- /obj/structure/reagent_dispensers/fueltank,
- /obj/effect/decal/cleanable/dirt,
-@@ -33595,7 +33595,7 @@
- 	dir = 10
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bdQ" = (
- /obj/structure/closet/secure_closet/medical2,
- /obj/machinery/airalarm{
-@@ -33948,7 +33948,7 @@
- /obj/item/weapon/storage/pill_bottle,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bev" = (
- /obj/machinery/computer/slot_machine,
- /obj/effect/decal/cleanable/dirt,
-@@ -33959,7 +33959,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bew" = (
- /obj/structure/table/wood,
- /obj/effect/decal/cleanable/dirt,
-@@ -33979,7 +33979,7 @@
- 	pixel_y = 6
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bex" = (
- /obj/structure/table/wood,
- /obj/item/weapon/reagent_containers/blood/random,
-@@ -33991,14 +33991,14 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bey" = (
- /obj/structure/table/wood,
- /obj/item/weapon/newspaper,
- /obj/item/clothing/head/bowler,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bez" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
-@@ -34006,7 +34006,7 @@
- 	pixel_y = -32
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beA" = (
- /obj/machinery/computer/security/telescreen/entertainment{
- 	pixel_y = -32
-@@ -34014,7 +34014,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 5
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beB" = (
- /obj/machinery/door/window{
- 	dir = 8;
-@@ -34023,7 +34023,7 @@
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/bar,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beC" = (
- /obj/structure/table/wood,
- /obj/item/weapon/lipstick/random{
-@@ -34038,7 +34038,7 @@
- /turf/open/floor/plasteel/vault{
- 	dir = 8
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beD" = (
- /obj/structure/cable/white{
- 	tag = "icon-1-2";
-@@ -34051,11 +34051,11 @@
- /turf/open/floor/plasteel{
- 	tag = "icon-plasteel_warn_side (EAST)"
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beE" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/closed/wall,
--/area/medical/medbay3)
-+/area/medical/medbay/zone3)
- "beF" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/decal/cleanable/dirt,
-@@ -34218,7 +34218,7 @@
- 	dir = 5
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beS" = (
- /obj/structure/cable/white{
- 	tag = "icon-2-8";
-@@ -34239,7 +34239,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beT" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -34252,7 +34252,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plasteel/neutral/corner,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beU" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -34265,7 +34265,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beV" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34286,7 +34286,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beW" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34301,7 +34301,7 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 4
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beX" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34313,7 +34313,7 @@
- 	dir = 4
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beY" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34329,7 +34329,7 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 4
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "beZ" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34342,7 +34342,7 @@
- 	},
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfa" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -34361,7 +34361,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfb" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34375,7 +34375,7 @@
- /turf/open/floor/plasteel/neutral/corner{
- 	dir = 4
- 	},
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfc" = (
- /obj/structure/cable/white{
- 	tag = "icon-2-8";
-@@ -34386,13 +34386,13 @@
- 	},
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/neutral/corner,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfd" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/closet/emcloset,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfe" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/machinery/airalarm{
-@@ -34731,7 +34731,7 @@
- 	dir = 10
- 	},
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfE" = (
- /obj/structure/cable/white{
- 	tag = "icon-1-4";
-@@ -34744,7 +34744,7 @@
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /obj/effect/landmark/blobstart,
- /turf/open/floor/plasteel/neutral,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfF" = (
- /obj/structure/cable/white{
- 	tag = "icon-4-8";
-@@ -34753,7 +34753,7 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/effect/decal/cleanable/dirt,
- /turf/open/floor/plasteel/neutral,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfG" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/structure/cable/white{
-@@ -34762,7 +34762,7 @@
- 	},
- /obj/effect/turf_decal/delivery,
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfH" = (
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/door/airlock/maintenance_hatch{
-@@ -34777,7 +34777,7 @@
- 	dir = 8
- 	},
- /turf/open/floor/plasteel,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bfI" = (
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /obj/structure/cable/white{
-@@ -35085,11 +35085,11 @@
- /obj/effect/decal/cleanable/dirt,
- /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bgd" = (
- /obj/structure/closet/firecloset,
- /turf/open/floor/plating,
--/area/maintenance/fpmaint2/port_maintenance)
-+/area/maintenance/port)
- "bge" = (
- /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- 	tag = "icon-manifold (WEST)";
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej b/_maps/map_files/PubbyStation/PubbyStation.dmm.rej
deleted file mode 100644
index d471261e8b..0000000000
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm.rej
+++ /dev/null
@@ -1,36 +0,0 @@
-diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm	(rejected hunks)
-@@ -7901,7 +7901,7 @@
- /area/chapel/main/monastery)
- "aqa" = (
- /turf/open/floor/plating,
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "aqb" = (
- /obj/machinery/light/small{
- 	dir = 4
-@@ -8760,14 +8760,14 @@
- /area/chapel/main/monastery)
- "arM" = (
- /turf/open/floor/plasteel,
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "arN" = (
- /obj/machinery/firealarm{
- 	dir = 4;
- 	pixel_x = 28
- 	},
- /turf/open/floor/plasteel,
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "arO" = (
- /obj/structure/grille,
- /obj/structure/window/reinforced/fulltile,
-@@ -12924,7 +12924,7 @@
- "aAv" = (
- /obj/machinery/atmospherics/pipe/simple/supply/hidden,
- /turf/open/floor/plasteel,
--/area/crew_quarters/sleep)
-+/area/crew_quarters/dorms)
- "aAw" = (
- /turf/closed/wall,
- /area/crew_quarters/toilet/restrooms)
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
deleted file mode 100644
index dd4d037640..0000000000
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej
+++ /dev/null
@@ -1,101 +0,0 @@
-diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm	(rejected hunks)
-@@ -26775,17 +26763,17 @@
- /turf/open/floor/plasteel/whitepurple/side{
- 	dir = 1
- 	},
--/area/toxins/lab)
-+/area/science/lab)
- "biV" = (
- /obj/structure/chair/stool,
- /obj/effect/landmark/start/scientist,
- /turf/open/floor/plasteel/whitepurple/side{
- 	dir = 1
- 	},
--/area/toxins/lab)
-+/area/science/lab)
- "biW" = (
- /turf/open/floor/plasteel/white,
--/area/toxins/lab)
-+/area/science/lab)
- "biX" = (
- /obj/machinery/camera{
- 	c_tag = "Research and Development";
-@@ -26804,7 +26792,7 @@
- /turf/open/floor/plasteel/whitepurple/corner{
- 	dir = 1
- 	},
--/area/toxins/lab)
-+/area/science/lab)
- "biY" = (
- /obj/structure/disposalpipe/segment,
- /obj/structure/cable{
-@@ -31498,17 +31452,13 @@
- /turf/open/floor/plasteel/white/side{
- 	dir = 5
- 	},
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "bsA" = (
- /obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
- /turf/open/floor/plasteel/white/side{
- 	dir = 9
- 	},
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "bsB" = (
- /obj/structure/reagent_dispensers/fueltank,
- /turf/open/floor/mineral/plastitanium,
-@@ -33607,9 +33493,7 @@
- /turf/open/floor/plasteel/white/side{
- 	dir = 9
- 	},
--/area/medical/research{
--	name = "Research Division"
--	})
-+/area/science/research)
- "bwP" = (
- /obj/structure/table,
- /obj/item/weapon/storage/box/donkpockets{
-@@ -37035,7 +36889,7 @@
- 	},
- /mob/living/simple_animal/mouse,
- /turf/open/floor/plasteel/floorgrime,
--/area/toxins/storage)
-+/area/science/storage)
- "bDY" = (
- /obj/structure/cable{
- 	d1 = 4;
-@@ -39989,17 +39807,17 @@
- 	},
- /obj/structure/window/reinforced/fulltile,
- /turf/open/floor/engine,
--/area/toxins/xenobiology)
-+/area/science/xenobiology)
- "bJN" = (
- /turf/closed/wall,
--/area/toxins/xenobiology)
-+/area/science/xenobiology)
- "bJO" = (
- /obj/machinery/door/airlock/research{
- 	name = "Testing Lab";
- 	req_access_txt = "47"
- 	},
- /turf/open/floor/plasteel,
--/area/toxins/misc_lab)
-+/area/science/misc_lab)
- "bJP" = (
- /obj/machinery/vending/boozeomat,
- /turf/open/floor/plasteel/bar,
-@@ -54609,7 +54415,7 @@
- 	pipe_type = 14
- 	},
- /turf/open/floor/engine,
--/area/toxins/misc_lab)
-+/area/science/misc_lab)
- "coU" = (
- /obj/structure/table,
- /obj/item/weapon/surgicaldrill,
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 00021dc862..a44e57fd59 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -98,7 +98,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 //STATION13
 
 //Maintenance
-
+
 /area/maintenance
 	ambientsounds = list('sound/ambience/ambimaint1.ogg',
 						 'sound/ambience/ambimaint2.ogg',
@@ -110,54 +110,113 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 						 'sound/voice/lowHiss4.ogg')
 	valid_territory = 0
 
-/area/maintenance/atmos_control
-	name = "Atmospherics Maintenance"
+
+//Departments
+
+/area/maintenance/department/chapel
+	name = "Chapel Maintenance"
 	icon_state = "fpmaint"
 
-/area/maintenance/fpmaint
-	name = "EVA Maintenance"
+/area/maintenance/department/chapel/monastery
+	name = "Monastery Maintenance"
 	icon_state = "fpmaint"
 
-/area/maintenance/fpmaint2
-	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"
-
-/area/maintenance/fsmaint2
+/area/maintenance/department/crew_quarters/bar
+//	/area/maintenance/fsmaint2
 	name = "Bar Maintenance"
 	icon_state = "fsmaint"
 
-/area/maintenance/asmaint
+/area/maintenance/department/crew_quarters/dorms
+//	/area/maintenance/fsmaint
+	name = "Dormitory Maintenance"
+	icon_state = "fsmaint"
+
+/area/maintenance/department/crew_quarters/locker
+//	/area/maintenance/port
+	name = "Locker Room Maintenance"
+	icon_state = "pmaint"
+
+/area/maintenance/department/eva
+//	/area/maintenance/fpmaint
+	name = "EVA Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/department/electrical
+//	/area/maintenance/electrical
+	name = "Electrical Maintenance"
+	icon_state = "yellow"
+
+/area/maintenance/department/engine/atmos
+//	/area/maintenance/atmos_control
+	name = "Atmospherics Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/department/security
+	name = "Security Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/department/security/brig
+	name = "Brig Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/department/medical
+//	/area/maintenance/asmaint
 	name = "Medbay Maintenance"
 	icon_state = "asmaint"
 
-/area/maintenance/asmaint2
+/area/maintenance/department/science
+//	/area/maintenance/asmaint2
 	name = "Science Maintenance"
 	icon_state = "asmaint"
 
-/area/maintenance/apmaint
+/area/maintenance/department/cargo
+//	/area/maintenance/apmaint
 	name = "Cargo Maintenance"
 	icon_state = "apmaint"
 
-/area/maintenance/maintcentral
+/area/maintenance/department/bridge
+//	/area/maintenance/maintcentral
 	name = "Bridge Maintenance"
 	icon_state = "maintcentral"
 
+/area/maintenance/department/engine
+//	/area/maintenance/aft
+	name = "Engineering Maintenance"
+	icon_state = "amaint"
+
+/area/maintenance/department/science/xenobiology
+//	/area/maintenance/aft/xeno_maint
+	name = "Xenobiology Maintenance"
+	icon_state = "xenomaint"
+
+
+//Maintenance - Generic
+
+/area/maintenance/arrivals/north
+//	/area/maintenance/fpmaint2
+	name = "Arrivals North Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/arrivals/north_2
+//	/area/maintenance/fpmaint2/fore_port_maintenance
+	name = "Arrivals North Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/aft
+//	/area/maintenance/aft/Aft_Maintenance // old aft maint path was engi maint
+	name = "Aft Maintenance"
+	icon_state = "amaint"
+
+/area/maintenance/port
+//	/area/maintenance/fpmaint2/port_maintenance
+	name = "Port Maintenance"
+	icon_state = "fpmaint"
+
+/area/maintenance/central
+//	/area/maintenance/maintcentral
+	name = "Central Maintenance"
+	icon_state = "maintcentral"
+
 /area/maintenance/fore
 	name = "Fore Maintenance"
 	icon_state = "fmaint"
@@ -166,41 +225,108 @@ 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"
+/area/maintenance/starboard/central
+	name = "Central Starboard Maintenance"
 	icon_state = "smaint"
 
-/area/maintenance/starboard/fore_starboard_maintenance
-	name = "Fore Starboard Maintenance"
+/area/maintenance/starboard/aft
+//	/area/maintenance/starboard/aft_starboard_maintenance
+	name = "Starboard Quarter Maintenance"
 	icon_state = "smaint"
 
-/area/maintenance/port
-	name = "Locker Room Maintenance"
+/area/maintenance/starboard/fore
+//	/area/maintenance/starboard/fore_starboard_maintenance
+	name = "Starboard Bow Maintenance"
+	icon_state = "smaint"
+
+/area/maintenance/port/central
+	name = "Central Port Maintenance"
 	icon_state = "pmaint"
 
-/area/maintenance/aft
-	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"
-
-/area/maintenance/incinerator
-	name = "Incinerator"
-	icon_state = "disposal"
+/area/maintenance/port/aft
+//	/area/maintenance/fpmaint2/aft_port_maintenance
+	name = "Port Quarter Maintenance"
+	icon_state = "fpmaint"
 
 /area/maintenance/disposal
 	name = "Waste Disposal"
 	icon_state = "disposal"
 
-/area/maintenance/electrical
-	name = "Electrical Maintenance"
-	icon_state = "yellow"
+/area/maintenance/disposal/incinerator
+//	/area/maintenance/incinerator
+	name = "Incinerator"
+	icon_state = "disposal"
+
+
+//Cere / Asteroid Specific
+
+/area/maintenance/asteroid/aft/science
+	name = "Aft Maintenance"
+	icon_state = "amaint"
+
+/area/maintenance/asteroid/aft/arrivals
+	name = "Aft Maintenance"
+	icon_state = "amaint"
+
+/area/maintenance/asteroid/central
+	name = "Central Asteroid Maintenance"
+	icon_state = "maintcentral"
+
+/area/maintenance/asteroid/disposal/east
+	name = "Eastern External Waste Belt"
+	icon_state = "disposal"
+
+/area/maintenance/asteroid/disposal/north
+	name = "Northern External Waste Belt"
+	icon_state = "disposal"
+
+/area/maintenance/asteroid/disposal/southeast
+	name = "South-Eastern Disposal"
+	icon_state = "disposal"
+
+/area/maintenance/asteroid/disposal/southwest
+	name = "South-Western Disposal"
+	icon_state = "disposal"
+
+/area/maintenance/asteroid/fore/cargo_west
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/fore/cargo_south
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/fore/com_west
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/fore/com_north
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/fore/com_east
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/fore/com_south
+	name = "Fore Asteroid Maintenance"
+	icon_state = "fmaint"
+
+/area/maintenance/asteroid/port/neast
+	name = "Port Asteroid Maintenance"
+	icon_state = "pmaint"
+
+/area/maintenance/asteroid/port/east
+	name = "Port Asteroid Maintenance"
+	icon_state = "pmaint"
+
+/area/maintenance/asteroid/port/west
+	name = "Port Asteroid Maintenance"
+	icon_state = "pmaint"
+
+/area/maintenance/asteroid/starboard
+	name = "Starboard Asteroid Maintenance"
+	icon_state = "smaint"
 
 
 //Hallway
@@ -213,22 +339,74 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Starboard Primary Hallway"
 	icon_state = "hallS"
 
+/area/hallway/primary/starboard/aft
+	name = "Starboard Quarter Primary Hallway"
+	icon_state = "hallS"
+
+/area/hallway/primary/starboard/fore
+	name = "Starboard Bow Primary Hallway"
+	icon_state = "hallS"
+
 /area/hallway/primary/aft
 	name = "Aft Primary Hallway"
 	icon_state = "hallA"
-	
+
 /area/hallway/primary/port
 	name = "Port Primary Hallway"
 	icon_state = "hallP"
-	
+
 /area/hallway/primary/central
 	name = "Central Primary Hallway"
 	icon_state = "hallC"
-	
+
 /area/hallway/secondary/exit
 	name = "Escape Shuttle Hallway"
 	icon_state = "escape"
 
+/area/hallway/secondary/exit/departure_lounge
+	name = "Departure Lounge"
+	icon_state = "escape"
+
+/area/hallway/secondary/bridges/cargo_ai
+	name = "Cargo-AI-Command Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/com_engi
+	name = "Command-Engineering Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/com_serv
+	name = "Command-Service Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/dock_med
+	name = "Docking-Medical Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/engi_med
+	name = "Engineering-Medical Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/med_cargo
+	name = "Medical-Cargo Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/sci_dock
+	name = "Science-Docking Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/serv_engi
+	name = "Service-Engineering Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/bridges/serv_sci
+	name = "Service-Science Bridge"
+	icon_state = "yellow"
+
+/area/hallway/secondary/command
+	name = "Command Hallway"
+	icon_state = "bridge"
+
 /area/hallway/secondary/construction
 	name = "Construction Area"
 	icon_state = "construction"
@@ -237,6 +415,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Arrival Shuttle Hallway"
 	icon_state = "entry"
 
+/area/hallway/secondary/service
+	name = "Service Hallway"
+	icon_state = "Sleep"
+
 //Command
 
 /area/bridge
@@ -249,28 +431,70 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "meeting"
 	music = null
 
-/area/crew_quarters/captain
+/area/bridge/meeting_room/council
+	name = "Council Chamber"
+	icon_state = "meeting"
+	music = null
+
+/area/bridge/showroom/corporate
+	name = "Corporate Showroom"
+	icon_state = "showroom"
+	music = null
+
+/area/crew_quarters/heads/captain
+//	/area/crew_quarters/captain
 	name = "Captain's Office"
 	icon_state = "captain"
 
-/area/crew_quarters/captain/captains_quarters
+/area/crew_quarters/heads/captain/private
+//	/area/crew_quarters/captain/captains_quarters
 	name = "Captain's Quarters"
 	icon_state = "captain"
 
-/area/crew_quarters/courtroom
-	name = "Courtroom"
-	icon_state = "courtroom"
+/area/crew_quarters/heads/chief
+//	/area/crew_quarters/chief
+//	/area/engine/chiefs_office
+	name = "Chief Engineer's Office"
+	icon_state = "engine_control"
 
-/area/crew_quarters/heads
+/area/crew_quarters/heads/chief/private
+//	/area/crew_quarters/chief/private
+	name = "Chief Engineer's Private Quarters"
+	icon_state = "head_quarters"
+
+/area/crew_quarters/heads/cmo
+//	/area/medical/cmo
+	name = "Chief Medical Officer's Office"
+	icon_state = "CMO"
+
+/area/crew_quarters/heads/cmo/private
+//	/area/medical/cmo/private
+	name = "Chief Medical Officer's Private Quarters"
+	icon_state = "CMO"
+
+/area/crew_quarters/heads/hop
+//	/area/crew_quarters/heads
 	name = "Head of Personnel's Office"
 	icon_state = "head_quarters"
 
-/area/crew_quarters/hor
+/area/crew_quarters/heads/hos
+//	/area/security/hos
+	name = "Head of Security's Office"
+	icon_state = "sec_hos"
+
+/area/crew_quarters/heads/hos/private
+//	/area/security/hos/private
+	name = "Head of Security's Private Quarters"
+	icon_state = "sec_hos"
+
+/area/crew_quarters/heads/hor
+//	/area/crew_quarters/hor
 	name = "Research Director's Office"
 	icon_state = "head_quarters"
 
-/area/crew_quarters/chief
-	name = "Chief Engineer's Office"
+/area/crew_quarters/heads/hor/private
+//	/area/crew_quarters/hor/private
+	name = "Research Director's Private Quarters"
 	icon_state = "head_quarters"
 
 /area/mint
@@ -287,56 +511,86 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 //Crew
 
-/area/crew_quarters/dorms
-//	/area/crew_quarters
+/area/crew_quarters/dorms
+//	/area/crew_quarters
+//	/area/crew_quarters/sleep
 	name = "Dormitories"
 	icon_state = "Sleep"
 	safe = 1
 
+/area/crew_quarters/dorms/male
+//	/area/crew_quarters/sleep_male
+	name = "Male Dorm"
+	icon_state = "Sleep"
+
+/area/crew_quarters/dorms/female
+//	/area/crew_quarters/sleep_female
+	name = "Female Dorm"
+	icon_state = "Sleep"
+
+/area/crew_quarters/rehab_dome
+	name = "Rehabilitation Dome"
+	icon_state = "Sleep"
+
 /area/crew_quarters/toilet
 	name = "Dormitory Toilets"
 	icon_state = "toilet"
 
-/area/crew_quarters/sleep
-	name = "Dormitories"
-	icon_state = "Sleep"
+/area/crew_quarters/toilet/auxiliary
+	name = "Auxiliary Restrooms"
+	icon_state = "toilet"
 
-/area/crew_quarters/sleep_male
-	name = "Male Dorm"
-	icon_state = "Sleep"
+/area/crew_quarters/toilet/locker
+//	/area/crew_quarters/locker/locker_toilet
+	name = "Locker Toilets"
+	icon_state = "toilet"
 
-/area/crew_quarters/sleep_male/toilet_male
+/area/crew_quarters/toilet/female
+//	/area/crew_quarters/sleep_female/toilet_female
+	name = "Female Toilets"
+	icon_state = "toilet"
+
+/area/crew_quarters/toilet/male
+//	/area/crew_quarters/sleep_male/toilet_male
 	name = "Male Toilets"
 	icon_state = "toilet"
 
-/area/crew_quarters/sleep_female
-	name = "Female Dorm"
-	icon_state = "Sleep"
-
-/area/crew_quarters/sleep_female/toilet_female
-	name = "Female Toilets"
+/area/crew_quarters/toilet/restrooms
+	name = "Restrooms"
 	icon_state = "toilet"
 
 /area/crew_quarters/locker
 	name = "Locker Room"
 	icon_state = "locker"
 
-/area/crew_quarters/locker/locker_toilet
-	name = "Locker Toilets"
-	icon_state = "toilet"
+/area/crew_quarters/lounge
+	name = "Lounge"
+	icon_state = "yellow"
 
 /area/crew_quarters/fitness
 	name = "Fitness Room"
 	icon_state = "fitness"
 
+/area/crew_quarters/fitness/recreation
+	name = "Recreation Area"
+	icon_state = "fitness"
+
 /area/crew_quarters/cafeteria
 	name = "Cafeteria"
 	icon_state = "cafeteria"
 
+/area/crew_quarters/cafeteria/lunchroom
+	name = "Lunchroom"
+	icon_state = "cafeteria"
+
 /area/crew_quarters/kitchen
 	name = "Kitchen"
 	icon_state = "kitchen"
 
+/area/crew_quarters/kitchen/backroom
+	name = "Kitchen Coldroom"
+	icon_state = "kitchen"
+
 /area/crew_quarters/bar
 	name = "Bar"
 	icon_state = "bar"
@@ -357,12 +611,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Theatre"
 	icon_state = "Theatre"
 
+/area/crew_quarters/theatre/abandoned
+	name = "Abandoned Theatre"
+	icon_state = "Theatre"
+
 /area/library
  	name = "Library"
  	icon_state = "library"
  	flags = NONE
 
-/area/library/abandoned_library
+/area/library/lounge
+ 	name = "Library Lounge"
+ 	icon_state = "library"
+
+/area/library/abandoned
+//	/area/library/abandoned_library
  	name = "Abandoned Library"
  	icon_state = "library"
  	flags = NONE
@@ -375,14 +638,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/chapel/main
 	name = "Chapel"
 
+/area/chapel/main/monastery
+	name = "Monastery"
+
 /area/chapel/office
 	name = "Chapel Office"
 	icon_state = "chapeloffice"
 
+/area/chapel/asteroid
+	name = "Chapel Asteroid"
+	icon_state = "explored"
+
+/area/chapel/dock
+	name = "Chapel Dock"
+	icon_state = "construction"
+
 /area/lawoffice
 	name = "Law Office"
 	icon_state = "law"
 
+
 //Engineering
 
 /area/engine
@@ -396,22 +671,37 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Engineering"
 	icon_state = "engine"
 
+/area/engine/atmos
+//	/area/atmos
+ 	name = "Atmospherics"
+ 	icon_state = "atmos"
+ 	flags = NONE
+
+/area/engine/atmospherics_engine
+	name = "Atmospherics Engine"
+	icon_state = "blue"
+
 /area/engine/break_room
 	name = "Engineering Foyer"
 	icon_state = "engine"
 
-/area/engine/chiefs_office
-	name = "Chief Engineer's office"
-	icon_state = "engine_control"
-
-/area/engine/secure_construction
-	name = "Secure Construction Area"
-	icon_state = "engine"
-
 /area/engine/gravity_generator
 	name = "Gravity Generator Room"
 	icon_state = "blue"
 
+/area/engine/secure_construction
+	name = "Secure Construction Area"
+	icon_state = "engine"
+
+/area/engine/storage
+	name = "Engineering Storage"
+	icon_state = "engine"
+
+/area/engine/transit_tube
+	name = "Transit Tube"
+	icon_state = "engine"
+
+
 //Solars
 
 /area/solar
@@ -421,58 +711,124 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	blob_allowed = FALSE
 	flags = NONE
 
-/area/solar/auxport
-		name = "Fore Port Solar Array"
-		icon_state = "panelsA"
+/area/solar/asteroid/aft
+	name = "Aft Asteroid Solar"
+	icon_state = "panelsA"
 
-/area/solar/auxstarboard
-		name = "Fore Starboard Solar Array"
-		icon_state = "panelsA"
+/area/solar/asteroid/command
+	name = "Command Asteroid Solar"
+	icon_state = "panelsA"
+
+/area/solar/asteroid/fore
+	name = "Fore Asteroid Solar"
+	icon_state = "panelsA"
 
 /area/solar/fore
-		name = "Fore Solar Array"
-		icon_state = "yellow"
+	name = "Fore Solar Array"
+	icon_state = "yellow"
 
 /area/solar/aft
-		name = "Aft Solar Array"
-		icon_state = "aft"
+	name = "Aft Solar Array"
+	icon_state = "yellow"
+
+/area/solar/aux/port
+//	/area/solar/auxport
+	name = "Port Bow Auxiliary Solar Array"
+	icon_state = "panelsA"
+
+/area/solar/aux/starboard
+//	/area/solar/auxstarboard
+	name = "Starboard Bow Auxiliary Solar Array"
+	icon_state = "panelsA"
 
 /area/solar/starboard
-		name = "Aft Starboard Solar Array"
-		icon_state = "panelsS"
+	name = "Starboard Solar Array"
+	icon_state = "panelsS"
+
+/area/solar/starboard/aft
+//	/area/solar/starboard
+	name = "Starboard Quarter Solar Array"
+	icon_state = "panelsS"
+
+/area/solar/starboard/fore
+	name = "Starboard Bow Solar Array"
+	icon_state = "panelsS"
 
 /area/solar/port
-		name = "Aft Port Solar Array"
-		icon_state = "panelsP"
+	name = "Port Solar Array"
+	icon_state = "panelsP"
 
-/area/maintenance/auxsolarport
-	name = "Fore Port Solar Maintenance"
-	icon_state = "SolarcontrolA"
+/area/solar/port/aft
+//	/area/solar/port
+	name = "Port Quarter Solar Array"
+	icon_state = "panelsP"
 
-/area/maintenance/starboardsolar
-	name = "Aft Starboard Solar Maintenance"
-	icon_state = "SolarcontrolS"
+/area/solar/port/fore
+	name = "Port Bow Solar Array"
+	icon_state = "panelsP"
 
-/area/maintenance/portsolar
-	name = "Aft Port Solar Maintenance"
+
+//Solar Maint
+
+/area/maintenance/solars
+	name = "Solar Maintenance"
+	icon_state = "yellow"
+
+/area/maintenance/solars/asteroid/aft
+	name = "Aft Asteroid Solar Maintenance"
 	icon_state = "SolarcontrolP"
 
-/area/maintenance/auxsolarstarboard
-	name = "Fore Starboard Solar Maintenance"
+/area/maintenance/solars/asteroid/command
+	name = "Command Asteroid Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/asteroid/fore
+	name = "Fore Asteroid Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/port
+	name = "Port Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/port/aft
+	name = "Starboard Quarter Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/port/fore
+	name = "Starboard Bow Solar Maintenance"
+	icon_state = "SolarcontrolP"
+
+/area/maintenance/solars/starboard
+	name = "Starboard Solar Maintenance"
+	icon_state = "SolarcontrolS"
+
+/area/maintenance/solars/starboard/aft
+	name = "Starboard Quarter Solar Maintenance"
+	icon_state = "SolarcontrolS"
+
+/area/maintenance/solars/starboard/fore
+	name = "Starboard Bow Solar Maintenance"
+	icon_state = "SolarcontrolS"
+
+/area/maintenance/solars/aux/port/fore
+//	/area/maintenance/auxsolarport
+	name = "Port Bow Auxiliary Solar Maintenance"
 	icon_state = "SolarcontrolA"
 
+/area/maintenance/solars/aux/port/aft
+//	/area/maintenance/portsolar
+	name = "Port Quarter Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolP"
 
-/area/assembly/chargebay
-	name = "Mech Bay"
-	icon_state = "mechbay"
+/area/maintenance/solars/aux/starboard/port/aft
+//	/area/maintenance/starboardsolar
+	name = "Starboard Quarter Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolS"
 
-/area/assembly/showroom
-	name = "Robotics Showroom"
-	icon_state = "showroom"
-
-/area/assembly/robotics
-	name = "Robotics Lab"
-	icon_state = "ass_line"
+/area/maintenance/solars/aux/starboard/port/aft
+//	/area/maintenance/auxsolarstarboard
+	name = "Starboard Bow Auxiliary Solar Maintenance"
+	icon_state = "SolarcontrolA"
 
 /area/assembly/assembly_line //Derelict Assembly Line
 	name = "Assembly Line"
@@ -488,6 +844,26 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "teleporter"
 	music = "signal"
 
+/area/teleporter/quantum/cargo
+	name = "Cargo Quantum Pad"
+	icon_state = "teleporter"
+	music = "signal"
+
+/area/teleporter/quantum/docking
+	name = "Docking Quantum Pad"
+	icon_state = "teleporter"
+	music = "signal"
+
+/area/teleporter/quantum/research
+	name = "Research Quantum Pad"
+	icon_state = "teleporter"
+	music = "signal"
+
+/area/teleporter/quantum/security
+	name = "Security Quantum Pad"
+	icon_state = "teleporter"
+	music = "signal"
+
 /area/gateway
 	name = "Gateway"
 	icon_state = "teleporter"
@@ -495,18 +871,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 //MedBay
 
-/area/medical
-	name = "Medical"
-	icon_state = "medbay3"
-	
-/area/medical/abandoned
-//	/area/medical/abandoned_medbay
-	name = "Abandoned Medbay"
-	icon_state = "medbay3"
-	music = 'sound/ambience/signal.ogg'
-
-/area/medical/medbay/central
-//	/area/medical/medbay
+/area/medical
+	name = "Medical"
+	icon_state = "medbay3"
+
+/area/medical/abandoned
+//	/area/medical/abandoned_medbay
+	name = "Abandoned Medbay"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbay/central
+//	/area/medical/medbay
 	name = "Medbay Central"
 	icon_state = "medbay"
 	music = 'sound/ambience/signal.ogg'
@@ -522,49 +898,41 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	music = 'sound/ambience/signal.ogg'
 
 //Medbay is a large area, these additional areas help level out APC load.
-/area/medical/medbay2
+/area/medical/medbay/zone2
+//	/area/medical/medbay2
 	name = "Medbay"
 	icon_state = "medbay2"
 	music = 'sound/ambience/signal.ogg'
 
-/area/medical/medbay2/medbay_storage
+/area/medical/medbay/zone3
+//	/area/medical/medbay3
+	name = "Medbay"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/medbay/aft
+//	/area/medical/medbay3/aft
+	name = "Medbay Aft"
+	icon_state = "medbay3"
+	music = 'sound/ambience/signal.ogg'
+
+/area/medical/storage
+//	/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"
 
-/area/medical/cmo
-	name = "Chief Medical Officer's office"
-	icon_state = "CMO"
+/area/medical/patients_rooms/room_a
+	name = "Patient Room A"
+	icon_state = "patients"
 
-/area/medical/robotics
-	name = "Robotics"
-	icon_state = "medresearch"
-
-/area/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/patients_rooms/room_b
+	name = "Patient Room B"
+	icon_state = "patients"
 
 /area/medical/virology
 	name = "Virology"
@@ -596,8 +964,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Genetics Lab"
 	icon_state = "genetics"
 
-/area/medical/genetics/cloning
-//	/area/medical/genetics_cloning
+/area/medical/genetics/cloning
+//	/area/medical/genetics_cloning
 	name = "Cloning Lab"
 	icon_state = "cloning"
 
@@ -605,13 +973,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Medbay Treatment Center"
 	icon_state = "exam_room"
 
-	
+
 //Security
 
-/area/security
-	name = "Security"
-	icon_state = "security"
-
+/area/security
+	name = "Security"
+	icon_state = "security"
+
 /area/security/main
 	name = "Security Office"
 	icon_state = "security"
@@ -619,11 +987,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/brig
 	name = "Brig"
 	icon_state = "brig"
-	
-/area/security/courtroom
-//	/area/crew_quarters/courtroom
-	name = "Courtroom"
-	icon_state = "courtroom"
+
+/area/security/courtroom
+//	/area/crew_quarters/courtroom
+	name = "Courtroom"
+	icon_state = "courtroom"
 
 /area/security/prison
 	name = "Prison Wing"
@@ -633,6 +1001,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Labor Shuttle Dock"
 	icon_state = "sec_prison"
 
+/area/security/processing/cremation
+	name = "Security Crematorium"
+	icon_state = "sec_prison"
+
 /area/security/warden
 	name = "Brig Control"
 	icon_state = "Warden"
@@ -641,10 +1013,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Armory"
 	icon_state = "armory"
 
-/area/security/hos
-	name = "Head of Security's Office"
-	icon_state = "sec_hos"
-
 /area/security/detectives_office
 	name = "Detective's Office"
 	icon_state = "detective"
@@ -663,7 +1031,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Transfer Centre"
 	icon_state = "armory"
 
-
 /area/security/nuke_storage
 	name = "Vault"
 	icon_state = "nuke_storage"
@@ -676,8 +1043,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Security Checkpoint"
 	icon_state = "checkpoint1"
 
-/area/security/checkpoint/checkpoint2
-//	/area/security/checkpoint2
+/area/security/checkpoint/checkpoint2
+//	/area/security/checkpoint2
 	name = "Security Checkpoint"
 	icon_state = "security"
 
@@ -692,16 +1059,29 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/checkpoint/medical
 	name = "Security Post - Medbay"
 	icon_state = "checkpoint1"
-	
+
 /area/security/checkpoint/science
 	name = "Security Post - Science"
 	icon_state = "checkpoint1"
 
+/area/security/checkpoint/science/research
+	name = "Security Post - Research Division"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/customs
+	name = "Customs"
+	icon_state = "bridge"
+
 /area/security/vacantoffice
 	name = "Vacant Office"
 	icon_state = "security"
 
-/area/security/vacantoffice2
+/area/security/vacantoffice/a
+	name = "Vacant Office A"
+	icon_state = "security"
+
+/area/security/vacantoffice/b
+//	/area/security/vacantoffice2
 	name = "Vacant Office B"
 	icon_state = "security"
 
@@ -733,10 +1113,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Quartermaster's Office"
 	icon_state = "quart"
 
+/area/quartermaster/qm/private
+	name = "Quartermaster's Private Quarters"
+	icon_state = "quart"
+
 /area/quartermaster/miningdock
 	name = "Mining Dock"
 	icon_state = "mining"
 
+/area/quartermaster/miningdock/abandoned
+	name = "Abandoned Mining Dock"
+	icon_state = "mining"
+
 /area/quartermaster/miningoffice
 	name = "Mining Office"
 	icon_state = "mining"
@@ -745,10 +1133,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Mining Storage"
 	icon_state = "mining"
 
-/area/quartermaster/mechbay
-	name = "Mech Bay"
-	icon_state = "yellow"
-
 /area/janitor
 	name = "Custodial Closet"
 	icon_state = "janitor"
@@ -758,49 +1142,107 @@ 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
+/area/hydroponics/garden
+	name = "Garden"
+	icon_state = "hydro"
+
+/area/hydroponics/garden/abandoned
 	name = "Abandoned Garden"
 	icon_state = "hydro"
 
-//Toxins
+/area/hydroponics/garden/monastery
+	name = "Monastery Garden"
+	icon_state = "hydro"
 
-/area/toxins/lab
+
+//Science
+
+/area/science
+	name = "Science Division"
+	icon_state = "toxlab"
+
+/area/science/lab
 	name = "Research and Development"
 	icon_state = "toxlab"
 
-/area/toxins/xenobiology
+/area/science/xenobiology
 	name = "Xenobiology Lab"
 	icon_state = "toxlab"
 
-/area/toxins/storage
+/area/science/storage
 	name = "Toxins Storage"
 	icon_state = "toxstorage"
 
-/area/toxins/mineral_storeroom
+/area/science/mineral_storeroom
 	name = "Mineral Storeroom"
 	icon_state = "toxmisc"
 
-/area/toxins/test_area
+/area/science/test_area
 	valid_territory = 0
 	name = "Toxins Test Area"
 	icon_state = "toxtest"
 
-/area/toxins/mixing
+/area/science/mixing
 	name = "Toxins Mixing Lab"
 	icon_state = "toxmix"
 
-/area/toxins/misc_lab
+/area/science/misc_lab
 	name = "Testing Lab"
 	icon_state = "toxmisc"
 
-/area/toxins/server
+/area/science/misc_lab/range
+	name = "Research Testing Range"
+	icon_state = "toxmisc"
+
+/area/science/server
 	name = "Research Division Server Room"
 	icon_state = "server"
 
-/area/toxins/explab
+/area/science/explab
 	name = "Experimentation Lab"
 	icon_state = "toxmisc"
 
+/area/science/robotics
+//	/area/medical/robotics
+	name = "Robotics"
+	icon_state = "medresearch"
+
+/area/science/robotics/mechbay
+//	/area/assembly/chargebay
+	name = "Mech Bay"
+	icon_state = "mechbay"
+
+/area/science/robotics/mechbay_cargo
+//	/area/quartermaster/mechbay
+	name = "Mech Bay"
+	icon_state = "yellow"
+
+/area/science/robotics/showroom
+//	/area/assembly/showroom
+	name = "Robotics Showroom"
+	icon_state = "showroom"
+
+/area/science/robotics/lab
+//	/area/assembly/robotics
+	name = "Robotics Lab"
+	icon_state = "ass_line"
+
+/area/science/research
+//	/area/medical/research
+	name = "Research Division"
+	icon_state = "medresearch"
+
+/area/science/research/lobby
+//	/area/medical/research/research_lobby
+	name = "Research Division Lobby"
+	icon_state = "medresearch"
+
+/area/science/research/abandoned
+//	/area/medical/research/abandoned
+//	/area/medical/research/abandoned_research_lab
+	name = "Abandoned Research Lab"
+	icon_state = "medresearch"
+
 //Storage
 
 /area/storage/tools
@@ -819,22 +1261,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Art Supply Storage"
 	icon_state = "storage"
 
-/area/storage/auxiliary
-//	/area/storage/auxillary
-	name = "Auxiliary Storage"
+/area/storage/auxiliary
+//	/area/storage/auxillary
+	name = "Auxiliary Storage"
 	icon_state = "auxstorage"
-	
-/area/storage/atmos
-//	/area/maintenance/storage
-	name = "Atmospherics Storage"
-	icon_state = "atmos"
-	valid_territory = 0
-	
-/area/storage/tcom
-//	/area/maintenance/storage/tcom_storage
-	name = "Telecoms Storage"
-	icon_state = "green"
-	valid_territory = 0
+
+/area/storage/atmos
+//	/area/maintenance/storage
+	name = "Atmospherics Storage"
+	icon_state = "atmos"
+	valid_territory = 0
+
+/area/storage/tcom
+//	/area/maintenance/storage/tcom_storage
+	name = "Telecoms Storage"
+	icon_state = "green"
+	valid_territory = 0
 
 /area/storage/eva
 	name = "EVA Storage"
@@ -844,13 +1286,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Secure Storage"
 	icon_state = "storage"
 
-/area/storage/emergency/starboard
-//	/area/storage/emergency
+/area/storage/emergency/starboard
+//	/area/storage/emergency
 	name = "Starboard Emergency Storage"
 	icon_state = "emergencystorage"
 
-/area/storage/emergency/port
-//	/area/storage/emergency2
+/area/storage/emergency/port
+//	/area/storage/emergency2
 	name = "Port Emergency Storage"
 	icon_state = "emergencystorage"
 
@@ -874,8 +1316,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Minisat Exterior"
 	icon_state = "yellow"
 
-/area/mining_construction
-	name = "Auxillary Base Construction"
+/area/construction/mining/aux_base
+//	/area/mining_construction
+	name = "Auxiliary Base Construction"
+	icon_state = "yellow"
+
+/area/construction/mining/aux_base/closet
+//	/area/mining_construction/closet
+	name = "Auxiliary Closet Construction"
 	icon_state = "yellow"
 
 /area/construction/supplyshuttle
@@ -902,15 +1350,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Solar Panel Control"
 	icon_state = "yellow"
 
-/area/construction/storage
+/area/construction/storage
 	name = "Construction Site Storage"
 	icon_state = "yellow"
-	
-/area/construction/storage/wing
-//	/area/construction/Storage
-	name = "Storage Wing"
-	icon_state = "yellow"
-	
+
+/area/construction/storage/wing
+//	/area/construction/Storage
+	name = "Storage Wing"
+	icon_state = "yellow"
+
 
 //AI
 /area/ai_monitored/security/armory
@@ -953,6 +1401,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "AI Satellite"
 	icon_state = "ai"
 
+/area/ai_monitored/turret_protected/aisat/atmos
+	name = "AI Satellite Atmos"
+	icon_state = "ai"
+
+	/area/ai_monitored/turret_protected/aisat/atmos
+	name = "AI Satellite Atmos"
+	icon_state = "ai"
+
+/area/ai_monitored/turret_protected/aisat/service
+	name = "AI Satellite Service"
+	icon_state = "ai"
+
+/area/ai_monitored/turret_protected/aisat/hallway
+	name = "AI Satellite Hallway"
+	icon_state = "ai"
+
 /area/aisat
 	name = "AI Satellite Exterior"
 	icon_state = "yellow"
@@ -1036,27 +1500,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 //SPACE STATION 13
 GLOBAL_LIST_INIT(the_station_areas, list (
-	/area/assembly,				
-	/area/bridge,		
-	/area/chapel,		
-	/area/construction,		
-	/area/crew_quarters,		
-	/area/engine,		
-	/area/hallway,		
-	/area/holodeck,		
-	/area/hydroponics,		
-	/area/janitor,		
-	/area/lawoffice,		
-	/area/library,		
-	/area/maintenance,		
-	/area/medical,		
+	/area/assembly,
+	/area/bridge,
+	/area/chapel,
+	/area/construction,
+	/area/crew_quarters,
+	/area/engine,
+	/area/hallway,
+	/area/holodeck,
+	/area/hydroponics,
+	/area/janitor,
+	/area/lawoffice,
+	/area/library,
+	/area/maintenance,
+	/area/medical,
 //	/area/mint,		//not present on map
-	/area/quartermaster,		
-	/area/science,	// /area/toxins/	
-	/area/security,		
-	/area/solar,		
-	/area/storage,		
-	/area/teleporter,		
+	/area/quartermaster,
+	/area/science,	// /area/toxins/
+	/area/security,
+	/area/solar,
+	/area/storage,
+	/area/teleporter,
 	/area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0
 //	/area/ai_monitored/storage/secure,	//not present on map
 //	/area/ai_monitored/storage/emergency,	//not present on map
diff --git a/code/game/area/Space_Station_13_areas.dm.rej b/code/game/area/Space_Station_13_areas.dm.rej
deleted file mode 100644
index 6183073e76..0000000000
--- a/code/game/area/Space_Station_13_areas.dm.rej
+++ /dev/null
@@ -1,74 +0,0 @@
-diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm	(rejected hunks)
-@@ -513,10 +513,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
- 
- /area/crew_quarters/dorms
- //	/area/crew_quarters
-+//	/area/crew_quarters/sleep
- 	name = "Dormitories"
- 	icon_state = "Sleep"
- 	safe = 1
- 	
-+/area/crew_quarters/dorms/male
-+//	/area/crew_quarters/sleep_male
-+	name = "Male Dorm"
-+	icon_state = "Sleep"
-+	
-+/area/crew_quarters/dorms/female
-+//	/area/crew_quarters/sleep_female
-+	name = "Female Dorm"
-+	icon_state = "Sleep"
-+	
- /area/crew_quarters/rehab_dome
- 	name = "Rehabilitation Dome"
- 	icon_state = "Sleep"	
-@@ -534,28 +545,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
- 	name = "Locker Toilets"
- 	icon_state = "toilet"
- 	
--/area/crew_quarters/toilet/restrooms
--	name = "Restrooms"
-+/area/crew_quarters/toilet/female
-+//	/area/crew_quarters/sleep_female/toilet_female
-+	name = "Female Toilets"
- 	icon_state = "toilet"
--
--/area/crew_quarters/sleep
--	name = "Dormitories"
--	icon_state = "Sleep"
--
--/area/crew_quarters/sleep_male
--	name = "Male Dorm"
--	icon_state = "Sleep"
--
--/area/crew_quarters/sleep_male/toilet_male
-+	
-+/area/crew_quarters/toilet/male
-+//	/area/crew_quarters/sleep_male/toilet_male
- 	name = "Male Toilets"
- 	icon_state = "toilet"
--
--/area/crew_quarters/sleep_female
--	name = "Female Dorm"
--	icon_state = "Sleep"
--
--/area/crew_quarters/sleep_female/toilet_female
--	name = "Female Toilets"
-+	
-+/area/crew_quarters/toilet/restrooms
-+	name = "Restrooms"
- 	icon_state = "toilet"
- 
- /area/crew_quarters/locker
-@@ -565,11 +566,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
- /area/crew_quarters/lounge
- 	name = "Lounge"
- 	icon_state = "yellow"
--
--										
--						
--					  
--
-+	
- /area/crew_quarters/fitness
- 	name = "Fitness Room"
- 	icon_state = "fitness"
diff --git a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm
index 6ca11df629..60b6f4d537 100644
--- a/code/game/area/areas/misc.dm
+++ b/code/game/area/areas/misc.dm
@@ -116,14 +116,21 @@
 	name = "Solitary Confinement"
 	icon_state = "brig"
 
-/area/prison/cell_block/A
+/area/prison/execution_room
+	name = "Prisoner Education Chamber"
+	icon_state = "armory"
+
+/area/prison/cell_block/a
+//	/area/prison/cell_block/A
 	name = "Prison Cell Block A"
 	icon_state = "brig"
 
-/area/prison/cell_block/B
+/area/prison/cell_block/b
+//	/area/prison/cell_block/B
 	name = "Prison Cell Block B"
 	icon_state = "brig"
 
-/area/prison/cell_block/C
+/area/prison/cell_block/c
+//	/area/prison/cell_block/C
 	name = "Prison Cell Block C"
 	icon_state = "brig"
diff --git a/code/game/area/areas/misc.dm.rej b/code/game/area/areas/misc.dm.rej
deleted file mode 100644
index d19a629d66..0000000000
--- a/code/game/area/areas/misc.dm.rej
+++ /dev/null
@@ -1,22 +0,0 @@
-diff a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm	(rejected hunks)
-@@ -120,14 +120,17 @@
- 	name = "Prisoner Education Chamber"
- 	icon_state = "armory"
- 
--/area/prison/cell_block/A
-+/area/prison/cell_block/a
-+//	/area/prison/cell_block/A
- 	name = "Prison Cell Block A"
- 	icon_state = "brig"
- 
--/area/prison/cell_block/B
-+/area/prison/cell_block/b
-+//	/area/prison/cell_block/B
- 	name = "Prison Cell Block B"
- 	icon_state = "brig"
- 
--/area/prison/cell_block/C
-+/area/prison/cell_block/c
-+//	/area/prison/cell_block/C
- 	name = "Prison Cell Block C"
- 	icon_state = "brig"
diff --git a/code/modules/projectiles/projectile/special.dm.rej b/code/modules/projectiles/projectile/special.dm.rej
deleted file mode 100644
index 2af063669d..0000000000
--- a/code/modules/projectiles/projectile/special.dm.rej
+++ /dev/null
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm	(rejected hunks)
-@@ -203,7 +203,7 @@
- 	range = 4
- 	dismemberment = 20
- 	impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
--	var/mine_range = 4 //mines this many additional tiles
-+	var/mine_range = 3 //mines this many additional tiles
- 
- /obj/item/projectile/plasma/Initialize()
- 	. = ..()