diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index bbd764fce19..a7ac65165eb 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -54,8 +54,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -85,8 +84,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -121,8 +119,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -194,8 +191,7 @@
 /obj/machinery/status_display{
 	density = 0;
 	layer = 3;
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/computer/shuttle/pod{
 	pixel_x = -32;
@@ -217,8 +213,7 @@
 /obj/machinery/status_display{
 	density = 0;
 	layer = 3;
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/computer/shuttle/pod{
 	pixel_x = -32;
@@ -300,9 +295,7 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -657,8 +650,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	d1 = 2;
@@ -674,8 +666,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/external{
 	name = "External Solar Access";
@@ -691,8 +682,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/turf_decal/delivery,
@@ -703,8 +693,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /turf/open/space,
 /area/solar/starboard/fore)
@@ -849,8 +838,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK";
-	pixel_x = 0
+	name = "WARNING: EXTERNAL AIRLOCK"
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/solars/starboard/fore)
@@ -892,8 +880,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK";
-	pixel_x = 0
+	name = "WARNING: EXTERNAL AIRLOCK"
 	},
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
@@ -1207,7 +1194,6 @@
 	department = "Construction";
 	departmentType = 0;
 	name = "Construction RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -1601,8 +1587,6 @@
 "adt" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = 0;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -1663,9 +1647,7 @@
 	width = 9
 	},
 /obj/machinery/bluespace_beacon,
-/obj/docking_port/mobile/auxillary_base{
-	pixel_y = 0
-	},
+/obj/docking_port/mobile/auxillary_base,
 /obj/machinery/computer/auxillary_base,
 /turf/closed/wall,
 /area/shuttle/auxillary_base)
@@ -1746,8 +1728,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1757,8 +1738,7 @@
 "adJ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/secondary/entry)
@@ -1944,8 +1924,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/construction/mining/aux_base)
@@ -2092,7 +2071,6 @@
 "aeA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/newscaster{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/firealarm{
@@ -2122,7 +2100,6 @@
 "aeC" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/rack,
@@ -2634,7 +2611,6 @@
 	id = "smindicate";
 	name = "external door control";
 	pixel_x = -26;
-	pixel_y = 0;
 	req_access_txt = "150"
 	},
 /obj/docking_port/mobile{
@@ -2669,8 +2645,7 @@
 	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
 	icon_state = "space";
 	layer = 4;
-	name = "EXTERNAL AIRLOCK";
-	pixel_x = 0
+	name = "EXTERNAL AIRLOCK"
 	},
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/syndicate)
@@ -2842,9 +2817,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
@@ -2893,11 +2866,9 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
-	name = "Arrivals APC";
-	pixel_x = 0;
-	pixel_y = 25
+	name = "Arrivals Hallway APC";
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -2935,9 +2906,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/arrival{
 	dir = 1
@@ -3102,7 +3071,6 @@
 "agO" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -3220,7 +3188,6 @@
 "ahc" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3866,7 +3833,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/bot,
@@ -3876,7 +3842,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/bot,
@@ -3909,8 +3874,7 @@
 /area/shuttle/syndicate)
 "aiO" = (
 /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = 6;
-	pixel_y = 0
+	pixel_x = 6
 	},
 /obj/item/weapon/reagent_containers/glass/bottle/charcoal{
 	pixel_x = -3
@@ -4065,8 +4029,7 @@
 "aje" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/security/vacantoffice)
@@ -4124,13 +4087,11 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Customs Desk APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/blue/side{
 	dir = 8
@@ -4270,13 +4231,11 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Security Checkpoint APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 4
@@ -4337,8 +4296,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -4592,8 +4550,7 @@
 "aku" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/carpet,
 /area/hallway/secondary/entry)
@@ -4681,11 +4638,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Starboard Bow Maintenance APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/stool/bar,
@@ -4847,9 +4802,7 @@
 "ale" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /turf/open/floor/plasteel/grimy,
 /area/security/vacantoffice)
@@ -4933,8 +4886,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/camera{
 	c_tag = "Arrivals Customs";
@@ -5053,8 +5005,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/red,
 /area/security/checkpoint/checkpoint2)
@@ -5196,9 +5147,7 @@
 "alR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -5698,8 +5647,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -5734,8 +5682,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -5853,7 +5800,6 @@
 	pixel_y = 3
 	},
 /obj/machinery/newscaster{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/grimy,
@@ -5922,7 +5868,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/weapon/storage/secure/briefcase,
@@ -5960,7 +5905,6 @@
 /obj/effect/landmark/start/assistant,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/grimy,
@@ -6008,7 +5952,6 @@
 /obj/structure/closet/secure_closet/security,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/red/side{
@@ -6192,9 +6135,7 @@
 "anX" = (
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /obj/structure/mirror{
 	pixel_x = 30
@@ -6234,9 +6175,7 @@
 /obj/structure/table/wood,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/light_switch{
 	pixel_y = -26
@@ -6448,8 +6387,7 @@
 /obj/machinery/mineral/stacking_unit_console{
 	dir = 2;
 	machinedir = 8;
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
@@ -6811,7 +6749,6 @@
 "aps" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/structure/table/wood,
@@ -6966,8 +6903,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	d1 = 2;
@@ -7715,14 +7651,12 @@
 "arc" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmospherics_engine)
@@ -7733,8 +7667,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/yellow,
 /area/engine/atmospherics_engine)
@@ -7746,8 +7679,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -7761,8 +7693,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/caution{
 	dir = 4
@@ -7775,8 +7706,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/circuit/green,
 /area/engine/atmospherics_engine)
@@ -7787,8 +7717,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/caution{
 	icon_state = "caution";
@@ -7801,8 +7730,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -7831,8 +7759,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/yellow,
 /area/engine/atmospherics_engine)
@@ -7848,14 +7775,12 @@
 	pixel_x = -5
 	},
 /obj/item/weapon/tank/internals/emergency_oxygen/engi{
-	pixel_x = 5;
-	pixel_y = 0
+	pixel_x = 5
 	},
 /obj/item/device/geiger_counter,
 /obj/item/device/geiger_counter,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/cable{
@@ -8270,7 +8195,6 @@
 /obj/machinery/power/apc{
 	dir = 2;
 	name = "Disposal APC";
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/structure/disposalpipe/segment{
@@ -8412,7 +8336,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -8506,6 +8429,9 @@
 "asz" = (
 /obj/structure/table_frame/wood,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "asA" = (
@@ -8533,6 +8459,9 @@
 /obj/structure/table/wood,
 /obj/item/device/camera_film,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/wood,
 /area/maintenance/port/fore)
 "asE" = (
@@ -8584,11 +8513,9 @@
 "asH" = (
 /obj/structure/closet/jcloset,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Custodial Closet APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -8604,7 +8531,6 @@
 	department = "Custodial Closet";
 	departmentType = 0;
 	name = "Custodial RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -8649,6 +8575,9 @@
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
 /obj/effect/turf_decal/bot,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/toilet/auxiliary)
 "asN" = (
@@ -8844,9 +8773,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
-/area/engine/gravity_generator{
-	name = "Atmospherics Engine"
-	})
+/area/engine/atmospherics_engine)
 "atj" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 1;
@@ -8859,8 +8786,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -8971,8 +8897,7 @@
 /obj/item/weapon/melee/skateboard,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/cafeteria,
 /area/maintenance/port/fore)
@@ -9095,8 +9020,7 @@
 /obj/effect/landmark/start/janitor,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitegreen/side{
 	icon_state = "whitegreen";
@@ -9127,7 +9051,6 @@
 	},
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/effect/turf_decal/bot,
@@ -9321,7 +9244,6 @@
 /obj/item/weapon/storage/box/lights/mixed,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/brown{
@@ -9373,8 +9295,6 @@
 /obj/machinery/status_display{
 	density = 0;
 	name = "cargo display";
-	pixel_x = 0;
-	pixel_y = 0;
 	supply_display = 1
 	},
 /turf/closed/wall,
@@ -9432,8 +9352,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -9444,8 +9363,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "engsm";
@@ -9479,8 +9397,7 @@
 "auE" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/engine,
 /area/engine/supermatter)
@@ -9518,8 +9435,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "engsm";
@@ -9641,9 +9557,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/weapon/storage/box/lights/mixed{
 	pixel_x = 3;
@@ -9730,7 +9644,6 @@
 "avm" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/cable/white{
@@ -10017,8 +9930,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -10051,8 +9963,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "engsm";
@@ -10073,8 +9984,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -10090,8 +10000,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmospherics_engine)
@@ -10268,9 +10177,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /turf/open/floor/plasteel/brown{
 	icon_state = "brown";
@@ -10508,8 +10415,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "engsm";
@@ -10529,14 +10435,12 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/stripes/line{
@@ -10547,8 +10451,7 @@
 "awW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/securearea{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter Engine - Starboard";
@@ -10648,7 +10551,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/vomit/old,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -10660,7 +10562,6 @@
 "axi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -10673,7 +10574,6 @@
 "axj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -10755,8 +10655,7 @@
 "axt" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/warehouse)
@@ -10923,8 +10822,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/light{
 	dir = 4;
@@ -10976,8 +10874,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light{
@@ -11078,6 +10975,9 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
 /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
 /obj/effect/turf_decal/bot,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel,
 /area/hydroponics/garden/abandoned)
 "ayf" = (
@@ -11321,9 +11221,7 @@
 	dir = 4
 	},
 /turf/closed/wall,
-/area/crew_quarters/toilet{
-	name = "\improper Auxiliary Restrooms"
-	})
+/area/crew_quarters/toilet/auxiliary)
 "ayA" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -11528,8 +11426,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
@@ -11538,9 +11435,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/engine/gravity_generator{
-	name = "Atmospherics Engine"
-	})
+/area/engine/atmospherics_engine)
 "azc" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/portable_atmospherics/scrubber,
@@ -11583,8 +11478,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -11919,8 +11813,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Cargo Warehouse APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/brown{
 	icon_state = "brown";
@@ -11978,8 +11871,7 @@
 "azT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/storage)
@@ -12043,9 +11935,7 @@
 	name = "Gas to Thermo"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/engine/gravity_generator{
-	name = "Atmospherics Engine"
-	})
+/area/engine/atmospherics_engine)
 "aAb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 5
@@ -12119,7 +12009,6 @@
 /area/space)
 "aAk" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -12171,6 +12060,9 @@
 /area/hallway/secondary/service)
 "aAq" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/grimy,
 /area/hallway/secondary/service)
 "aAr" = (
@@ -12454,8 +12346,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -12466,8 +12357,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/sign/fire{
 	pixel_x = 32;
@@ -12488,8 +12378,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/button/door{
 	id = "engsm";
@@ -12511,8 +12400,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -12524,8 +12412,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter Engine - Aft";
@@ -12544,12 +12431,12 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	locked = 0;
+	name = "Engine Air Alarm";
 	pixel_y = 23;
 	req_access = null;
 	req_one_access_txt = "24;10"
@@ -12565,8 +12452,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -12578,8 +12464,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -12599,8 +12484,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
 	d1 = 2;
@@ -12635,8 +12519,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Atmospherics Engine APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-8"
@@ -12751,7 +12634,6 @@
 /obj/structure/reagent_dispensers/beerkeg,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/vault{
@@ -12761,11 +12643,9 @@
 "aBx" = (
 /obj/structure/closet/secure_closet/bar,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Bar APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/light/small{
 	dir = 1
@@ -12785,9 +12665,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Bar Backroom";
@@ -12851,7 +12729,6 @@
 	department = "Bar Counter";
 	departmentType = 0;
 	name = "Bar RC";
-	pixel_x = 0;
 	pixel_y = 32;
 	receive_ore_updates = 1
 	},
@@ -12882,7 +12759,6 @@
 /obj/item/weapon/storage/fancy/cigarettes/cigars/havana,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/vault{
@@ -12924,7 +12800,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -13121,8 +12996,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -13272,8 +13146,7 @@
 "aCC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/hallway/secondary/service)
@@ -13429,8 +13302,7 @@
 "aCQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -13561,7 +13433,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/red/side{
@@ -13574,9 +13445,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_x = 38
@@ -13819,7 +13688,6 @@
 	pixel_y = 3
 	},
 /obj/structure/sign/electricshock{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -13990,8 +13858,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -13999,7 +13866,6 @@
 "aDH" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/structure/cable/white{
@@ -14089,8 +13955,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -14495,9 +14360,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/prison)
@@ -14543,8 +14406,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/external{
 	name = "External Solar Access";
@@ -14562,8 +14424,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/decal/cleanable/dirt,
@@ -14579,8 +14440,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -14666,8 +14526,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -14682,8 +14541,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -14695,8 +14553,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -14708,8 +14565,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -14740,11 +14596,9 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Turbine Generator APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -14758,9 +14612,7 @@
 "aFb" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_x = 24;
@@ -14841,8 +14693,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/glass_atmos{
 	name = "Power Monitoring";
@@ -14920,6 +14771,9 @@
 /obj/structure/table/wood,
 /obj/item/weapon/folder,
 /obj/item/weapon/pen,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/wood,
 /area/hallway/secondary/service)
 "aFq" = (
@@ -14943,8 +14797,7 @@
 "aFt" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -14964,8 +14817,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/loadingarea,
 /area/hallway/secondary/service)
@@ -15043,8 +14895,7 @@
 /obj/effect/landmark/lightsout,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -15160,8 +15011,7 @@
 "aFS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/storage)
@@ -15259,7 +15109,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -15297,8 +15146,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/stripes/line{
@@ -15431,7 +15279,6 @@
 "aGy" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -15451,8 +15298,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -15460,7 +15306,6 @@
 "aGA" = (
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -15482,8 +15327,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 1;
@@ -15604,7 +15448,6 @@
 "aGR" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/newscaster{
@@ -15679,8 +15522,7 @@
 /obj/structure/chair/stool/bar,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/redyellow,
 /area/crew_quarters/bar/atrium)
@@ -15713,8 +15555,7 @@
 "aHe" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/brown{
 	icon_state = "brown";
@@ -15754,8 +15595,7 @@
 /obj/machinery/conveyor_switch/oneway{
 	id = "cargodisposals";
 	name = "Trash Filter Switch";
-	pixel_x = -1;
-	pixel_y = 0
+	pixel_x = -1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -15947,8 +15787,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/oil,
@@ -15975,9 +15814,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/caution,
 /area/maintenance/disposal/incinerator)
@@ -16064,7 +15901,6 @@
 "aHP" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/light/small,
@@ -16088,7 +15924,6 @@
 "aHR" = (
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -16107,12 +15942,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/bot,
@@ -16156,7 +15989,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/vault,
@@ -16191,8 +16023,7 @@
 "aHZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/hallway/secondary/service)
@@ -16237,7 +16068,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -16257,7 +16087,6 @@
 "aIg" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -16321,8 +16150,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Security Post - Cargo APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/red/side{
 	icon_state = "red";
@@ -16338,8 +16166,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side,
 /area/security/checkpoint/supply)
@@ -16347,7 +16174,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -16410,7 +16236,6 @@
 /area/shuttle/supply)
 "aIw" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 4
 	},
 /obj/item/weapon/soap/nanotrasen,
@@ -16530,7 +16355,6 @@
 	},
 /obj/item/toy/figure/syndie,
 /obj/structure/sign/electricshock{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/red/corner{
@@ -16657,8 +16481,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/stripes/line{
@@ -16806,11 +16629,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Abandoned Gambling Den APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood{
@@ -16868,11 +16689,9 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Atrium APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Theatre Stage";
@@ -16883,8 +16702,7 @@
 /area/crew_quarters/bar/atrium)
 "aJx" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -16918,8 +16736,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
@@ -17045,9 +16862,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -17132,7 +16947,6 @@
 "aKb" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -17146,9 +16960,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/darkred/corner{
 	icon_state = "darkredcorners";
@@ -17227,8 +17039,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/engine/vacuum,
 /area/maintenance/disposal/incinerator)
@@ -17246,8 +17057,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
@@ -17260,8 +17070,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
@@ -17280,8 +17089,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/engine,
@@ -17290,8 +17098,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -17362,7 +17169,6 @@
 "aKt" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -17520,11 +17326,9 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Theatre Backstage APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /turf/open/floor/plasteel/redblue,
 /area/crew_quarters/theatre)
@@ -17540,7 +17344,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/redblue,
@@ -17576,8 +17379,7 @@
 /area/crew_quarters/bar/atrium)
 "aKW" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/grimy,
@@ -18261,7 +18063,6 @@
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck/syndicate{
 	icon_state = "deck_syndicate_full";
-	pixel_x = 0;
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/grimy,
@@ -18348,8 +18149,7 @@
 /obj/structure/table/wood,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/item/device/camera,
 /turf/open/floor/plasteel/vault{
@@ -18369,8 +18169,7 @@
 /area/crew_quarters/bar/atrium)
 "aMF" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/bar/atrium)
@@ -18482,7 +18281,6 @@
 /obj/item/weapon/storage/box/lights/mixed,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/light_switch{
@@ -18515,7 +18313,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -18607,8 +18404,6 @@
 /obj/machinery/status_display{
 	density = 0;
 	name = "cargo display";
-	pixel_x = 0;
-	pixel_y = 0;
 	supply_display = 1
 	},
 /turf/closed/wall,
@@ -18750,7 +18545,6 @@
 	desc = "Talk through this. It looks like it has been modified to not broadcast.";
 	dir = 2;
 	name = "Prison Intercom";
-	pixel_x = 0;
 	pixel_y = -28;
 	prison_radio = 1
 	},
@@ -19110,9 +18904,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -19476,10 +19268,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 10000;
 	dir = 1;
 	name = "Quartermaster's Office APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -19633,9 +19423,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -19919,8 +19707,7 @@
 /area/engine/atmos)
 "aPu" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -20103,9 +19890,7 @@
 "aPO" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_x = 26;
@@ -20308,7 +20093,6 @@
 	department = "Cargo Office";
 	departmentType = 0;
 	name = "Cargo Office RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/machinery/camera{
@@ -20325,10 +20109,8 @@
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/machinery/power/apc{
-	cell_type = 10000;
 	dir = 1;
 	name = "Cargo Office APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/structure/cable/white{
@@ -20580,9 +20362,7 @@
 "aQI" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/whitered/side{
 	dir = 4
@@ -20609,7 +20389,6 @@
 	id = "permabolt3";
 	name = "Cell Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = 0;
 	pixel_y = 25;
 	req_access_txt = "0";
 	specialfunctions = 4
@@ -20653,7 +20432,6 @@
 	id = "permabolt2";
 	name = "Cell Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = 0;
 	pixel_y = 25;
 	req_access_txt = "0";
 	specialfunctions = 4
@@ -20687,7 +20465,6 @@
 	id = "permabolt1";
 	name = "Cell Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = 0;
 	pixel_y = 25;
 	req_access_txt = "0";
 	specialfunctions = 4
@@ -20749,8 +20526,7 @@
 "aQU" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/general/hidden,
 /turf/open/floor/plasteel/vault{
@@ -20873,7 +20649,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/camera{
@@ -20938,8 +20713,7 @@
 	sensors = list("air_sensor" = "Tank")
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 10
@@ -20997,8 +20771,7 @@
 	department = "Theatre Backstage";
 	departmentType = 0;
 	name = "Theatre RC";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/item/weapon/lipstick/random{
 	pixel_x = 3;
@@ -21018,7 +20791,6 @@
 /obj/machinery/vending/autodrobe,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light,
@@ -21055,8 +20827,7 @@
 "aRC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/carpet,
 /area/crew_quarters/bar/atrium)
@@ -21487,8 +21258,7 @@
 	icon_state = "tube1"
 	},
 /obj/machinery/ai_status_display{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /turf/open/floor/plasteel/brown{
 	icon_state = "brown";
@@ -21519,9 +21289,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -21550,9 +21318,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
@@ -21573,9 +21339,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -21633,7 +21397,6 @@
 "aSB" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -21875,8 +21638,7 @@
 /area/engine/atmos)
 "aTd" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/green/visible,
@@ -21968,7 +21730,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light,
@@ -21999,8 +21760,7 @@
 "aTq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/redyellow,
 /area/crew_quarters/bar/atrium)
@@ -22086,9 +21846,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -22152,9 +21910,7 @@
 "aTH" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/storage)
@@ -22240,6 +21996,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_x = 23
+	},
 /turf/open/floor/plasteel/brown{
 	icon_state = "brown";
 	dir = 4
@@ -22271,8 +22030,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -22368,7 +22126,7 @@
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
-/area/prison/solitary)
+/area/prison/execution_room)
 "aUe" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
@@ -22458,8 +22216,7 @@
 "aUp" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmos)
@@ -22781,9 +22538,7 @@
 "aUS" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -22918,7 +22673,6 @@
 /obj/structure/closet/wardrobe/cargotech,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23012,13 +22766,11 @@
 "aVq" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Quartermaster's Office";
@@ -23541,8 +23293,7 @@
 "aWm" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/caution{
@@ -23592,16 +23343,13 @@
 	node1_concentration = 0.8;
 	node2_concentration = 0.2;
 	on = 1;
-	pixel_x = 0;
-	pixel_y = 0;
 	target_pressure = 4500
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmos)
 "aWt" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -23705,8 +23453,7 @@
 "aWG" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -23812,7 +23559,6 @@
 /obj/machinery/autolathe,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/firealarm{
@@ -23995,7 +23741,6 @@
 "aXm" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/light,
@@ -24052,7 +23797,6 @@
 "aXr" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -24074,8 +23818,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/red/corner{
 	dir = 1
@@ -24228,7 +23971,7 @@
 	dir = 4
 	},
 /obj/item/device/radio/intercom{
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/item/weapon/storage/pod{
 	pixel_x = 6;
@@ -24250,7 +23993,6 @@
 /obj/machinery/status_display{
 	density = 0;
 	layer = 3;
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/machinery/computer/shuttle/pod{
@@ -24389,8 +24131,7 @@
 	sensors = list("o2_sensor" = "Tank")
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/plasteel/blue/side{
@@ -24470,7 +24211,6 @@
 /obj/structure/closet/wardrobe/botanist,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/effect/turf_decal/bot,
@@ -24489,9 +24229,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/chem_master/condimaster{
 	name = "BrewMaster 3000"
@@ -24552,8 +24290,7 @@
 "aYq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/freezer,
 /area/crew_quarters/kitchen)
@@ -24730,13 +24467,15 @@
 /obj/item/toy/figure/miner,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/light{
 	dir = 1
 	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/light_switch{
+	pixel_x = -38
+	},
 /turf/open/floor/plasteel,
 /area/quartermaster/miningoffice)
 "aYK" = (
@@ -25064,8 +24803,7 @@
 /area/engine/atmos)
 "aZw" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/atmospherics/components/trinary/filter{
@@ -25321,7 +25059,6 @@
 /obj/item/weapon/hand_labeler,
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/turf_decal/bot,
@@ -25720,8 +25457,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/caution{
@@ -25833,8 +25569,7 @@
 "baZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/greenblue/side,
 /area/hydroponics)
@@ -25922,8 +25657,7 @@
 /obj/structure/kitchenspike,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/bot,
@@ -25932,7 +25666,6 @@
 "bbl" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/device/radio/intercom{
@@ -26147,8 +25880,7 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/sign/pods{
-	name = "MINING POD";
-	pixel_x = 0
+	name = "MINING POD"
 	},
 /turf/open/floor/plating,
 /area/quartermaster/miningoffice)
@@ -26381,8 +26113,7 @@
 /area/engine/atmos)
 "bcm" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -26822,9 +26553,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: BLAST DOORS";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "WARNING: BLAST DOORS"
 	},
 /turf/open/floor/plating,
 /area/security/brig)
@@ -26881,8 +26610,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Atmospherics APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -26967,8 +26695,7 @@
 "bdA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -26984,8 +26711,7 @@
 	sensors = list("n2_sensor" = "Tank")
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/plasteel/red/side{
@@ -27032,8 +26758,7 @@
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/weapon/reagent_containers/glass/bucket,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -27059,7 +26784,6 @@
 /obj/structure/table/glass,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/item/weapon/storage/box/beakers{
@@ -27125,7 +26849,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -27161,7 +26884,6 @@
 	department = "Kitchen";
 	departmentType = 0;
 	name = "Kitchen RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/red,
@@ -27169,7 +26891,6 @@
 "bdW" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/white,
@@ -27410,8 +27131,7 @@
 "bew" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/miningoffice)
@@ -27492,8 +27212,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitered/side{
 	dir = 1
@@ -27505,7 +27224,6 @@
 /obj/item/weapon/bedsheet/medical,
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = 0;
 	pixel_y = 26;
 	req_access_txt = "0";
 	use_power = 0
@@ -27898,8 +27616,7 @@
 /area/engine/atmos)
 "bft" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/atmospherics/components/trinary/filter{
@@ -27961,12 +27678,10 @@
 "bfz" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/turf_decal/bot,
@@ -28121,8 +27836,7 @@
 "bfO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28218,8 +27932,7 @@
 "bfZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/fore)
@@ -28258,8 +27971,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/quartermaster/miningoffice)
@@ -28307,7 +28019,6 @@
 	department = "Mining";
 	departmentType = 0;
 	name = "Mining Dock RC";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/camera{
@@ -28504,7 +28215,6 @@
 	pixel_y = 2
 	},
 /obj/item/weapon/reagent_containers/spray/cleaner{
-	pixel_x = 0;
 	pixel_x = 5;
 	pixel_y = -1
 	},
@@ -28679,7 +28389,6 @@
 	department = "Head of Security's Desk";
 	departmentType = 5;
 	name = "Head of Security RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault{
@@ -29210,13 +28919,10 @@
 /obj/machinery/computer/stockexchange,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/brown{
@@ -29256,8 +28962,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Mining Dock APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/camera{
 	c_tag = "Cargo - Mining Office";
@@ -29309,7 +29014,6 @@
 /obj/item/device/radio/intercom{
 	dir = 8;
 	name = "Station Intercom (General)";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/item/weapon/storage/backpack/satchel/explorer,
@@ -29327,7 +29031,6 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/delivery,
@@ -29380,7 +29083,6 @@
 /obj/structure/bed/roller,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/whitered/side,
@@ -29591,8 +29293,7 @@
 /area/crew_quarters/heads/hos)
 "biN" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -29624,8 +29325,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/vault{
@@ -30112,9 +29812,7 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -30152,8 +29850,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Security Office APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -30344,8 +30041,7 @@
 "bko" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -30355,9 +30051,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -30379,8 +30073,7 @@
 /area/aisat)
 "bks" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 2;
@@ -30511,8 +30204,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_x = 28
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -30740,6 +30432,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "Central Primary Hallway APC";
+	pixel_y = 24
+	},
+/obj/structure/cable/white{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
@@ -30830,7 +30530,6 @@
 "bln" = (
 /obj/machinery/computer/shuttle/labor,
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/red/side{
@@ -30844,7 +30543,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/red,
@@ -31105,8 +30803,7 @@
 /area/crew_quarters/heads/hos)
 "blN" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/lattice,
 /turf/open/space,
@@ -31154,8 +30851,6 @@
 	dir = 1;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -31175,8 +30870,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/door/window/southright,
 /turf/open/floor/plasteel/vault{
@@ -31566,8 +31260,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -31684,9 +31377,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "1-4"
@@ -31792,8 +31483,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hall14";
@@ -31849,8 +31539,7 @@
 "bnk" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -32152,8 +31841,7 @@
 /area/crew_quarters/heads/hos)
 "bnM" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -32229,8 +31917,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -32518,8 +32205,7 @@
 "boA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hydroponics)
@@ -32582,7 +32268,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/neutral/corner,
@@ -32596,7 +32281,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/neutral/corner,
@@ -32644,7 +32328,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel{
@@ -32691,7 +32374,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/camera{
@@ -32743,7 +32425,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -32758,7 +32439,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -32802,8 +32482,7 @@
 "bpa" = (
 /obj/machinery/computer/shuttle/labor,
 /obj/structure/reagent_dispensers/peppertank{
-	pixel_x = -31;
-	pixel_y = 0
+	pixel_x = -31
 	},
 /turf/open/floor/mineral/plastitanium/brig,
 /area/shuttle/labor)
@@ -33134,8 +32813,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/heads/hos)
@@ -33183,8 +32861,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -33219,8 +32896,7 @@
 "bpM" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -33303,9 +32979,7 @@
 "bpV" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmos)
@@ -33330,7 +33004,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -33371,9 +33044,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
@@ -33489,6 +33160,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/white{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/port)
 "bqm" = (
@@ -33589,7 +33263,6 @@
 /obj/machinery/button/flasher{
 	id = "gulagshuttleflasher";
 	name = "Flash Control";
-	pixel_x = 0;
 	pixel_y = -26;
 	req_access_txt = "1"
 	},
@@ -33779,8 +33452,7 @@
 "bqT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/main)
@@ -33844,7 +33516,6 @@
 /obj/machinery/disposal/bin,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light,
@@ -33960,7 +33631,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/escape,
@@ -34172,9 +33842,7 @@
 "brF" = (
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /obj/machinery/requests_console{
 	department = "Hydroponics";
@@ -34284,9 +33952,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -34375,7 +34041,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/structure/reagent_dispensers/peppertank{
@@ -34393,7 +34058,6 @@
 /area/security/main)
 "bsg" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/red/corner{
@@ -34537,7 +34201,6 @@
 "bsv" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/visible,
@@ -34570,8 +34233,7 @@
 "bsy" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
 	name = "scrubbers pipe";
@@ -34618,8 +34280,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/light_switch{
 	pixel_x = -38;
@@ -34635,8 +34296,7 @@
 "bsD" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -34811,7 +34471,6 @@
 /obj/machinery/hydroponics/constructable,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/delivery,
@@ -34820,7 +34479,6 @@
 "bsQ" = (
 /obj/machinery/hydroponics/constructable,
 /obj/structure/sign/nanotrasen{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/delivery,
@@ -35029,8 +34687,7 @@
 "btm" = (
 /obj/machinery/mineral/labor_claim_console{
 	machinedir = 1;
-	pixel_x = 30;
-	pixel_y = 0
+	pixel_x = 30
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -35129,8 +34786,7 @@
 /area/security/main)
 "btv" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -35140,8 +34796,6 @@
 	dir = 8;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -35193,8 +34847,7 @@
 /area/ai_monitored/turret_protected/ai)
 "btC" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -35204,8 +34857,6 @@
 	dir = 4;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -35364,8 +35015,7 @@
 "btW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -35380,7 +35030,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/item/weapon/wrench,
@@ -35648,8 +35297,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Vault APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -35749,8 +35397,7 @@
 "buI" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/red/side{
@@ -35820,8 +35467,7 @@
 /area/security/main)
 "buR" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -36334,8 +35980,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/camera{
 	c_tag = "Central Hallway - Bridge Port";
@@ -36716,9 +36361,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -36758,7 +36401,6 @@
 	frequency = 1424;
 	listening = 1;
 	name = "Interrogation Intercom";
-	pixel_x = 0;
 	pixel_y = -58
 	},
 /turf/open/floor/plasteel/vault{
@@ -36783,8 +36425,7 @@
 /area/security/main)
 "bww" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -36870,8 +36511,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -36937,8 +36577,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Gravity Generator APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	icon_state = "intact";
@@ -36960,7 +36599,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -37107,8 +36745,7 @@
 	layer = 4;
 	name = "Engine Monitor";
 	network = list("Engine");
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /turf/open/floor/plasteel/caution{
 	dir = 8
@@ -37335,7 +36972,6 @@
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
 	name = "WARNING: BLAST DOORS";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -37439,9 +37075,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -37463,7 +37097,6 @@
 	desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
 	name = "Research Monitor";
 	network = list("RD","Sat");
-	pixel_x = 0;
 	pixel_y = 2
 	},
 /turf/open/floor/plasteel/black,
@@ -37524,7 +37157,6 @@
 /obj/item/weapon/storage/belt/champion,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light/small,
@@ -37598,16 +37230,14 @@
 "bxZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/transfer)
 "bya" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -37645,7 +37275,6 @@
 "bye" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/structure/extinguisher_cabinet{
@@ -37691,7 +37320,6 @@
 	frequency = 1424;
 	listening = 0;
 	name = "Interrogation Intercom";
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -37730,8 +37358,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -37840,8 +37467,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -38067,8 +37693,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Engineering Foyer APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -38112,7 +37737,6 @@
 "byV" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -38136,7 +37760,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/caution,
@@ -38155,7 +37778,6 @@
 /obj/item/weapon/pen,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/caution,
@@ -38172,8 +37794,7 @@
 	department = "Atmospherics Office";
 	departmentType = 0;
 	name = "Atmospherics RC";
-	pixel_x = 30;
-	pixel_y = 0
+	pixel_x = 30
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26;
@@ -38266,7 +37887,6 @@
 	department = "Primary Tool Storage";
 	departmentType = 0;
 	name = "Primary Tool Storage RC";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/structure/disposalpipe/trunk,
@@ -38848,7 +38468,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/red/side,
@@ -38887,8 +38506,7 @@
 	freerange = 1;
 	listening = 1;
 	name = "Common Channel";
-	pixel_x = -27;
-	pixel_y = 0
+	pixel_x = -27
 	},
 /obj/item/device/radio/intercom{
 	anyai = 1;
@@ -39002,8 +38620,7 @@
 	freerange = 1;
 	listening = 1;
 	name = "Common Channel";
-	pixel_x = 27;
-	pixel_y = 0
+	pixel_x = 27
 	},
 /obj/item/device/radio/intercom{
 	anyai = 1;
@@ -39577,8 +39194,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -39899,7 +39515,6 @@
 	freerange = 1;
 	listening = 0;
 	name = "Custom Channel";
-	pixel_x = 0;
 	pixel_y = -27
 	},
 /obj/item/device/radio/intercom{
@@ -39940,12 +39555,10 @@
 /area/ai_monitored/turret_protected/ai)
 "bBP" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -39964,9 +39577,7 @@
 "bBR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -39982,8 +39593,7 @@
 "bBT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/gravity_generator)
@@ -40057,8 +39667,7 @@
 "bCa" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/effect/turf_decal/delivery,
@@ -40083,21 +39692,17 @@
 "bCd" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/caution,
 /area/engine/break_room)
 "bCe" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -40189,9 +39794,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_y = 26
@@ -40338,8 +39941,7 @@
 /obj/item/weapon/stock_parts/micro_laser,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -40573,7 +40175,6 @@
 "bDc" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -40597,7 +40198,6 @@
 "bDf" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/darkblue/side,
@@ -40895,7 +40495,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -40921,9 +40520,7 @@
 "bDJ" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_y = -26
@@ -41162,8 +40759,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
@@ -41227,7 +40823,6 @@
 /obj/item/weapon/stock_parts/manipulator,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/vault{
@@ -41269,8 +40864,7 @@
 /obj/effect/landmark/start/assistant,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/storage/primary)
@@ -41316,9 +40910,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/primary/central)
@@ -41400,8 +40992,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Bridge - Command Chair";
@@ -41584,11 +41175,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Detective's Office APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/item/device/taperecorder,
 /obj/item/weapon/restraints/handcuffs,
@@ -41615,7 +41204,6 @@
 "bFc" = (
 /obj/machinery/photocopier,
 /obj/machinery/ai_status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault,
@@ -41798,8 +41386,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -41842,7 +41429,6 @@
 	dir = 6
 	},
 /obj/machinery/power/apc{
-	aidisabled = 0;
 	dir = 1;
 	name = "AI Chamber APC";
 	pixel_y = 24
@@ -42126,8 +41712,7 @@
 "bFZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -42217,8 +41802,7 @@
 /obj/machinery/vending/tool,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -42289,7 +41873,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Council Chambers APC";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/wood,
@@ -42402,7 +41985,6 @@
 /area/crew_quarters/heads/captain)
 "bGI" = (
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault{
@@ -42417,8 +41999,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
@@ -42429,8 +42010,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
@@ -42606,8 +42186,7 @@
 "bHb" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 10
@@ -42636,8 +42215,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
@@ -42709,8 +42287,7 @@
 "bHl" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	icon_state = "intact";
@@ -42799,8 +42376,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	icon_state = "intact";
@@ -42830,8 +42406,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Transit Tube Access APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 2;
@@ -42850,14 +42425,11 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/button/door{
 	id = "transitlock";
 	name = "Transit Tube Lockdown Control";
-	pixel_x = 0;
 	pixel_y = 26;
 	req_access_txt = "39; 19"
 	},
@@ -43006,8 +42578,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -43235,8 +42806,7 @@
 "bIg" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/carpet,
 /area/bridge/meeting_room/council)
@@ -43329,7 +42899,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Telecoms Monitoring APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -43470,7 +43039,6 @@
 "bIF" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/wood,
@@ -43497,8 +43065,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Auxiliary Tool Storage APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /turf/open/floor/plasteel/yellow/corner{
 	dir = 1
@@ -43514,6 +43081,9 @@
 /obj/structure/closet/toolcloset,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/yellow/corner{
 	dir = 4
 	},
@@ -43599,8 +43169,7 @@
 	department = "Detective's Office";
 	departmentType = 0;
 	name = "Detective RC";
-	pixel_x = 30;
-	pixel_y = 0
+	pixel_x = 30
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -43639,7 +43208,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/open/floor/plasteel/red/corner{
@@ -43651,8 +43219,7 @@
 	desc = "A warning sign which reads 'HIGH VOLTAGE'";
 	icon_state = "shock";
 	name = "HIGH VOLTAGE";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/light{
 	dir = 4
@@ -43725,8 +43292,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/item/clothing/mask/gas/sechailer,
 /obj/item/clothing/mask/gas/sechailer,
@@ -43828,7 +43394,6 @@
 "bJm" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -43872,8 +43437,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -44004,9 +43568,7 @@
 	},
 /area/engine/transit_tube)
 "bJD" = (
-/obj/machinery/computer/card/minor/ce{
-	pixel_x = 0
-	},
+/obj/machinery/computer/card/minor/ce,
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
@@ -44070,7 +43632,6 @@
 "bJL" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/yellow/side{
@@ -44225,9 +43786,7 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -44386,8 +43945,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/tcommsat/computer)
@@ -44474,9 +44032,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/captain)
@@ -44537,9 +44093,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
@@ -44560,8 +44114,7 @@
 "bKP" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/camera{
@@ -44737,9 +44290,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/warden)
@@ -44766,9 +44317,7 @@
 "bLl" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -44796,8 +44345,7 @@
 /area/ai_monitored/security/armory)
 "bLo" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -44808,8 +44356,6 @@
 	dir = 8;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -44847,8 +44393,7 @@
 	frequency = 1447;
 	listening = 0;
 	name = "AI Intercom";
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_x = 28
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -44868,8 +44413,7 @@
 /area/ai_monitored/turret_protected/aisat_interior)
 "bLw" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -44880,8 +44424,6 @@
 	dir = 4;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -44912,9 +44454,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/flasher{
 	id = "AI";
@@ -44943,8 +44483,7 @@
 	department = "Chief Engineer's Desk";
 	departmentType = 5;
 	name = "Chief Engineer's RC";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/machinery/camera{
 	c_tag = "Engineering - Chief Engineer's Office";
@@ -45128,7 +44667,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -45204,7 +44742,6 @@
 /obj/item/device/radio,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /obj/machinery/light_switch{
@@ -45435,6 +44972,9 @@
 /obj/item/weapon/storage/toolbox/emergency,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel/yellow/side{
 	dir = 10
 	},
@@ -45485,15 +45025,13 @@
 /area/security/detectives_office)
 "bMR" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/floor/plasteel/black,
 /area/security/detectives_office)
 "bMS" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -45504,13 +45042,11 @@
 "bMT" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -45594,8 +45130,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -45674,9 +45209,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/suit/armor/vest{
-	pixel_y = 0
-	},
+/obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/suit/armor/vest{
 	pixel_x = 3;
 	pixel_y = -3
@@ -45790,8 +45323,6 @@
 	dir = 2;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault,
@@ -45849,8 +45380,7 @@
 /obj/structure/lattice,
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -46206,7 +45736,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/structure/bookcase/random,
@@ -46220,7 +45749,6 @@
 "bOn" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/camera{
@@ -46288,7 +45816,6 @@
 /obj/structure/table/wood,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/item/weapon/phone{
@@ -46383,8 +45910,7 @@
 	desc = "A direction sign, pointing out which way the Command department is.";
 	dir = 1;
 	icon_state = "direction_bridge";
-	name = "command department";
-	pixel_y = 0
+	name = "command department"
 	},
 /obj/structure/sign/directions/engineering{
 	desc = "A direction sign, pointing out which way the Supply department is.";
@@ -46514,9 +46040,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/weapon/clipboard,
 /obj/item/toy/figure/warden,
@@ -46545,8 +46069,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Warden's Office APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/camera{
 	c_tag = "Security - Warden's Office";
@@ -46606,9 +46129,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/suit/armor/bulletproof{
-	pixel_y = 0
-	},
+/obj/item/clothing/suit/armor/bulletproof,
 /obj/item/clothing/suit/armor/bulletproof{
 	pixel_x = 3;
 	pixel_y = -3
@@ -46658,9 +46179,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light/small{
 	dir = 4
@@ -46726,8 +46245,6 @@
 	dir = 8;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -46817,7 +46334,6 @@
 	icon_state = "control_standby";
 	name = "Antechamber Turret Control";
 	pixel_x = -32;
-	pixel_y = 0;
 	req_access_txt = "65"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -46828,8 +46344,6 @@
 	dir = 4;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -46874,7 +46388,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -46915,8 +46428,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	icon_state = "intact";
@@ -46938,8 +46450,7 @@
 "bPx" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -46956,8 +46467,6 @@
 	dir = 2;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /obj/item/weapon/clipboard,
@@ -46983,9 +46492,7 @@
 "bPA" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -47047,8 +46554,7 @@
 "bPF" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8;
@@ -47209,11 +46715,9 @@
 /area/security/checkpoint/engineering)
 "bPS" = (
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Security Post - Engineering APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	icon_state = "intact";
@@ -47265,8 +46769,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/camera{
 	c_tag = "Security Post - Engineering";
@@ -47552,8 +47055,7 @@
 	department = "Captain's Desk";
 	departmentType = 5;
 	name = "Captain RC";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/carpet,
@@ -47815,8 +47317,7 @@
 	desc = "A warning sign which reads 'HIGH VOLTAGE'";
 	icon_state = "shock";
 	name = "HIGH VOLTAGE";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	icon_state = "intact";
@@ -48007,8 +47508,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -48039,7 +47539,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -48104,8 +47603,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/ai_monitored/turret_protected/aisat_interior)
@@ -48148,8 +47646,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -48223,8 +47720,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -48232,8 +47728,7 @@
 /area/aisat)
 "bRE" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/transit_tube/station{
@@ -48291,8 +47786,7 @@
 "bRK" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -48316,7 +47810,6 @@
 	dir = 4;
 	name = "Research Monitor";
 	network = list("Sat");
-	pixel_x = 0;
 	pixel_y = 2
 	},
 /turf/open/floor/plasteel/vault{
@@ -48344,7 +47837,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -48367,8 +47859,7 @@
 	layer = 4;
 	name = "Engine Monitor";
 	network = list("Engine");
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_x = -30
 	},
 /mob/living/simple_animal/parrot/Poly,
 /turf/open/floor/plasteel/vault{
@@ -48435,7 +47926,6 @@
 /obj/machinery/suit_storage_unit/ce,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -48459,8 +47949,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
@@ -48496,9 +47985,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -48534,7 +48021,6 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/item/weapon/book/manual/wiki/security_space_law,
@@ -48589,9 +48075,7 @@
 "bSp" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/port)
@@ -48974,8 +48458,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/starboard)
@@ -49333,9 +48816,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -49423,8 +48904,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -49437,8 +48917,7 @@
 /obj/structure/window/reinforced,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -49475,8 +48954,7 @@
 "bTQ" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/transit_tube/curved/flipped{
 	icon_state = "curved1";
@@ -49548,7 +49026,6 @@
 /obj/item/weapon/cartridge/atmos,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/vault{
@@ -49625,9 +49102,7 @@
 /obj/machinery/light/small,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/camera{
@@ -49795,7 +49270,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/door/firedoor,
@@ -49811,7 +49285,6 @@
 /obj/machinery/light,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -50005,9 +49478,7 @@
 "bUT" = (
 /obj/structure/sink{
 	dir = 4;
-	icon_state = "sink";
-	pixel_x = 11;
-	pixel_y = 0
+	pixel_x = 11
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
@@ -50073,7 +49544,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/neutral/corner,
@@ -50391,7 +49861,6 @@
 /obj/machinery/power/apc{
 	dir = 2;
 	name = "MiniSat APC";
-	pixel_x = 0;
 	pixel_y = -27
 	},
 /obj/structure/cable/white,
@@ -50418,7 +49887,6 @@
 	frequency = 1447;
 	listening = 0;
 	name = "AI Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -50471,7 +49939,6 @@
 	control_area = "AI Upload Chamber";
 	icon_state = "control_stun";
 	name = "AI Upload turret control";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -50482,7 +49949,6 @@
 /obj/machinery/light,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/vault,
@@ -50490,9 +49956,7 @@
 "bVM" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/porta_turret/ai,
 /turf/open/floor/plasteel/vault{
@@ -50520,7 +49984,6 @@
 	frequency = 1447;
 	listening = 0;
 	name = "AI Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/vault{
@@ -51035,7 +50498,6 @@
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
 	name = "WARNING: BLAST DOORS";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -51490,8 +50952,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Port Maintenance APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -51573,8 +51034,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
@@ -51586,8 +51046,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/central)
@@ -51905,7 +51364,6 @@
 /obj/machinery/button/door{
 	id = "lawyerprivacy";
 	name = "Lawyer's Privacy Control";
-	pixel_x = 0;
 	pixel_y = 24;
 	req_access_txt = "0"
 	},
@@ -51936,9 +51394,7 @@
 /obj/structure/closet/lawcloset,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/wood,
 /area/lawoffice)
@@ -52181,8 +51637,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/yellow,
 /area/engine/engineering)
@@ -52497,8 +51952,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "HoP Office APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-8"
@@ -52518,8 +51972,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Telecoms Server Room APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/cable/white,
 /turf/open/floor/plasteel/vault{
@@ -52708,9 +52161,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -52917,7 +52368,6 @@
 /obj/structure/filingcabinet/employment,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/wood,
@@ -53073,7 +52523,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Brig APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -53391,8 +52840,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -53442,16 +52890,14 @@
 /obj/structure/sign/kiddieplaque{
 	desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside.";
 	name = "Library Rules Sign";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/open/floor/wood,
 /area/library)
 "cby" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/library)
@@ -53486,8 +52932,7 @@
 /obj/structure/sign/kiddieplaque{
 	desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside.";
 	name = "Library Rules Sign";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/corner{
@@ -53510,8 +52955,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/heads/hop)
@@ -53630,7 +53074,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -53651,7 +53094,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -53742,9 +53184,7 @@
 "ccd" = (
 /obj/structure/table/wood,
 /obj/item/device/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "Station Intercom"
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
@@ -54006,8 +53446,7 @@
 /obj/effect/landmark/start/security_officer,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/brig)
@@ -54069,8 +53508,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/space,
 /area/space)
@@ -54386,7 +53824,6 @@
 /obj/item/weapon/pen,
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/open/floor/wood,
@@ -54572,9 +54009,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/primary/central)
@@ -54668,8 +54103,7 @@
 /obj/effect/landmark/start/lawyer,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/lawoffice)
@@ -54679,7 +54113,6 @@
 	department = "Law Office";
 	departmentType = 0;
 	name = "'Law Office RC";
-	pixel_x = 0;
 	pixel_y = -64
 	},
 /obj/item/weapon/folder/blue{
@@ -54726,8 +54159,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Security - Brig Desk";
@@ -54823,9 +54255,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/device/radio{
 	pixel_x = 5;
@@ -54956,8 +54386,7 @@
 "cew" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -55411,7 +54840,6 @@
 /obj/structure/table/wood,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/item/weapon/folder/yellow{
@@ -55449,8 +54877,7 @@
 /obj/item/device/flashlight/lamp,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/wood,
 /area/lawoffice)
@@ -55524,8 +54951,7 @@
 /area/security/brig)
 "cfL" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -55543,8 +54969,7 @@
 /obj/item/weapon/aiModule/reset,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -55596,8 +55021,7 @@
 	frequency = 1447;
 	listening = 0;
 	name = "AI Intercom";
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_x = 28
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -55661,8 +55085,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -55674,8 +55097,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -55736,8 +55158,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Engine Room APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -55765,6 +55186,9 @@
 /obj/item/weapon/tank/internals/emergency_oxygen/engi,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plating,
 /area/maintenance/port)
 "cgk" = (
@@ -55853,7 +55277,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -56128,6 +55551,9 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/bot,
+/obj/machinery/light_switch{
+	pixel_x = -36
+	},
 /turf/open/floor/plasteel,
 /area/security/range)
 "cgZ" = (
@@ -56612,7 +56038,6 @@
 /obj/item/stack/packageWrap,
 /obj/item/weapon/hand_labeler,
 /obj/structure/extinguisher_cabinet{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/bot,
@@ -56625,7 +56050,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Teleporter APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/structure/cable/white{
@@ -56663,7 +56087,6 @@
 /obj/machinery/button/door{
 	id = "teleporterhubshutters";
 	name = "Teleporter Shutters";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/bluespace_beacon,
@@ -56722,8 +56145,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -56754,9 +56176,7 @@
 "cir" = (
 /obj/structure/table/wood,
 /obj/item/device/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "Station Intercom"
 	},
 /turf/open/floor/plasteel/neutral/side,
 /area/security/courtroom)
@@ -56966,9 +56386,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -57062,8 +56480,7 @@
 /area/security/range)
 "ciQ" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -57073,8 +56490,6 @@
 	dir = 8;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -57089,7 +56504,6 @@
 /obj/machinery/power/apc{
 	dir = 2;
 	name = "AI Upload Access APC";
-	pixel_x = 0;
 	pixel_y = -27
 	},
 /turf/open/floor/plasteel/vault{
@@ -57133,7 +56547,6 @@
 /obj/machinery/light,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -57143,8 +56556,7 @@
 /area/ai_monitored/turret_protected/ai_upload)
 "ciW" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -57154,8 +56566,6 @@
 	dir = 4;
 	name = "ai camera";
 	network = list("Sat");
-	pixel_x = 0;
-	pixel_y = 0;
 	start_active = 1
 	},
 /turf/open/floor/plasteel/vault{
@@ -57215,7 +56625,6 @@
 	department = "Chapel Office";
 	departmentType = 0;
 	name = "Chapel RC";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/closed/wall/r_wall,
@@ -57231,8 +56640,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -57334,9 +56742,7 @@
 /obj/item/device/camera_film,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/grimy,
 /area/library)
@@ -57584,8 +56990,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
@@ -57625,8 +57030,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/courtroom)
@@ -57749,8 +57153,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Shooting Range APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -57778,7 +57181,6 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/weapon/gun/energy/laser/practice{
@@ -57832,8 +57234,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
@@ -58004,7 +57405,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -58123,7 +57523,6 @@
 "ckZ" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -58148,15 +57547,12 @@
 "clc" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -58184,7 +57580,6 @@
 "clf" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -58211,7 +57606,6 @@
 /obj/item/device/radio,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/bot,
@@ -58258,13 +57652,11 @@
 /obj/machinery/light,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1
@@ -58329,8 +57721,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Courtroom APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-8"
@@ -58434,8 +57825,7 @@
 "clH" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/structure/lattice,
 /obj/structure/lattice,
@@ -58777,7 +58167,6 @@
 	id = "teleportershutters";
 	name = "Teleporter Shutters";
 	pixel_x = -26;
-	pixel_y = 0;
 	req_access_txt = "19"
 	},
 /obj/machinery/door/poddoor/shutters{
@@ -58814,9 +58203,7 @@
 /obj/structure/table,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/weapon/storage/fancy/donut_box,
 /turf/open/floor/plasteel/vault{
@@ -58861,9 +58248,7 @@
 "cmH" = (
 /obj/structure/table/wood,
 /obj/item/device/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "Station Intercom"
 	},
 /turf/open/floor/plasteel/vault,
 /area/security/courtroom)
@@ -59013,8 +58398,7 @@
 "cnc" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/door/window/northright,
 /turf/open/floor/plasteel/vault{
@@ -59097,8 +58481,7 @@
 	layer = 4;
 	name = "Engine Containment Telescreen";
 	network = list("Singularity");
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_x = -30
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -59136,8 +58519,7 @@
 "cnr" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -59185,8 +58567,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 4
@@ -59309,8 +58690,7 @@
 /obj/structure/noticeboard{
 	dir = 8;
 	icon_state = "nboard00";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /turf/open/floor/plasteel/grimy,
 /area/library)
@@ -59405,7 +58785,6 @@
 	dir = 4
 	},
 /obj/machinery/power/apc{
-	aidisabled = 0;
 	dir = 1;
 	name = "Command Hall APC";
 	pixel_y = 24
@@ -59474,7 +58853,6 @@
 /area/hallway/secondary/command)
 "cnY" = (
 /obj/structure/sign/electricshock{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -59505,9 +58883,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -59555,7 +58931,6 @@
 /obj/machinery/vending/coffee,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/vault{
@@ -59816,13 +59191,11 @@
 /area/aisat)
 "coH" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -59973,6 +59346,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -23
+	},
 /turf/open/floor/plasteel,
 /area/maintenance/port)
 "cpc" = (
@@ -60042,7 +59419,6 @@
 /obj/item/toy/figure/curator,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/item/device/radio/intercom{
@@ -60388,6 +59764,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/secondary/command)
 "cpL" = (
@@ -60419,9 +59799,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: PRESSURIZED DOORS";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "WARNING: PRESSURIZED DOORS"
 	},
 /turf/closed/wall,
 /area/security/courtroom)
@@ -60436,6 +59814,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
@@ -60577,8 +59958,7 @@
 "cqh" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/vault{
@@ -60809,8 +60189,7 @@
 	desc = "A direction sign, pointing out which way the Command department is.";
 	dir = 1;
 	icon_state = "direction_bridge";
-	name = "command department";
-	pixel_y = 0
+	name = "command department"
 	},
 /turf/closed/wall/r_wall,
 /area/ai_monitored/storage/eva)
@@ -60880,8 +60259,7 @@
 "cqN" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/secondary/command)
@@ -60963,8 +60341,7 @@
 	desc = "A direction sign, pointing out which way the Command department is.";
 	dir = 1;
 	icon_state = "direction_bridge";
-	name = "command department";
-	pixel_y = 0
+	name = "command department"
 	},
 /turf/closed/wall/r_wall,
 /area/gateway)
@@ -61096,6 +60473,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
@@ -61403,7 +60783,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -61449,7 +60828,6 @@
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "E.V.A. Storage APC";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/structure/cable/white{
@@ -61595,7 +60973,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Gateway APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -61644,7 +61021,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -61672,9 +61048,7 @@
 "csv" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/central)
@@ -61948,7 +61322,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -61985,7 +61358,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/suit_storage_unit/engine,
@@ -62111,8 +61483,7 @@
 "ctu" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/black,
 /area/library)
@@ -62141,8 +61512,7 @@
 /obj/effect/landmark/revenantspawn,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/black,
 /area/library)
@@ -62404,7 +61774,6 @@
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -62520,7 +61889,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/neutral/corner{
@@ -62796,8 +62164,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -62846,9 +62213,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/yellow/side{
 	dir = 1;
@@ -62895,8 +62260,7 @@
 /obj/structure/sign/kiddieplaque{
 	desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside.";
 	name = "Library Rules Sign";
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -62975,7 +62339,6 @@
 /obj/structure/filingcabinet,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/black,
@@ -62985,7 +62348,6 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/vault{
@@ -63024,9 +62386,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
@@ -63037,7 +62397,6 @@
 	dir = 4;
 	name = "Magboot Storage";
 	pixel_x = -1;
-	pixel_y = 0;
 	req_access_txt = "19"
 	},
 /obj/structure/window/reinforced{
@@ -63052,10 +62411,7 @@
 	pixel_x = -4;
 	pixel_y = 3
 	},
-/obj/item/clothing/shoes/magboots{
-	pixel_x = 0;
-	pixel_y = 0
-	},
+/obj/item/clothing/shoes/magboots,
 /obj/item/clothing/shoes/magboots{
 	pixel_x = 4;
 	pixel_y = -3
@@ -63171,8 +62527,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/gateway)
@@ -63280,8 +62635,7 @@
 "cvI" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/locker)
@@ -63528,7 +62882,6 @@
 /obj/item/clothing/shoes/magboots,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/delivery,
@@ -63652,7 +63005,6 @@
 	dir = 4;
 	name = "RCD Storage";
 	pixel_x = 1;
-	pixel_y = 0;
 	req_access_txt = "19"
 	},
 /obj/structure/window/reinforced,
@@ -63685,8 +63037,7 @@
 	department = "E.V.A. Storage";
 	departmentType = 0;
 	name = "E.V.A. RC";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -63717,7 +63068,6 @@
 "cwH" = (
 /obj/structure/bookcase,
 /obj/structure/sign/nanotrasen{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/wood,
@@ -63754,7 +63104,6 @@
 /area/bridge/showroom/corporate)
 "cwM" = (
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault{
@@ -63779,7 +63128,6 @@
 	icon_state = "implantchair";
 	layer = 2.7;
 	name = "NanoTrasen automated loyalty implanter exhibit";
-	pixel_x = 0;
 	pixel_y = 4
 	},
 /turf/open/floor/plasteel/grimy,
@@ -63796,8 +63144,6 @@
 /obj/item/weapon/reagent_containers/syringe/charcoal,
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = 0;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -63890,8 +63236,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	icon_state = "neutralcorner";
@@ -63900,7 +63245,6 @@
 /area/hallway/primary/central)
 "cwZ" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 4
 	},
 /obj/item/weapon/soap/nanotrasen,
@@ -63949,6 +63293,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	pixel_x = -10;
+	pixel_y = 26
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	icon_state = "neutralcorner";
 	dir = 1
@@ -63969,11 +63317,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Primary Restroom APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -64025,6 +63371,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
@@ -64130,8 +63480,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Lockerroom APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -64173,6 +63522,9 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium,
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium,
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cxw" = (
@@ -64206,6 +63558,9 @@
 	},
 /obj/item/clothing/under/kilt,
 /obj/item/clothing/head/beret,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "cxz" = (
@@ -64248,6 +63603,9 @@
 	icon_state = "curator"
 	},
 /obj/item/clothing/under/rank/curator/treasure_hunter,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cxC" = (
@@ -64286,8 +63644,7 @@
 "cxG" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
@@ -64537,7 +63894,6 @@
 	dir = 4;
 	name = "Jetpack Storage";
 	pixel_x = -1;
-	pixel_y = 0;
 	req_access_txt = "19"
 	},
 /obj/structure/window/reinforced,
@@ -64549,10 +63905,7 @@
 	pixel_x = 4;
 	pixel_y = -1
 	},
-/obj/item/weapon/tank/jetpack/carbondioxide{
-	pixel_x = 0;
-	pixel_y = 0
-	},
+/obj/item/weapon/tank/jetpack/carbondioxide,
 /obj/item/weapon/tank/jetpack/carbondioxide{
 	pixel_x = -4;
 	pixel_y = 1
@@ -64582,8 +63935,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Corporate Lounge APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -64596,8 +63948,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/bridge/showroom/corporate)
@@ -64704,7 +64055,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/wood,
@@ -64860,7 +64210,6 @@
 /area/gateway)
 "cyF" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral/side{
@@ -64923,16 +64272,13 @@
 "cyO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/toilet/restrooms)
 "cyP" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/side{
@@ -65201,8 +64547,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Engineering Storage APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white{
 	icon_state = "0-8"
@@ -65277,7 +64622,6 @@
 /obj/item/weapon/storage/fancy/donut_box,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/vault{
@@ -65423,8 +64767,7 @@
 "czS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -65481,7 +64824,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/table/reinforced,
@@ -65660,8 +65002,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -65671,13 +65012,11 @@
 "cAq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/toilet/restrooms)
@@ -65686,6 +65025,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/neutral/side,
 /area/crew_quarters/toilet/restrooms)
 "cAs" = (
@@ -65711,7 +65054,6 @@
 	},
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -65925,9 +65267,7 @@
 /obj/item/weapon/folder,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner{
@@ -66036,9 +65376,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/yellow,
 /area/engine/engineering)
@@ -66220,7 +65558,6 @@
 /area/ai_monitored/storage/eva)
 "cBx" = (
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -66265,7 +65602,6 @@
 "cBB" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -66370,7 +65706,6 @@
 "cBL" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -66427,7 +65762,6 @@
 	},
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -66472,7 +65806,6 @@
 "cBY" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/vault{
@@ -66533,11 +65866,19 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cCf" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cCg" = (
@@ -66546,6 +65887,10 @@
 /area/crew_quarters/dorms)
 "cCh" = (
 /obj/structure/dresser,
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "cCi" = (
@@ -66560,10 +65905,18 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cCj" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cCk" = (
@@ -66878,9 +66231,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: PRESSURIZED DOORS";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "WARNING: PRESSURIZED DOORS"
 	},
 /turf/closed/wall/r_wall,
 /area/ai_monitored/storage/eva)
@@ -67003,9 +66354,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: BLAST DOORS";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "WARNING: BLAST DOORS"
 	},
 /turf/closed/wall/r_wall,
 /area/gateway)
@@ -67049,7 +66398,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/vomit/old,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -67061,7 +66409,6 @@
 "cDl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -67074,7 +66421,6 @@
 "cDm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/machinery/newscaster{
@@ -67138,8 +66484,7 @@
 "cDs" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner{
@@ -67555,6 +66900,10 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light_switch{
+	pixel_x = -26;
+	pixel_y = 26
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
@@ -67619,6 +66968,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
@@ -67666,10 +67018,7 @@
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	icon_state = "manifold";
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
@@ -67765,7 +67114,6 @@
 "cEF" = (
 /obj/machinery/light,
 /obj/structure/extinguisher_cabinet{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -68330,8 +67678,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hall6";
@@ -68381,9 +67728,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=hall7";
@@ -68442,8 +67787,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -68684,6 +68028,7 @@
 /area/crew_quarters/dorms)
 "cGb" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
@@ -68692,11 +68037,9 @@
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/dorms)
 "cGd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber{
-	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	icon_state = "manifold";
+	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/dorms)
@@ -68712,6 +68055,7 @@
 /area/crew_quarters/dorms)
 "cGg" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/dorms)
 "cGh" = (
@@ -69255,6 +68599,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/neutral/side,
 /area/crew_quarters/dorms)
 "cHq" = (
@@ -69286,7 +68634,6 @@
 "cHs" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -69295,6 +68642,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8;
 	heat_capacity = 1e+006
@@ -69314,10 +68662,10 @@
 /area/crew_quarters/dorms)
 "cHu" = (
 /obj/machinery/light,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
@@ -69371,6 +68719,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/corner,
 /area/crew_quarters/dorms)
 "cHz" = (
@@ -69429,8 +68778,7 @@
 "cHD" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -69761,31 +69109,23 @@
 	pixel_y = 8
 	},
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIs" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIt" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIu" = (
 /obj/machinery/status_display,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIv" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
@@ -69793,15 +69133,11 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIw" = (
 /obj/structure/sign/bluecross_2,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cIy" = (
 /obj/machinery/vending/snack/random,
 /obj/machinery/light,
@@ -69846,7 +69182,6 @@
 /obj/structure/closet/secure_closet/medical3,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/neutral/side,
@@ -70021,8 +69356,7 @@
 "cJa" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral/side,
 /area/crew_quarters/fitness/recreation)
@@ -70479,33 +69813,25 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKh" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKi" = (
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKj" = (
 /obj/structure/chair,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKk" = (
 /obj/structure/table,
 /obj/item/weapon/reagent_containers/glass/bottle/charcoal{
@@ -70516,9 +69842,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKl" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/light{
@@ -70527,9 +69851,7 @@
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKm" = (
 /obj/structure/table,
 /obj/item/stack/medical/gauze,
@@ -70538,41 +69860,31 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKn" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKo" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKp" = (
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKq" = (
 /obj/structure/chair,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKr" = (
 /obj/structure/table,
 /obj/item/weapon/storage/firstaid/regular,
@@ -70584,14 +69896,10 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKs" = (
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cKt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -70622,8 +69930,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Medbay Storage APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay - Storage";
@@ -70643,8 +69950,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whiteblue/side{
 	icon_state = "whiteblue";
@@ -70816,6 +70122,10 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "cKL" = (
@@ -70828,6 +70138,10 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cKM" = (
@@ -70837,6 +70151,10 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cKN" = (
@@ -70852,6 +70170,10 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cKO" = (
@@ -70862,6 +70184,10 @@
 	pixel_x = 26;
 	pixel_y = 26
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cKP" = (
@@ -70917,9 +70243,7 @@
 /obj/machinery/atmospherics/components/binary/valve,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -71042,8 +70366,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Auxiliary Power APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plating,
 /area/maintenance/department/electrical)
@@ -71153,8 +70476,7 @@
 /obj/structure/closet/secure_closet/security/science,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -71175,7 +70497,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/red/side{
@@ -71267,31 +70588,21 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLL" = (
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLM" = (
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLN" = (
 /obj/machinery/holopad,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLO" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLP" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
@@ -71299,9 +70610,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLQ" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/button/door{
@@ -71315,27 +70624,21 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLR" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLS" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cLT" = (
 /turf/closed/wall,
 /area/security/checkpoint/medical)
@@ -71614,8 +70917,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/maintenance/department/electrical)
@@ -71716,8 +71018,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
@@ -71947,9 +71248,7 @@
 "cNi" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -72050,9 +71349,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNv" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -72060,39 +71357,29 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNy" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNz" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -72100,9 +71387,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNA" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -72110,9 +71395,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNB" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -72127,17 +71410,13 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNC" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cND" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	icon_state = "intact";
@@ -72146,9 +71425,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNE" = (
 /obj/machinery/status_display{
 	pixel_y = 32
@@ -72187,7 +71464,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/red/side{
@@ -72200,9 +71476,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light_switch{
 	pixel_x = 38
@@ -72229,9 +71503,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNI" = (
 /obj/structure/table,
 /obj/item/weapon/storage/box/gloves{
@@ -72241,27 +71513,25 @@
 /obj/item/weapon/storage/box/beakers,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNJ" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/item/weapon/storage/pod{
 	pixel_x = 32;
 	pixel_y = 32
 	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNK" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -72311,7 +71581,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -72326,9 +71595,7 @@
 "cNP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNQ" = (
 /obj/machinery/door/airlock{
 	name = "Medbay Auxiliary Storage";
@@ -72342,9 +71609,7 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cNR" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -72567,8 +71832,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -72667,8 +71931,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: BIOHAZARD CELL";
-	pixel_x = 0
+	name = "WARNING: BIOHAZARD CELL"
 	},
 /turf/closed/wall,
 /area/science/xenobiology)
@@ -72737,7 +72000,6 @@
 /obj/item/weapon/storage/box/syringes,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/item/weapon/extinguisher/mini,
@@ -72961,9 +72223,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPk" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -72974,9 +72234,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -72985,9 +72243,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPm" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -72996,18 +72252,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPn" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPo" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -73017,26 +72269,20 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPp" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPq" = (
 /obj/effect/landmark/lightsout,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -73050,9 +72296,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPs" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -73061,9 +72305,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPt" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -73081,9 +72323,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	icon_state = "intact";
@@ -73095,9 +72335,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPv" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
@@ -73108,9 +72346,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPw" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -73119,9 +72355,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPx" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -73140,8 +72374,7 @@
 "cPz" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/checkpoint/medical)
@@ -73173,9 +72406,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPD" = (
 /obj/structure/table/glass,
 /obj/item/weapon/storage/firstaid/brute{
@@ -73221,8 +72452,7 @@
 	department = "Medbay Storage";
 	departmentType = 0;
 	name = "Medbay Storage RC";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8;
@@ -73248,9 +72478,7 @@
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPH" = (
 /obj/machinery/door/airlock{
 	name = "Bathroom"
@@ -73264,9 +72492,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPI" = (
 /obj/structure/urinal{
 	pixel_y = 28
@@ -73276,9 +72502,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPJ" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -73286,9 +72510,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cPL" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -73315,6 +72537,10 @@
 /obj/item/clothing/suit/toggle/lawyer,
 /obj/item/clothing/under/maid,
 /obj/item/clothing/head/kitty,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "cPO" = (
@@ -73338,6 +72564,10 @@
 	icon_state = "detective"
 	},
 /obj/item/clothing/under/lawyer/female,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/carpet,
 /area/crew_quarters/dorms)
 "cPQ" = (
@@ -73362,6 +72592,10 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily,
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily,
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
 "cPS" = (
@@ -73622,7 +72856,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 5
 	},
 /obj/effect/turf_decal/bot,
@@ -73886,9 +73119,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cQX" = (
 /obj/structure/disposalpipe/segment{
 	icon_state = "pipe-s";
@@ -73900,51 +73131,39 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cQY" = (
 /obj/structure/disposalpipe/segment{
 	icon_state = "pipe-s";
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cQZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cRa" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-21"
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cRb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cRc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cRd" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -74045,7 +73264,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/neutral/side{
@@ -74064,9 +73282,7 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cRp" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -74088,6 +73304,11 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Recreation Area APC";
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
@@ -74106,9 +73327,7 @@
 "cRt" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/fitness/recreation)
@@ -74318,14 +73537,11 @@
 	},
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
@@ -74363,7 +73579,6 @@
 	},
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -74456,8 +73671,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/button/door{
 	desc = "A remote control switch.";
@@ -74484,7 +73698,6 @@
 "cSd" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -74508,6 +73721,10 @@
 /obj/item/weapon/electronics/airlock,
 /obj/item/weapon/stock_parts/console_screen,
 /obj/item/device/assembly/signaler,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
 	},
@@ -74611,18 +73828,14 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSs" = (
 /obj/structure/table,
 /obj/item/weapon/folder/white,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSt" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -74630,16 +73843,12 @@
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSu" = (
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSv" = (
 /obj/structure/disposalpipe/segment,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -74648,23 +73857,21 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSw" = (
 /obj/structure/bed/roller,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSx" = (
 /obj/structure/bed/roller,
 /turf/open/floor/plasteel/whiteblue/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSy" = (
 /obj/structure/bed/roller,
 /obj/structure/sign/chemistry{
@@ -74677,36 +73884,26 @@
 	name = "medbay camera"
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSz" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSA" = (
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSB" = (
 /obj/structure/table,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSC" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSD" = (
 /obj/structure/cable/white,
 /obj/structure/grille,
@@ -74756,9 +73953,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSJ" = (
 /obj/structure/sign/bluecross_2{
 	pixel_x = 32
@@ -74770,9 +73965,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -74794,9 +73987,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSN" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/box/donkpockets,
@@ -74804,21 +73995,20 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSO" = (
 /obj/machinery/camera{
 	c_tag = "Medbay - Break Room";
 	dir = 2;
 	name = "medbay camera"
 	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSP" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment{
@@ -74828,9 +74018,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSQ" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -74838,9 +74026,7 @@
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cSR" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -75239,7 +74425,6 @@
 	departmentType = 0;
 	name = "Xenobiology RC";
 	pixel_x = 32;
-	pixel_y = 0;
 	receive_ore_updates = 1
 	},
 /obj/machinery/camera{
@@ -75394,8 +74579,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/extinguisher_cabinet{
 	dir = 4;
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/primary/aft)
@@ -75407,9 +74591,7 @@
 	name = "Chemisty Lobby Shutters"
 	},
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUf" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -75418,9 +74600,7 @@
 	},
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUg" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -75436,16 +74616,12 @@
 /obj/machinery/door/window/northleft,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUh" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/smartfridge/chemistry/preloaded,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUi" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -75453,9 +74629,7 @@
 /obj/item/weapon/reagent_containers/hypospray/medipen,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUj" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -75466,24 +74640,18 @@
 /obj/item/weapon/reagent_containers/syringe,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUk" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/item/weapon/reagent_containers/food/drinks/britcup,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUl" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/light{
@@ -75493,9 +74661,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/camera{
@@ -75506,9 +74672,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUn" = (
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -75522,8 +74686,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Security Post - Medical APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
@@ -75556,7 +74719,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -75577,18 +74739,14 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUr" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
 	on = 1
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUs" = (
 /obj/structure/table/glass,
 /obj/item/stack/medical/gauze,
@@ -75602,9 +74760,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUt" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -75612,68 +74768,51 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUu" = (
 /turf/open/floor/plasteel/whiteblue/side{
 	icon_state = "whiteblue";
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUv" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUw" = (
 /obj/machinery/newscaster{
 	pixel_x = -32
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUx" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
 	dir = 4
 	},
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUy" = (
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUz" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUA" = (
 /obj/machinery/vending/coffee,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cUB" = (
 /obj/structure/cable/white{
 	icon_state = "1-4"
@@ -76169,7 +75308,6 @@
 "cVw" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -76373,11 +75511,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Chemistry Lab APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /turf/open/floor/plasteel/whiteyellow/corner{
 	dir = 4
@@ -76399,9 +75535,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cVV" = (
 /obj/structure/chair/office/light{
 	dir = 1
@@ -76409,16 +75543,12 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cVW" = (
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cVX" = (
 /obj/structure/chair/office/light{
 	dir = 1
@@ -76426,9 +75556,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cVY" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/button/door{
@@ -76442,9 +75570,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cVZ" = (
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -76484,23 +75610,17 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWe" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWf" = (
 /obj/effect/landmark/start/medical_doctor,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWg" = (
 /obj/structure/mirror{
 	pixel_x = 26
@@ -76512,23 +75632,17 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWh" = (
 /obj/structure/chair/stool,
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWi" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWj" = (
 /obj/machinery/holopad,
 /obj/effect/landmark/start/medical_doctor,
@@ -76537,18 +75651,14 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWk" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
 	dir = 4
 	},
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWl" = (
 /obj/machinery/vending/cola/random,
 /obj/machinery/status_display{
@@ -76561,9 +75671,7 @@
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cWm" = (
 /obj/structure/girder,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -76749,10 +75857,8 @@
 	dir = 8
 	},
 /obj/machinery/power/apc{
-	cell_type = 10000;
 	dir = 1;
 	name = "Port Maintenance APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/structure/cable/white{
@@ -76854,7 +75960,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/delivery,
@@ -77047,8 +76152,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitepurple/side,
 /area/science/xenobiology)
@@ -77075,8 +76179,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Xenobiology Lab APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -77116,8 +76219,7 @@
 "cXm" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -77172,9 +76274,7 @@
 /obj/item/weapon/stock_parts/micro_laser,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -77302,43 +76402,33 @@
 /obj/machinery/computer/crew,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXI" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 2;
 	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXJ" = (
 /obj/machinery/holopad,
 /obj/effect/landmark/start/medical_doctor,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -77352,9 +76442,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXM" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -77363,9 +76451,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXN" = (
 /obj/structure/cable/white{
 	d2 = 2;
@@ -77414,30 +76500,23 @@
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXS" = (
 /obj/machinery/holopad{
 	pixel_y = 16
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXT" = (
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXU" = (
 /obj/structure/table/wood,
 /obj/item/weapon/folder/white,
@@ -77449,34 +76528,26 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXV" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXW" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 1;
 	on = 1
 	},
 /turf/open/floor/plasteel/redblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXX" = (
 /obj/machinery/vending/cigarette,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
 /turf/open/floor/plasteel/neutral/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cXY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
@@ -77488,8 +76559,7 @@
 "cXZ" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/sleeper{
 	icon_state = "sleeper-open";
@@ -77766,8 +76836,7 @@
 /obj/item/weapon/pen,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/item/weapon/storage/bag/bio,
 /obj/item/weapon/storage/bag/bio,
@@ -77823,17 +76892,19 @@
 "cYM" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/bot,
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -23
+	},
 /turf/open/floor/plasteel,
 /area/science/research)
 "cYN" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -77887,8 +76958,7 @@
 /obj/item/weapon/stock_parts/manipulator,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -77973,9 +77043,7 @@
 "cZd" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/whiteyellow/side{
 	dir = 5
@@ -78001,22 +77069,16 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZi" = (
 /obj/structure/chair/office/light,
 /turf/open/floor/plasteel/whiteblue/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZj" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/light/small,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZk" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -78025,20 +77087,15 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZl" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZm" = (
 /obj/structure/chair{
 	dir = 4
@@ -78087,9 +77144,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZr" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -78097,14 +77152,10 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZs" = (
 /turf/open/floor/plasteel/whiteblue/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZt" = (
 /obj/machinery/sleeper{
 	icon_state = "sleeper-open";
@@ -78114,37 +77165,27 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZv" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZx" = (
 /turf/open/floor/plasteel/neutral/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZy" = (
 /obj/structure/table/wood,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
 /turf/open/floor/plasteel/neutral/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "cZz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -78461,7 +77502,6 @@
 	departmentType = 0;
 	name = "Research RC";
 	pixel_x = 32;
-	pixel_y = 0;
 	receive_ore_updates = 1
 	},
 /obj/machinery/camera{
@@ -78527,9 +77567,7 @@
 /obj/item/weapon/reagent_containers/dropper,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/light{
 	dir = 4;
@@ -78548,9 +77586,7 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dap" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -78562,15 +77598,11 @@
 	},
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "daq" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dar" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall,
@@ -78603,18 +77635,14 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dau" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dav" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/firedoor,
@@ -78622,15 +77650,11 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "daw" = (
 /obj/structure/sign/examroom,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dax" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -78640,17 +77664,13 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "day" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/tinted/fulltile,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "daz" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical{
@@ -78662,16 +77682,12 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "daA" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/tinted/fulltile,
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "daB" = (
 /obj/item/weapon/firstaid_arm_assembly,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -78812,11 +77828,9 @@
 /obj/item/clothing/gloves/color/fyellow,
 /obj/item/weapon/storage/toolbox/electrical,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Abandoned Gambling Den APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
@@ -79314,9 +78328,7 @@
 	icon_state = "whiteyellowcorner";
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbS" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79325,9 +78337,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79335,9 +78345,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbU" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -26;
@@ -79347,18 +78355,14 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbV" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbW" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79367,9 +78371,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79379,9 +78381,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbY" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79389,9 +78389,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dbZ" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -79402,9 +78400,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dca" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -79413,9 +78409,7 @@
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dcb" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -79428,25 +78422,19 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dcc" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dcd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dce" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
@@ -79455,25 +78443,19 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dcg" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dch" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dci" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -79494,7 +78476,6 @@
 "dck" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/structure/cable/white{
@@ -79533,7 +78514,6 @@
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -79740,9 +78720,7 @@
 "dcQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -79798,9 +78776,7 @@
 /obj/effect/landmark/start/scientist,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/science/lab)
@@ -79870,7 +78846,6 @@
 	department = "Chemistry Lab";
 	departmentType = 0;
 	name = "Chemistry RC";
-	pixel_x = 0;
 	pixel_y = -64;
 	receive_ore_updates = 1
 	},
@@ -79900,51 +78875,39 @@
 /turf/open/floor/plasteel/whiteyellow/side{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddi" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddj" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddk" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddl" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddm" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddn" = (
 /obj/structure/cable/white{
 	icon_state = "2-4"
@@ -79956,18 +78919,14 @@
 /obj/effect/landmark/lightsout,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddo" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddp" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -79977,9 +78936,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddq" = (
 /obj/structure/cable/white{
 	icon_state = "1-4"
@@ -79988,31 +78945,24 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddr" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dds" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddt" = (
 /obj/structure/cable/white{
 	icon_state = "2-4"
@@ -80021,18 +78971,14 @@
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddu" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddv" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -80041,31 +78987,24 @@
 	icon_state = "1-4"
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddw" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddx" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddy" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -80073,9 +79012,7 @@
 /turf/open/floor/plasteel/whiteblue/side{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddz" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -80088,9 +79025,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ddA" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -80115,7 +79050,6 @@
 "ddC" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -80404,6 +79338,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
 /turf/open/floor/plasteel,
 /area/science/explab)
 "deo" = (
@@ -80412,11 +79349,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Experimentation Lab APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Science - Experimentation Lab";
@@ -80565,7 +79500,6 @@
 /obj/machinery/cell_charger,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/light_switch{
@@ -80707,7 +79641,6 @@
 /obj/item/weapon/hand_labeler,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -80721,7 +79654,6 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -80771,17 +79703,13 @@
 	icon_state = "whiteyellowcorner";
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "deX" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "deY" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -80789,9 +79717,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "deZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -80805,9 +79731,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfa" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -80816,9 +79740,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfb" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -80828,15 +79750,11 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfc" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -80847,25 +79765,19 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfe" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dff" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfg" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -80874,17 +79786,13 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfh" = (
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfi" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -80893,9 +79801,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfj" = (
 /obj/structure/sign/bluecross_2{
 	pixel_x = 32;
@@ -80906,41 +79812,31 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfm" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfn" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
 	dir = 1
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfo" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dfp" = (
 /obj/structure/rack,
 /obj/item/roller,
@@ -80968,7 +79864,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 2;
 	name = "Abandoned Medical Lab APC";
 	pixel_x = 1;
@@ -81180,7 +80075,6 @@
 "dfM" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/black,
@@ -81505,9 +80399,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/stripes/line{
@@ -81552,9 +80444,7 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dgH" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -81564,9 +80454,7 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dgI" = (
 /turf/closed/wall,
 /area/medical/surgery)
@@ -81683,9 +80571,7 @@
 /obj/item/weapon/stock_parts/matter_bin,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -81755,14 +80641,15 @@
 "dhh" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/effect/turf_decal/bot,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel,
 /area/science/explab)
 "dhi" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/whitepurple/side{
 	dir = 8
@@ -81798,9 +80685,7 @@
 "dhp" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -81808,13 +80693,11 @@
 "dhq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -81937,9 +80820,7 @@
 /obj/item/device/paicard,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
@@ -81967,9 +80848,7 @@
 "dhB" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -82012,13 +80891,10 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/effect/turf_decal/bot,
@@ -82073,7 +80949,6 @@
 	cell_type = 10000;
 	dir = 1;
 	name = "Mech Bay APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -82136,8 +81011,7 @@
 "dhR" = (
 /obj/machinery/clonepod,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/status_display{
 	pixel_x = -32
@@ -82205,8 +81079,7 @@
 	cell_type = 5000;
 	dir = 1;
 	name = "Cloning Lab APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/item/weapon/folder/white,
 /obj/item/weapon/book/manual/medical_cloning,
@@ -82219,9 +81092,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dhZ" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -82232,33 +81103,25 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dia" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dib" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dic" = (
 /obj/machinery/atmospherics/components/unary/cryo_cell,
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "did" = (
 /obj/structure/table,
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{
@@ -82274,18 +81137,14 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "die" = (
 /obj/machinery/atmospherics/components/unary/cryo_cell,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dif" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	icon_state = "manifold";
@@ -82294,9 +81153,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dig" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -82306,15 +81163,11 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dih" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dii" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/vault,
@@ -82341,8 +81194,7 @@
 "din" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -82528,8 +81380,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -83153,7 +82004,6 @@
 	},
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /turf/open/floor/plasteel/vault{
@@ -83222,9 +82072,7 @@
 	icon_state = "whitepurplecorner";
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dka" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -83237,14 +82085,10 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dkb" = (
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dkc" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 5
@@ -83253,18 +82097,14 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dkd" = (
 /obj/machinery/atmospherics/pipe/manifold/general/visible{
 	dir = 1
 	},
 /obj/effect/landmark/start/medical_doctor,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dke" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 9
@@ -83273,18 +82113,14 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dkf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dkg" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/vault{
@@ -83348,7 +82184,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/yellow/corner{
@@ -83397,7 +82232,6 @@
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck/syndicate{
 	icon_state = "deck_syndicate_full";
-	pixel_x = 0;
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/grimy,
@@ -83738,7 +82572,6 @@
 /obj/machinery/recharger,
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/machinery/light_switch{
@@ -83761,8 +82594,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -83987,8 +82819,7 @@
 "dly" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/aft)
@@ -84044,8 +82875,7 @@
 "dlG" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/medical/genetics/cloning)
@@ -84098,24 +82928,18 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlN" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlO" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlP" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 6
@@ -84124,15 +82948,11 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlQ" = (
 /obj/machinery/atmospherics/pipe/manifold4w/general/visible,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlR" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 10
@@ -84141,9 +82961,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dlS" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -84240,7 +83058,6 @@
 "dmf" = (
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 2;
 	name = "Abandoned Research Lab APC";
 	pixel_x = 1;
@@ -84399,8 +83216,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Research Director's Office APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/cable/white,
 /obj/structure/disposalpipe/segment,
@@ -84442,9 +83258,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Science - Research Director's Office";
@@ -84537,7 +83351,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner,
@@ -84565,13 +83378,11 @@
 /area/hallway/primary/aft)
 "dmV" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -84607,7 +83418,6 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
 	pixel_x = 7;
 	pixel_y = -26
 	},
@@ -84637,18 +83447,14 @@
 	icon_state = "whitepurplecorner";
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dnd" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dne" = (
 /obj/structure/table/glass,
 /obj/item/weapon/folder/white,
@@ -84656,9 +83462,7 @@
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,
 /obj/item/weapon/reagent_containers/dropper,
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dnf" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -84668,18 +83472,14 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dng" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dnh" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -84689,9 +83489,7 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dni" = (
 /obj/structure/table/glass,
 /obj/item/weapon/wrench/medical,
@@ -84702,18 +83500,14 @@
 	name = "medbay camera"
 	},
 /turf/open/floor/plasteel/whiteblue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dnj" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
 	dir = 8
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dnk" = (
 /obj/structure/sign/nosmoking_2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -84911,8 +83705,7 @@
 /obj/structure/closet/bombcloset,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -85073,8 +83866,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/primary/aft)
@@ -85141,16 +83933,13 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Medbay APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "doi" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -85160,18 +83949,14 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "doj" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/light{
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dok" = (
 /obj/structure/sign/bluecross_2,
 /turf/closed/wall/r_wall,
@@ -85197,9 +83982,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "doo" = (
 /obj/structure/bed/roller,
 /obj/machinery/iv_drip,
@@ -85210,8 +83993,7 @@
 "dop" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/medical/surgery)
@@ -85235,8 +84017,7 @@
 "dor" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
@@ -85256,15 +84037,13 @@
 "dou" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/blue,
 /area/medical/surgery)
 "dov" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/structure/mirror{
@@ -85521,8 +84300,7 @@
 "doX" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -85582,7 +84360,6 @@
 "dpf" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /obj/effect/turf_decal/delivery,
@@ -85630,7 +84407,6 @@
 	departmentType = 5;
 	name = "Research Director's RC";
 	pixel_x = -32;
-	pixel_y = 0;
 	receive_ore_updates = 1
 	},
 /obj/effect/turf_decal/bot,
@@ -85755,8 +84531,7 @@
 "dpw" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -85779,7 +84554,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
 	pixel_x = 24;
 	pixel_y = -26
 	},
@@ -85807,8 +84581,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -85854,7 +84627,6 @@
 /obj/structure/table/reinforced,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/item/clothing/gloves/color/latex,
@@ -85923,8 +84695,7 @@
 	layer = 2.9
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/end{
@@ -85950,9 +84721,7 @@
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dpR" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -85984,7 +84753,6 @@
 	pixel_x = 3
 	},
 /obj/item/weapon/cartridge/chemistry{
-	pixel_x = 0;
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/cmo,
@@ -86007,7 +84775,6 @@
 /obj/item/clothing/glasses/hud/health,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/neutral/side{
@@ -86026,9 +84793,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dpY" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -86038,9 +84803,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dpZ" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -86680,8 +85443,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Genetics Lab APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -86709,6 +85471,9 @@
 	dir = 4;
 	name = "medbay camera"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -86763,8 +85528,7 @@
 /area/medical/genetics)
 "drr" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/door/window/westright{
 	name = "'Monkey Pen";
@@ -86798,9 +85562,7 @@
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dru" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -86813,9 +85575,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "drv" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -86825,9 +85585,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "drw" = (
 /obj/machinery/door/airlock/command{
 	name = "Chief Medical Officer's Office";
@@ -86935,9 +85693,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "drE" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -86948,22 +85704,17 @@
 /obj/effect/landmark/lightsout,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "drF" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "drG" = (
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
@@ -86989,7 +85740,6 @@
 	},
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /turf/open/floor/plasteel/whiteblue/corner{
@@ -87018,8 +85768,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
 /area/medical/surgery)
@@ -87256,8 +86005,7 @@
 "dss" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plating,
 /area/science/misc_lab/range)
@@ -87329,6 +86077,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/open/floor/plasteel,
 /area/science/research)
 "dsA" = (
@@ -87377,9 +86129,7 @@
 /obj/structure/table/glass,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -87532,8 +86282,7 @@
 "dsQ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -87545,8 +86294,7 @@
 /area/medical/genetics)
 "dsR" = (
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/machinery/door/window/westleft{
 	name = "'Monkey Pen";
@@ -87584,9 +86332,7 @@
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dsU" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -87596,14 +86342,11 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dsV" = (
 /obj/structure/cable/white,
 /obj/structure/grille,
@@ -87652,8 +86395,7 @@
 /obj/structure/table,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/ai_status_display{
 	pixel_y = -32
@@ -87672,7 +86414,6 @@
 /obj/machinery/computer/med_data,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/whiteblue/side,
@@ -87719,7 +86460,6 @@
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -87832,7 +86572,6 @@
 "dtw" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plating,
@@ -88084,7 +86823,6 @@
 	department = "Robotics Lab";
 	departmentType = 0;
 	name = "Robotics RC";
-	pixel_x = 0;
 	pixel_y = 32;
 	receive_ore_updates = 1
 	},
@@ -88201,8 +86939,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitepurple/corner{
 	icon_state = "whitepurplecorner";
@@ -88283,8 +87020,7 @@
 	},
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/end,
@@ -88299,9 +87035,7 @@
 	name = "medbay camera"
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dut" = (
 /obj/structure/bed/dogbed{
 	desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off.";
@@ -88309,9 +87043,7 @@
 	},
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -88354,8 +87086,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Chief Medical Officer's Office APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay - Chief Medical Officer's Office";
@@ -88370,14 +87101,11 @@
 "duy" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "duz" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -88622,8 +87350,7 @@
 "dvb" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/heads/hor)
@@ -88654,8 +87381,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -88775,7 +87501,6 @@
 "dvn" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/plasteel/whitepurple/corner,
@@ -88794,7 +87519,6 @@
 	department = "Medbay Storage";
 	departmentType = 0;
 	name = "Genetics Lab RC";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/item/weapon/storage/box/gloves{
@@ -88831,7 +87555,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/whitepurple/side{
@@ -88893,9 +87616,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/open/floor/plasteel/whiteblue/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvA" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -88903,9 +87624,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvB" = (
 /obj/structure/cable/white{
 	icon_state = "0-4"
@@ -89008,31 +87727,23 @@
 "dvI" = (
 /obj/structure/closet/secure_closet/personal/patient,
 /turf/open/floor/plasteel/vault,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvJ" = (
 /obj/machinery/iv_drip,
 /turf/open/floor/plasteel/vault,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvK" = (
 /obj/structure/bed,
 /obj/item/weapon/bedsheet/medical,
 /turf/open/floor/plasteel/vault,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvL" = (
 /obj/item/weapon/folder/white,
 /obj/item/device/flashlight/pen,
 /obj/item/clothing/neck/stethoscope,
 /obj/structure/table,
 /turf/open/floor/plasteel/vault,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvM" = (
 /obj/machinery/computer/med_data/laptop,
 /obj/structure/table,
@@ -89040,9 +87751,7 @@
 	pixel_x = 32
 	},
 /turf/open/floor/plasteel/vault,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dvN" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -89293,7 +88002,6 @@
 /obj/structure/table/reinforced,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/item/device/assembly/igniter{
@@ -89404,8 +88112,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /turf/open/floor/plasteel/whitepurple/corner,
 /area/crew_quarters/heads/hor)
@@ -89559,8 +88266,7 @@
 "dwS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/cmo,
 /area/crew_quarters/heads/cmo)
@@ -89595,9 +88301,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dwW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical{
@@ -89610,18 +88314,14 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dwX" = (
 /obj/effect/landmark/start/medical_doctor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dwY" = (
 /obj/structure/chair/office/light{
 	dir = 1
@@ -89630,9 +88330,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dwZ" = (
 /obj/structure/sink{
 	dir = 4;
@@ -89641,7 +88339,6 @@
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
 	pixel_x = 26;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -89650,9 +88347,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dxa" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -89763,7 +88458,6 @@
 /obj/structure/cable,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -89823,7 +88517,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plating,
@@ -89871,7 +88564,6 @@
 	pixel_y = -2
 	},
 /obj/item/device/assembly/prox_sensor{
-	pixel_x = 0;
 	pixel_y = 2
 	},
 /obj/structure/table/reinforced,
@@ -89896,10 +88588,7 @@
 	pixel_x = 6;
 	pixel_y = -4
 	},
-/obj/item/device/assembly/timer{
-	pixel_x = 0;
-	pixel_y = 0
-	},
+/obj/item/device/assembly/timer,
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/stripes/line{
@@ -89979,8 +88668,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
@@ -90069,8 +88757,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/science/robotics/lab)
@@ -90078,8 +88765,7 @@
 /obj/structure/noticeboard{
 	dir = 8;
 	icon_state = "nboard00";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/camera{
@@ -90137,9 +88823,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -90265,8 +88949,7 @@
 	department = "Chief Medical Officer's Desk";
 	departmentType = 5;
 	name = "Chief Medical Officer's RC";
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 8;
@@ -90280,58 +88963,44 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dyk" = (
 /obj/structure/dresser,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dyl" = (
 /obj/structure/mirror{
 	pixel_y = -28
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dym" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/light,
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dyn" = (
 /obj/structure/closet/wardrobe/pjs,
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dyo" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/status_display{
 	pixel_x = 32
 	},
 /turf/open/floor/plasteel/cmo,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dyp" = (
 /obj/effect/landmark/blobstart,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -90371,8 +89040,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -90403,12 +89071,8 @@
 /obj/item/device/transfer_valve{
 	pixel_x = -5
 	},
-/obj/item/device/transfer_valve{
-	pixel_x = 0
-	},
-/obj/item/device/transfer_valve{
-	pixel_x = 0
-	},
+/obj/item/device/transfer_valve,
+/obj/item/device/transfer_valve,
 /obj/item/device/transfer_valve{
 	pixel_x = 5
 	},
@@ -90421,7 +89085,6 @@
 	departmentType = 0;
 	name = "Toxins RC";
 	pixel_x = -32;
-	pixel_y = 0;
 	receive_ore_updates = 1
 	},
 /obj/effect/turf_decal/delivery,
@@ -90448,8 +89111,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/science/mixing)
@@ -90488,7 +89150,6 @@
 "dyG" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/portable_atmospherics/canister/nitrogen,
@@ -90516,9 +89177,7 @@
 "dyJ" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/structure/table,
 /obj/structure/extinguisher_cabinet{
@@ -90533,8 +89192,7 @@
 "dyK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -90619,6 +89277,9 @@
 	dir = 4;
 	on = 1
 	},
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/aft)
 "dyW" = (
@@ -90735,9 +89396,7 @@
 "dzn" = (
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/light{
@@ -90747,18 +89406,14 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dzo" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dzp" = (
 /obj/structure/table/wood,
 /obj/item/clothing/under/maid,
@@ -90781,11 +89436,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Abandoned Theatre APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/theatre/abandoned)
@@ -90939,12 +89592,10 @@
 "dzJ" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/newscaster{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -90977,7 +89628,6 @@
 /area/science/mixing)
 "dzN" = (
 /obj/item/device/assembly/signaler{
-	pixel_x = 0;
 	pixel_y = 8
 	},
 /obj/item/device/assembly/signaler{
@@ -91093,8 +89743,11 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Research Division Server Room APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
+	},
+/obj/machinery/light_switch{
+	pixel_x = -28;
+	pixel_y = -26
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 8
@@ -91183,8 +89836,7 @@
 /obj/machinery/power/apc{
 	dir = 8;
 	name = "Robotics Lab APC";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -91231,7 +89883,6 @@
 /obj/item/weapon/reagent_containers/glass/beaker/sulphuric,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/effect/turf_decal/bot,
@@ -91361,7 +90012,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
 	pixel_x = 24;
 	pixel_y = -26
 	},
@@ -91482,9 +90132,7 @@
 	on = 1
 	},
 /turf/open/floor/plasteel/blue,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dAG" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/costume,
@@ -91611,8 +90259,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -91639,8 +90286,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -91660,9 +90306,7 @@
 	dir = 4;
 	layer = 4;
 	name = "Testing Site Telescreen";
-	network = list("Toxins");
-	pixel_x = 0;
-	pixel_y = 0
+	network = list("Toxins")
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -91788,8 +90432,7 @@
 "dBq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel,
@@ -91798,6 +90441,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/machinery/light_switch{
+	pixel_x = 26
+	},
 /turf/open/floor/plasteel,
 /area/science/storage)
 "dBs" = (
@@ -91843,8 +90489,7 @@
 "dBv" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -91885,8 +90530,7 @@
 "dBy" = (
 /obj/structure/table,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/item/weapon/storage/box/gloves{
 	pixel_x = 3;
@@ -91942,8 +90586,7 @@
 "dBE" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/vault{
@@ -92076,8 +90719,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -92222,8 +90864,7 @@
 /obj/machinery/button/massdriver{
 	dir = 2;
 	id = "toxinsdriver";
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/structure/chair/office/dark{
 	dir = 8
@@ -92550,18 +91191,24 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 4;
+	on = 1
+	},
 /turf/open/floor/plasteel/neutral,
 /area/science/research)
 "dCM" = (
 /obj/structure/cable/white{
 	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Research Division APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	icon_state = "manifold";
+	dir = 4
 	},
 /turf/open/floor/plasteel/whitepurple/corner,
 /area/science/research)
@@ -92572,7 +91219,6 @@
 /obj/machinery/cell_charger,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/effect/turf_decal/bot,
@@ -92590,8 +91236,7 @@
 "dCP" = (
 /obj/structure/closet/wardrobe/robotics_black,
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -92672,13 +91317,11 @@
 "dCZ" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plating{
 	icon_state = "platingdmg1"
@@ -92741,7 +91384,6 @@
 "dDj" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/camera{
@@ -92753,7 +91395,6 @@
 /area/crew_quarters/heads/cmo)
 "dDk" = (
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/cmo,
@@ -92772,26 +91413,20 @@
 /turf/open/floor/plasteel/whitegreen/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dDn" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/whitegreen/side,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dDo" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	icon_state = "manifold";
 	dir = 8
 	},
 /turf/open/floor/plasteel/whitegreen/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dDp" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/costume,
@@ -92969,8 +91604,7 @@
 /obj/machinery/light,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -93025,9 +91659,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -93112,7 +91744,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -93173,8 +91804,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Toxins Storage APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/structure/cable/white,
 /obj/effect/turf_decal/bot,
@@ -93259,9 +91889,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/neutral/corner,
 /area/hallway/primary/aft)
@@ -93283,9 +91911,7 @@
 "dEn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dEo" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -93299,9 +91925,7 @@
 	dir = 2
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dEp" = (
 /obj/effect/landmark/xeno_spawn,
 /obj/machinery/atmospherics/components/unary/vent_pump{
@@ -93332,6 +91956,10 @@
 "dEs" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -23
+	},
 /turf/open/floor/plasteel/grimy,
 /area/security/detectives_office/private_investigators_office)
 "dEt" = (
@@ -93359,7 +91987,6 @@
 /obj/item/device/taperecorder,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel/vault{
@@ -93564,6 +92191,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/primary/aft)
 "dET" = (
@@ -93767,9 +92397,7 @@
 /turf/open/floor/plasteel/whitegreen/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dFk" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -93781,18 +92409,14 @@
 /turf/open/floor/plasteel/whitegreen/side{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dFl" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
 /turf/open/floor/plasteel/whitegreen/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dFm" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -93876,9 +92500,7 @@
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
-/area/crew_quarters/theatre{
-	name = "Abandoned Theatre"
-	})
+/area/crew_quarters/theatre/abandoned)
 "dFw" = (
 /obj/structure/table/wood,
 /obj/item/clothing/suit/cardborg,
@@ -94367,7 +92989,6 @@
 	},
 /obj/structure/cable/white,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 2;
 	name = "Aft Maintenance APC";
 	pixel_x = 1;
@@ -94484,9 +93105,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dGO" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -94495,9 +93114,7 @@
 /turf/open/floor/plasteel/whitegreen/side{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dGP" = (
 /obj/structure/cable/white{
 	icon_state = "1-4"
@@ -94517,8 +93134,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/cable/white{
 	icon_state = "2-8"
@@ -94528,9 +93144,7 @@
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dGQ" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -94543,9 +93157,7 @@
 	icon_state = "whitegreen";
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dGR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/white{
@@ -94562,9 +93174,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dGS" = (
 /obj/structure/cable/white{
 	icon_state = "4-8"
@@ -94650,7 +93260,6 @@
 "dHb" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/item/weapon/twohanded/required/kirbyplants/random,
@@ -94845,8 +93454,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -94914,6 +93522,10 @@
 "dHH" = (
 /obj/structure/chair/stool,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
@@ -95003,9 +93615,7 @@
 /turf/open/floor/plasteel/whitegreen/side{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dHS" = (
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -95016,18 +93626,14 @@
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dHT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whitegreen/side{
 	icon_state = "whitegreen";
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dHU" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
@@ -95186,7 +93792,6 @@
 "dIn" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/structure/mirror{
@@ -95285,9 +93890,7 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -95329,9 +93932,7 @@
 /obj/structure/filingcabinet/medical,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/blue/side{
 	dir = 5
@@ -95398,17 +93999,13 @@
 /turf/open/floor/plasteel/whitegreen/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dIG" = (
 /obj/machinery/light/small,
 /obj/machinery/iv_drip,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/whitegreen/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dIH" = (
 /obj/item/stack/cable_coil,
 /obj/structure/lattice/catwalk,
@@ -95500,8 +94097,7 @@
 "dIT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/white{
@@ -95635,15 +94231,11 @@
 /area/shuttle/escape)
 "dJl" = (
 /turf/closed/wall/r_wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dJm" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dJn" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -95671,16 +94263,12 @@
 	req_access_txt = "39"
 	},
 /turf/open/floor/plasteel,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dJo" = (
 /obj/structure/sign/biohazard,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "dJp" = (
 /turf/closed/wall/r_wall,
 /area/medical/virology)
@@ -95832,11 +94420,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Port Quarter Maintenance APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -95855,7 +94441,6 @@
 /area/maintenance/port/aft)
 "dJM" = (
 /obj/structure/toilet{
-	icon_state = "toilet00";
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -96023,18 +94608,15 @@
 "dKe" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 1;
@@ -96223,9 +94805,6 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible{
 	dir = 5
 	},
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "dKD" = (
@@ -96235,9 +94814,6 @@
 	req_access = "0"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/neutral,
 /area/maintenance/port/aft)
 "dKE" = (
@@ -96245,9 +94821,6 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable/white{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plasteel/neutral,
 /area/maintenance/port/aft)
 "dKF" = (
@@ -96340,8 +94913,7 @@
 "dKP" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/bot,
@@ -96373,7 +94945,6 @@
 "dKV" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/structure/mirror{
@@ -96382,13 +94953,11 @@
 	},
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -96439,7 +95008,6 @@
 	idDoor = "virology_airlock_interior";
 	idSelf = "virology_airlock_control";
 	name = "Virology Access Button";
-	pixel_x = 0;
 	pixel_y = 22;
 	req_access_txt = "39"
 	},
@@ -96660,7 +95228,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plating,
@@ -96885,8 +95452,7 @@
 "dLR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/blue/side,
 /area/security/checkpoint/customs)
@@ -97075,8 +95641,7 @@
 "dMi" = (
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -97148,8 +95713,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/medical/virology)
@@ -97194,8 +95758,7 @@
 /obj/effect/landmark/start/virologist,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/green,
 /area/medical/virology)
@@ -97495,8 +96058,7 @@
 /area/shuttle/escape)
 "dNd" = (
 /obj/item/weapon/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = 6;
-	pixel_y = 0
+	pixel_x = 6
 	},
 /obj/item/weapon/reagent_containers/glass/bottle/charcoal{
 	pixel_x = -3
@@ -97892,7 +96454,6 @@
 /obj/structure/table,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/microwave{
@@ -97994,9 +96555,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/vault{
@@ -98021,7 +96580,6 @@
 	desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom.";
 	icon_state = "kiddieplaque";
 	name = "Remembrance Plaque";
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault{
@@ -98040,7 +96598,6 @@
 	},
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy,
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/black,
@@ -98062,7 +96619,6 @@
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -98124,9 +96680,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -98299,8 +96853,7 @@
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Virology Satellite APC";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/white{
@@ -98509,8 +97062,7 @@
 	},
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -98526,7 +97078,6 @@
 "dPD" = (
 /obj/machinery/shower{
 	dir = 8;
-	icon_state = "shower";
 	name = "emergency shower"
 	},
 /turf/open/floor/plasteel/whiteblue/side{
@@ -98551,7 +97102,6 @@
 	department = "Virology Lab";
 	departmentType = 0;
 	name = "Virology RC";
-	pixel_x = 0;
 	pixel_y = 32;
 	receive_ore_updates = 1
 	},
@@ -98595,9 +97145,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -98631,8 +97179,7 @@
 "dPN" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/camera{
@@ -98677,9 +97224,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 2;
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+	on = 1
 	},
 /mob/living/carbon/monkey,
 /turf/open/floor/plasteel/whitegreen/side{
@@ -98790,8 +97335,7 @@
 "dQf" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/chapel/main)
@@ -99014,9 +97558,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /turf/open/floor/wood,
 /area/library/abandoned)
@@ -99525,8 +98067,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -99535,7 +98076,6 @@
 "dRO" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /obj/machinery/light{
@@ -99583,9 +98123,7 @@
 /obj/structure/chair/wood,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Chapel - Starboard";
@@ -99660,9 +98198,7 @@
 /obj/structure/table/glass,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/structure/cable/white{
 	icon_state = "1-2"
@@ -99731,8 +98267,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
@@ -99744,7 +98279,6 @@
 "dSm" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/structure/extinguisher_cabinet{
@@ -99786,8 +98320,7 @@
 /obj/item/weapon/hand_labeler,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	icon_state = "intact";
@@ -100030,7 +98563,6 @@
 	pixel_y = 1
 	},
 /obj/item/weapon/storage/toolbox/mechanical{
-	pixel_x = 0;
 	pixel_y = -1
 	},
 /obj/item/weapon/storage/toolbox/emergency{
@@ -100110,9 +98642,7 @@
 "dTb" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/structure/closet/secure_closet/medical1,
 /obj/machinery/light_switch{
@@ -100323,8 +98853,7 @@
 /obj/structure/reagent_dispensers/fueltank,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_x = -26
 	},
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
@@ -100425,7 +98954,6 @@
 	},
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -100448,7 +98976,6 @@
 "dTH" = (
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/iv_drip,
@@ -100610,7 +99137,6 @@
 "dTX" = (
 /obj/machinery/airalarm{
 	dir = 8;
-	icon_state = "alarm0";
 	pixel_x = 24
 	},
 /turf/open/floor/plasteel{
@@ -100934,8 +99460,6 @@
 "dUI" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = 0;
-	pixel_y = 0;
 	req_access_txt = "0";
 	use_power = 0
 	},
@@ -101044,8 +99568,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK";
-	pixel_x = 0
+	name = "WARNING: EXTERNAL AIRLOCK"
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/solars/port/aft)
@@ -101137,7 +99660,6 @@
 /obj/structure/bodycontainer/morgue,
 /obj/machinery/airalarm{
 	dir = 4;
-	icon_state = "alarm0";
 	pixel_x = -22
 	},
 /turf/open/floor/plasteel/vault{
@@ -101246,8 +99768,7 @@
 /obj/machinery/iv_drip,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitegreen/side{
 	icon_state = "whitegreen";
@@ -101283,8 +99804,7 @@
 /obj/machinery/iv_drip,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/whitegreen/side{
 	icon_state = "whitegreen";
@@ -101308,8 +99828,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /turf/open/space,
 /area/solar/port/aft)
@@ -101317,8 +99836,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/external{
 	name = "External Solar Access";
@@ -101334,8 +99852,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/turf_decal/delivery,
@@ -101350,8 +99867,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -101483,8 +99999,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -101506,8 +100021,7 @@
 "dVO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel{
 	icon_state = "chapel"
@@ -101601,8 +100115,7 @@
 "dVZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/hallway/secondary/exit/departure_lounge)
@@ -101680,7 +100193,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -101707,9 +100219,7 @@
 /obj/structure/table/reinforced,
 /obj/machinery/airalarm{
 	dir = 4;
-	locked = 0;
-	pixel_x = -23;
-	pixel_y = 0
+	pixel_x = -23
 	},
 /obj/item/stack/cable_coil/white,
 /obj/item/stack/cable_coil/white,
@@ -101782,7 +100292,6 @@
 /obj/structure/bodycontainer/morgue,
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -24
 	},
 /turf/open/floor/plasteel/vault{
@@ -101886,7 +100395,6 @@
 "dWE" = (
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -102459,8 +100967,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 8;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/vault{
 	dir = 5
@@ -102504,8 +101011,7 @@
 /obj/structure/filingcabinet/security,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/machinery/light_switch{
 	pixel_x = -26;
@@ -102843,8 +101349,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/neutral,
 /area/security/checkpoint/checkpoint2)
@@ -102909,8 +101414,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/red/side{
 	dir = 8
@@ -102992,7 +101496,6 @@
 "dYK" = (
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = 58
 	},
 /turf/open/floor/plasteel/neutral/side,
@@ -103110,11 +101613,9 @@
 	dir = 1
 	},
 /obj/machinery/power/apc{
-	cell_type = 5000;
 	dir = 1;
 	name = "Chapel Quarters APC";
-	pixel_x = 0;
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/structure/cable/white{
 	icon_state = "0-8"
@@ -103139,12 +101640,9 @@
 /obj/item/device/camera_film,
 /obj/machinery/firealarm{
 	dir = 4;
-	icon_state = "fire0";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/machinery/status_display{
-	pixel_x = 0;
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/vault{
@@ -103255,7 +101753,6 @@
 /obj/structure/closet/secure_closet/security,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/machinery/light,
@@ -103313,7 +101810,6 @@
 	},
 /obj/machinery/firealarm{
 	dir = 1;
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/light,
@@ -103576,7 +102072,6 @@
 /obj/item/weapon/storage/box/zipties,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /turf/open/floor/mineral/plastitanium/brig,
@@ -103636,8 +102131,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -103672,8 +102166,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -103732,7 +102225,6 @@
 /obj/structure/closet/wardrobe/chaplain_black,
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /turf/open/floor/plasteel/vault{
@@ -103763,7 +102255,6 @@
 	department = "Chapel Office";
 	departmentType = 0;
 	name = "Chapel RC";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/machinery/status_display{
@@ -104001,8 +102492,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -104069,7 +102559,6 @@
 	},
 /obj/machinery/airalarm{
 	dir = 1;
-	icon_state = "alarm0";
 	pixel_y = -22
 	},
 /obj/effect/turf_decal/stripes/line,
@@ -104167,8 +102656,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/yellow,
 /area/engine/atmospherics_engine)
@@ -104179,8 +102667,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmospherics_engine)
@@ -104192,8 +102679,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/neutral,
 /area/engine/atmospherics_engine)
@@ -104201,8 +102687,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -104273,8 +102758,7 @@
 "ecb" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
@@ -104319,6 +102803,10 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 2;
+	on = 1
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "eci" = (
@@ -104331,6 +102819,10 @@
 	req_access_txt = "0";
 	specialfunctions = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 1;
+	on = 1
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/dorms)
 "ecj" = (
@@ -104390,8 +102882,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
@@ -104496,8 +102987,7 @@
 "ecS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/abandoned_gambling_den)
@@ -104557,8 +103047,7 @@
 "eda" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/abandoned_gambling_den)
@@ -104574,8 +103063,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
-	on = 1;
-	scrub_Toxins = 0
+	on = 1
 	},
 /turf/open/floor/plasteel/hydrofloor,
 /area/hydroponics/garden/abandoned)
@@ -104706,8 +103194,7 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced{
-	dir = 4;
-	pixel_x = 0
+	dir = 4
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/transport)
@@ -104882,7 +103369,6 @@
 "eeS" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/item/weapon/reagent_containers/glass/bucket,
@@ -104892,7 +103378,6 @@
 /obj/item/weapon/mop,
 /obj/item/device/radio/intercom{
 	name = "Station Intercom";
-	pixel_x = 0;
 	pixel_y = -26
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -105197,7 +103682,6 @@
 "efA" = (
 /obj/structure/sink{
 	dir = 8;
-	icon_state = "sink";
 	pixel_x = -12
 	},
 /obj/effect/turf_decal/bot,
@@ -105421,7 +103905,6 @@
 	department = "Engineering";
 	departmentType = 0;
 	name = "Engineering RC";
-	pixel_x = 0;
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/delivery,
@@ -105542,9 +104025,7 @@
 	pixel_y = 32
 	},
 /turf/open/floor/plasteel/neutral,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ega" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -105579,9 +104060,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 1
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "egd" = (
 /obj/structure/table/glass,
 /obj/item/weapon/clipboard,
@@ -105593,9 +104072,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "ege" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/pill_bottle/dice,
@@ -105605,9 +104082,7 @@
 /turf/open/floor/plasteel/neutral/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "egf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/contraband/random{
@@ -105625,9 +104100,7 @@
 /turf/open/floor/plasteel/whiteblue/corner{
 	dir = 4
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "egh" = (
 /obj/item/weapon/twohanded/required/kirbyplants/random,
 /obj/effect/decal/cleanable/dirt,
@@ -105660,9 +104133,7 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/whiteblue/corner,
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "egk" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/cable_coil/white{
@@ -105712,9 +104183,7 @@
 /turf/open/floor/plasteel/whitepurple/corner{
 	dir = 8
 	},
-/area/medical/medbay{
-	name = "Medbay Central"
-	})
+/area/medical/medbay/central)
 "egp" = (
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
@@ -105868,10 +104337,9 @@
 /area/hallway/secondary/exit/departure_lounge)
 "egC" = (
 /obj/machinery/power/apc{
-	cell_type = 10000;
+	cell_type = 5000;
 	dir = 1;
 	name = "Departure Lounge APC";
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/machinery/camera{
@@ -105900,9 +104368,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
-/area/hallway/secondary/exit{
-	name = "\improper Departure Lounge"
-	})
+/area/hallway/secondary/exit/departure_lounge)
 "egF" = (
 /obj/effect/turf_decal/delivery,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -105919,8 +104385,7 @@
 	},
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_x = -24
 	},
 /obj/structure/sign/poster/official/work_for_a_future{
 	pixel_y = -32
@@ -105952,9 +104417,7 @@
 "egK" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/hallway/secondary/exit{
-	name = "\improper Departure Lounge"
-	})
+/area/hallway/secondary/exit/departure_lounge)
 "egL" = (
 /obj/effect/turf_decal/delivery,
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -105975,15 +104438,11 @@
 "egN" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/hallway/secondary/exit{
-	name = "\improper Departure Lounge"
-	})
+/area/hallway/secondary/exit/departure_lounge)
 "egO" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/neutral,
-/area/hallway/secondary/exit{
-	name = "\improper Departure Lounge"
-	})
+/area/hallway/secondary/exit/departure_lounge)
 "egP" = (
 /obj/structure/bodycontainer/morgue,
 /obj/structure/sign/poster/official/ian{
@@ -106083,9 +104542,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/hallway/secondary/entry{
-	name = "Arrivals"
-	})
+/area/hallway/secondary/entry)
 "egY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/external{
@@ -106096,9 +104553,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/hallway/secondary/entry{
-	name = "Arrivals"
-	})
+/area/hallway/secondary/entry)
 "egZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/external{
@@ -106109,9 +104564,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/hallway/secondary/entry{
-	name = "Arrivals"
-	})
+/area/hallway/secondary/entry)
 "eha" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 8;
@@ -106121,9 +104574,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/hallway/secondary/entry{
-	name = "Arrivals"
-	})
+/area/hallway/secondary/entry)
 "ehb" = (
 /obj/structure/chair{
 	dir = 4;
@@ -106201,8 +104652,7 @@
 "ehj" = (
 /obj/machinery/requests_console{
 	department = "Arrival shuttle";
-	name = "Arrivals Shuttle console";
-	pixel_y = 0
+	name = "Arrivals Shuttle console"
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/arrival)
@@ -106495,8 +104945,7 @@
 /obj/structure/sign/directions/engineering{
 	desc = "A sign that shows there are doors here. There are doors everywhere!";
 	icon_state = "doors";
-	name = "WARNING: EXTERNAL AIRLOCK";
-	pixel_x = 0
+	name = "WARNING: EXTERNAL AIRLOCK"
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/solars/starboard/aft)
@@ -106547,8 +104996,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	d1 = 2;
@@ -106564,8 +105012,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/external{
 	name = "External Solar Access";
@@ -106581,8 +105028,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/structure/fans/tiny,
 /obj/effect/turf_decal/delivery,
@@ -106592,8 +105038,7 @@
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
+	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/external{
 	name = "External Solar Access";
@@ -106642,6 +105087,415 @@
 /obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
 /area/maintenance/solars/starboard/aft)
+"eiE" = (
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "Port Primary Hallway APC";
+	pixel_x = 26
+	},
+/obj/structure/cable/white{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 4
+	},
+/area/hallway/primary/port)
+"eiF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/power/apc{
+	dir = 2;
+	name = "Starboard Primary Hallway APC";
+	pixel_y = -26
+	},
+/turf/open/floor/plasteel/neutral/corner,
+/area/hallway/primary/starboard)
+"eiG" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/white{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/neutral/side{
+	dir = 8
+	},
+/area/maintenance/starboard/aft)
+"eiH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "Starboard Quarter Maintenace APC";
+	pixel_x = 26
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/aft)
+"eiI" = (
+/obj/structure/cable/white{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "Aft Primary Hallway APC";
+	pixel_x = 26
+	},
+/obj/structure/cable/white{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/neutral/corner,
+/area/hallway/primary/aft)
+"eiK" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiL" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiM" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiN" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiO" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/neutral,
+/area/hallway/primary/aft)
+"eiP" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 1
+	},
+/area/hallway/secondary/command)
+"eiQ" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	icon_state = "manifold";
+	dir = 1
+	},
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 4
+	},
+/area/hallway/secondary/command)
+"eiR" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 8
+	},
+/area/hallway/secondary/command)
+"eiS" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 1;
+	on = 1
+	},
+/turf/open/floor/plasteel/neutral/corner,
+/area/hallway/secondary/command)
+"eiT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiU" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiW" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiX" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"eiZ" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 1
+	},
+/area/crew_quarters/dorms)
+"eja" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 1
+	},
+/area/crew_quarters/dorms)
+"ejb" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 1
+	},
+/area/crew_quarters/dorms)
+"ejc" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 4
+	},
+/area/crew_quarters/dorms)
+"ejd" = (
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 4
+	},
+/area/crew_quarters/dorms)
+"eje" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 4;
+	on = 1
+	},
+/turf/open/floor/plasteel/neutral,
+/area/crew_quarters/dorms)
+"ejf" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/neutral,
+/area/crew_quarters/dorms)
+"ejg" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral,
+/area/crew_quarters/dorms)
+"ejh" = (
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 4;
+	on = 1
+	},
+/turf/open/floor/plasteel/neutral,
+/area/crew_quarters/dorms)
+"eji" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	icon_state = "manifold";
+	dir = 4
+	},
+/turf/open/floor/plasteel/neutral,
+/area/crew_quarters/dorms)
+"ejj" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/neutral/corner{
+	dir = 8;
+	heat_capacity = 1e+006
+	},
+/area/crew_quarters/dorms)
+"ejk" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel/neutral/corner,
+/area/crew_quarters/dorms)
+"ejl" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/plasteel/neutral/corner,
+/area/crew_quarters/dorms)
+"ejm" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejn" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejo" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejr" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall,
+/area/crew_quarters/dorms)
+"ejs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/whitepurple/corner{
+	dir = 1
+	},
+/area/science/research)
+"ejt" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 1;
+	on = 1
+	},
+/turf/open/floor/plasteel/neutral,
+/area/science/research)
+"eju" = (
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -23
+	},
+/turf/open/floor/plasteel/whitepurple/corner{
+	dir = 8
+	},
+/area/science/research)
+"ejv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
+/turf/open/floor/plating,
+/area/quartermaster/warehouse)
+"ejw" = (
+/obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/light_switch{
+	pixel_x = 22;
+	pixel_y = -10
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/engine/transit_tube)
+"ejx" = (
+/obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/machinery/light_switch{
+	pixel_x = -26
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 8
+	},
+/area/ai_monitored/turret_protected/aisat_interior)
+"ejy" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/cable/white{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel/brown,
+/area/maintenance/disposal)
+"ejz" = (
+/obj/item/weapon/twohanded/required/kirbyplants/random,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
+"ejA" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -23
+	},
+/turf/open/floor/plating,
+/area/maintenance/port)
+"ejB" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/pump,
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/arrival{
+	dir = 1
+	},
+/area/crew_quarters/locker)
 
 (1,1,1) = {"
 aaa
@@ -116280,7 +115134,7 @@ bNw
 bPo
 ebZ
 bTM
-bNw
+ejx
 bLp
 bYV
 bYV
@@ -128354,7 +127208,7 @@ bDL
 bFF
 bHA
 bJC
-bLC
+ejw
 bNK
 bLC
 bRO
@@ -135061,7 +133915,7 @@ bWg
 cwo
 cxU
 czx
-cBl
+ejA
 cCF
 bWg
 cFi
@@ -135280,7 +134134,7 @@ aJg
 aib
 bmu
 bot
-bot
+eiE
 brx
 brx
 btX
@@ -137830,7 +136684,7 @@ awX
 aqg
 aoT
 aHW
-aJm
+ejz
 ecs
 aMr
 aOa
@@ -137907,7 +136761,7 @@ cYF
 cZR
 dbj
 dcJ
-cOW
+eju
 dad
 dhq
 djj
@@ -138814,7 +137668,7 @@ aaD
 aax
 aax
 aaD
-abP
+abT
 aax
 acj
 aax
@@ -139694,7 +138548,7 @@ cFs
 cGK
 cId
 cJM
-cLs
+ejs
 cLs
 cOO
 cOO
@@ -141760,8 +140614,8 @@ cVv
 cXm
 cYM
 dac
-dbo
-cLE
+dbm
+ejt
 dez
 dgr
 dhD
@@ -142506,7 +141360,7 @@ cjw
 ckX
 bQn
 cnM
-cpp
+eiR
 cqH
 crY
 ctF
@@ -145075,7 +143929,7 @@ ecG
 cjC
 clc
 cmt
-cnM
+eiP
 cpy
 cqM
 csf
@@ -145629,13 +144483,13 @@ drc
 dgz
 cKe
 cKe
-cKe
-cKe
+eiI
+eiK
 dyV
-cKe
-cKe
-cKe
-cKe
+eiK
+eiK
+eiK
+eiK
 dES
 dGr
 dHN
@@ -145886,7 +144740,7 @@ drd
 dsF
 due
 dpB
-cSq
+eiJ
 dxQ
 dyW
 dAk
@@ -146815,7 +145669,7 @@ asW
 atZ
 aua
 awq
-aua
+ejv
 ayC
 azF
 aAB
@@ -147388,8 +146242,8 @@ cfi
 cfi
 cfi
 cfi
-cnV
-cpG
+eiQ
+eiS
 cqS
 csm
 ctS
@@ -152721,7 +151575,7 @@ alJ
 alJ
 apw
 aqS
-arW
+ejy
 alJ
 aaf
 aaf
@@ -153801,7 +152655,7 @@ bMV
 bOK
 bQN
 bSZ
-bUW
+eiF
 bWM
 bYH
 cax
@@ -153817,10 +152671,10 @@ con
 bWM
 crg
 csA
-cuj
+cuh
 cvF
 cxj
-cyP
+cyH
 cAB
 cBV
 cDm
@@ -155868,7 +154722,7 @@ cgR
 ciC
 cke
 clx
-cmO
+ejB
 cos
 cpQ
 crr
@@ -156163,7 +155017,7 @@ dnu
 dow
 dqk
 drO
-dkj
+eiG
 duz
 dvR
 dxd
@@ -156420,7 +155274,7 @@ daL
 dox
 dql
 daL
-cWq
+eiH
 cWq
 dvS
 dxe
@@ -156907,11 +155761,11 @@ cxt
 cyT
 cAK
 cCe
-cvP
-cEq
+eiT
+eiZ
 cGb
 cHs
-cvP
+eiT
 eci
 cCg
 cNS
@@ -157166,7 +156020,7 @@ cyT
 cyT
 cDp
 cEq
-cGc
+eje
 cHt
 cIM
 cyX
@@ -157421,11 +156275,11 @@ cxv
 cyU
 cAL
 cCf
-cvP
-cEq
+eiU
+eja
 cGd
 cHu
-cvP
+eiU
 cKK
 cMj
 cyX
@@ -157935,11 +156789,11 @@ cxw
 cyV
 cCg
 ech
-cvP
-cEq
-cGc
-cHt
-cvP
+eiT
+eiZ
+ejf
+ejj
+eiT
 cKL
 cMk
 cyY
@@ -158449,11 +157303,11 @@ cxy
 cyX
 cAM
 cCh
-cvP
-cEt
-cGc
-cHx
-cvP
+eiU
+ejc
+ejg
+ejl
+eiU
 cKM
 cyZ
 cyZ
@@ -158708,7 +157562,7 @@ cvP
 cvP
 cvP
 cEu
-cGc
+ejh
 cHx
 cvP
 cvP
@@ -158963,11 +157817,11 @@ cxz
 cyY
 cAN
 cCi
-cvP
+eiT
 cEv
-cFY
+eji
 cHy
-cvP
+eiT
 cKN
 cMl
 cyT
@@ -159477,11 +158331,11 @@ cxB
 cyZ
 cyZ
 cCj
-cvP
-cEt
+eiU
+ejc
 cGg
-cHx
-cvP
+ejl
+eiU
 cKO
 cMm
 cNU