diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index 7dbbd03c05835..343494ced9191 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -1005,7 +1005,6 @@
 "ahy" = (
 /obj/machinery/computer/air_control{
 	dir = 1;
-	frequency = 1441;
 	input_tag = "fuel_in";
 	name = "Fuel Supply Control";
 	output_tag = "fuel_out";
@@ -1030,7 +1029,6 @@
 "ahA" = (
 /obj/structure/hygiene/shower{
 	dir = 4;
-	icon_state = "shower";
 	pixel_x = -9
 	},
 /obj/floor_decal/industrial/hatch/yellow,
@@ -1364,8 +1362,7 @@
 	id_tag = "escape_pod_4";
 	name = "escape pod four controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_4_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_4_hatch"
 	},
 /obj/floor_decal/borderfloor{
 	dir = 8
@@ -3652,9 +3649,7 @@
 	dir = 4;
 	pixel_x = 5
 	},
-/obj/floor_decal/steeldecal/steel_decals10{
-	dir = 2
-	},
+/obj/floor_decal/steeldecal/steel_decals10,
 /obj/floor_decal/steeldecal/steel_decals10{
 	dir = 4
 	},
@@ -6561,7 +6556,6 @@
 	dir = 4
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
@@ -6759,7 +6753,6 @@
 /area/maintenance/abandoned_hydroponics)
 "aXB" = (
 /obj/floor_decal/borderfloorwhite{
-	icon_state = "borderfloor_white";
 	dir = 9
 	},
 /obj/floor_decal/corner/lime/border{
@@ -9810,8 +9803,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 9;
-	icon_state = "spline_plain"
+	dir = 9
 	},
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/random/maintenance/clean,
@@ -10488,8 +10480,7 @@
 "bBf" = (
 /obj/structure/railing/mapped,
 /obj/floor_decal/spline/plain/black{
-	dir = 10;
-	icon_state = "spline_plain"
+	dir = 10
 	},
 /obj/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -11375,26 +11366,26 @@
 	},
 /obj/decal/cleanable/dirt,
 /obj/machinery/status_light{
-	id_tag = "ReacEng1";
-	name = "Deck Four Starboard status indicator";
+	id_tag = "ReacEng2";
+	name = "Fourth Deck Port status indicator";
 	pixel_x = -8;
 	pixel_y = 25
 	},
 /obj/machinery/status_light{
-	id_tag = "ReacEng3";
-	name = "Deck One Starboard status indicator";
+	id_tag = "ReacEng4";
+	name = "First Deck Port status indicator";
 	pixel_x = -8;
 	pixel_y = 34
 	},
 /obj/machinery/status_light{
-	id_tag = "ReacEng4";
-	name = "Deck One Port status indicator";
+	id_tag = "ReacEng3";
+	name = "First Deck Starboard status indicator";
 	pixel_x = 8;
 	pixel_y = 34
 	},
 /obj/machinery/status_light{
-	id_tag = "ReacEng2";
-	name = "Deck Four Port status indicator";
+	id_tag = "ReacEng1";
+	name = "Fourth Deck Starboard status indicator";
 	pixel_x = 8;
 	pixel_y = 25
 	},
@@ -11614,8 +11605,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 1;
-	icon_state = "spline_plain"
+	dir = 1
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /obj/decal/cleanable/dirt,
@@ -12946,8 +12936,7 @@
 /area/maintenance/seconddeck/aftstarboard)
 "bUM" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/blue{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -14735,8 +14724,7 @@
 /obj/structure/closet/crate/freezer,
 /obj/structure/railing/mapped,
 /obj/floor_decal/spline/plain/black{
-	dir = 6;
-	icon_state = "spline_plain"
+	dir = 6
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /obj/decal/cleanable/dirt,
@@ -17948,6 +17936,9 @@
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Chapel - Office"
 	},
+/obj/machinery/alarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/carpet/purple,
 /area/chapel/office)
 "cHz" = (
@@ -18234,8 +18225,7 @@
 	id_tag = "escape_pod_6";
 	name = "escape pod six controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_6_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_6_hatch"
 	},
 /obj/structure/bed/chair/shuttle{
 	dir = 1
@@ -18915,7 +18905,6 @@
 	dir = 10
 	},
 /obj/floor_decal/corner/paleblue/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 5
 	},
 /obj/floor_decal/corner/paleblue/half{
@@ -19144,8 +19133,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
-	dir = 8;
-	icon_state = "techfloor_corners"
+	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -20326,8 +20314,7 @@
 	name = "escape pod three berth controller";
 	pixel_x = -20;
 	pixel_y = 32;
-	tag_door = "escape_pod_3_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_3_berth_hatch"
 	},
 /obj/floor_decal/borderfloorblack{
 	dir = 8
@@ -23733,7 +23720,6 @@
 	pixel_x = 34
 	},
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "charon_cargo_out";
 	name = "charon interior conveyor belt"
 	},
@@ -23815,8 +23801,7 @@
 	pixel_y = -24
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/blue{
-	dir = 4;
-	icon_state = "map"
+	dir = 4
 	},
 /obj/machinery/light,
 /obj/floor_decal/techfloor{
@@ -24402,8 +24387,7 @@
 /area/storage/primary)
 "dBw" = (
 /obj/machinery/atmospherics/unary/freezer{
-	dir = 1;
-	icon_state = "freezer"
+	dir = 1
 	},
 /obj/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/techfloor/grid,
@@ -25726,7 +25710,6 @@
 	dir = 8
 	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
-	frequency = 1379;
 	id_tag = "ai_core_airlock";
 	name = "AI Core Airlock Console";
 	pixel_y = 24;
@@ -26124,7 +26107,6 @@
 /area/medical/infirmreception)
 "dOh" = (
 /obj/machinery/door/window/brigdoor/westleft{
-	id_tag = null;
 	req_access = newlist();
 	dir = 4
 	},
@@ -26924,15 +26906,11 @@
 "dUF" = (
 /obj/machinery/atmospherics/omni/mixer{
 	active_power_usage = 7500;
-	tag_east = 0;
-	tag_east_con = null;
 	tag_north = 1;
 	tag_north_con = 0.5;
 	tag_south = 2;
-	tag_south_con = null;
 	tag_west = 1;
-	tag_west_con = 0.5;
-	use_power = 1
+	tag_west_con = 0.5
 	},
 /obj/machinery/light/small{
 	dir = 4
@@ -27032,8 +27010,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/engine_room)
@@ -27951,8 +27928,7 @@
 	id_tag = "escape_pod_2";
 	name = "escape pod two controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_2_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_2_hatch"
 	},
 /obj/floor_decal/borderfloor/corner2{
 	dir = 10
@@ -28459,8 +28435,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 23;
-	pixel_y = 0
+	pixel_x = 23
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/floor_decal/borderfloor{
@@ -28838,8 +28813,7 @@
 	id_tag = "escape_pod_1";
 	name = "escape pod one controller";
 	pixel_x = 20;
-	tag_door = "escape_pod_1_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_1_hatch"
 	},
 /obj/floor_decal/borderfloor/corner2{
 	dir = 5
@@ -30660,7 +30634,7 @@
 /obj/machinery/atmospherics/omni/filter{
 	tag_north = 1;
 	tag_south = 2;
-	tag_west = 8
+	tag_east = 8
 	},
 /obj/engine_setup/filter,
 /obj/floor_decal/industrial/outline/blue,
@@ -31177,8 +31151,7 @@
 	name = "escape pod four berth controller";
 	pixel_x = 20;
 	pixel_y = -32;
-	tag_door = "escape_pod_4_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_4_berth_hatch"
 	},
 /obj/floor_decal/borderfloorblack{
 	dir = 4
@@ -31605,9 +31578,7 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/xenobiology/level1)
 "eDo" = (
-/obj/item/folder/red{
-	pixel_y = 0
-	},
+/obj/item/folder/red,
 /obj/item/stamp/hos,
 /obj/structure/table/woodentable_reinforced/ebony,
 /turf/simulated/floor/carpet/red,
@@ -32352,8 +32323,7 @@
 /obj/item/stack/material/wood/ebony/ten,
 /obj/item/stack/material/wood/bamboo/fifty,
 /obj/floor_decal/spline/plain/black{
-	dir = 10;
-	icon_state = "spline_plain"
+	dir = 10
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -32940,8 +32910,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 5;
-	icon_state = "spline_plain"
+	dir = 5
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -33167,8 +33136,7 @@
 	name = "escape pod two berth controller";
 	pixel_x = 20;
 	pixel_y = -32;
-	tag_door = "escape_pod_2_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_2_berth_hatch"
 	},
 /obj/floor_decal/borderfloorblack{
 	dir = 4
@@ -35450,8 +35418,7 @@
 	id_tag = "escape_pod_8";
 	name = "escape pod eight controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_8_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_8_hatch"
 	},
 /obj/structure/bed/chair/shuttle{
 	dir = 1
@@ -35642,8 +35609,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
-	dir = 1;
-	icon_state = "map"
+	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -36136,6 +36102,10 @@
 "fmq" = (
 /obj/machinery/sleeper,
 /obj/floor_decal/industrial/outline/yellow,
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/white/monotile,
 /area/medical/sleeper)
 "fmy" = (
@@ -36579,6 +36549,21 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/quartermaster/suplocker_room)
+"fpC" = (
+/obj/structure/bed/chair/padded/black{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/chapel/main)
 "fpD" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -36804,16 +36789,10 @@
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/adherent)
 "frA" = (
-/obj/machinery/atmospherics/omni/filter{
-	tag_east = 2;
-	tag_south = 5;
-	tag_west = 1
-	},
-/obj/floor_decal/techfloor{
-	dir = 1
+/obj/machinery/air_sensor{
+	id_tag = "n2_sensor"
 	},
-/obj/floor_decal/industrial/outline/green,
-/turf/simulated/floor/tiled/techfloor/grid,
+/turf/simulated/floor/reinforced/nitrogen,
 /area/engineering/atmos)
 "frD" = (
 /obj/structure/cable/green{
@@ -36941,9 +36920,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/safe_room/seconddeck)
 "fsI" = (
-/obj/machinery/atmospherics/unary/freezer{
-	icon_state = "freezer"
-	},
+/obj/machinery/atmospherics/unary/freezer,
 /obj/floor_decal/industrial/warning{
 	dir = 1
 	},
@@ -38926,7 +38903,6 @@
 	dir = 8
 	},
 /obj/floor_decal/borderfloorwhite{
-	icon_state = "borderfloor_white";
 	dir = 5
 	},
 /obj/floor_decal/corner/paleblue/border{
@@ -39491,7 +39467,6 @@
 /area/bridge/adjutants)
 "fLQ" = (
 /obj/machinery/door/window/brigdoor/westleft{
-	id_tag = null;
 	req_access = list("ACCESS_BRIDGE");
 	dir = 2;
 	autoset_access = 0
@@ -39535,7 +39510,6 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/research{
 	dir = 4;
-	id_tag = null;
 	name = "Report desk";
 	req_access = newlist()
 	},
@@ -43814,8 +43788,7 @@
 	req_access = list("ACCESS_ENGINE_EQUIP")
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -43921,6 +43894,11 @@
 "guo" = (
 /turf/simulated/floor/tiled/monotile,
 /area/quartermaster/hangar)
+"guy" = (
+/obj/machinery/door/firedoor,
+/obj/wallframe_spawn/no_grille,
+/turf/simulated/floor/plating,
+/area/quartermaster/hangar)
 "guH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -44072,7 +44050,6 @@
 	dir = 9
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -44951,7 +44928,6 @@
 	pixel_x = -32;
 	pixel_y = -28;
 	tag_door = "escape_pod_11_berth_hatch";
-	frequency = 1380;
 	dir = 1
 	},
 /obj/floor_decal/industrial/warning,
@@ -45621,7 +45597,6 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining{
 	dir = 4;
-	id_tag = null;
 	name = "Warehouse";
 	req_access = newlist()
 	},
@@ -45819,8 +45794,7 @@
 	id_tag = "escape_pod_9";
 	name = "escape pod nine controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_9_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_9_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape_pod/escape_pod9/station)
@@ -45867,8 +45841,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 9;
-	icon_state = "spline_plain"
+	dir = 9
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -46486,8 +46459,7 @@
 	name = "escape pod one berth controller";
 	pixel_x = -20;
 	pixel_y = 32;
-	tag_door = "escape_pod_1_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_1_berth_hatch"
 	},
 /obj/floor_decal/borderfloorblack{
 	dir = 8
@@ -46941,7 +46913,6 @@
 "gTc" = (
 /obj/floor_decal/corner/green/diagonal,
 /obj/structure/bed/chair/office/light{
-	icon_state = "officechair_preview";
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -49587,7 +49558,6 @@
 	name = "Captain"
 	},
 /obj/machinery/button/blast_door{
-	dir = 2;
 	id_tag = "bridge_windows";
 	name = "Bridge Window Blast Doors";
 	pixel_x = 36;
@@ -50545,6 +50515,16 @@
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/medical/backstorage)
+"hwq" = (
+/obj/floor_decal/spline/fancy/black{
+	dir = 4
+	},
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/simulated/floor/grass/cut,
+/area/crew_quarters/garden_room)
 "hwv" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/rnd/toxins/storage)
@@ -50622,8 +50602,7 @@
 	dir = 10
 	},
 /obj/structure/bed/chair/padded/yellow{
-	dir = 1;
-	icon_state = "chair_preview"
+	dir = 1
 	},
 /obj/machinery/light{
 	dir = 8
@@ -51958,8 +51937,7 @@
 /area/hallway/primary/fourthdeck/center)
 "hGt" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/cyan{
@@ -54934,8 +54912,7 @@
 	id_tag = "escape_pod_7";
 	name = "escape pod seven controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_7_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_7_hatch"
 	},
 /obj/structure/bed/chair/shuttle{
 	dir = 1
@@ -55308,7 +55285,6 @@
 	dir = 4
 	},
 /obj/floor_decal/borderfloorwhite{
-	icon_state = "borderfloor_white";
 	dir = 9
 	},
 /obj/floor_decal/corner/paleblue/border{
@@ -55608,10 +55584,14 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/turret_protected/ai)
 "ikg" = (
+/obj/machinery/door/window/westleft{
+	dir = 2;
+	name = "Chemistry Refrigerator"
+	},
 /obj/machinery/smartfridge/secure/medbay{
 	req_access = list(list("ACCESS_CHEMISTRY","ACCESS_MEDICAL_EQUIP"))
 	},
-/turf/simulated/wall/r_wall/prepainted,
+/turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "iko" = (
 /obj/floor_decal/industrial/warning{
@@ -55622,14 +55602,12 @@
 	name = "escape pod six berth controller";
 	pixel_x = -32;
 	pixel_y = 21;
-	tag_door = "escape_pod_6_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_6_berth_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/centralstarboard)
 "ikr" = (
 /obj/machinery/door/airlock/glass/mining{
-	id_tag = null;
 	name = "Shuttle Fuel Bay Interior";
 	req_access = newlist()
 	},
@@ -55716,8 +55694,7 @@
 	id_tag = "escape_pod_10";
 	name = "escape pod ten controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_10_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_10_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape_pod/escape_pod10/station)
@@ -56228,8 +56205,7 @@
 /obj/paint_stripe/yellow,
 /obj/paint/dark_gunmetal,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/wall/r_titanium,
 /area/guppy_hangar/start)
@@ -57486,7 +57462,6 @@
 "izs" = (
 /obj/machinery/computer/air_control{
 	dir = 1;
-	frequency = 1441;
 	input_tag = "waste_in";
 	name = "Waste Tank Control";
 	output_tag = "waste_out";
@@ -60333,7 +60308,6 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass/mining{
 	dir = 8;
-	id_tag = null;
 	name = "Hangar Bay";
 	req_access = newlist()
 	},
@@ -60611,8 +60585,7 @@
 /area/hallway/primary/fourthdeck/central_stairwell)
 "iVQ" = (
 /obj/machinery/atmospherics/binary/pump{
-	dir = 8;
-	in_use = 0
+	dir = 8
 	},
 /obj/machinery/firealarm{
 	dir = 1;
@@ -61801,7 +61774,6 @@
 	dir = 9
 	},
 /obj/structure/filingcabinet/wallcabinet{
-	pixel_y = 0;
 	pixel_x = -30
 	},
 /turf/simulated/floor/tiled/dark,
@@ -63167,7 +63139,6 @@
 	},
 /obj/floor_decal/corner/red,
 /obj/machinery/door_timer/cell_2{
-	pixel_y = 0;
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/steel_grid,
@@ -64189,7 +64160,6 @@
 /obj/structure/closet/emcloset,
 /obj/structure/sign/warning/nosmoking_1{
 	dir = 4;
-	icon_state = "nosmoking";
 	pixel_x = -32
 	},
 /obj/structure/cable/green{
@@ -65341,7 +65311,6 @@
 "jKa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/door/airlock/mining{
-	id_tag = null;
 	name = "Port Auxiliary Storage";
 	req_access = newlist()
 	},
@@ -66249,7 +66218,6 @@
 	dir = 9
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/decal/cleanable/cobweb{
@@ -66514,7 +66482,6 @@
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass/mining{
 	dir = 8;
-	id_tag = null;
 	name = "Hangar Bay";
 	req_access = newlist()
 	},
@@ -68696,6 +68663,10 @@
 	pixel_x = 24;
 	pixel_y = 10
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/mortuary)
 "khA" = (
@@ -70058,9 +70029,7 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/medical/morgue)
 "ksE" = (
-/obj/machinery/vending/snack{
-	icon_state = "snack"
-	},
+/obj/machinery/vending/snack,
 /obj/machinery/alarm{
 	pixel_y = 24
 	},
@@ -71391,7 +71360,6 @@
 "kBD" = (
 /obj/structure/sign/warning/fire{
 	dir = 8;
-	icon_state = "fire";
 	pixel_x = 32
 	},
 /obj/structure/cable{
@@ -71604,8 +71572,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/power/terminal{
-	dir = 1;
-	icon_state = "term"
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/turret_protected/ai)
@@ -71986,8 +71953,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 5;
-	icon_state = "spline_plain"
+	dir = 5
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -72930,7 +72896,6 @@
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/mining{
-	id_tag = null;
 	name = "Delivery Office";
 	req_access = newlist()
 	},
@@ -72974,10 +72939,8 @@
 	dir = 8
 	},
 /obj/machinery/airlock_sensor{
-	frequency = 1379;
 	id_tag = "ai_core_sensor";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /obj/floor_decal/industrial/warning/corner,
 /obj/floor_decal/industrial/warning/corner{
@@ -75315,7 +75278,6 @@
 	dir = 9
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/machinery/alarm{
@@ -75728,8 +75690,7 @@
 	name = "escape pod eight berth controller";
 	pixel_x = -32;
 	pixel_y = 21;
-	tag_door = "escape_pod_8_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_8_berth_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/centralstarboard)
@@ -78169,8 +78130,7 @@
 	icon_state = "pipe-c"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /obj/structure/catwalk,
 /obj/decal/cleanable/dirt,
@@ -78956,7 +78916,6 @@
 "lGG" = (
 /obj/floor_decal/corner/black/three_quarters,
 /obj/floor_decal/corner/paleblue/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/floor_decal/corner/paleblue/bordercorner2,
@@ -79231,7 +79190,6 @@
 /area/vacant/cargo)
 "lJb" = (
 /obj/structure/filingcabinet/wallcabinet{
-	pixel_y = 0;
 	pixel_x = 30
 	},
 /obj/floor_decal/borderfloor{
@@ -80067,9 +80025,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "lOA" = (
-/obj/machinery/atmospherics/unary/freezer{
-	icon_state = "freezer"
-	},
+/obj/machinery/atmospherics/unary/freezer,
 /obj/item/device/radio/intercom{
 	pixel_y = 26
 	},
@@ -81722,6 +81678,10 @@
 /obj/floor_decal/corner/yellow/border{
 	dir = 5
 	},
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "mdr" = (
@@ -82281,6 +82241,12 @@
 "mhi" = (
 /turf/simulated/wall/r_wall/hull,
 /area/crew_quarters/gym)
+"mhj" = (
+/obj/machinery/air_sensor{
+	id_tag = "n2o_sensor"
+	},
+/turf/simulated/floor/reinforced/n20,
+/area/engineering/atmos)
 "mhn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/floor_decal/borderfloorblack{
@@ -82833,7 +82799,6 @@
 	dir = 9
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/machinery/recharge_station,
@@ -83159,7 +83124,6 @@
 	dir = 6
 	},
 /obj/floor_decal/corner/paleblue/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/floor_decal/corner/paleblue/bordercorner2,
@@ -83580,8 +83544,7 @@
 	dir = 9
 	},
 /obj/structure/bed/chair/padded/yellow{
-	dir = 1;
-	icon_state = "chair_preview"
+	dir = 1
 	},
 /obj/structure/cable/green,
 /turf/simulated/floor/tiled,
@@ -84259,15 +84222,9 @@
 /area/maintenance/firstdeck/aftstarboard)
 "mxK" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/armor/laserproof{
-	pixel_y = 0
-	},
-/obj/item/clothing/suit/armor/laserproof{
-	pixel_y = 0
-	},
-/obj/item/clothing/suit/armor/laserproof{
-	pixel_y = 0
-	},
+/obj/item/clothing/suit/armor/laserproof,
+/obj/item/clothing/suit/armor/laserproof,
+/obj/item/clothing/suit/armor/laserproof,
 /obj/item/clothing/head/helmet/ablative,
 /obj/item/clothing/head/helmet/ablative,
 /obj/item/clothing/head/helmet/ablative,
@@ -85204,6 +85161,10 @@
 	c_tag = "Research - Toxins";
 	dir = 1
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/toxins)
 "mDL" = (
@@ -86134,6 +86095,15 @@
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/virology/atmos)
+"mLp" = (
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -24
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/seconddeck/hangar)
 "mLr" = (
 /obj/machinery/shield_diffuser,
 /obj/machinery/door/airlock/external/bolted/cycling{
@@ -87647,8 +87617,6 @@
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/multi_tile/research{
 	dir = 8;
-	frequency = null;
-	id_tag = null;
 	name = "Xenobiology Atmospherics"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -88536,8 +88504,7 @@
 /area/command/exploration_leader)
 "neC" = (
 /obj/machinery/atmospherics/portables_connector{
-	dir = 4;
-	icon_state = "map_connector"
+	dir = 4
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/alarm{
@@ -89957,8 +89924,7 @@
 	dir = 1
 	},
 /obj/floor_decal/techfloor/corner{
-	dir = 8;
-	icon_state = "techfloor_corners"
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/vacant/storage)
@@ -90271,8 +90237,7 @@
 /area/crew_quarters/laundry)
 "nrm" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/green{
-	dir = 4;
-	icon_state = "map"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/engine_room)
@@ -90353,10 +90318,6 @@
 /obj/structure/bed/chair/wood/walnut{
 	dir = 1
 	},
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -24
-	},
 /obj/floor_decal/carpet/purple,
 /obj/floor_decal/carpet/purple{
 	dir = 1
@@ -91507,8 +91468,7 @@
 /area/medical/virology/lab)
 "nAg" = (
 /obj/machinery/computer/ship/navigation{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/monotile,
@@ -93934,7 +93894,6 @@
 "nVr" = (
 /obj/machinery/atmospherics/omni/mixer{
 	active_power_usage = 7500;
-	tag_east_con = null;
 	tag_north_con = 0.21;
 	tag_south = 1;
 	tag_south_con = 0.79;
@@ -95142,8 +95101,7 @@
 /area/crew_quarters/adherent)
 "ofy" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
-	dir = 8;
-	icon_state = "map"
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor,
@@ -96157,7 +96115,6 @@
 	dir = 4
 	},
 /obj/machinery/door_timer/cell_3{
-	pixel_y = 0;
 	pixel_x = 32
 	},
 /obj/floor_decal/borderfloor/corner2{
@@ -99430,7 +99387,15 @@
 /area/engineering/hardstorage)
 "oLr" = (
 /obj/machinery/computer/mining,
-/turf/simulated/wall/prepainted,
+/obj/structure/table/standard,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
 /area/quartermaster/hangar)
 "oLA" = (
 /obj/item/stool/padded/red,
@@ -101493,8 +101458,7 @@
 	id_tag = "escape_pod_3";
 	name = "escape pod three controller";
 	pixel_x = 20;
-	tag_door = "escape_pod_3_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_3_hatch"
 	},
 /obj/floor_decal/borderfloor/corner2{
 	dir = 6
@@ -103304,7 +103268,6 @@
 	},
 /obj/structure/sign/warning/nosmoking_1{
 	dir = 4;
-	icon_state = "nosmoking";
 	pixel_x = -32
 	},
 /obj/machinery/camera/network/medbay{
@@ -103615,6 +103578,12 @@
 /obj/floor_decal/corner/yellow/half,
 /turf/simulated/floor/tiled,
 /area/quartermaster/deckofficer)
+"ppX" = (
+/obj/machinery/air_sensor{
+	id_tag = "co2_sensor"
+	},
+/turf/simulated/floor/reinforced/carbon_dioxide,
+/area/engineering/atmos)
 "pqb" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -104231,6 +104200,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/alarm{
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/toxins/storage)
 "ptD" = (
@@ -104550,15 +104522,12 @@
 /obj/item/reagent_containers/syringe/drugs,
 /obj/item/paper/sticky{
 	name = "I not wall, i am door.";
-	pixel_y = 0;
 	pixel_x = -25
 	},
 /turf/simulated/floor/wood/walnut,
 /area/maintenance/firstdeck/foreport)
 "pwt" = (
-/obj/machinery/vending/cigarette{
-	icon_state = "cigs"
-	},
+/obj/machinery/vending/cigarette,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -105106,7 +105075,6 @@
 /obj/machinery/door/blast/regular/open{
 	density = 0;
 	dir = 4;
-	icon_state = "pdoor0";
 	id_tag = "AICoreLastResort";
 	name = "Last Resort";
 	opacity = 0
@@ -105218,8 +105186,7 @@
 /obj/item/stack/material/steel/fifty,
 /obj/structure/railing/mapped,
 /obj/floor_decal/spline/plain/black{
-	dir = 6;
-	icon_state = "spline_plain"
+	dir = 6
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -107152,6 +107119,10 @@
 /obj/machinery/vending/coffee{
 	dir = 8
 	},
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/wardhallway)
 "pSa" = (
@@ -108419,9 +108390,7 @@
 	dir = 1
 	},
 /obj/structure/table/woodentable/walnut,
-/obj/item/reagent_containers/food/drinks/teapot{
-	pixel_y = 0
-	},
+/obj/item/reagent_containers/food/drinks/teapot,
 /obj/item/reagent_containers/food/drinks/glass2/coffeecup/NT,
 /obj/item/reagent_containers/food/drinks/glass2/coffeecup/metal,
 /obj/item/reagent_containers/food/drinks/glass2/coffeecup/corp,
@@ -110951,8 +110920,7 @@
 /area/vacant/prototype/engine)
 "qvY" = (
 /obj/machinery/atmospherics/portables_connector{
-	dir = 4;
-	icon_state = "map_connector"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/medical/virology/atmos)
@@ -112839,7 +112807,6 @@
 	master_tag = "ai_core_airlock";
 	name = "exterior access button";
 	pixel_x = 24;
-	pixel_y = 0;
 	req_access = list("ACCESS_AI_UPLOAD")
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -112996,7 +112963,6 @@
 	dir = 4
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -113295,7 +113261,6 @@
 "qOc" = (
 /obj/item/paper/sticky{
 	name = "I not wall, i am door.";
-	pixel_y = 0;
 	pixel_x = 25
 	},
 /turf/simulated/floor/wood/walnut,
@@ -114557,7 +114522,6 @@
 "qXy" = (
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/command{
-	id_tag = null;
 	name = "Head of Personnel's Quarter";
 	secured_wires = 1;
 	stripe_color = "#b7f27d"
@@ -115892,8 +115856,7 @@
 	dir = 8
 	},
 /obj/structure/sign/warning/deathsposal{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/alarm{
 	dir = 8;
@@ -118209,7 +118172,6 @@
 	dir = 5
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 9
 	},
 /obj/floor_decal/corner/green/bordercorner,
@@ -120666,7 +120628,6 @@
 "rRW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining{
-	id_tag = null;
 	name = "Port Auxiliary Storage";
 	req_access = newlist()
 	},
@@ -120926,7 +120887,6 @@
 "rUf" = (
 /obj/machinery/door/airlock/mining{
 	dir = 4;
-	id_tag = null;
 	name = "Supply Office";
 	req_access = newlist()
 	},
@@ -120997,7 +120957,6 @@
 /area/thruster/d3starboard)
 "rUE" = (
 /obj/machinery/atmospherics/unary/tank/oxygen{
-	dir = 2;
 	volume = 3200
 	},
 /obj/floor_decal/industrial/outline/blue,
@@ -122196,6 +122155,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "sdo" = (
@@ -122985,19 +122948,27 @@
 "siF" = (
 /obj/machinery/button/toggle/valve/nacelle/third{
 	pixel_x = -6;
-	pixel_y = 25
+	pixel_y = 25;
+	id_tag = "RE2F";
+	name = "Fourth Deck Port Nacelle Fuel Control"
 	},
 /obj/machinery/button/toggle/valve/nacelle/first{
 	pixel_x = -6;
-	pixel_y = 34
+	pixel_y = 34;
+	id_tag = "RE4F";
+	name = "First Deck Port Nacelle Fuel Control"
 	},
 /obj/machinery/button/toggle/valve/nacelle/fourth{
 	pixel_x = 6;
-	pixel_y = 25
+	pixel_y = 25;
+	id_tag = "RE1F";
+	name = "Fourth Deck Starboard Nacelle Fuel Control"
 	},
 /obj/machinery/button/toggle/valve/nacelle/second{
 	pixel_x = 6;
-	pixel_y = 34
+	pixel_y = 34;
+	id_tag = "RE3F";
+	name = "First Deck Starboard Nacelle Fuel Control"
 	},
 /obj/structure/bed/chair/padded/yellow{
 	dir = 8
@@ -123119,8 +123090,7 @@
 /area/thruster/d1port)
 "sjZ" = (
 /obj/structure/sign/kiddieplaque{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_x = 32
 	},
 /obj/machinery/tele_projector{
 	dir = 6
@@ -123163,7 +123133,6 @@
 /obj/floor_decal/corner/green/diagonal,
 /obj/structure/table/glass,
 /obj/item/modular_computer/laptop/preset/records{
-	icon_state = "laptop-open";
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -123610,9 +123579,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/seconddeck/foreport)
 "sob" = (
-/obj/machinery/vending/games{
-	icon_state = "games"
-	},
+/obj/machinery/vending/games,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
@@ -125952,8 +125919,7 @@
 /area/engineering/engine_room)
 "sEl" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
-	dir = 1;
-	icon_state = "map"
+	dir = 1
 	},
 /obj/structure/cable/green{
 	d1 = 2;
@@ -126653,7 +126619,6 @@
 /obj/machinery/turretid/stun{
 	check_synth = 1;
 	name = "AI Entry Chamber turret control";
-	pixel_x = 0;
 	pixel_y = -32;
 	control_area = list(/area/turret_protected/ai_teleport)
 	},
@@ -127525,26 +127490,26 @@
 	dir = 8
 	},
 /obj/machinery/button/blast_door{
-	id_tag = "cChamber1pV";
-	name = "Third Deck Starboard Chamber Vent";
+	id_tag = "cChamber2pV";
+	name = "Fourth Deck Port Chamber Vent";
 	pixel_x = -6;
 	pixel_y = 25
 	},
 /obj/machinery/button/blast_door{
-	id_tag = "cChamber3pV";
-	name = "First Deck Starboard Chamber Vent";
+	id_tag = "cChamber4pV";
+	name = "First Deck Port Chamber Vent";
 	pixel_x = -6;
 	pixel_y = 34
 	},
 /obj/machinery/button/blast_door{
-	id_tag = "cChamber4pV";
-	name = "First Deck Port Chamber Vent";
+	id_tag = "cChamber1pV";
+	name = "Fourth Deck Starboard Chamber Vent";
 	pixel_x = 6;
 	pixel_y = 25
 	},
 /obj/machinery/button/blast_door{
-	id_tag = "cChamber2pV";
-	name = "Third Deck Port Chamber Vent";
+	id_tag = "cChamber3pV";
+	name = "First Deck Starboard Chamber Vent";
 	pixel_x = 6;
 	pixel_y = 34
 	},
@@ -132664,7 +132629,6 @@
 	pixel_x = -32;
 	pixel_y = -28;
 	tag_door = "escape_pod_10_berth_hatch";
-	frequency = 1380;
 	dir = 1
 	},
 /obj/floor_decal/industrial/warning,
@@ -132921,8 +132885,7 @@
 	dir = 1
 	},
 /obj/floor_decal/spline/plain/black{
-	dir = 1;
-	icon_state = "spline_plain"
+	dir = 1
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -133452,8 +133415,7 @@
 	id_tag = "escape_pod_11";
 	name = "escape pod eleven controller";
 	pixel_x = -20;
-	tag_door = "escape_pod_11_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_11_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/escape_pod/escape_pod11/station)
@@ -134817,7 +134779,6 @@
 /area/thruster/d3port)
 "tUj" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{
-	dir = 2;
 	id_tag = "ai_core_pump"
 	},
 /obj/machinery/light{
@@ -135135,8 +135096,7 @@
 	name = "escape pod seven berth controller";
 	pixel_x = -32;
 	pixel_y = 21;
-	tag_door = "escape_pod_7_berth_hatch";
-	frequency = 1380
+	tag_door = "escape_pod_7_berth_hatch"
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/centralstarboard)
@@ -136483,6 +136443,12 @@
 /obj/structure/closet/bombclosetsecurity,
 /turf/simulated/floor/tiled/techfloor,
 /area/security/sierra/suits)
+"uiw" = (
+/obj/machinery/air_sensor{
+	id_tag = "h2_sensor"
+	},
+/turf/simulated/floor/reinforced/hydrogen,
+/area/engineering/atmos)
 "uiA" = (
 /obj/machinery/conveyor{
 	id = "packageSort1";
@@ -137111,14 +137077,8 @@
 /obj/machinery/firealarm{
 	pixel_y = 24
 	},
-/obj/machinery/atmospherics/pipe/zpipe/down/supply{
-	color = "#0000ff";
-	dir = 2
-	},
-/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
-	color = "#ff0000";
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/zpipe/down/supply,
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
 /turf/simulated/open,
 /area/maintenance/seconddeck/starboard)
 "unm" = (
@@ -139503,7 +139463,6 @@
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/mining{
-	id_tag = null;
 	name = "Delivery Office";
 	req_access = newlist()
 	},
@@ -141767,8 +141726,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
-	dir = 8;
-	icon_state = "techfloor_corners"
+	dir = 8
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -142896,8 +142854,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
-	dir = 8;
-	icon_state = "techfloor_corners"
+	dir = 8
 	},
 /obj/floor_decal/techfloor{
 	dir = 8
@@ -143603,7 +143560,6 @@
 /area/crew_quarters/docking)
 "vkD" = (
 /obj/machinery/door/airlock/mining{
-	id_tag = null;
 	name = "Supply Office";
 	req_access = newlist()
 	},
@@ -144391,10 +144347,6 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/bridge/marine_room)
 "vpJ" = (
-/obj/machinery/alarm{
-	dir = 8;
-	pixel_x = 24
-	},
 /obj/floor_decal/carpet/purple{
 	dir = 1
 	},
@@ -144575,7 +144527,6 @@
 	dir = 8
 	},
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "charon_cargo_out";
 	name = "charon interior conveyor belt"
 	},
@@ -146618,7 +146569,6 @@
 	pixel_x = -32;
 	pixel_y = -28;
 	tag_door = "escape_pod_9_berth_hatch";
-	frequency = 1380;
 	dir = 1
 	},
 /obj/floor_decal/industrial/warning,
@@ -148043,8 +147993,7 @@
 /area/space)
 "vTd" = (
 /obj/machinery/computer/ship/navigation{
-	dir = 4;
-	icon_state = "computer"
+	dir = 4
 	},
 /obj/floor_decal/corner/black/full,
 /obj/machinery/light/spot{
@@ -148239,8 +148188,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
-	dir = 1;
-	icon_state = "map"
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/engineering/fuelbay)
@@ -148620,7 +148568,6 @@
 	dir = 4
 	},
 /obj/floor_decal/corner/green/bordercorner2{
-	icon_state = "bordercolorcorner2";
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -150676,7 +150623,6 @@
 /obj/floor_decal/industrial/outline/yellow,
 /obj/structure/sign/warning/nosmoking_1{
 	dir = 4;
-	icon_state = "nosmoking";
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/white/monotile,
@@ -151884,8 +151830,7 @@
 	dir = 6
 	},
 /obj/machinery/vending/coffee{
-	dir = 1;
-	icon_state = "coffee"
+	dir = 1
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -152625,9 +152570,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/engine_room)
 "wBV" = (
-/obj/structure/bed/chair/padded/red{
-	icon_state = "chair_preview"
-	},
+/obj/structure/bed/chair/padded/red,
 /turf/simulated/floor/tiled/dark,
 /area/quartermaster/hangar/upper)
 "wBZ" = (
@@ -153165,7 +153108,7 @@
 	name = "Hydrogen Supply Control";
 	output_tag = "h2_out";
 	sensor_name = "Tank";
-	sensor_tag = "tox_sensor"
+	sensor_tag = "h2_sensor"
 	},
 /obj/floor_decal/techfloor,
 /obj/floor_decal/corner/paleblue{
@@ -154615,6 +154558,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/shuttle/petrov/scan)
+"wUZ" = (
+/obj/machinery/door/firedoor,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled,
+/area/quartermaster/hangar)
 "wVd" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -157903,7 +157854,6 @@
 /obj/floor_decal/industrial/outline/yellow,
 /obj/structure/sign/warning/nosmoking_1{
 	dir = 4;
-	icon_state = "nosmoking";
 	pixel_x = -32
 	},
 /obj/machinery/camera/network/medbay{
@@ -157955,6 +157905,16 @@
 /obj/machinery/atmospherics/pipe/simple/visible/green,
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/engine_room)
+"xuX" = (
+/obj/machinery/computer/mining,
+/obj/structure/table/standard,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled,
+/area/quartermaster/hangar)
 "xvl" = (
 /obj/floor_decal/borderfloor{
 	dir = 10
@@ -157969,9 +157929,7 @@
 /obj/floor_decal/steeldecal/steel_decals10{
 	dir = 4
 	},
-/obj/floor_decal/steeldecal/steel_decals10{
-	dir = 2
-	},
+/obj/floor_decal/steeldecal/steel_decals10,
 /obj/structure/curtain/open/shower,
 /obj/item/soap,
 /obj/structure/closet/walllocker{
@@ -160265,6 +160223,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/medical/wardhallway)
+"xMw" = (
+/obj/machinery/air_sensor{
+	id_tag = "o2_sensor"
+	},
+/turf/simulated/floor/reinforced/oxygen,
+/area/engineering/atmos)
 "xMx" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -161381,8 +161345,7 @@
 "xUC" = (
 /obj/structure/sign/warning/fire{
 	dir = 4;
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -162719,8 +162682,7 @@
 "yei" = (
 /obj/structure/railing/mapped,
 /obj/structure/bed/chair/padded/yellow{
-	dir = 1;
-	icon_state = "chair_preview"
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/port)
@@ -163419,8 +163381,7 @@
 /area/crew_quarters/actor/stage)
 "yiR" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/red{
-	dir = 4;
-	icon_state = "map"
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -188025,7 +187986,7 @@ ceT
 lQb
 grZ
 iJi
-iul
+guy
 wlV
 isv
 wlV
@@ -188229,8 +188190,8 @@ grZ
 iJi
 iul
 oLr
-iul
-oLr
+wUZ
+xuX
 iul
 hiM
 seP
@@ -229017,7 +228978,7 @@ byL
 gHg
 cro
 wZo
-fBj
+mhj
 dyA
 mfK
 cGs
@@ -230026,7 +229987,7 @@ aiQ
 hzW
 dQU
 oro
-oja
+uiw
 oja
 vPj
 kVJ
@@ -230834,7 +230795,7 @@ jeV
 yaz
 hIu
 oro
-rSA
+ppX
 rSA
 alZ
 mfr
@@ -232237,12 +232198,12 @@ fKI
 fKI
 fKI
 fKI
-sCl
+xMw
 oNp
 nmS
 fKI
 nmj
-nmj
+frA
 rKp
 sDI
 kqY
@@ -250842,7 +250803,7 @@ stw
 vZL
 cmm
 cmm
-cmm
+hwq
 fQy
 sGg
 pAr
@@ -270624,7 +270585,7 @@ wyy
 oxy
 oxy
 sUj
-xWW
+mLp
 xWW
 ibC
 xWW
@@ -272866,7 +272827,7 @@ lOr
 kOt
 lnp
 kOt
-lOr
+fpC
 mYK
 mYK
 hvo