diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
index d010f68345e..f6577e952aa 100644
--- a/_maps/map_files/nova/nova.dmm
+++ b/_maps/map_files/nova/nova.dmm
@@ -164,9 +164,9 @@
 "abj" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
-	dir = 1;
 	id_tag = "janitorshutters";
-	name = "Janitor Shutters"
+	name = "Janitor Shutters";
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/janitor)
@@ -332,8 +332,8 @@
 	req_access = list(50)
 	},
 /obj/machinery/conveyor{
-	dir = 8;
-	id = "packageExternal"
+	id = "packageExternal";
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -571,8 +571,8 @@
 	},
 /obj/item/storage/box/lights/mixed,
 /obj/item/storage/box/lights/mixed{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -586,8 +586,8 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "redcorner"
+	dir = 9;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "aeK" = (
@@ -784,8 +784,8 @@
 	pixel_y = 24
 	},
 /obj/machinery/light_switch{
-	pixel_x = -24;
-	pixel_y = 34
+	pixel_y = 34;
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -875,13 +875,6 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "agU" = (
-/obj/structure/table,
-/obj/machinery/door/window{
-	dir = 8;
-	name = "High-Risk Modules";
-	req_access = list(20)
-	},
-/obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -892,7 +885,20 @@
 /obj/item/ai_module/one_crew_member,
 /obj/item/ai_module/purge,
 /obj/item/ai_module/antimov,
-/turf/simulated/floor/bluegrid,
+/obj/structure/table/glass,
+/obj/machinery/door/window{
+	base_state = "right";
+	dir = 8;
+	icon_state = "right";
+	name = "Core Modules";
+	req_access = list(20)
+	},
+/obj/structure/window/reinforced{
+	dir = 2
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
 /area/turret_protected/ai_upload)
 "agX" = (
 /obj/structure/cable{
@@ -1544,8 +1550,8 @@
 /obj/structure/table/wood,
 /obj/item/folder/blue,
 /obj/item/folder/blue{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/clothing/mask/cigarette/cigar/havana{
 	pixel_x = -3;
@@ -1553,8 +1559,8 @@
 	},
 /obj/item/clothing/mask/cigarette/cigar/havana,
 /obj/item/flashlight/lamp/green{
-	pixel_x = -3;
-	pixel_y = 13
+	pixel_y = 13;
+	pixel_x = -3
 	},
 /obj/item/radio/intercom{
 	pixel_x = -28
@@ -1923,24 +1929,15 @@
 	},
 /area/maintenance/banya)
 "anR" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
-/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
-/obj/item/tank/internals/emergency_oxygen/engi/empty,
-/obj/item/tank/internals/emergency_oxygen/engi/empty,
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/item/twohanded/required/kirbyplants,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
 	},
-/obj/machinery/power/apc{
-	cell_type = 5000;
-	dir = 4;
-	name = "east bump";
-	pixel_x = 26
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -2288,7 +2285,9 @@
 /turf/simulated/floor/shuttle/plating,
 /area/shuttle/arrival/station)
 "ari" = (
-/obj/machinery/door/airlock/external,
+/obj/machinery/door/airlock/external{
+	use_power = 0
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/casino)
 "arn" = (
@@ -2350,8 +2349,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = 6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -2835,8 +2834,8 @@
 /area/medical/virology/lab)
 "avV" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -2958,6 +2957,9 @@
 /obj/item/radio/intercom{
 	pixel_x = 28
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "axC" = (
@@ -3155,8 +3157,8 @@
 	dir = 4
 	},
 /obj/machinery/newscaster{
-	pixel_x = 32;
-	pixel_y = 32
+	pixel_y = 32;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -3414,20 +3416,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/chapel)
-"aAP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cryo)
 "aAV" = (
 /obj/machinery/atmospherics/pipe/multiz{
 	dir = 4
@@ -3481,11 +3469,11 @@
 "aBm" = (
 /obj/effect/decal/cleanable/dust,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /obj/machinery/light,
 /turf/simulated/floor/wood,
@@ -3542,6 +3530,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -3985,8 +3976,8 @@
 	pixel_x = 32
 	},
 /obj/item/radio/intercom{
-	pixel_x = 26;
-	pixel_y = -26
+	pixel_y = -26;
+	pixel_x = 26
 	},
 /turf/simulated/floor/carpet/royalblue,
 /area/crew_quarters/captain/bedroom)
@@ -4090,11 +4081,11 @@
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "brig_detprivacy";
 	name = "Detective Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -4251,12 +4242,12 @@
 	},
 /obj/structure/table/wood/fancy/red,
 /obj/item/lighter/zippo/hos{
-	pixel_x = -6;
-	pixel_y = 1
+	pixel_y = 1;
+	pixel_x = -6
 	},
 /obj/item/reagent_containers/food/drinks/mug/hos{
-	pixel_x = 9;
-	pixel_y = 1
+	pixel_y = 1;
+	pixel_x = 9
 	},
 /obj/item/paper/safe_code{
 	owner = "hos"
@@ -4334,17 +4325,18 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1
+	dir = 1;
+	icon_state = "red"
 	},
 /area/security/reception)
 "aGQ" = (
@@ -4489,8 +4481,8 @@
 	pixel_y = 9
 	},
 /obj/item/clothing/mask/cigarette/cigar/cohiba{
-	pixel_x = 2;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 2
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/bridge/meeting_room)
@@ -4723,8 +4715,8 @@
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/camera{
 	c_tag = "HoS Office South";
-	dir = 10;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 10
 	},
 /obj/item/radio/intercom{
 	pixel_y = -28
@@ -4931,8 +4923,8 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "permacell2";
 	layer = 5;
-	pixel_x = -24;
-	range = 3
+	range = 3;
+	pixel_x = -24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -4960,9 +4952,9 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/crew_quarters/sleep)
 "aKR" = (
@@ -5337,9 +5329,9 @@
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
 /obj/structure/sign/beautyplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Saad603. Слава НаноТрейзен!";
+	pixel_y = 32;
 	name = "Благодарственное Письмо от Главного Инженера станции Нова";
-	pixel_y = 32
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Saad603. Слава НаноТрейзен!"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -5466,8 +5458,8 @@
 	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "aPf" = (
@@ -5651,14 +5643,14 @@
 /area/maintenance/medroom)
 "aQe" = (
 /obj/docking_port/stationary{
-	area_type = /area/quartermaster/miningdock;
 	dir = 2;
 	dwidth = 3;
 	height = 5;
 	id = "mining_home";
 	name = "mining shuttle bay";
+	width = 7;
 	turf_type = /turf/simulated/floor/plating;
-	width = 7
+	area_type = /area/quartermaster/miningdock
 	},
 /turf/space/openspace{
 	icon_state = "black"
@@ -5876,8 +5868,8 @@
 /area/maintenance/fsmaint3)
 "aRp" = (
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -5966,11 +5958,11 @@
 /area/solar/auxport)
 "aRT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -6225,8 +6217,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Research West Hallway 2";
-	dir = 9;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 9
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -6619,21 +6611,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint3)
 "aWH" = (
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/machinery/vending/cart{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "brown"
+/obj/machinery/status_display/supply_display{
+	pixel_y = 32
 	},
-/area/quartermaster/office)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/quartermaster/storage)
 "aWJ" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7133,11 +7116,11 @@
 "bbC" = (
 /obj/structure/dispenser,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7275,11 +7258,11 @@
 /area/quartermaster/miningdock)
 "bcx" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/toilet3)
@@ -7617,8 +7600,8 @@
 	dir = 6
 	},
 /obj/item/twohanded/required/kirbyplants{
-	pixel_x = -4;
-	pixel_y = 7
+	pixel_y = 7;
+	pixel_x = -4
 	},
 /obj/effect/turf_decal/siding/wideplating/light{
 	dir = 6
@@ -7674,8 +7657,8 @@
 	},
 /obj/machinery/door/poddoor{
 	id_tag = "transitlock";
-	layer = 3;
-	name = "Transit AI Sattelite Blast Doors"
+	name = "Transit AI Sattelite Blast Doors";
+	layer = 3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -7801,8 +7784,8 @@
 	},
 /obj/item/paper/tcommskey,
 /obj/item/paper/monitorkey{
-	pixel_x = 3;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 3
 	},
 /obj/effect/turf_decal/siding/white{
 	dir = 1
@@ -8051,6 +8034,20 @@
 	icon_state = "dark"
 	},
 /area/engineering/aienter)
+"bil" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "whiteblue"
+	},
+/area/medical/cloning)
 "bio" = (
 /obj/structure/bookcase,
 /turf/simulated/floor/wood,
@@ -8918,20 +8915,20 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/item/folder/white{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/folder/red{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /obj/item/folder/blue{
-	pixel_x = 6;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 6
 	},
 /obj/item/folder/yellow{
-	pixel_x = 8;
-	pixel_y = 8
+	pixel_y = 8;
+	pixel_x = 8
 	},
 /obj/item/stamp/rep,
 /obj/structure/cable{
@@ -8958,8 +8955,8 @@
 	layer = 2.9
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 4
 	},
 /area/toxins/lab)
 "boZ" = (
@@ -9027,8 +9024,8 @@
 /area/hallway/secondary/entry/lounge)
 "bpt" = (
 /obj/machinery/conveyor_switch/oneway{
-	dir = 8;
-	id = "packageExternal"
+	id = "packageExternal";
+	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -9391,7 +9388,6 @@
 	},
 /area/security/securearmory)
 "brw" = (
-/obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 8;
 	id_tag = "SecMedPrivInside"
@@ -9402,6 +9398,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/medbay)
 "bry" = (
@@ -9795,8 +9792,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay Genetics Office";
-	dir = 4;
-	network = list("Medical","SS13")
+	network = list("Medical","SS13");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -9978,19 +9975,14 @@
 	},
 /area/hallway/primary/central)
 "bvn" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/item/radio/intercom{
+	pixel_y = 23
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1
+	dir = 1;
+	icon_state = "red"
 	},
-/area/security/prison/cell_block/A)
+/area/hallway/primary/central/second/west)
 "bvt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -10438,8 +10430,8 @@
 	opacity = 0
 	},
 /obj/machinery/door/airlock/atmos{
-	name = "Supermatter Chamber";
 	req_access = list(24);
+	name = "Supermatter Chamber";
 	security_level = 1
 	},
 /turf/simulated/floor/plasteel/dark,
@@ -10464,9 +10456,9 @@
 /area/gateway)
 "byN" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter"
+	name = "Robotics Privacy Shutter";
+	dir = 8
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -10717,8 +10709,8 @@
 	},
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/cans/beer{
-	pixel_x = 5;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = 5
 	},
 /obj/item/storage/ashtray,
 /turf/simulated/floor/plating,
@@ -11185,12 +11177,12 @@
 /area/maintenance/fpmaint)
 "bDG" = (
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /obj/machinery/conveyor{
-	dir = 8;
 	id = "QMLoad2";
+	dir = 8;
 	layer = 2.494
 	},
 /turf/simulated/floor/plasteel{
@@ -11214,8 +11206,8 @@
 	dir = 1
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 4;
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 4
 	},
 /turf/simulated/wall,
 /area/hallway/primary/fore)
@@ -11936,22 +11928,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/atmospherics)
 "bIO" = (
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/structure/table,
-/obj/machinery/recharger{
-	pixel_x = 1;
-	pixel_y = 3
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/stairs{
+	layer = 2
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "brown"
+	icon_state = "neutralfull"
 	},
-/area/quartermaster/office)
+/area/hallway/primary/starboard)
 "bIT" = (
 /obj/structure/barricade/wooden{
 	layer = 3.5
@@ -12014,9 +11997,6 @@
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance/double,
-/obj/structure/sign/poster/official/random{
-	pixel_x = -32
-	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -12254,14 +12234,17 @@
 	},
 /obj/item/lipstick/random,
 /obj/item/lipstick/random{
-	pixel_x = -3;
-	pixel_y = -3
+	pixel_y = -3;
+	pixel_x = -3
 	},
 /obj/item/lipstick/random{
 	pixel_y = 6
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "bLy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12356,8 +12339,8 @@
 "bMf" = (
 /obj/effect/decal/warning_stripes/west,
 /obj/structure/sign/poster/official/random{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -12858,6 +12841,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
 "bQd" = (
+/obj/machinery/door/airlock/glass{
+	name = "Barber Shop"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -12867,12 +12853,14 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/door/airlock/maintenance{
-	locked = 1;
-	req_access = list(12)
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "bQg" = (
 /turf/simulated/wall,
 /area/quartermaster/office)
@@ -12922,8 +12910,8 @@
 /area/engineering/mechanic_workshop/hangar)
 "bQv" = (
 /obj/machinery/conveyor/inverted{
-	dir = 9;
-	id = "garbage"
+	id = "garbage";
+	dir = 9
 	},
 /obj/effect/decal/warning_stripes/northeastcorner,
 /turf/simulated/floor/plating,
@@ -13244,9 +13232,6 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -13309,8 +13294,8 @@
 	c_tag = "Engineering SM Access";
 	dir = 10;
 	network = list("Engineering","SS13");
-	pixel_x = -2;
-	pixel_y = -1
+	pixel_y = -1;
+	pixel_x = -2
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -13383,6 +13368,16 @@
 /obj/structure/flora/ausbushes/palebush,
 /turf/simulated/floor/grass,
 /area/maintenance/fore)
+"bTD" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "bTE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -13628,8 +13623,8 @@
 	icon_state = "NStation4"
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "It's Officer Uploadsky! Powered by a potato and a shot of whiskey.";
-	name = "Officer Uploadsky"
+	name = "Officer Uploadsky";
+	desc = "It's Officer Uploadsky! Powered by a potato and a shot of whiskey."
 	},
 /turf/simulated/floor/engine{
 	slowdown = -0.3
@@ -13847,8 +13842,8 @@
 	pixel_x = -4
 	},
 /obj/item/folder/white{
-	pixel_x = -4;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = -4
 	},
 /obj/item/folder/blue,
 /obj/item/folder/blue{
@@ -13858,8 +13853,8 @@
 	pixel_x = 3
 	},
 /obj/item/folder{
-	pixel_x = 3;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 3
 	},
 /obj/item/folder/yellow{
 	pixel_x = 6
@@ -14451,8 +14446,13 @@
 	},
 /area/toxins/misc_lab)
 "cbk" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/photocopier,
+/obj/machinery/light{
+	dir = 1;
+	in_use = 1
+	},
+/obj/machinery/alarm{
+	pixel_y = 25
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -14638,8 +14638,8 @@
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/newscaster{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -14733,11 +14733,11 @@
 /area/maintenance/fsmaint3)
 "cdu" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -15116,17 +15116,6 @@
 	icon_state = "darkred"
 	},
 /area/security/permahallway)
-"cgR" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cryo)
 "cgX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -15231,8 +15220,8 @@
 /obj/machinery/door_control{
 	id = "ceprivacy1";
 	name = "Privacy Shutters";
-	pixel_x = 38;
-	pixel_y = -26
+	pixel_y = -26;
+	pixel_x = 38
 	},
 /obj/machinery/button/windowtint{
 	dir = 1;
@@ -15272,8 +15261,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "chZ" = (
@@ -15396,9 +15385,9 @@
 	network = list("SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/security/warden)
 "ciO" = (
@@ -15671,9 +15660,9 @@
 "clx" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	name = "backstage";
-	pixel_x = 32
+	pixel_x = 32;
+	anchored = 1
 	},
 /obj/structure/disposalpipe/junction{
 	dir = 2
@@ -16307,8 +16296,8 @@
 	pixel_y = -2
 	},
 /obj/item/flashlight/flare{
-	pixel_x = 2;
-	pixel_y = 8
+	pixel_y = 8;
+	pixel_x = 2
 	},
 /obj/item/flashlight/flare{
 	pixel_y = 4
@@ -16684,11 +16673,11 @@
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "brig_detprivacy";
 	name = "Detective Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -16808,8 +16797,8 @@
 	pixel_y = 12
 	},
 /obj/item/reagent_containers/food/drinks/mug/serv{
-	pixel_x = -8;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = -8
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/quartermaster/qm)
@@ -16926,6 +16915,7 @@
 	pixel_x = -3;
 	pixel_y = 5
 	},
+/obj/item/megaphone,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "red"
@@ -17126,15 +17116,15 @@
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/eastleft{
-	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35)
+	req_access = list(35);
+	dir = 1
 	},
 /obj/item/reagent_containers/food/snacks/grown/apple,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters"
+	name = "Hydroponics Shutters";
+	dir = 1
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -17798,14 +17788,9 @@
 	},
 /area/maintenance/medroom)
 "cAA" = (
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -26
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
+/obj/structure/closet/secure_closet/security,
+/obj/item/clothing/mask/balaclava,
+/obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -18022,6 +18007,10 @@
 	icon_state = "solarpanel"
 	},
 /area/solar/starboard)
+"cCn" = (
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/civilian/barber)
 "cCv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -18133,17 +18122,13 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/atmospherics)
 "cDR" = (
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/machinery/computer/merch{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/table,
+/obj/machinery/recharger{
+	pixel_x = 1;
+	pixel_y = 3
 	},
 /turf/simulated/floor/plasteel{
-	dir = 5;
+	dir = 8;
 	icon_state = "brown"
 	},
 /area/quartermaster/office)
@@ -18489,25 +18474,11 @@
 	},
 /area/chapel/office)
 "cGc" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/effect/spawner/window/reinforced,
-/obj/structure/curtain/open/shower/security{
-	alpha = 255;
-	anchored = 1;
-	icon_state = "closed";
-	name = "backstage";
-	opacity = 1
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "redcorner"
 	},
-/turf/simulated/floor/plating,
-/area/security/medbay)
+/area/hallway/primary/central/second/west)
 "cGm" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18722,8 +18693,10 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "cHB" = (
@@ -18988,8 +18961,8 @@
 	},
 /area/atmos)
 "cKm" = (
-/obj/structure/table,
 /obj/item/ai_module/freeform,
+/obj/structure/table/glass,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -19015,8 +18988,8 @@
 "cKy" = (
 /obj/effect/spawner/lootdrop/maintenance/double,
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
@@ -19510,12 +19483,13 @@
 /turf/space/openspace,
 /area/space)
 "cOi" = (
-/obj/item/radio/intercom{
-	pixel_x = 28;
-	pixel_y = 28
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/wood,
-/area/library)
+/turf/simulated/floor/plasteel{
+	icon_state = "redcorner"
+	},
+/area/security/prison/cell_block/A)
 "cOl" = (
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
@@ -19649,8 +19623,8 @@
 	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "cPm" = (
@@ -19662,11 +19636,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -19854,8 +19828,8 @@
 	network = list("Research","SS13")
 	},
 /obj/item/clothing/glasses/welding/superior{
-	pixel_x = 6;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = 6
 	},
 /obj/structure/table/glass,
 /obj/structure/cable{
@@ -19878,8 +19852,8 @@
 	dir = 10
 	},
 /obj/item/twohanded/required/kirbyplants{
-	pixel_x = 2;
-	pixel_y = 7
+	pixel_y = 7;
+	pixel_x = 2
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -19981,9 +19955,9 @@
 /area/security/hos)
 "cRf" = (
 /obj/machinery/door/window/eastleft{
-	dir = 8;
 	name = "Mail";
-	req_access = list(50)
+	req_access = list(50);
+	dir = 8
 	},
 /obj/structure/window/reinforced,
 /obj/effect/decal/warning_stripes/yellow,
@@ -20051,6 +20025,21 @@
 	},
 /turf/simulated/floor/glass/reinforced,
 /area/engineering/aienter)
+"cRz" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	icon_state = "open";
+	id_tag = "rdprivacy";
+	name = "Research Director Office Shutters";
+	opacity = 0;
+	dir = 2
+	},
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/toxins/rdoffice)
 "cRB" = (
 /obj/structure/railing{
 	dir = 8
@@ -20211,8 +20200,8 @@
 /area/maintenance/tourist)
 "cSM" = (
 /obj/machinery/vending/wallmed{
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -20683,8 +20672,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance{
-	locked = 1;
 	req_access = list(12);
+	locked = 1;
 	welded = 1
 	},
 /obj/structure/barricade/wooden{
@@ -21043,8 +21032,8 @@
 	dir = 4
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 1;
-	pixel_y = -8
+	pixel_y = -8;
+	dir = 1
 	},
 /obj/structure/sign/directions/medical{
 	dir = 1;
@@ -21078,23 +21067,6 @@
 	icon_state = "vault"
 	},
 /area/turret_protected/aisat_interior/secondary)
-"cZo" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "whiteblue"
-	},
-/area/medical/cloning)
 "cZt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -21686,8 +21658,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -21707,8 +21679,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "red"
+	dir = 1
 	},
 /area/hallway/primary/central/second/west)
 "dgl" = (
@@ -21888,8 +21859,8 @@
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/camera{
 	c_tag = "Engine Room West";
-	dir = 4;
-	network = list("Engineering","SS13")
+	network = list("Engineering","SS13");
+	dir = 4
 	},
 /obj/machinery/alarm{
 	dir = 4;
@@ -21936,12 +21907,17 @@
 	},
 /area/hallway/secondary/exit)
 "dhv" = (
-/obj/machinery/door/airlock{
-	id_tag = "toilet3";
-	name = "Toilet"
+/obj/effect/turf_decal/number/number_2{
+	dir = 1;
+	pixel_y = -18
 	},
-/turf/simulated/floor/plasteel/freezer,
-/area/crew_quarters/toilet2)
+/obj/effect/turf_decal/arrows/white{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/hallway/primary/central/west)
 "dhz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21969,8 +21945,8 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite";
 	name = "AI Antechamber Turret Control";
-	pixel_y = -32;
-	req_access = list(75)
+	req_access = list(75);
+	pixel_y = -32
 	},
 /obj/machinery/light,
 /obj/machinery/camera{
@@ -22471,13 +22447,16 @@
 	},
 /area/turret_protected/ai)
 "dlT" = (
-/obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "0-4"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id_tag = "SecMedPrivOutside"
+/obj/effect/spawner/window/reinforced,
+/obj/structure/curtain/open/shower/security{
+	alpha = 255;
+	icon_state = "closed";
+	name = "backstage";
+	opacity = 1;
+	anchored = 1
 	},
 /turf/simulated/floor/plating,
 /area/security/medbay)
@@ -22636,8 +22615,8 @@
 /obj/machinery/fishtank/bowl,
 /obj/item/fish_net,
 /obj/item/fishfood{
-	pixel_x = 2;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 2
 	},
 /obj/item/stack/wrapping_paper,
 /turf/simulated/floor/wood,
@@ -22790,9 +22769,9 @@
 /area/crew_quarters/serviceyard)
 "doq" = (
 /obj/machinery/door/airlock/security{
-	id = "execution";
 	name = "Execution Room";
-	req_access = list(2)
+	req_access = list(2);
+	id = "execution"
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23348,7 +23327,8 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1
+	dir = 1;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "dsh" = (
@@ -23482,6 +23462,12 @@
 	icon_state = "neutralfull"
 	},
 /area/quartermaster/delivery)
+"dsN" = (
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/security/prison/cell_block/A)
 "dsO" = (
 /obj/machinery/libraryscanner,
 /turf/simulated/floor/wood,
@@ -23735,8 +23721,8 @@
 /obj/effect/decal/warning_stripes/yellow/partial,
 /obj/item/radio/intercom{
 	dir = 1;
-	pixel_x = -26;
-	pixel_y = 28
+	pixel_y = 28;
+	pixel_x = -26
 	},
 /obj/effect/landmark/join_late_cyborg,
 /obj/machinery/light{
@@ -24337,8 +24323,8 @@
 	},
 /area/maintenance/detectives_office)
 "dzE" = (
-/obj/structure/table,
 /obj/item/ai_module/quarantine,
+/obj/structure/table/glass,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -24417,8 +24403,8 @@
 "dzV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/contraband/random{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint6)
@@ -24451,8 +24437,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/door/window{
-	dir = 8;
-	name = "Atmospherics Desk"
+	name = "Atmospherics Desk";
+	dir = 8
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/door/poddoor{
@@ -24616,11 +24602,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 8
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -24871,11 +24857,11 @@
 /area/crew_quarters/mrchangs)
 "dCX" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -24912,8 +24898,8 @@
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -25151,8 +25137,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno6";
-	name = "Creature Cell #6"
+	name = "Creature Cell #6";
+	id_tag = "xeno6"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -25406,7 +25392,7 @@
 /obj/machinery/firealarm{
 	dir = 4;
 	name = "east fire alarm";
-	pixel_x = 24
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -25510,6 +25496,16 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/gambling_den)
+"dIS" = (
+/obj/machinery/computer/secure_data,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "red"
+	},
+/area/security/reception)
 "dIY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -25761,8 +25757,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Gravity Generator Area West";
-	dir = 8;
-	network = list("SS13","Engineering")
+	network = list("SS13","Engineering");
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/gravitygenerator)
@@ -25892,6 +25888,16 @@
 	icon_state = "vault"
 	},
 /area/bridge)
+"dLR" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "red"
+	},
+/area/hallway/primary/central/west)
 "dMb" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -26212,15 +26218,23 @@
 /turf/simulated/wall/r_wall,
 /area/atmos)
 "dOu" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "dOx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -26287,8 +26301,8 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/security{
-	dir = 1;
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 1
 	},
 /obj/structure/sign/directions/medical{
 	dir = 1
@@ -26444,8 +26458,8 @@
 	scrub_Toxins = 1
 	},
 /obj/structure/sign/poster/random{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -26482,8 +26496,8 @@
 /obj/structure/table,
 /obj/machinery/camera{
 	c_tag = "Research Break Room";
-	dir = 10;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
@@ -26574,29 +26588,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/brig)
 "dQT" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/door/airlock/medical{
-	name = "Brig Medical Bay";
-	req_access = list(63);
-	security_level = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/security/medbay)
+/turf/simulated/openspace,
+/area/hallway/primary/central/second/west)
 "dQY" = (
 /obj/structure/chair{
 	dir = 1
@@ -26646,17 +26639,14 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine)
 "dRn" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -26983,8 +26973,8 @@
 /area/maintenance/trading)
 "dTN" = (
 /obj/structure/chair/sofa/right{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -27201,6 +27191,11 @@
 /area/medical/cryo)
 "dWb" = (
 /obj/structure/table/wood,
+/obj/item/folder/blue,
+/obj/item/folder/blue{
+	pixel_x = 4;
+	pixel_y = 4
+	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 4;
 	name = "standard air scrubber";
@@ -27208,8 +27203,11 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "dWg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -27248,7 +27246,6 @@
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/bottle/whiskey,
 /obj/item/reagent_containers/food/drinks/flask/detflask,
-/obj/item/lighter/zippo/detective,
 /turf/simulated/floor/wood,
 /area/security/detectives_office)
 "dWp" = (
@@ -27695,9 +27692,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "eab" = (
+/obj/machinery/vending/wallmed{
+	pixel_y = -30
+	},
 /obj/machinery/vending/artvend,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "eae" = (
 /obj/machinery/computer/station_alert,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -27980,8 +27980,8 @@
 	},
 /obj/machinery/light_switch{
 	name = "north light switch";
-	pixel_x = 24;
-	pixel_y = 24
+	pixel_y = 24;
+	pixel_x = 24
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28150,9 +28150,9 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 2;
 	id_tag = "Kitchen Dinner Windows";
-	name = "Kitchen Shutters"
+	name = "Kitchen Shutters";
+	dir = 2
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -28189,6 +28189,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
 "edt" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -28201,7 +28204,7 @@
 /obj/machinery/door/airlock/maintenance{
 	req_access = list(12)
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/wood/fancy/cherry,
 /area/maintenance/tourist)
 "edu" = (
 /obj/structure/table/wood,
@@ -28329,8 +28332,8 @@
 "eeb" = (
 /obj/machinery/camera{
 	c_tag = "Prisoners Lockers";
-	dir = 4;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -28882,8 +28885,8 @@
 	id = "Evidence Storage";
 	name = "Evidence Storage Privacy Shutters Control";
 	pixel_x = -24;
-	pixel_y = -24;
-	req_access = list(63)
+	req_access = list(63);
+	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 0;
@@ -29137,9 +29140,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/energy/gun{
 	pixel_x = 3
@@ -29398,9 +29401,6 @@
 /area/security/permabrig)
 "elt" = (
 /obj/effect/landmark/start/brig_physician,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -29410,8 +29410,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -29763,19 +29763,14 @@
 	},
 /area/maintenance/trading)
 "enP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 9
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	dir = 4;
+	icon_state = "red"
 	},
-/area/security/medbay)
+/area/security/processing)
 "enR" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -29789,6 +29784,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -29804,10 +29800,10 @@
 "enZ" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "BrigRight";
-	locked = 1;
 	name = "Brig Mechbay";
 	req_access = list(63);
-	welded = 1
+	welded = 1;
+	locked = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/secpost)
@@ -30004,6 +30000,16 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/bridge)
+"epN" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cryo)
 "epP" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -30030,11 +30036,10 @@
 	},
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "eqc" = (
 /obj/structure/chair/comfy/black{
 	dir = 1
@@ -30079,8 +30084,16 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/power/apc{
+	cell_type = 5000;
+	dir = 4;
+	name = "east bump";
+	pixel_x = 26
+	},
+/obj/structure/cable,
 /turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+	dir = 4;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "eqO" = (
@@ -30188,11 +30201,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "erL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -30287,11 +30299,11 @@
 /area/maintenance/fsmaint3)
 "esF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -30324,8 +30336,8 @@
 /area/solar/port)
 "esR" = (
 /obj/structure/sign/vacuum{
-	icon_state = "space1";
-	pixel_x = -32
+	pixel_x = -32;
+	icon_state = "space1"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -30519,8 +30531,8 @@
 "eut" = (
 /obj/machinery/computer/card,
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -30617,15 +30629,10 @@
 "eva" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/disposalpipe/segment,
-/obj/item/vending_refill/custom,
-/obj/item/vending_refill/custom{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/item/wrench,
 /obj/item/crowbar,
+/obj/item/wrench,
 /obj/item/gps,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
 "evi" = (
@@ -30643,8 +30650,8 @@
 /area/medical/medrest)
 "evm" = (
 /obj/machinery/light_switch{
-	pixel_x = -24;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -30832,8 +30839,8 @@
 "ewT" = (
 /obj/structure/table/wood,
 /obj/item/grenade/chem_grenade{
-	pixel_x = 3;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = 3
 	},
 /obj/item/grenade/chem_grenade{
 	pixel_x = 7
@@ -30871,8 +30878,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/item/radio/intercom{
-	pixel_x = -28;
-	pixel_y = 23
+	pixel_y = 23;
+	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -30953,8 +30960,8 @@
 /obj/item/twohanded/required/kirbyplants,
 /obj/item/radio/intercom{
 	dir = 1;
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -31251,10 +31258,10 @@
 	pixel_y = 4
 	},
 /obj/machinery/door/window/brigdoor{
-	color = "red";
-	dir = 2;
 	name = "Security Reception";
-	req_access = list(1)
+	req_access = list(1);
+	dir = 2;
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull";
@@ -31432,11 +31439,11 @@
 	pixel_x = -28
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/carpet/royalblue,
 /area/ntrep)
@@ -31606,8 +31613,8 @@
 /area/crew_quarters/captain)
 "eBd" = (
 /obj/structure/chair/sofa/right{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 8
@@ -32020,8 +32027,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "eEY" = (
@@ -32097,8 +32104,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "eFF" = (
@@ -32436,8 +32443,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "rampbottom"
@@ -32781,8 +32788,8 @@
 "eKM" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = 28;
-	pixel_y = 28
+	pixel_y = 28;
+	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -32881,8 +32888,8 @@
 	pixel_y = 2
 	},
 /obj/item/flashlight/lamp/green{
-	pixel_x = -7;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = -7
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -32965,8 +32972,8 @@
 "eLS" = (
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/reagent_containers/glass/bucket{
-	pixel_x = 3;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 3
 	},
 /obj/structure/table,
 /obj/structure/window/reinforced/polarized,
@@ -32983,8 +32990,8 @@
 	pixel_y = 5
 	},
 /obj/item/reagent_containers/spray/cleaner{
-	pixel_x = -1;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = -1
 	},
 /obj/item/reagent_containers/spray/cleaner{
 	pixel_x = 2;
@@ -33399,8 +33406,8 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 1
 	},
 /area/hallway/primary/fore)
 "ePu" = (
@@ -33458,6 +33465,19 @@
 /obj/structure/grille/broken,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint3)
+"ePX" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 8
+	},
+/obj/effect/landmark/start/civilian,
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "ePZ" = (
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -33513,9 +33533,9 @@
 "eQD" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/maintenance/fsmaint2)
 "eQG" = (
@@ -33828,9 +33848,9 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/sortjunction{
-	dir = 1;
 	name = "CE's Junction";
-	sortType = 5
+	sortType = 5;
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -34327,8 +34347,8 @@
 "eYo" = (
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 9
 	},
 /area/hallway/primary/fore)
 "eYp" = (
@@ -34478,8 +34498,8 @@
 /obj/item/shard,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	name = "backstage";
+	anchored = 1;
 	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
@@ -34629,8 +34649,8 @@
 /area/engineering/controlroom)
 "eZN" = (
 /mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "It's Officer Rightsky! Powered by a potato and a shot of whiskey.";
-	name = "Officer Rightsky"
+	name = "Officer Rightsky";
+	desc = "It's Officer Rightsky! Powered by a potato and a shot of whiskey."
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -34898,7 +34918,7 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 6
+	dir = 10
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -35518,8 +35538,8 @@
 	pixel_y = 15
 	},
 /obj/item/storage/box/masks{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /obj/item/storage/box/gloves,
 /obj/machinery/door_control{
@@ -35584,25 +35604,6 @@
 /obj/effect/decal/warning_stripes/southwest,
 /turf/simulated/floor/plasteel,
 /area/storage/tech)
-"fgL" = (
-/obj/machinery/camera{
-	c_tag = "Central Bridge Hallway East 2";
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = -30
-	},
-/turf/simulated/floor/engine{
-	slowdown = -0.3
-	},
-/area/hallway/primary/central)
 "fgN" = (
 /obj/machinery/computer/crew,
 /obj/structure/cable{
@@ -35725,6 +35726,9 @@
 "fhv" = (
 /obj/machinery/door/firedoor,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/machinery/vending/wallmed{
+	pixel_x = -25
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "neutral"
@@ -36004,8 +36008,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno4";
-	name = "Creature Cell #4"
+	name = "Creature Cell #4";
+	id_tag = "xeno4"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -36066,8 +36070,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "fkd" = (
@@ -36129,11 +36133,13 @@
 /area/security/podbay)
 "fky" = (
 /obj/effect/turf_decal/siding/red{
-	dir = 4
+	dir = 5
 	},
-/obj/effect/landmark/start/brig_physician,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/medbay)
@@ -36176,6 +36182,10 @@
 	icon_state = "darkred"
 	},
 /area/turret_protected/aisat_interior/secondary)
+"fkL" = (
+/obj/machinery/vending/boozeomat,
+/turf/simulated/floor/carpet/black,
+/area/ntrep)
 "fkO" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -36327,6 +36337,7 @@
 	pixel_x = -2;
 	pixel_y = 4
 	},
+/obj/item/storage/belt/medical,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -36453,8 +36464,8 @@
 /area/bridge/checkpoint/south)
 "fmX" = (
 /obj/machinery/door/airlock/maintenance{
-	name = "Cargo maintenance access";
-	req_access = list(12)
+	req_access = list(12);
+	name = "Cargo maintenance access"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -36801,8 +36812,8 @@
 "fps" = (
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
-/obj/structure/sign/tajarplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. Особая благодарность за помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Daeberdir. Слава НаноТрейзен!";
+/obj/structure/sign/atmosplaque{
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Aeterna0. Слава НаноТрейзен!";
 	name = "Благодарственное Письмо от Главного Инженера станции Нова";
 	pixel_y = 32
 	},
@@ -36830,17 +36841,13 @@
 /turf/simulated/floor/shuttle,
 /area/shuttle/arrival/station)
 "fpy" = (
-/obj/structure/cable,
-/obj/effect/spawner/window/reinforced,
-/obj/structure/curtain/open/shower/security{
-	alpha = 255;
-	anchored = 1;
-	icon_state = "closed";
-	name = "backstage";
-	opacity = 1
+/obj/structure/sign/poster/official/obey{
+	pixel_x = 32
 	},
-/turf/simulated/floor/plating,
-/area/security/medbay)
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/security/prison/cell_block/A)
 "fpz" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -36880,8 +36887,8 @@
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 4
 	},
 /area/toxins/lab)
 "fpW" = (
@@ -36898,8 +36905,8 @@
 "fpZ" = (
 /obj/machinery/computer/rdconsole/mechanics,
 /obj/item/radio/intercom{
-	pixel_x = 30;
-	pixel_y = 22
+	pixel_y = 22;
+	pixel_x = 30
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -37065,8 +37072,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance{
-	name = "Hangar access";
-	req_access = list(18,48,70,71)
+	req_access = list(18,48,70,71);
+	name = "Hangar access"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/maintcentral)
@@ -38002,6 +38009,17 @@
 	},
 /turf/simulated/floor/plasteel/grimy,
 /area/crew_quarters/bar)
+"fxY" = (
+/obj/effect/decal/warning_stripes/west,
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 4;
+	name = "standard air scrubber";
+	on = 1;
+	scrub_N2O = 1;
+	scrub_Toxins = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/atmos)
 "fyh" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -38253,8 +38271,8 @@
 /obj/machinery/door_control{
 	id = "xeno5";
 	name = "Containment Control";
-	pixel_x = 32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = 32
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -38302,15 +38320,15 @@
 /obj/structure/table/wood/fancy/blue,
 /obj/item/lighter/zippo/hop,
 /obj/item/paper/monitorkey{
-	pixel_x = 5;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 5
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
 /obj/item/toy/figure/hop{
-	pixel_x = -8;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = -8
 	},
 /turf/simulated/floor/wood/fancy/light,
 /area/crew_quarters/heads/hop)
@@ -38327,8 +38345,8 @@
 	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 6
 	},
 /area/bridge/checkpoint/south)
 "fAu" = (
@@ -38376,8 +38394,8 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xenosecure";
-	name = "Secure Creature Cell"
+	name = "Secure Creature Cell";
+	id_tag = "xenosecure"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -38417,8 +38435,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/chair/stool,
 /obj/structure/sign/poster/official/the_owl{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/apmaint)
@@ -38593,26 +38611,6 @@
 	icon_state = "dark"
 	},
 /area/crew_quarters/chief)
-"fCz" = (
-/obj/effect/mapping_helpers/airlock/unres{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/medical/glass{
-	id = "cloninglab";
-	name = "Cloning Lab";
-	req_access = list(5)
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cloning)
 "fCA" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 1
@@ -38985,8 +38983,8 @@
 "fEJ" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
-	name = "backstage"
+	name = "backstage";
+	anchored = 1
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
@@ -39007,8 +39005,8 @@
 "fES" = (
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = 6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 6
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 8
@@ -39973,8 +39971,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/reception)
 "fMT" = (
@@ -40158,8 +40156,8 @@
 	req_access = list(24)
 	},
 /obj/machinery/door/window{
-	dir = 8;
-	name = "Atmospherics Desk"
+	name = "Atmospherics Desk";
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -40279,8 +40277,8 @@
 /area/maintenance/casino)
 "fOY" = (
 /obj/structure/sign/directions/security{
-	dir = 8;
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 8
 	},
 /obj/structure/sign/directions/medical,
 /obj/structure/sign/directions/evac{
@@ -40352,8 +40350,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno5";
-	name = "Creature Cell #5"
+	name = "Creature Cell #5";
+	id_tag = "xeno5"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -40554,8 +40552,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = 5;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -40597,11 +40595,11 @@
 /area/engineering/mechanic_workshop/hangar)
 "fRt" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/courtroom)
@@ -41337,8 +41335,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = 5;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -41422,8 +41420,8 @@
 /obj/structure/table/reinforced,
 /obj/item/gps,
 /obj/item/gps{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -41610,8 +41608,8 @@
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/camera{
 	c_tag = "Experimentation Lab";
-	dir = 10;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 10
 	},
 /turf/simulated/floor/engine,
 /area/toxins/explab)
@@ -41763,8 +41761,8 @@
 "fZz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/drip{
-	pixel_x = 6;
-	pixel_y = 12
+	pixel_y = 12;
+	pixel_x = 6
 	},
 /obj/effect/decal/cleanable/blood/drip{
 	pixel_x = -11;
@@ -41782,16 +41780,16 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/structure/window/reinforced{
 	color = "red";
@@ -41834,11 +41832,13 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/sofa/corp/left{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "gab" = (
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/carpet/black,
@@ -42030,24 +42030,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
-"gbK" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = -30
-	},
-/turf/simulated/floor/engine{
-	slowdown = -0.3
-	},
-/area/hallway/primary/central)
 "gbN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -42186,15 +42168,23 @@
 	},
 /area/security/securehallway)
 "gcQ" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "gdc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -42384,14 +42374,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "geA" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -2;
-	pixel_y = -1
-	},
-/obj/item/storage/belt/utility,
-/obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/effect/decal/warning_stripes/northeast,
+/obj/machinery/computer/roboquest,
+/obj/effect/turf_decal/bot_red{
+	layer = 1.99
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -42840,11 +42827,11 @@
 /area/maintenance/xenozoo)
 "ghS" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -42962,8 +42949,8 @@
 /obj/machinery/firealarm{
 	dir = 1;
 	name = "south fire alarm";
-	pixel_x = 29;
-	pixel_y = -25
+	pixel_y = -25;
+	pixel_x = 29
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -43552,8 +43539,8 @@
 /area/maintenance/asmaint)
 "gmA" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -43592,8 +43579,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/cryo)
 "gmI" = (
@@ -43661,11 +43648,11 @@
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "ai_airlock";
 	pixel_x = 28;
-	pixel_y = -3;
 	tag_airpump = "ai_pump";
 	tag_chamber_sensor = "ai_sensor";
 	tag_exterior_door = "ai_outer";
-	tag_interior_door = "ai_inner"
+	tag_interior_door = "ai_inner";
+	pixel_y = -3
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "ai_sensor";
@@ -43948,8 +43935,8 @@
 /area/hallway/primary/port/south)
 "gph" = (
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -44182,12 +44169,12 @@
 	pixel_y = 7
 	},
 /obj/item/clothing/mask/cigarette/syndicate{
-	pixel_x = 5;
-	pixel_y = 7
+	pixel_y = 7;
+	pixel_x = 5
 	},
 /obj/item/lighter{
-	pixel_x = -4;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = -4
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -44246,8 +44233,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno2";
-	name = "Creature Cell #2"
+	name = "Creature Cell #2";
+	id_tag = "xeno2"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -44548,8 +44535,8 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "permacell1";
 	layer = 5;
-	pixel_x = 24;
-	range = 3
+	range = 3;
+	pixel_x = 24
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -44652,8 +44639,8 @@
 /area/crew_quarters/locker)
 "guH" = (
 /obj/machinery/door/window/northleft{
-	dir = 2;
-	name = "Cafe"
+	name = "Cafe";
+	dir = 2
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dust,
@@ -44664,6 +44651,12 @@
 /obj/effect/decal/warning_stripes/red,
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry/additional)
+"guO" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/security/prison/cell_block/A)
 "guT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -44767,9 +44760,9 @@
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/sortjunction{
-	dir = 4;
 	name = "Atmospherics Junction";
-	sortType = 6
+	sortType = 6;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -45063,13 +45056,9 @@
 /area/maintenance/fore)
 "gxY" = (
 /obj/structure/window/reinforced,
-/obj/structure/sign/goldenplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Zhojaba. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо от Главного Инженера станции Нова";
-	pixel_y = 32
-	},
-/obj/structure/statue/gold/hos{
-	pixel_y = 7
+/obj/structure/statue/gold/tajaran{
+	desc = "Перед собою вы наблюдаете статую таяры, которая держит в руках чертежи станции очень похожие на станцию Нова. Надпись на табличке - Один из двух главных инженеров союза Таяр и Унати, по прозвищу Daeberdir, принимавших участие в разработке передовой научно-исследовательской станции НаноТрейзен - Nova.";
+	name = "Л.А.Р"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -45268,8 +45257,8 @@
 /obj/structure/closet/radiation,
 /obj/machinery/camera{
 	c_tag = "Medbay GenCells";
-	dir = 1;
-	network = list("Medical","SS13")
+	network = list("Medical","SS13");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple"
@@ -45577,6 +45566,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "redcorner"
@@ -45689,10 +45679,10 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/structure/window/reinforced{
 	color = "red"
@@ -46282,10 +46272,19 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fpmaint)
 "gIv" = (
+/obj/effect/turf_decal/siding/wood{
+	do_not_delete_me = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "gIw" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -46317,8 +46316,8 @@
 	pixel_y = 3
 	},
 /obj/machinery/defibrillator_mount/loaded{
-	pixel_x = 32;
-	pixel_y = 26
+	pixel_y = 26;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -46723,8 +46722,8 @@
 "gLP" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -47087,8 +47086,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xenosecure";
-	name = "Secure Creature Cell"
+	name = "Secure Creature Cell";
+	id_tag = "xenosecure"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -47237,8 +47236,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_x = -32;
-	pixel_y = -30
+	pixel_y = -30;
+	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -47318,8 +47317,8 @@
 /area/solar/auxport)
 "gRO" = (
 /obj/structure/chair/sofa/right{
-	color = "#85130b";
-	dir = 8
+	dir = 8;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 5
@@ -47450,8 +47449,8 @@
 	opacity = 0
 	},
 /obj/machinery/conveyor{
-	dir = 8;
-	id = "packageExternal"
+	id = "packageExternal";
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -48113,8 +48112,8 @@
 /obj/item/paper_bin,
 /obj/item/pen,
 /obj/item/lighter/zippo/ce{
-	pixel_x = 4;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 4
 	},
 /obj/effect/turf_decal/siding/white{
 	dir = 5
@@ -48206,9 +48205,9 @@
 /obj/structure/flora/ausbushes/grassybush,
 /obj/machinery/camera{
 	c_tag = "Xenobio Central-South";
-	dir = 6;
 	network = list("Research","SS13");
-	pixel_x = -1
+	pixel_x = -1;
+	dir = 6
 	},
 /turf/simulated/floor/grass,
 /area/toxins/xenobiology)
@@ -48248,6 +48247,15 @@
 	icon_state = "dark"
 	},
 /area/maintenance/trading)
+"gYr" = (
+/obj/effect/turf_decal/number/number_1{
+	dir = 1
+	},
+/obj/effect/turf_decal/arrows/white,
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/hallway/primary/central/second/west)
 "gYu" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -48332,8 +48340,8 @@
 	pixel_x = 3
 	},
 /obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -24
+	pixel_x = -24;
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 8
@@ -48892,11 +48900,11 @@
 /area/atmos)
 "hcF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/maintenance/starboardaux)
@@ -48943,9 +48951,9 @@
 	desc = "A remote control-switch to lock down the prison wing's blast doors";
 	id = "Prison Gate";
 	name = "PermaBrig Lockdown";
-	pixel_x = 26;
 	pixel_y = -25;
-	req_access = list(2)
+	req_access = list(2);
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
@@ -48981,6 +48989,21 @@
 	icon_state = "red"
 	},
 /area/hallway/primary/central/second/west)
+"hdq" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine{
+	slowdown = -0.3
+	},
+/area/hallway/primary/central)
 "hdt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/girder,
@@ -49065,8 +49088,8 @@
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/drinks/mug/hop{
-	pixel_x = 10;
-	pixel_y = -11
+	pixel_y = -11;
+	pixel_x = 10
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
@@ -49108,20 +49131,20 @@
 "hei" = (
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "aisole_airlock";
-	pixel_y = 28;
 	tag_airpump = "aisole_pump";
 	tag_chamber_sensor = "aisole_sensor";
 	tag_exterior_door = "aisole_outer";
-	tag_interior_door = "aisole_inner"
+	tag_interior_door = "aisole_inner";
+	pixel_y = 28
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "aisole_sensor";
 	pixel_y = 35
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 8;
 	frequency = 1379;
-	id_tag = "aisole_pump"
+	id_tag = "aisole_pump";
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -49270,8 +49293,8 @@
 	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "hft" = (
@@ -49773,8 +49796,8 @@
 /area/maintenance/engineering)
 "hjr" = (
 /obj/machinery/power/apc{
-	dir = 4;
-	pixel_x = 28
+	pixel_x = 28;
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -50426,18 +50449,18 @@
 	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "engineering_west_airlock";
-	pixel_x = 25;
 	pixel_y = -4;
 	req_access = list(10,13);
 	tag_airpump = "engineering_west_pump";
 	tag_chamber_sensor = "engineering_west_sensor";
 	tag_exterior_door = "engineering_west_outer";
-	tag_interior_door = "engineering_west_inner"
+	tag_interior_door = "engineering_west_inner";
+	pixel_x = 25
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "engineering_west_sensor";
-	pixel_x = 25;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 25
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -50476,8 +50499,8 @@
 /area/maintenance/secpost)
 "hoR" = (
 /obj/structure/sign/directions/evac{
-	dir = 1;
-	pixel_y = -8
+	pixel_y = -8;
+	dir = 1
 	},
 /obj/structure/sign/directions/security{
 	dir = 8
@@ -50515,8 +50538,8 @@
 	dir = 4
 	},
 /obj/machinery/door/window/brigdoor/southright{
-	dir = 8;
-	req_access = list(17,75)
+	req_access = list(17,75);
+	dir = 8
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -50572,6 +50595,16 @@
 	icon_state = "neutralcorner"
 	},
 /area/crew_quarters/fitness)
+"hpC" = (
+/obj/structure/sign/directions/floor/alt{
+	dir = 6;
+	pixel_x = -32
+	},
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "red"
+	},
+/area/hallway/primary/central/second/west)
 "hpH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -51055,8 +51088,8 @@
 /area/engineering/gravitygenerator)
 "htU" = (
 /obj/machinery/conveyor/inverted{
-	dir = 10;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 10
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -51437,6 +51470,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -51590,8 +51626,8 @@
 /obj/machinery/door_control{
 	id = "xeno3";
 	name = "Containment Control";
-	pixel_x = -32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/xenobiology)
@@ -51728,8 +51764,8 @@
 	department = "Head of Security's Desk";
 	departmentType = 5;
 	name = "Head of Security Requests Console";
-	pixel_x = -32;
-	pixel_y = 30
+	pixel_y = 30;
+	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -51762,8 +51798,8 @@
 "hAk" = (
 /obj/machinery/computer/sm_monitor,
 /obj/machinery/camera/autoname{
-	c_tag = "Chief Engineer's Office";
-	dir = 1
+	dir = 1;
+	c_tag = "Chief Engineer's Office"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -51887,8 +51923,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 9
 	},
 /area/toxins/lab)
 "hBv" = (
@@ -51974,16 +52010,16 @@
 "hCi" = (
 /obj/structure/table/wood/fancy/black,
 /obj/item/mining_voucher{
-	pixel_x = -6;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = -6
 	},
 /obj/item/lighter/zippo/qm{
 	pixel_x = 7;
 	pixel_y = 5
 	},
 /obj/item/mining_voucher{
-	pixel_x = -6;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = -6
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
@@ -52022,8 +52058,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "HoS Bedroom";
-	dir = 9;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 9
 	},
 /obj/item/radio/intercom{
 	pixel_x = 28;
@@ -52082,8 +52118,8 @@
 	id = "toilet4";
 	name = "cyborg recharging cabin Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+	specialfunctions = 4;
+	pixel_x = 25
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -52245,8 +52281,8 @@
 /area/gateway)
 "hEB" = (
 /obj/effect/turf_decal/siding/white/end{
-	color = "#444444";
-	dir = 1
+	dir = 1;
+	color = "#444444"
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -52434,6 +52470,18 @@
 	icon_state = "whitehall"
 	},
 /area/maintenance/fsmaint3)
+"hFZ" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/obj/structure/sign/directions/science{
+	pixel_y = 32;
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "neutral"
+	},
+/area/hallway/primary/central/sw)
 "hGi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -52456,8 +52504,8 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/vending/wallmed{
-	pixel_x = 26;
-	pixel_y = 32
+	pixel_y = 32;
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/controlroom)
@@ -52489,8 +52537,8 @@
 "hGF" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/firealarm{
-	pixel_x = 4;
-	pixel_y = -28
+	pixel_y = -28;
+	pixel_x = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue";
@@ -52802,9 +52850,9 @@
 /area/medical/reception)
 "hJE" = (
 /obj/machinery/door/window/eastright{
-	dir = 2;
 	name = "Forensic laboratory";
-	req_access = list(3,4)
+	req_access = list(3,4);
+	dir = 2
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood,
@@ -53035,8 +53083,8 @@
 "hMn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/statue/bone/rib{
-	anchored = 1;
-	dir = 1
+	dir = 1;
+	anchored = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -53309,8 +53357,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
@@ -53412,9 +53460,8 @@
 /area/storage/tech)
 "hPR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "hPZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -53639,10 +53686,10 @@
 "hRC" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1
+	opacity = 1;
+	anchored = 1
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/plating,
@@ -53875,8 +53922,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8;
-	pixel_x = 9;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = 9
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
@@ -53909,8 +53956,8 @@
 /area/crew_quarters/captain)
 "hTz" = (
 /obj/machinery/newscaster{
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -30
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -53953,16 +54000,16 @@
 	},
 /obj/structure/table/glass,
 /obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = 8;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 8
 	},
 /obj/item/reagent_containers/food/drinks/mug/sec{
 	pixel_x = 3;
 	pixel_y = 14
 	},
 /obj/item/reagent_containers/glass/bottle/charcoal{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = -2
 	},
 /obj/item/reagent_containers/hypospray/autoinjector,
 /turf/simulated/floor/plasteel{
@@ -53975,6 +54022,9 @@
 	c_tag = "East Primary Hallway 1";
 	dir = 1
 	},
+/obj/item/radio/intercom{
+	pixel_y = -32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
 	},
@@ -54002,8 +54052,8 @@
 "hTW" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	desc = "Труба содержит газ для обработки и после возвращает его обратно в трубу смешивания";
-	dir = 9;
-	name = "Труба обработки"
+	name = "Труба обработки";
+	dir = 9
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -54200,23 +54250,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "hVx" = (
-/obj/structure/toilet{
-	pixel_y = 19
-	},
-/obj/machinery/light/small{
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/door_control{
-	desiredstate = 1;
-	id = "toilet3";
-	name = "Toilet Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "neutral"
 	},
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/turf/simulated/floor/plasteel/freezer,
-/area/crew_quarters/toilet2)
+/area/hallway/primary/central/west)
 "hVS" = (
 /obj/machinery/vending/crittercare,
 /obj/item/radio/intercom{
@@ -54230,8 +54271,8 @@
 /area/civilian/pet_store)
 "hVU" = (
 /obj/item/stack/packageWrap{
-	pixel_x = -3;
-	pixel_y = -4
+	pixel_y = -4;
+	pixel_x = -3
 	},
 /obj/item/stack/packageWrap,
 /obj/item/stack/packageWrap{
@@ -54312,12 +54353,12 @@
 "hWy" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/snacks/fried_vox{
-	pixel_x = -6;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -6
 	},
 /obj/item/cigbutt{
-	pixel_x = 6;
-	pixel_y = 12
+	pixel_y = 12;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -54598,8 +54639,8 @@
 /obj/machinery/recharge_station,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/reception)
 "hYo" = (
@@ -54623,8 +54664,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno7";
-	name = "Creature Cell #7"
+	name = "Creature Cell #7";
+	id_tag = "xeno7"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -54884,8 +54925,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "ibg" = (
@@ -54985,8 +55026,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Briefing Room South";
-	dir = 1;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
@@ -55352,6 +55393,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -55661,6 +55705,17 @@
 	icon_state = "yellow"
 	},
 /area/engineering/break_room)
+"igl" = (
+/obj/machinery/access_button{
+	command = "cycle_exterior";
+	frequency = 1379;
+	master_tag = "port4";
+	name = "exterior access button";
+	pixel_x = -28;
+	pixel_y = -28
+	},
+/turf/space,
+/area/space)
 "ign" = (
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
@@ -55942,8 +55997,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = 5;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -56182,9 +56237,9 @@
 /obj/machinery/door_control{
 	id = "HoSBPriv";
 	name = "HoS Bedroom Privacy Shutters Control";
-	pixel_x = 26;
 	pixel_y = -24;
-	req_access = list(58)
+	req_access = list(58);
+	pixel_x = 26
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -56193,9 +56248,9 @@
 /area/security/hos)
 "ijI" = (
 /obj/machinery/door/window/eastright{
-	dir = 8;
 	name = "Mime Delivery";
-	req_access = list(46)
+	req_access = list(46);
+	dir = 8
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
@@ -56305,11 +56360,11 @@
 /area/bridge)
 "iks" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -56327,8 +56382,8 @@
 "ikv" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/item/healthupgrade,
 /turf/simulated/floor/plasteel{
@@ -56654,11 +56709,11 @@
 /area/maintenance/apmaint)
 "imT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluealt"
@@ -56895,17 +56950,17 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/brigdoor{
 	armor = list("melee"=60,"bullet"=70,"laser"=70,"energy"=70,"bomb"=40,"bio"=100,"rad"=100,"fire"=70,"acid"=100);
-	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/machinery/door/window/brigdoor{
 	armor = list("melee"=60,"bullet"=70,"laser"=70,"energy"=70,"bomb"=40,"bio"=100,"rad"=100,"fire"=70,"acid"=100);
-	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(3)
+	req_access = list(3);
+	color = "red"
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -57029,19 +57084,9 @@
 	},
 /area/medical/research/restroom)
 "ipA" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/spawner/window/reinforced,
-/obj/structure/curtain/open/shower/security{
-	alpha = 255;
-	anchored = 1;
-	icon_state = "closed";
-	name = "backstage";
-	opacity = 1
-	},
-/turf/simulated/floor/plating,
-/area/security/medbay)
+/obj/effect/turf_decal/siding/wood,
+/turf/simulated/floor/carpet,
+/area/library)
 "ipK" = (
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -57050,11 +57095,27 @@
 	c_tag = "Cargo Delivery Warehouse West";
 	dir = 5
 	},
+/obj/structure/sign/poster/official/random{
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
 	},
 /area/quartermaster/storage)
+"ipR" = (
+/obj/machinery/camera{
+	c_tag = "Barber Shop"
+	},
+/obj/machinery/light{
+	dir = 1;
+	in_use = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "ipS" = (
 /obj/machinery/vending/autodrobe,
 /obj/machinery/firealarm{
@@ -57252,8 +57313,8 @@
 "irg" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -57584,11 +57645,14 @@
 /turf/simulated/floor/wood,
 /area/library/game_zone)
 "itL" = (
-/obj/structure/table/wood,
-/obj/item/folder,
-/obj/item/pen,
-/turf/simulated/floor/wood,
-/area/library)
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "red"
+	},
+/area/hallway/primary/central/west)
 "itM" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -58330,6 +58394,26 @@
 	icon_state = "whitegreen"
 	},
 /area/medical/virology/lab)
+"iza" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10;
+	initialize_directions = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cloning)
 "izb" = (
 /obj/machinery/power/solar{
 	name = "South-East Solar Panel"
@@ -58440,8 +58524,8 @@
 /obj/machinery/flasher_button{
 	id = "permacell2";
 	name = "Perma cell 2 flasher button";
-	pixel_x = 7;
-	pixel_y = -32
+	pixel_y = -32;
+	pixel_x = 7
 	},
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -58470,11 +58554,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -58597,10 +58681,14 @@
 	},
 /area/crew_quarters/kitchen)
 "iAJ" = (
-/obj/effect/decal/warning_stripes/southeast,
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
+/obj/machinery/roboquest_pad,
+/obj/effect/turf_decal/bot_red{
+	layer = 1.99
+	},
+/obj/effect/decal/warning_stripes/southeast,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -59008,8 +59096,8 @@
 /area/maintenance/fsmaint3)
 "iEQ" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "garbage"
+	id = "garbage";
+	dir = 4
 	},
 /obj/machinery/recycler,
 /obj/effect/decal/warning_stripes/north,
@@ -59097,8 +59185,8 @@
 "iFv" = (
 /obj/structure/table/wood,
 /obj/machinery/keycard_auth{
-	pixel_x = 6;
-	pixel_y = -1
+	pixel_y = -1;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -59130,16 +59218,13 @@
 /turf/simulated/floor/plating/airless,
 /area/toxins/test_area)
 "iGe" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -59170,6 +59255,14 @@
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/magistrateoffice)
+"iGz" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel{
+	icon_state = "blue";
+	dir = 8
+	},
+/area/hallway/secondary/entry/lounge)
 "iGA" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -59200,8 +59293,8 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "iGM" = (
@@ -59278,8 +59371,8 @@
 /obj/machinery/door/airlock/multi_tile{
 	dir = 1;
 	glass = 1;
-	name = "Medical Emergency Ward";
-	req_access = list(5)
+	req_access = list(5);
+	name = "Medical Emergency Ward"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bcarpet05"
@@ -59321,8 +59414,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno1";
-	name = "Creature Cell #1"
+	name = "Creature Cell #1";
+	id_tag = "xeno1"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -60781,11 +60874,11 @@
 /area/assembly/robotics)
 "iUO" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -60984,10 +61077,10 @@
 	},
 /obj/machinery/door/window/eastleft{
 	base_state = "right";
-	dir = 2;
 	icon_state = "right";
 	layer = 3;
-	req_access = list(50)
+	req_access = list(50);
+	dir = 2
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/disposalpipe/trunk{
@@ -61717,10 +61810,10 @@
 /obj/structure/table/reinforced,
 /obj/item/gun/energy/laser/practice,
 /obj/machinery/door/window/brigdoor{
-	color = "red";
-	dir = 2;
 	name = "Security Reception";
-	req_access = list(1)
+	req_access = list(1);
+	dir = 2;
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull";
@@ -61747,11 +61840,11 @@
 "jcg" = (
 /obj/effect/landmark/event/xeno_spawn,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/engine,
@@ -62219,10 +62312,10 @@
 "jfx" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1
+	opacity = 1;
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/snacks/grown/tomato,
@@ -62236,13 +62329,6 @@
 /obj/structure/closet,
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
-"jfC" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/black,
-/area/ntrep)
 "jfD" = (
 /obj/structure/toilet/secret{
 	dir = 1
@@ -62264,15 +62350,15 @@
 "jfO" = (
 /obj/structure/table/reinforced,
 /obj/item/flashlight/sectaclight{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = -2
 	},
 /obj/item/flashlight/sectaclight{
 	pixel_y = 0
 	},
 /obj/item/flashlight/sectaclight{
-	pixel_x = 2;
-	pixel_y = -2
+	pixel_y = -2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -62330,9 +62416,9 @@
 	req_access = list(7)
 	},
 /obj/machinery/door/window/southright{
-	dir = 4;
 	name = "Toxins Launcher";
-	req_access = list(7)
+	req_access = list(7);
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/toxins/launch)
@@ -62599,9 +62685,9 @@
 "jhT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/westright{
-	dir = 2;
 	name = "Mechanic's Desk";
-	req_access = list(70)
+	req_access = list(70);
+	dir = 2
 	},
 /obj/machinery/cell_charger{
 	pixel_x = -1;
@@ -62655,8 +62741,8 @@
 	dir = 8
 	},
 /obj/machinery/vending/wallmed{
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -62699,8 +62785,8 @@
 "jiH" = (
 /obj/machinery/camera{
 	c_tag = "Medbay Suit Storage";
-	dir = 8;
-	network = list("Medical","SS13")
+	network = list("Medical","SS13");
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -62975,12 +63061,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "jkm" = (
-/obj/item/radio/intercom{
-	pixel_x = 28;
-	pixel_y = -2
-	},
+/obj/structure/table,
 /turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+	dir = 6;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "jkt" = (
@@ -63032,8 +63116,8 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "jlb" = (
@@ -63103,13 +63187,14 @@
 	},
 /area/maintenance/livingcomplex)
 "jlI" = (
-/obj/structure/sign/redcross{
-	pixel_x = 32
+/obj/effect/turf_decal/number/number_1{
+	dir = 1
 	},
+/obj/effect/turf_decal/arrows/white,
 /turf/simulated/floor/plasteel{
 	icon_state = "redcorner"
 	},
-/area/security/prison/cell_block/A)
+/area/hallway/primary/central/second/west)
 "jlM" = (
 /obj/machinery/optable,
 /obj/effect/decal/cleanable/dirt,
@@ -63300,8 +63385,8 @@
 	dir = 1
 	},
 /obj/structure/sign/directions/science{
-	dir = 1;
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 1
 	},
 /obj/structure/sign/directions/evac{
 	pixel_y = -8
@@ -63330,9 +63415,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -63384,8 +63469,8 @@
 /area/security/permabrig)
 "jnD" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable,
 /obj/effect/spawner/window/reinforced,
@@ -64453,16 +64538,16 @@
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/eastleft{
-	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35)
+	req_access = list(35);
+	dir = 1
 	},
 /obj/item/clipboard,
 /obj/item/toy/figure/botanist,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters"
+	name = "Hydroponics Shutters";
+	dir = 1
 	},
 /obj/structure/window/reinforced{
 	dir = 4
@@ -64531,6 +64616,15 @@
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
+"jwc" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "jwm" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -65409,21 +65503,21 @@
 	pixel_y = -32
 	},
 /obj/item/circuitboard/smes{
-	pixel_x = -4;
-	pixel_y = -4
+	pixel_y = -4;
+	pixel_x = -4
 	},
 /obj/item/circuitboard/powermonitor{
-	pixel_x = -2;
-	pixel_y = -2
+	pixel_y = -2;
+	pixel_x = -2
 	},
 /obj/item/circuitboard/stationalert,
 /obj/item/circuitboard/atmos_alert{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/circuitboard/thermomachine{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "caution"
@@ -65912,8 +66006,8 @@
 	color = "#996633"
 	},
 /obj/item/paper/ntrep{
-	pixel_x = 3;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 3
 	},
 /obj/item/book/manual/sop_command,
 /turf/simulated/floor/wood/dark,
@@ -66064,8 +66158,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "jIz" = (
@@ -66425,24 +66519,31 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint3)
 "jKN" = (
-/obj/effect/turf_decal/siding/red{
-	dir = 5
+/obj/machinery/door/airlock/medical{
+	name = "Brig Physician's Quarters";
+	req_access = list(5);
+	security_level = 1
 	},
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
-	icon_state = "1-2"
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
 	},
-/turf/simulated/floor/carpet/red,
 /area/security/medbay)
 "jKU" = (
 /obj/structure/chair/sofa/right{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood{
@@ -66641,37 +66742,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/maintenance/tourist)
-"jLR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/turf_decal{
-	dir = 8;
-	icon_state = "golden_stripes"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/disposalpipe/sortjunction/reversed{
-	dir = 1;
-	name = "Captain Office";
-	sortType = 18
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/bridge)
+/area/civilian/barber)
 "jLT" = (
 /obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plasteel{
@@ -66992,6 +67066,31 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/primary/central/nw)
+"jOe" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/button/windowtint{
+	pixel_y = -24;
+	pixel_x = 24;
+	id = "ntrepprivate";
+	name = "Door tint control"
+	},
+/obj/machinery/door_control{
+	id = "NTRprivate";
+	name = "Privacy Shutters Control";
+	pixel_x = 26;
+	pixel_y = -33;
+	req_access = list(73)
+	},
+/turf/simulated/floor/carpet/black,
+/area/ntrep)
 "jOs" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -67179,10 +67278,6 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
-"jQq" = (
-/obj/effect/decal/cleanable/spiderling_remains,
-/turf/simulated/floor/plating,
-/area/maintenance/secpost)
 "jQt" = (
 /obj/machinery/light{
 	dir = 1;
@@ -67374,8 +67469,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno1";
-	name = "Creature Cell #1"
+	name = "Creature Cell #1";
+	id_tag = "xeno1"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -67439,6 +67534,24 @@
 	icon_state = "darkblue"
 	},
 /area/medical/surgery/south)
+"jRZ" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/machinery/power/apc{
+	cell_type = 5000;
+	dir = 4;
+	name = "east bump";
+	pixel_x = 26
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "darkblue"
+	},
+/area/security/medbay)
 "jSd" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -67972,8 +68085,8 @@
 	pixel_y = 24
 	},
 /obj/machinery/light_switch{
-	pixel_x = 32;
-	pixel_y = 24
+	pixel_y = 24;
+	pixel_x = 32
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -68103,8 +68216,8 @@
 "jXw" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno5";
-	name = "Creature Cell #5"
+	name = "Creature Cell #5";
+	id_tag = "xeno5"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -68117,6 +68230,13 @@
 /obj/item/camera,
 /turf/simulated/floor/plating,
 /area/maintenance/livingcomplex)
+"jXF" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel{
+	icon_state = "red"
+	},
+/area/hallway/primary/central/west)
 "jXN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -68237,8 +68357,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Research Outpost Temporary Storage";
-	dir = 1;
-	network = list("Research Outpost")
+	network = list("Research Outpost");
+	dir = 1
 	},
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
@@ -68557,8 +68677,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -68709,8 +68829,8 @@
 "kdp" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "red"
+	dir = 1;
+	icon_state = "redcorner"
 	},
 /area/hallway/primary/central/second/west)
 "kds" = (
@@ -68850,6 +68970,16 @@
 	icon_state = "neutralfull"
 	},
 /area/crew_quarters/fitness)
+"keM" = (
+/obj/structure/sign/barber{
+	pixel_x = -32
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "neutral"
+	},
+/area/crew_quarters/serviceyard)
 "kfa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/west,
@@ -68873,11 +69003,11 @@
 /area/turret_protected/ai_upload)
 "kff" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -68933,7 +69063,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
+	dir = 5;
 	icon_state = "red"
 	},
 /area/security/reception)
@@ -69083,7 +69213,7 @@
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
-	icon_state = "redcorner"
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "kgI" = (
@@ -69195,8 +69325,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno6";
-	name = "Creature Cell #6"
+	name = "Creature Cell #6";
+	id_tag = "xeno6"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -69265,8 +69395,8 @@
 "khZ" = (
 /obj/structure/sign/directions/cargo{
 	dir = 4;
-	pixel_x = 32;
-	pixel_y = -8
+	pixel_y = -8;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -69291,8 +69421,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno3";
-	name = "Creature Cell #3"
+	name = "Creature Cell #3";
+	id_tag = "xeno3"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -69349,7 +69479,6 @@
 /area/toxins/storage)
 "kiE" = (
 /obj/structure/table,
-/obj/item/ai_module/reset,
 /obj/item/radio/intercom{
 	name = "east station intercom (General)";
 	pixel_x = 28
@@ -69393,8 +69522,8 @@
 /obj/machinery/door_control{
 	id = "xeno7";
 	name = "Containment Control";
-	pixel_x = -32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -69441,11 +69570,11 @@
 /area/security/permabrig)
 "kjf" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -69681,8 +69810,8 @@
 /obj/structure/cable,
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	id_tag = "NTRprivate";
-	name = "Privacy Shutters"
+	name = "Privacy Shutters";
+	id_tag = "NTRprivate"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -69811,11 +69940,11 @@
 /area/atmos)
 "kmi" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /obj/machinery/camera{
 	c_tag = "Prison Solitary Confinement 2";
@@ -69968,8 +70097,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/sofa/left{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /turf/simulated/floor/wood,
 /area/maintenance/backstage)
@@ -70001,8 +70130,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno7";
-	name = "Creature Cell #7"
+	name = "Creature Cell #7";
+	id_tag = "xeno7"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -70146,11 +70275,11 @@
 /area/crew_quarters/heads)
 "koQ" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -70167,8 +70296,8 @@
 /obj/machinery/door_control{
 	id = "FRange";
 	name = "Firing Range Privacy Shutters Control";
-	pixel_y = 26;
-	req_access = list(63)
+	req_access = list(63);
+	pixel_y = 26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -70288,14 +70417,14 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/eastleft{
-	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35)
+	req_access = list(35);
+	dir = 1
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters"
+	name = "Hydroponics Shutters";
+	dir = 1
 	},
 /obj/item/desk_bell{
 	anchored = 1;
@@ -70484,8 +70613,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -70676,10 +70805,10 @@
 /area/hallway/primary/central/second/west)
 "ktN" = (
 /obj/machinery/door/window/brigdoor{
-	color = "red";
-	dir = 2;
 	name = "Security Reception";
-	req_access = list(1)
+	req_access = list(1);
+	dir = 2;
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -70947,11 +71076,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -70996,8 +71125,8 @@
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	desc = "Труба хранит в себе набор газов для смешивания";
-	dir = 1;
-	name = "Труба смешивания"
+	name = "Труба смешивания";
+	dir = 1
 	},
 /turf/space,
 /area/space)
@@ -71042,8 +71171,8 @@
 "kwl" = (
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/gavelblock{
-	pixel_x = 6;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 6
 	},
 /obj/item/gavelhammer{
 	pixel_y = 7
@@ -71065,10 +71194,10 @@
 	id = "courtroombolts";
 	name = "Courtroom Bolts Control";
 	normaldoorcontrol = 1;
-	pixel_x = -6;
-	pixel_y = 7;
 	req_access = list(74);
-	specialfunctions = 4
+	specialfunctions = 4;
+	pixel_y = 7;
+	pixel_x = -6
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/courtroom)
@@ -71098,8 +71227,8 @@
 	dir = 1
 	},
 /obj/machinery/light_switch{
-	pixel_x = -24;
-	pixel_y = -24
+	pixel_y = -24;
+	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -71253,19 +71382,17 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry/additional)
 "kxQ" = (
-/obj/machinery/photocopier,
-/obj/machinery/alarm{
-	pixel_y = 25
+/obj/structure/window/reinforced{
+	dir = 1
 	},
-/obj/machinery/light{
-	dir = 1;
-	in_use = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "red"
+	dir = 9;
+	icon_state = "darkblue"
 	},
-/area/security/reception)
+/area/security/medbay)
 "kxR" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/library/public,
@@ -71389,8 +71516,11 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "kzi" = (
 /obj/structure/closet/wardrobe/atmospherics_yellow,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -71409,11 +71539,16 @@
 	dir = 5;
 	network = list("SS13","Security")
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
+	dir = 9;
 	icon_state = "red"
 	},
 /area/security/reception)
@@ -71473,12 +71608,19 @@
 	},
 /area/crew_quarters/captain)
 "kAc" = (
-/obj/machinery/door/window/brigdoor/security{
-	name = "Brig Medical Bay";
+/obj/machinery/light_switch{
+	pixel_x = 7;
+	pixel_y = 29
+	},
+/obj/machinery/door_control{
+	id = "SecMedPrivInside";
+	name = "Brig Medbay Privacy Shutters Control";
+	pixel_x = -5;
+	pixel_y = 28;
 	req_access = list(63)
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/window/reinforced{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -71486,8 +71628,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/closet/crate/freezer,
+/obj/item/tank/internals/emergency_oxygen/engi/empty,
+/obj/item/tank/internals/emergency_oxygen/engi/empty,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
+/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -71746,10 +71895,10 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/glass{
-	id = "tintmagistrateoffice";
 	id_tag = "magistrateoffice";
 	name = "Magistrate's Office";
 	req_access = list(74);
+	id = "tintmagistrateoffice";
 	security_level = 1
 	},
 /obj/effect/turf_decal/siding/wood{
@@ -71822,8 +71971,8 @@
 /area/security/evidence)
 "kCH" = (
 /obj/structure/chair/sofa/left{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 9
@@ -71927,8 +72076,8 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 9
 	},
 /area/hallway/primary/fore)
 "kDD" = (
@@ -71950,8 +72099,8 @@
 /area/quartermaster/miningstorage)
 "kDG" = (
 /obj/machinery/newscaster{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/wood/dark,
 /area/crew_quarters/bar/atrium)
@@ -72427,9 +72576,9 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/highsecurity{
-	check_one_access = 0;
 	name = "Secure Tech Storage";
 	req_access = list(19,23);
+	check_one_access = 0;
 	security_level = 6
 	},
 /turf/simulated/floor/plasteel,
@@ -72457,8 +72606,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno2";
-	name = "Creature Cell #2"
+	name = "Creature Cell #2";
+	id_tag = "xeno2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -72543,9 +72692,9 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Upload Chamber";
 	name = "AI Upload Turret Control";
-	pixel_x = 32;
 	pixel_y = -24;
-	req_access = list(75)
+	req_access = list(75);
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/turret_protected/ai_upload)
@@ -72600,8 +72749,8 @@
 	pixel_y = 9
 	},
 /obj/item/clothing/mask/cigarette/rollie{
-	pixel_x = 9;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 9
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -72706,8 +72855,8 @@
 	},
 /obj/structure/table/wood/fancy/red,
 /obj/item/candle{
-	pixel_x = -9;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -9
 	},
 /turf/simulated/floor/carpet/red,
 /area/crew_quarters/theatre)
@@ -72971,8 +73120,8 @@
 /area/hallway/secondary/exit)
 "kMk" = (
 /obj/machinery/door/window/brigdoor{
-	color = "red";
-	dir = 2
+	dir = 2;
+	color = "red"
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -73009,8 +73158,8 @@
 	pixel_x = 32
 	},
 /obj/item/radio/intercom{
-	pixel_x = 26;
-	pixel_y = -26
+	pixel_y = -26;
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel/white,
 /area/teleporter)
@@ -73206,6 +73355,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
+"kOr" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cloning)
 "kOs" = (
 /obj/structure/chair/sofa/left,
 /obj/random/therapy,
@@ -73237,8 +73396,8 @@
 /area/maintenance/garden)
 "kOP" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "QMLoad"
+	id = "QMLoad";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -74128,12 +74287,12 @@
 /obj/structure/table/wood,
 /obj/item/folder/yellow,
 /obj/item/folder/red{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/folder/blue{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/magistrateoffice)
@@ -74145,12 +74304,9 @@
 /turf/space/openspace,
 /area/space)
 "kVT" = (
-/obj/machinery/vending/wallmed{
-	pixel_x = -25
-	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "neutral"
+	dir = 1;
+	icon_state = "neutralcorner"
 	},
 /area/hallway/primary/central/west)
 "kVV" = (
@@ -74377,7 +74533,9 @@
 	icon_state = "1-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -74504,8 +74662,8 @@
 "kYo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/clown{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -74794,8 +74952,8 @@
 "laf" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/item/clothing/gloves/color/black,
 /turf/simulated/floor/plasteel{
@@ -74865,6 +75023,9 @@
 	},
 /area/security/permabrig)
 "laP" = (
+/obj/structure/chair/barber{
+	dir = 8
+	},
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -24
@@ -74872,10 +75033,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/machinery/light,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "laS" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/controlroom)
@@ -75018,8 +75177,8 @@
 "lbI" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
-	name = "backstage"
+	name = "backstage";
+	anchored = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75060,8 +75219,8 @@
 /area/maintenance/casino)
 "lbO" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "garbage"
+	id = "garbage";
+	dir = 4
 	},
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/plating,
@@ -75136,8 +75295,8 @@
 	},
 /obj/item/storage/belt/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/green,
 /area/medical/virology)
@@ -75298,23 +75457,13 @@
 /turf/simulated/wall,
 /area/toxins/xenobiology)
 "ldS" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/turf/simulated/floor/plasteel{
+	dir = 1
 	},
-/turf/simulated/floor/wood,
-/area/hallway/primary/central/west)
+/area/security/prison/cell_block/A)
 "ldZ" = (
 /obj/machinery/power/apc{
 	name = "south bump";
@@ -75802,6 +75951,9 @@
 	},
 /area/solar/starboard)
 "lhJ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -76425,8 +76577,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	id_tag = "NTRprivate";
-	name = "Privacy Shutters"
+	name = "Privacy Shutters";
+	id_tag = "NTRprivate"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -76466,8 +76618,11 @@
 	icon_state = "0-2"
 	},
 /obj/structure/filingcabinet/filingcabinet,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "lnY" = (
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "psychoffice"
@@ -76555,6 +76710,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
+"loQ" = (
+/obj/machinery/disposal,
+/turf/simulated/floor/carpet/black,
+/area/ntrep)
 "loR" = (
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -76875,8 +77034,8 @@
 /obj/machinery/light,
 /obj/item/reagent_containers/iv_bag,
 /obj/item/reagent_containers/iv_bag{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -77564,8 +77723,8 @@
 "lxw" = (
 /obj/machinery/disposal,
 /obj/structure/sign/deathsposal{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /obj/effect/decal/warning_stripes/red,
 /obj/structure/disposalpipe/trunk{
@@ -77576,6 +77735,17 @@
 	icon_state = "red"
 	},
 /area/security/main)
+"lxy" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "dark"
+	},
+/area/medical/genetics)
 "lxA" = (
 /obj/effect/decal/warning_stripes/east,
 /obj/machinery/atmospherics/unary/vent_scrubber{
@@ -77633,10 +77803,10 @@
 "lyd" = (
 /obj/machinery/atmospherics/trinary/filter/flipped{
 	desc = "Отфильтровывает азот из трубы и отправляет их в камеру хранения";
-	filter_type = 2;
 	name = "Фильтр Азота (N2)";
 	on = 1;
-	target_pressure = 4500
+	target_pressure = 4500;
+	filter_type = 2
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -77772,6 +77942,20 @@
 	dir = 1
 	},
 /area/security/brigstaff)
+"lzn" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cloning)
 "lzo" = (
 /obj/item/flag/nt,
 /obj/machinery/light{
@@ -77818,9 +78002,9 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 2;
 	id_tag = "Kitchen Dinner Windows";
-	name = "Kitchen Shutters"
+	name = "Kitchen Shutters";
+	dir = 2
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -77929,8 +78113,8 @@
 	req_access = list(22)
 	},
 /obj/machinery/mass_driver{
-	dir = 1;
-	id_tag = "chapelgun"
+	id_tag = "chapelgun";
+	dir = 1
 	},
 /obj/structure/window/reinforced{
 	dir = 4
@@ -78025,8 +78209,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno5";
-	name = "Creature Cell #5"
+	name = "Creature Cell #5";
+	id_tag = "xeno5"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -78185,11 +78369,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 2;
 	icon_state = "open";
 	id_tag = "rdprivacy";
 	name = "Research Director Office Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 2
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -78436,6 +78620,9 @@
 	icon_state = "purple"
 	},
 /area/hallway/primary/central/ne)
+"lEx" = (
+/turf/simulated/wall,
+/area/civilian/barber)
 "lEz" = (
 /obj/machinery/camera{
 	c_tag = "Psychiatrist";
@@ -78656,8 +78843,8 @@
 /obj/structure/lattice,
 /obj/machinery/camera{
 	c_tag = "AI Satellite Exterior 11";
-	dir = 8;
-	network = list("SS13","MiniSat")
+	network = list("SS13","MiniSat");
+	dir = 8
 	},
 /turf/space/openspace,
 /area/maintenance/ai)
@@ -78806,8 +78993,8 @@
 "lGS" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "purple"
+	color = "purple";
+	anchored = 1
 	},
 /turf/simulated/floor/plating,
 /area/janitor)
@@ -79046,9 +79233,9 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/energy/laser,
 /obj/item/gun/energy/laser{
@@ -79227,8 +79414,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purple"
@@ -79242,17 +79429,19 @@
 	icon_state = "darkgrey"
 	},
 /area/engineering/mechanic_workshop/hangar)
-"lLc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit,
-/turf/simulated/floor/plating,
-/area/maintenance/secpost)
 "lLh" = (
 /obj/effect/decal/cleanable/dust,
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/seed_extractor,
 /turf/simulated/floor/wood,
 /area/maintenance/garden)
+"lLl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/security/medbay)
 "lLp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/southwest,
@@ -79272,8 +79461,8 @@
 /obj/machinery/light/small,
 /obj/machinery/camera{
 	c_tag = "Brig Cells";
-	dir = 10;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 10
 	},
 /obj/machinery/door_timer/cell_6{
 	pixel_y = -32
@@ -79764,12 +79953,12 @@
 	},
 /obj/item/folder/yellow,
 /obj/item/folder/blue{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/folder/red{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /obj/effect/turf_decal{
 	icon_state = "golden_stripes"
@@ -80713,6 +80902,16 @@
 /obj/structure/closet/firecloset,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint3)
+"lWD" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+	desc = "Труба хранит в себе набор газов для смешивания";
+	name = "Труба смешивания";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/atmos)
 "lWE" = (
 /obj/machinery/status_display{
 	pixel_y = -32
@@ -81138,8 +81337,8 @@
 	pixel_y = -10
 	},
 /obj/item/radio/intercom{
-	pixel_x = -28;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -81246,11 +81445,11 @@
 /area/solar/port)
 "mbd" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
@@ -81401,8 +81600,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno7";
-	name = "Creature Cell #7"
+	name = "Creature Cell #7";
+	id_tag = "xeno7"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -81557,8 +81756,8 @@
 	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hydroponics)
 "mcM" = (
@@ -82029,12 +82228,12 @@
 /obj/structure/table,
 /obj/item/reagent_containers/food/snacks/grown/moonlight,
 /obj/item/reagent_containers/food/snacks/grown/moonlight{
-	pixel_x = -6;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = -6
 	},
 /obj/item/reagent_containers/food/snacks/grown/moonlight{
-	pixel_x = 5;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -82303,9 +82502,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/clothing/shoes/jackboots/armored,
 /obj/item/clothing/shoes/jackboots/armored,
@@ -82581,7 +82780,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -82712,8 +82911,9 @@
 /area/chapel/main)
 "mkf" = (
 /obj/structure/table,
+/obj/item/storage/box/lip_stick,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "mki" = (
 /obj/effect/spawner/random_spawners/rodent,
 /turf/simulated/floor/carpet/red,
@@ -82969,6 +83169,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -82977,8 +83180,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/radio/intercom{
-	pixel_x = 28;
-	pixel_y = -28
+	pixel_y = -28;
+	pixel_x = 28
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plasteel{
@@ -83275,11 +83478,18 @@
 /area/maintenance/trading)
 "moe" = (
 /obj/structure/window/reinforced,
+/obj/structure/dresser,
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -32
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "moh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/reinforced,
@@ -83386,8 +83596,8 @@
 /obj/machinery/door_control{
 	id = "xeno4";
 	name = "Containment Control";
-	pixel_x = 32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = 32
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/warning_stripes/yellow,
@@ -83405,6 +83615,33 @@
 	},
 /turf/space/openspace,
 /area/space)
+"mpH" = (
+/obj/structure/disposalpipe/sortjunction{
+	dir = 1;
+	name = "Captain's Office";
+	sortType = 18;
+	icon_state = "pipe-j2s"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/turf_decal{
+	dir = 8;
+	icon_state = "golden_stripes"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/bridge)
 "mpL" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -83762,8 +83999,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "mtI" = (
@@ -83897,9 +84134,9 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 2;
 	id_tag = "Kitchen Dinner Windows";
-	name = "Kitchen Shutters"
+	name = "Kitchen Shutters";
+	dir = 2
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -84263,8 +84500,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "HoS Office North";
-	dir = 6;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -84320,9 +84557,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "myk" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84478,8 +84714,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/alarm{
-	dir = 8;
-	pixel_x = 24
+	pixel_x = 24;
+	dir = 8
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter East";
@@ -84585,11 +84821,11 @@
 /area/crew_quarters/theatre)
 "mAG" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/engine,
 /area/engineering/controlroom)
@@ -84664,32 +84900,32 @@
 	dir = 8
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/structure/window/reinforced{
 	color = "red";
 	dir = 4
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_x = -2;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -2
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_x = 2;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 2
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_x = 6;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -84711,12 +84947,15 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/tile/purple,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 5
+	},
+/area/civilian/barber)
 "mBI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -84822,8 +85061,8 @@
 "mCK" = (
 /obj/effect/decal/cleanable/dust,
 /obj/item/pen{
-	pixel_x = -13;
-	pixel_y = -13
+	pixel_y = -13;
+	pixel_x = -13
 	},
 /turf/simulated/floor/wood,
 /area/maintenance/library)
@@ -85020,8 +85259,8 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/sortjunction/reversed{
-	name = "Genetics";
-	sortType = 23
+	sortType = 23;
+	name = "Genetics"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -85043,8 +85282,8 @@
 	dir = 8
 	},
 /obj/machinery/recharger/wallcharger{
-	pixel_x = 7;
-	pixel_y = 24
+	pixel_y = 24;
+	pixel_x = 7
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -85243,8 +85482,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay Exam Room North";
-	dir = 5;
-	network = list("SS13","Medical")
+	network = list("SS13","Medical");
+	dir = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
@@ -85630,8 +85869,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = -3;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -3
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 4
@@ -86424,6 +86663,19 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/primary/central/se)
+"mND" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cryo)
 "mNG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -86800,8 +87052,8 @@
 	pixel_y = 24
 	},
 /obj/item/radio/intercom{
-	pixel_x = -32;
-	pixel_y = 24
+	pixel_y = 24;
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -86878,8 +87130,8 @@
 /area/maintenance/casino)
 "mRb" = (
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
@@ -86981,17 +87233,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/maintenance/apmaint)
-"mRP" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cloning)
 "mSa" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -87109,8 +87350,8 @@
 	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 4
 	},
 /area/toxins/lab)
 "mSI" = (
@@ -87210,8 +87451,8 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "mSW" = (
@@ -87335,8 +87576,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
-	pixel_x = 32;
-	pixel_y = 28
+	pixel_y = 28;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -87345,8 +87586,8 @@
 "mTT" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plasteel{
@@ -87772,10 +88013,10 @@
 "mXe" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1
+	opacity = 1;
+	anchored = 1
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
@@ -87792,10 +88033,10 @@
 "mXr" = (
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
-/obj/structure/sign/atmosplaque{
-	desc = "Важное Уточнение! Главный Инженер пожелал оставаться анонимным, поэтому, обойдёмся прозвищем. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование станции Нова по всем стандартам НаноТрейзен. Благодарим вас за труд, PiroMage. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Главного Инженера Команды Архитекторов Станции Нова";
-	pixel_y = 32
+/obj/structure/sign/goldenplaque{
+	pixel_y = 32;
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Zhojaba. Слава НаноТрейзен!";
+	name = "Благодарственное Письмо от Главного Инженера станции Нова"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -87877,10 +88118,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
@@ -88132,16 +88373,16 @@
 "mZZ" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_x = -5;
-	pixel_y = 13
+	pixel_y = 13;
+	pixel_x = -5
 	},
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_x = 7;
-	pixel_y = 1
+	pixel_y = 1;
+	pixel_x = 7
 	},
 /obj/effect/spawner/lootdrop/maintenance{
-	pixel_x = -5;
-	pixel_y = -1
+	pixel_y = -1;
+	pixel_x = -5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/brig)
@@ -88257,8 +88498,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = 6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -88409,9 +88650,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm{
@@ -88482,11 +88723,11 @@
 /area/security/hos)
 "nbK" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -88517,8 +88758,8 @@
 "nbN" = (
 /obj/machinery/camera{
 	c_tag = "Supermatter Second Floor South";
-	dir = 1;
-	network = list("SS13","Engineering")
+	network = list("SS13","Engineering");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/engineering/controlroom)
@@ -88663,8 +88904,8 @@
 	},
 /obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 4
 	},
 /area/toxins/lab)
 "ndp" = (
@@ -89143,8 +89384,8 @@
 /area/space)
 "ngP" = (
 /obj/item/cigbutt{
-	pixel_x = -2;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = -2
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -89417,9 +89658,16 @@
 	},
 /area/crew_quarters/chief)
 "nio" = (
+/obj/effect/turf_decal/number/number_1{
+	dir = 1;
+	pixel_y = -15
+	},
+/obj/effect/turf_decal/arrows/white{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "browncorner"
+	dir = 1;
+	icon_state = "brown"
 	},
 /area/quartermaster/office)
 "nix" = (
@@ -89934,15 +90182,15 @@
 /obj/structure/safe/floor,
 /obj/item/seeds/wheat/meat,
 /obj/item/gun/energy/floragun{
-	ammo_type = list(/obj/item/ammo_casing/energy/flora/beta,/obj/item/ammo_casing/energy/flora/gamma);
+	selfcharge = 0;
+	emagged = 1;
+	name = "old floral somatoray";
 	can_charge = 1;
 	cell_type = /obj/item/stock_parts/cell/degraded;
+	ammo_type = list(/obj/item/ammo_casing/energy/flora/beta,/obj/item/ammo_casing/energy/flora/gamma);
 	current_skin = "oldflora";
-	desc = "Старый ботанический инструмент, испускающий контролируемое излучение, вызывающее мутации в клетках растений, не имеет самозарядки. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия.";
 	description_info = "Это энергетическое оружие. Имеет 2 режима стрельбы: бета и гамма. Бета изменяет геном растений. Гамма ускоряет рост растений. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия.";
-	emagged = 1;
-	name = "old floral somatoray";
-	selfcharge = 0
+	desc = "Старый ботанический инструмент, испускающий контролируемое излучение, вызывающее мутации в клетках растений, не имеет самозарядки. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия."
 	},
 /turf/simulated/floor/grass,
 /area/maintenance/garden)
@@ -90525,6 +90773,23 @@
 	},
 /turf/simulated/floor/wood/dark,
 /area/crew_quarters/bar/atrium)
+"nrr" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/medical/glass{
+	id = "cloninglab";
+	name = "Genetics Lab";
+	req_access = list(9)
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "dark"
+	},
+/area/medical/genetics)
 "nrs" = (
 /obj/structure/lattice,
 /obj/structure/window/reinforced,
@@ -90589,9 +90854,9 @@
 "nrY" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
 	id_tag = "Bar Hall";
-	name = "Bar Privacy Shutters"
+	name = "Bar Privacy Shutters";
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar)
@@ -90971,12 +91236,12 @@
 	pixel_y = 9
 	},
 /obj/item/storage/box/syringes{
-	pixel_x = 4;
-	pixel_y = 11
+	pixel_y = 11;
+	pixel_x = 4
 	},
 /obj/item/storage/lockbox/vials{
-	pixel_x = 1;
-	pixel_y = -3
+	pixel_y = -3;
+	pixel_x = 1
 	},
 /obj/item/storage/fancy/vials{
 	pixel_x = 6;
@@ -91030,6 +91295,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "purple"
@@ -91138,10 +91404,6 @@
 	icon_state = "dark"
 	},
 /area/atmos)
-"nwA" = (
-/obj/effect/spawner/random_spawners/blood_5,
-/turf/simulated/floor/plating,
-/area/maintenance/secpost)
 "nwG" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -91384,8 +91646,8 @@
 "nyr" = (
 /obj/machinery/camera{
 	c_tag = "Permabrig Hallway North";
-	dir = 4;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -91867,14 +92129,15 @@
 	},
 /area/toxins/xenobiology)
 "nBo" = (
-/obj/structure/sign/redcross{
-	pixel_x = -32
+/obj/effect/turf_decal/number/number_1{
+	dir = 1
 	},
+/obj/effect/turf_decal/arrows/white,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "redcorner"
+	dir = 8;
+	icon_state = "red"
 	},
-/area/security/prison/cell_block/A)
+/area/hallway/primary/central/second/west)
 "nBq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/drip{
@@ -91944,6 +92207,26 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
+"nBP" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cryo)
 "nBS" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/light/small{
@@ -92006,11 +92289,11 @@
 	do_not_delete_me = 1
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/carpet,
 /area/library)
@@ -92133,8 +92416,8 @@
 	dir = 4
 	},
 /obj/machinery/vending/wallmed{
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -92201,8 +92484,8 @@
 	dir = 8
 	},
 /obj/machinery/door/window/brigdoor/southright{
-	dir = 4;
-	req_access = list(17,75)
+	req_access = list(17,75);
+	dir = 4
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -92696,8 +92979,8 @@
 	},
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
-	pixel_x = -32;
-	pixel_y = 35
+	pixel_y = 35;
+	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/blue,
 /area/medical/cmo)
@@ -92979,8 +93262,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = 5;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -93259,8 +93542,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 9
 	},
 /area/hallway/primary/central/north)
 "nMj" = (
@@ -93316,17 +93599,17 @@
 /obj/machinery/button/windowtint{
 	dir = 8;
 	id = "psychprivate";
-	name = "Door tint control";
 	pixel_x = 23;
-	pixel_y = 25
+	pixel_y = 25;
+	name = "Door tint control"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/door_control{
 	id = "Psychoprivate";
 	name = "Privacy shutters Control";
-	pixel_x = 24;
 	pixel_y = 34;
-	req_access = list(64)
+	req_access = list(64);
+	pixel_x = 24
 	},
 /turf/simulated/floor/carpet,
 /area/medical/psych)
@@ -93523,27 +93806,27 @@
 /turf/simulated/wall/r_wall,
 /area/security/brigstaff)
 "nNK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
 	},
 /area/security/medbay)
 "nNM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	dir = 1
 	},
-/area/security/medbay)
+/area/security/processing)
 "nNT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -94030,12 +94313,12 @@
 /obj/structure/table/reinforced,
 /obj/item/kitchen/knife/combat/survival,
 /obj/item/kitchen/knife/combat/survival{
-	pixel_x = 4;
-	pixel_y = -4
+	pixel_y = -4;
+	pixel_x = 4
 	},
 /obj/item/kitchen/knife/combat/survival{
-	pixel_x = -4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
@@ -94347,9 +94630,9 @@
 	},
 /obj/item/reagent_containers/food/condiment/peppermill,
 /obj/machinery/door/window{
-	dir = 1;
 	name = "Kitchen";
-	req_access = list(28)
+	req_access = list(28);
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -94425,8 +94708,8 @@
 	pixel_y = 36
 	},
 /obj/machinery/keycard_auth{
-	pixel_x = 6;
-	pixel_y = 27
+	pixel_y = 27;
+	pixel_x = 6
 	},
 /obj/machinery/door_control{
 	id = "Biohazard";
@@ -94477,12 +94760,14 @@
 /turf/simulated/wall,
 /area/maintenance/fsmaint)
 "nVF" = (
-/obj/effect/decal/warning_stripes/west,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/structure/sign/poster/official/safety_report{
+	pixel_x = -32
 	},
-/turf/simulated/floor/plasteel,
-/area/atmos)
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/hallway/primary/central/second/west)
 "nVI" = (
 /obj/machinery/atmospherics/pipe/simple/insulated{
 	dir = 5
@@ -94656,8 +94941,8 @@
 /area/medical/chemistry)
 "nWU" = (
 /obj/machinery/conveyor{
-	dir = 5;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -94855,8 +95140,8 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "nZu" = (
@@ -94920,8 +95205,8 @@
 "nZN" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno4";
-	name = "Creature Cell #4"
+	name = "Creature Cell #4";
+	id_tag = "xeno4"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -95199,11 +95484,11 @@
 "obH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
@@ -95214,8 +95499,8 @@
 	in_use = 1
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_x = -26;
-	pixel_y = 28
+	pixel_y = 28;
+	pixel_x = -26
 	},
 /obj/machinery/alarm{
 	pixel_y = 25
@@ -95591,7 +95876,11 @@
 	pixel_x = 28
 	},
 /obj/structure/table/reinforced,
-/obj/item/megaphone,
+/obj/item/paper_bin{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/pen,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -95608,8 +95897,8 @@
 /obj/item/clothing/glasses/hud/hydroponic,
 /obj/item/clothing/mask/cigarette/rollie,
 /obj/item/storage/fancy/cigarettes{
-	pixel_x = -11;
-	pixel_y = 8
+	pixel_y = 8;
+	pixel_x = -11
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -95731,20 +96020,20 @@
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "sw_maint2_airlock";
-	pixel_x = 25;
-	pixel_y = -2;
 	tag_airpump = "sw_maint2_pump";
 	tag_chamber_sensor = "sw_maint2_sensor";
 	tag_exterior_door = "sw_maint2_outer";
-	tag_interior_door = "sw_maint2_inner"
+	tag_interior_door = "sw_maint2_inner";
+	pixel_x = 25;
+	pixel_y = -2
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "sw_maint2_sensor";
-	pixel_x = 25;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = 25
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
@@ -95761,9 +96050,9 @@
 /area/hallway/secondary/entry)
 "ofJ" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter"
+	name = "Robotics Privacy Shutter";
+	dir = 8
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -95878,8 +96167,8 @@
 /obj/machinery/door_control{
 	id = "Chemistry2";
 	name = "Chem Hallway Desk Shutters";
-	pixel_x = -4;
-	pixel_y = 24
+	pixel_y = 24;
+	pixel_x = -4
 	},
 /turf/simulated/floor/engine,
 /area/medical/chemistry)
@@ -95963,8 +96252,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Minisat AI Core Centre";
-	dir = 10;
-	network = list("Minisat","SS13")
+	network = list("Minisat","SS13");
+	dir = 10
 	},
 /turf/simulated/floor/greengrid,
 /area/turret_protected/ai)
@@ -96381,19 +96670,15 @@
 /turf/simulated/floor/wood,
 /area/maintenance/banya)
 "olq" = (
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/double,
-/obj/machinery/light{
-	dir = 1;
-	in_use = 1
+/obj/structure/sign/directions/floor/alt{
+	dir = 8;
+	pixel_y = 32
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "dark"
+	dir = 4;
+	icon_state = "neutralcorner"
 	},
-/area/quartermaster/storage)
+/area/hallway/primary/starboard)
 "ols" = (
 /obj/machinery/gateway{
 	dir = 9
@@ -96449,9 +96734,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/door/airlock/medical/glass{
-	id = "Morgue";
 	name = "Morgue";
-	req_access = list(5)
+	req_access = list(5);
+	id = "Morgue"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -96508,9 +96793,14 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	name = "east fire alarm";
+	pixel_x = 24
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
-	icon_state = "redcorner"
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "omm" = (
@@ -96598,11 +96888,11 @@
 /area/maintenance/brig)
 "onm" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -96614,9 +96904,9 @@
 /obj/item/stack/cable_coil,
 /obj/item/stack/cable_coil,
 /obj/structure/closet/secure_closet/medical_wall{
-	name = "Exile item closet";
+	req_access = list(3);
 	pixel_x = -32;
-	req_access = list(3)
+	name = "Exile item closet"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -96640,11 +96930,17 @@
 	},
 /area/hallway/primary/central/second/west)
 "onF" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/sign/directions/floor/alt{
+	dir = 8;
+	pixel_x = -32
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
 	},
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/wood,
 /area/hallway/primary/central/west)
 "onK" = (
 /obj/structure/cable{
@@ -96653,9 +96949,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/sortjunction{
-	dir = 1;
 	name = "Engineering Junction";
-	sortType = 4
+	sortType = 4;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -96926,9 +97222,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint3)
 "oqt" = (
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "oqu" = (
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -97498,8 +97793,8 @@
 	icon_state = "0-2"
 	},
 /obj/structure/sign/electricshock{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /obj/machinery/light{
 	dir = 4
@@ -97614,10 +97909,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/clothing/suit/armor/riot,
 /obj/item/clothing/suit/armor/riot,
@@ -97627,6 +97922,13 @@
 	icon_state = "dark"
 	},
 /area/security/securearmory)
+"ovj" = (
+/obj/structure/table,
+/turf/simulated/floor/plasteel{
+	dir = 10;
+	icon_state = "red"
+	},
+/area/security/prison/cell_block/A)
 "ovn" = (
 /obj/structure/table/reinforced,
 /obj/item/clipboard,
@@ -97727,8 +98029,8 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "ovQ" = (
@@ -97772,9 +98074,15 @@
 	},
 /area/medical/chemistry)
 "ovR" = (
-/obj/structure/table,
-/obj/item/ai_module/protect_station,
-/obj/item/ai_module/nanotrasen,
+/obj/item/ai_module/protect_station{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/ai_module/nanotrasen{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/structure/table/glass,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -98487,8 +98795,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/camera/motion{
 	c_tag = "Minisat AI Core South";
-	dir = 10;
-	network = list("Minisat","SS13")
+	network = list("Minisat","SS13");
+	dir = 10
 	},
 /turf/simulated/floor/redgrid,
 /area/turret_protected/ai)
@@ -98773,20 +99081,20 @@
 "oEu" = (
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "aisolw_airlock";
-	pixel_y = 28;
 	tag_airpump = "aisolw_pump";
 	tag_chamber_sensor = "aisolw_sensor";
 	tag_exterior_door = "aisolw_outer";
-	tag_interior_door = "aisolw_inner"
+	tag_interior_door = "aisolw_inner";
+	pixel_y = 28
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "aisolw_sensor";
 	pixel_y = 35
 	},
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 4;
 	frequency = 1379;
-	id_tag = "aisolw_pump"
+	id_tag = "aisolw_pump";
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -98884,8 +99192,8 @@
 	dir = 4
 	},
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -99512,9 +99820,9 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/security/hos)
 "oKr" = (
@@ -99787,9 +100095,9 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/structure/window/reinforced{
 	color = "red"
@@ -99914,8 +100222,8 @@
 /area/maintenance/asmaint2)
 "oNn" = (
 /obj/machinery/conveyor/inverted{
-	dir = 9;
-	id = "QMLoad"
+	id = "QMLoad";
+	dir = 9
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -99953,8 +100261,8 @@
 /area/maintenance/secpost)
 "oNw" = (
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay)
 "oNx" = (
@@ -99997,11 +100305,11 @@
 /area/security/permabrig)
 "oNO" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purplefull"
@@ -100070,8 +100378,8 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "oOA" = (
@@ -100084,9 +100392,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/windowtint{
 	id = "Interrogation";
-	pixel_x = 24;
 	pixel_y = -24;
-	req_access = list(63)
+	req_access = list(63);
+	pixel_x = 24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -100109,8 +100417,8 @@
 "oOJ" = (
 /obj/machinery/camera{
 	c_tag = "Research Central Hallway";
-	dir = 10;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple";
@@ -100381,20 +100689,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/disposalpipe/sortjunction/reversed{
-	dir = 8;
-	name = "Brig Physician";
-	sortType = 24
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -100476,9 +100777,10 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/table,
+/obj/machinery/vending/cart{
+	pixel_x = -1;
+	pixel_y = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "brown"
@@ -100519,7 +100821,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "oRT" = (
 /obj/machinery/vending/snack,
 /obj/effect/turf_decal/siding/wood{
@@ -100591,6 +100893,9 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
 /turf/simulated/floor/carpet,
 /area/library)
 "oSB" = (
@@ -100847,8 +101152,8 @@
 /area/chapel/main)
 "oUd" = (
 /obj/machinery/door/window/brigdoor{
-	color = "red";
-	dir = 1
+	dir = 1;
+	color = "red"
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -100935,9 +101240,9 @@
 	desc = "A remote control-switch to lock down the prison wing's blast doors";
 	id = "Prison Gate";
 	name = "PermaBrig Lockdown";
-	pixel_x = 26;
 	pixel_y = 20;
-	req_access = list(2)
+	req_access = list(2);
+	pixel_x = 26
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -100948,9 +101253,9 @@
 /obj/machinery/door_control{
 	id = "HoSPriv";
 	name = "HoS Office Privacy Shutters Control";
-	pixel_x = 26;
 	pixel_y = -10;
-	req_access = list(58)
+	req_access = list(58);
+	pixel_x = 26
 	},
 /obj/machinery/door_control{
 	id = "Brig_lockdown";
@@ -101355,8 +101660,8 @@
 /area/security/prisonershuttle)
 "oXJ" = (
 /obj/machinery/conveyor{
-	dir = 8;
-	id = "packageExternal"
+	id = "packageExternal";
+	dir = 8
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plasteel{
@@ -101602,11 +101907,11 @@
 /area/maintenance/casino)
 "oZq" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
@@ -101617,18 +101922,18 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced{
-	color = "orange";
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /obj/structure/window/reinforced{
-	color = "orange";
 	dir = 4;
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /obj/structure/window/reinforced{
-	color = "orange";
 	dir = 8;
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /turf/simulated/floor/grass,
 /area/quartermaster/miningstorage)
@@ -102019,8 +102324,8 @@
 /area/medical/cryo)
 "pch" = (
 /obj/structure/chair/sofa/corner{
-	color = "#85130b";
-	dir = 4
+	dir = 4;
+	color = "#85130b"
 	},
 /turf/simulated/floor/wood{
 	icon_state = "wood-broken3";
@@ -102216,8 +102521,8 @@
 /obj/machinery/atmospherics/meter,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	desc = "Труба хранит в себе набор газов для смешивания";
-	dir = 1;
-	name = "Труба смешивания"
+	name = "Труба смешивания";
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -102312,8 +102617,8 @@
 /obj/machinery/door_control{
 	id = "SecPilotPriv";
 	name = "Pilot Privacy Shutters Control";
-	pixel_x = -24;
-	req_access = list(3,71)
+	req_access = list(3,71);
+	pixel_x = -24
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -102373,7 +102678,9 @@
 	},
 /area/quartermaster/office)
 "pfw" = (
-/obj/machinery/computer/secure_data,
+/obj/machinery/computer/security{
+	network = list("SS13","Research Outpost","Mining Outpost")
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -102431,14 +102738,13 @@
 /turf/simulated/floor/plating,
 /area/turret_protected/ai)
 "pfM" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "darkblue"
+	dir = 1;
+	icon_state = "red"
 	},
-/area/security/medbay)
+/area/hallway/primary/central/second/west)
 "pfN" = (
 /obj/effect/decal/warning_stripes/southeastcorner,
 /obj/structure/disposalpipe/segment,
@@ -102796,8 +103102,8 @@
 /obj/machinery/door_control{
 	id = "xeno1";
 	name = "Containment Control";
-	pixel_x = -32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = -32
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
@@ -103370,6 +103676,9 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green,
 /obj/item/card/id/captains_spare,
+/obj/structure/sign/poster/official/nanotrasen_logo{
+	pixel_y = -32
+	},
 /turf/simulated/floor/carpet/royalblue,
 /area/crew_quarters/captain/bedroom)
 "plI" = (
@@ -103478,10 +103787,10 @@
 /obj/item/reagent_containers/iv_bag/blood/AMinus,
 /obj/machinery/door/window/eastright{
 	base_state = "left";
-	dir = 8;
 	icon_state = "left";
 	name = "Blood Bag Storage";
-	req_access = list(5)
+	req_access = list(5);
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -103577,8 +103886,8 @@
 "pns" = (
 /obj/machinery/camera{
 	c_tag = "Research West Hallway 1";
-	dir = 9;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 9
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -103830,19 +104139,19 @@
 /obj/structure/flora/ausbushes/sunnybush,
 /obj/machinery/light,
 /obj/structure/window/reinforced{
-	color = "orange";
 	dir = 1;
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /obj/structure/window/reinforced{
-	color = "orange";
 	dir = 4;
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /obj/structure/window/reinforced{
-	color = "orange";
 	dir = 8;
-	layer = 2.9
+	layer = 2.9;
+	color = "orange"
 	},
 /turf/simulated/floor/grass,
 /area/quartermaster/miningstorage)
@@ -104095,6 +104404,13 @@
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
 /area/engineering/controlroom)
+"prN" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/hallway/primary/central/second/west)
 "prY" = (
 /obj/effect/landmark/tiles/damageturf,
 /turf/simulated/floor/plating,
@@ -104130,8 +104446,8 @@
 /turf/simulated/floor/grass,
 /area/hallway/secondary/exit)
 "psl" = (
-/obj/structure/table,
 /obj/item/ai_module/reset,
+/obj/structure/table/glass,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -104327,6 +104643,9 @@
 "ptU" = (
 /obj/item/storage/fancy/donut_box,
 /obj/structure/table/wood/fancy/purple,
+/obj/item/radio/intercom{
+	pixel_y = -28
+	},
 /turf/simulated/floor/carpet/purple,
 /area/crew_quarters/captain)
 "ptW" = (
@@ -104769,8 +105088,8 @@
 "pxf" = (
 /obj/machinery/light_switch{
 	name = "north bump";
-	pixel_x = 24;
-	pixel_y = -24
+	pixel_y = -24;
+	pixel_x = 24
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue";
@@ -104916,7 +105235,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/atmos)
@@ -105025,20 +105344,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "pyX" = (
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 9
+/obj/structure/sign/redcross{
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -105075,8 +105391,13 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "pzl" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -105833,8 +106154,8 @@
 /obj/item/tank/internals/plasma,
 /obj/machinery/camera{
 	c_tag = "Engine Room East";
-	dir = 8;
-	network = list("Engineering","SS13")
+	network = list("Engineering","SS13");
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/engine)
@@ -106206,17 +106527,17 @@
 	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "station_ai_airlock";
-	pixel_x = 57;
 	req_access = list(10,13);
 	tag_airpump = "station_ai_pump";
 	tag_chamber_sensor = "station_ai_sensor";
 	tag_exterior_door = "station_ai_outer";
-	tag_interior_door = "station_ai_inner"
+	tag_interior_door = "station_ai_inner";
+	pixel_x = 57
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "station_ai_sensor";
-	pixel_x = 57;
-	pixel_y = 7
+	pixel_y = 7;
+	pixel_x = 57
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -106249,6 +106570,7 @@
 	pixel_y = -24
 	},
 /obj/machinery/light,
+/obj/machinery/computer/secure_data,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkred"
 	},
@@ -106424,16 +106746,16 @@
 	layer = 2.9
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/energy/dominator,
 /obj/structure/window/reinforced{
@@ -106469,9 +106791,9 @@
 	},
 /obj/item/reagent_containers/food/condiment/saltshaker,
 /obj/machinery/door/window{
-	dir = 1;
 	name = "Kitchen";
-	req_access = list(28)
+	req_access = list(28);
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -106561,8 +106883,8 @@
 /obj/structure/table/reinforced,
 /obj/item/folder/red,
 /obj/item/folder/red{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -106852,8 +107174,8 @@
 /area/toxins/mixing)
 "pMN" = (
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "pMW" = (
@@ -106979,8 +107301,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter South";
-	dir = 1;
-	network = list("SS13","Engineering")
+	network = list("SS13","Engineering");
+	dir = 1
 	},
 /turf/simulated/floor/redgrid,
 /area/engineering/controlroom)
@@ -107205,35 +107527,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
 "pOZ" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/table/glass,
-/obj/effect/decal/warning_stripes/blue/hollow,
-/obj/machinery/door_control{
-	id = "SecMedPrivOutside";
-	name = "Brig Medbay Privacy Shutters Control";
-	pixel_x = 8;
-	pixel_y = 28;
-	req_access = list(63)
-	},
-/obj/machinery/light_switch{
-	pixel_x = null;
-	pixel_y = 22
-	},
-/obj/machinery/door_control{
-	id = "SecMedPrivInside";
-	name = "Brig Medbay Privacy Shutters Control";
-	pixel_x = -8;
-	pixel_y = 28;
-	req_access = list(63)
-	},
-/obj/item/storage/belt/medical,
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	dir = 1
 	},
-/area/security/medbay)
+/area/hallway/primary/central/west)
 "pPo" = (
 /obj/effect/landmark/event/revenantspawn,
 /obj/machinery/computer/security/telescreen/entertainment{
@@ -107310,12 +107609,12 @@
 	dir = 4
 	},
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /obj/machinery/conveyor{
-	dir = 8;
 	id = "QMLoad2";
+	dir = 8;
 	layer = 2.494
 	},
 /turf/simulated/floor/plasteel{
@@ -107571,6 +107870,19 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/plating,
 /area/quartermaster/sorting)
+"pRD" = (
+/obj/effect/turf_decal/number/number_2{
+	dir = 1;
+	pixel_y = -18
+	},
+/obj/effect/turf_decal/arrows/white{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "redcorner"
+	},
+/area/hallway/primary/central/west)
 "pRH" = (
 /obj/structure/table/glass,
 /obj/item/storage/fancy/donut_box,
@@ -107622,8 +107934,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "yellowcorner"
+	icon_state = "yellowcorner";
+	dir = 8
 	},
 /area/maintenance/apmaint)
 "pSo" = (
@@ -107790,10 +108102,10 @@
 	dir = 8
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/structure/rack{
 	dir = 8;
@@ -108025,10 +108337,10 @@
 /obj/effect/decal/warning_stripes/blue/hollow,
 /obj/machinery/door/window/eastright{
 	base_state = "left";
-	dir = 8;
 	icon_state = "left";
 	name = "Blood Bag Storage";
-	req_access = list(5)
+	req_access = list(5);
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -108192,8 +108504,8 @@
 /obj/structure/closet/radiation,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 9
 	},
 /area/toxins/explab)
 "pVY" = (
@@ -108391,9 +108703,9 @@
 /area/security/brig)
 "pWX" = (
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/security/hos)
 "pXa" = (
@@ -108404,11 +108716,11 @@
 	tag = "plant-dead"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -108445,8 +108757,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xenosecure";
-	name = "Secure Creature Cell"
+	name = "Secure Creature Cell";
+	id_tag = "xenosecure"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -108689,8 +109001,8 @@
 "pYO" = (
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/brigdoor/southright{
-	dir = 1;
-	req_access = list(17,75)
+	req_access = list(17,75);
+	dir = 1
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -108938,6 +109250,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "redcorner"
@@ -109046,10 +109359,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1
+	opacity = 1;
+	anchored = 1
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/plating,
@@ -109117,8 +109430,8 @@
 /obj/item/clipboard,
 /obj/item/toy/figure/virologist,
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_x = 10;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 10
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -109467,8 +109780,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = -6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -110057,8 +110370,8 @@
 "qjD" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable,
 /obj/structure/cable{
@@ -110194,15 +110507,15 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/biogenerator,
 /obj/machinery/door/window/eastleft{
-	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35)
+	req_access = list(35);
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters"
+	name = "Hydroponics Shutters";
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5
@@ -110333,8 +110646,8 @@
 /area/engineering/mechanic_workshop/hangar)
 "qmd" = (
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "qmk" = (
@@ -110492,8 +110805,8 @@
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/power/apc{
 	cell_type = 25000;
-	pixel_y = -26;
-	shock_proof = 1
+	shock_proof = 1;
+	pixel_y = -26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
@@ -110666,11 +110979,11 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/library/game_zone)
@@ -110760,6 +111073,18 @@
 	dir = 1
 	},
 /area/security/prison/cell_block/A)
+"qpZ" = (
+/obj/structure/sign/security{
+	pixel_x = -32
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
+	},
+/area/hallway/primary/central/second/west)
 "qqg" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecommunications Access";
@@ -110841,8 +111166,8 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/box/bodybags,
 /obj/item/storage/box/masks{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/storage/box/gloves{
 	pixel_x = 4;
@@ -111006,10 +111331,10 @@
 "qsm" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1
+	opacity = 1;
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
@@ -111123,8 +111448,8 @@
 /area/maintenance/cafeteria)
 "qta" = (
 /obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -6;
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dust,
@@ -111196,9 +111521,9 @@
 "qtz" = (
 /obj/machinery/atmospherics/binary/pump/on{
 	desc = "Отправляет дыхательную смесь из трубы распространяться по станции через вентиляции";
-	dir = 1;
 	name = "Дыхательную смесь на станцию";
-	target_pressure = 303.325
+	target_pressure = 303.325;
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -111336,11 +111661,11 @@
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "brig_detprivacy";
 	name = "Detective Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -111360,8 +111685,8 @@
 /area/engineering/mechanic_workshop)
 "quj" = (
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "yellowcorner"
+	icon_state = "yellowcorner";
+	dir = 8
 	},
 /area/maintenance/apmaint)
 "quk" = (
@@ -111475,6 +111800,9 @@
 	name = "Quarantine Lockdown";
 	opacity = 0
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "whiteblue";
@@ -111525,8 +111853,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "yellowcorner"
+	icon_state = "yellowcorner";
+	dir = 8
 	},
 /area/maintenance/apmaint)
 "qvy" = (
@@ -111637,15 +111965,12 @@
 /turf/simulated/floor/plating,
 /area/medical/virology/lab)
 "qwg" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	name = "east fire alarm";
-	pixel_x = 24
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+/obj/effect/turf_decal/siding/red{
+	dir = 4
 	},
-/area/security/prison/cell_block/A)
+/obj/effect/landmark/start/brig_physician,
+/turf/simulated/floor/carpet/red,
+/area/security/medbay)
 "qwi" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -111861,6 +112186,19 @@
 /obj/effect/decal/warning_stripes/northeast,
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry/additional)
+"qxP" = (
+/obj/effect/turf_decal/number/number_1{
+	dir = 1;
+	pixel_y = -15
+	},
+/obj/effect/turf_decal/arrows/white{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 9;
+	icon_state = "brown"
+	},
+/area/quartermaster/office)
 "qxX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -111874,8 +112212,8 @@
 "qya" = (
 /obj/effect/turf_decal/siding/yellow,
 /obj/structure/tribune{
-	anchored = 1;
-	pixel_y = 0
+	pixel_y = 0;
+	anchored = 1
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -112004,8 +112342,8 @@
 /obj/machinery/shower{
 	dir = 1;
 	layer = 5;
-	on = 1;
-	pixel_y = -5
+	pixel_y = -5;
+	on = 1
 	},
 /obj/structure/curtain/open/shower/security,
 /obj/item/radio/intercom{
@@ -112068,8 +112406,8 @@
 /area/security/customs)
 "qyW" = (
 /obj/machinery/newscaster{
-	pixel_x = -30;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -30
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -112134,8 +112472,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno3";
-	name = "Creature Cell #3"
+	name = "Creature Cell #3";
+	id_tag = "xeno3"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -112400,8 +112738,8 @@
 "qBq" = (
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/closet/walllocker/emerglocker/north{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -32
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -112520,9 +112858,9 @@
 	name = "Abandoned Kitchen Shutters"
 	},
 /obj/machinery/door/window{
-	dir = 1;
 	name = "Kitchen";
-	req_access = list(28)
+	req_access = list(28);
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -112881,8 +113219,8 @@
 /area/storage/secure)
 "qEH" = (
 /obj/machinery/door/airlock/glass{
-	name = "Break room";
-	req_access = list(63)
+	req_access = list(63);
+	name = "Break room"
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -113038,11 +113376,11 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -113468,9 +113806,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/projectile/automatic/wt550{
 	pixel_x = 3
@@ -113521,8 +113859,8 @@
 	pixel_y = 8
 	},
 /obj/structure/sign/directions/engineering{
-	dir = 1;
-	pixel_y = -8
+	pixel_y = -8;
+	dir = 1
 	},
 /turf/simulated/wall,
 /area/hallway/primary/central/second/north)
@@ -113688,7 +114026,8 @@
 /area/hallway/secondary/entry/commercial)
 "qMk" = (
 /obj/machinery/door/airlock/external{
-	name = "Escape Pod Airlock"
+	name = "Escape Pod Airlock";
+	use_power = 0
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/casino)
@@ -113761,10 +114100,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/energy/gun/advtaser{
 	pixel_x = -3;
@@ -114645,9 +114984,9 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/door/airlock/command/glass{
-	id = "ceprivacytint";
 	name = "Chief Engineer";
 	req_access = list(56);
+	id = "ceprivacytint";
 	security_level = 1
 	},
 /obj/structure/disposalpipe/segment,
@@ -114830,9 +115169,12 @@
 	},
 /area/quartermaster/office)
 "qTF" = (
-/obj/structure/sign/nosmoking_2,
-/turf/simulated/wall,
-/area/library)
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/simulated/floor/plasteel/freezer,
+/area/crew_quarters/toilet2)
 "qTM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -115094,8 +115436,8 @@
 /area/maintenance/casino)
 "qWk" = (
 /obj/structure/rack/gunrack{
-	desc = "A sturdy metal shelf to store a variety of items on.";
-	name = "shelf"
+	name = "shelf";
+	desc = "A sturdy metal shelf to store a variety of items on."
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -115300,10 +115642,10 @@
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
 "qYe" = (
-/obj/structure/chair/comfy/brown,
-/obj/effect/landmark/start/civilian,
-/turf/simulated/floor/wood,
-/area/library)
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/hallway/primary/central/west)
 "qYf" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -115793,13 +116135,6 @@
 	icon_state = "neutral"
 	},
 /area/crew_quarters/serviceyard)
-"rcy" = (
-/obj/machinery/vending/boozeomat,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/simulated/floor/wood/dark,
-/area/ntrep)
 "rcB" = (
 /obj/structure/table/reinforced,
 /obj/item/radio,
@@ -115940,10 +116275,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/storage/box/barrier,
 /obj/item/grenade/barrier{
@@ -116428,8 +116763,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_x = 6;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "blue"
@@ -116494,8 +116829,8 @@
 /area/security/permabrig)
 "ris" = (
 /obj/machinery/atmospherics/unary/portables_connector{
-	dir = 8;
-	layer = 2
+	layer = 2;
+	dir = 8
 	},
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/simulated/floor/plating,
@@ -116534,14 +116869,12 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
 /obj/item/radio/beacon,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/atmos)
 "riE" = (
@@ -116848,11 +117181,12 @@
 /area/hallway/primary/fore)
 "rlc" = (
 /obj/structure/table,
+/obj/item/storage/box/lip_stick,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "rlg" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/turretid/stun{
@@ -117863,9 +118197,9 @@
 "rsK" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical/glass{
-	id = "Morgue";
 	name = "Morgue";
-	req_access = list(5)
+	req_access = list(5);
+	id = "Morgue"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -117960,8 +118294,8 @@
 "rtn" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -118148,19 +118482,19 @@
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "n_tool_airlock";
 	layer = 3.3;
-	pixel_x = -25;
 	pixel_y = 0;
 	req_access = list(13);
 	tag_airpump = "n_tool_pump";
 	tag_chamber_sensor = "n_tool_sensor";
 	tag_exterior_door = "n_tool_outer";
-	tag_interior_door = "n_tool_inner"
+	tag_interior_door = "n_tool_inner";
+	pixel_x = -25
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "n_tool_sensor";
 	layer = 3.3;
-	pixel_x = -25;
-	pixel_y = 7
+	pixel_y = 7;
+	pixel_x = -25
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -118209,16 +118543,11 @@
 	},
 /area/hallway/primary/central/ne)
 "rvo" = (
-/obj/effect/spawner/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	dir = 1;
-	id_tag = "SecMedPrivOutside"
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "red"
 	},
-/turf/simulated/floor/plating,
-/area/security/medbay)
+/area/security/prison/cell_block/A)
 "rvp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -118864,6 +119193,19 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain/bedroom)
+"rzi" = (
+/obj/machinery/computer/rdconsole/core,
+/obj/effect/decal/warning_stripes/northwest,
+/obj/machinery/requests_console{
+	department = "Science";
+	departmentType = 2;
+	name = "Research Request Console";
+	pixel_x = -30
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/toxins/lab)
 "rzl" = (
 /obj/structure/girder,
 /turf/simulated/floor/plating,
@@ -119089,40 +119431,12 @@
 	pixel_y = 4
 	},
 /obj/item/lipstick/black{
-	pixel_x = -6;
-	pixel_y = -1
+	pixel_y = -1;
+	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/wood,
 /area/maintenance/backstage)
-"rAR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/button/windowtint{
-	id = "ntrepprivate";
-	name = "Door tint control";
-	pixel_x = 24;
-	pixel_y = -24
-	},
-/obj/machinery/door_control{
-	id = "NTRprivate";
-	name = "Privacy Shutters Control";
-	pixel_x = 26;
-	pixel_y = -33;
-	req_access = list(73)
-	},
-/obj/structure/disposalpipe/trunk/multiz/down{
-	dir = 2
-	},
-/turf/simulated/floor/carpet/black,
-/area/ntrep)
 "rBa" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/table/wood/fancy/red,
@@ -119171,8 +119485,8 @@
 	},
 /obj/effect/decal/warning_stripes/southwest,
 /obj/machinery/firealarm{
-	pixel_x = 27;
-	pixel_y = -27
+	pixel_y = -27;
+	pixel_x = 27
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -120131,17 +120445,19 @@
 	},
 /area/crew_quarters/chief)
 "rIa" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
-	pixel_x = -3;
-	pixel_y = 7
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/item/pen,
-/turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "red"
+/obj/structure/chair/comfy/brown{
+	dir = 8
 	},
-/area/security/reception)
+/obj/machinery/firealarm{
+	dir = 4;
+	name = "east fire alarm";
+	pixel_x = 26
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "rIc" = (
 /obj/machinery/light{
 	dir = 1;
@@ -120330,6 +120646,10 @@
 /turf/simulated/floor/grass,
 /area/security/permabrig)
 "rJL" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -120342,8 +120662,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "rJR" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/preopen{
@@ -121048,8 +121370,8 @@
 	dir = 8
 	},
 /obj/item/reagent_containers/food/drinks/mug/sci{
-	pixel_x = 3;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = 3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -121321,8 +121643,14 @@
 /area/blueshield)
 "rQj" = (
 /obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
+/obj/item/stack/packageWrap{
+	pixel_y = 15
+	},
+/obj/item/hand_labeler{
+	pixel_y = 11
+	},
+/obj/item/paper_bin,
+/obj/item/pen,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "brown"
@@ -121911,8 +122239,8 @@
 /obj/machinery/vending/wallmed{
 	layer = 3.3;
 	name = "Emergency NanoMed";
-	pixel_x = -26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/livingcomplex)
@@ -121953,6 +122281,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -121980,8 +122311,8 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xenosecure";
-	name = "Secure Creature Cell"
+	name = "Secure Creature Cell";
+	id_tag = "xenosecure"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -122162,9 +122493,9 @@
 	id = "conferenceroombolts";
 	name = "Conference Room Bolts Control";
 	normaldoorcontrol = 1;
-	pixel_x = -4;
 	req_access = list(19);
-	specialfunctions = 4
+	specialfunctions = 4;
+	pixel_x = -4
 	},
 /obj/machinery/button/windowtint{
 	id = "conferenceroomwindows";
@@ -122262,9 +122593,9 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 2;
 	id_tag = "Kitchen Dinner Windows";
-	name = "Kitchen Shutters"
+	name = "Kitchen Shutters";
+	dir = 2
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -122406,8 +122737,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/reception)
 "rYB" = (
@@ -122668,8 +122999,8 @@
 /area/quartermaster/delivery)
 "saW" = (
 /obj/effect/turf_decal/siding/white/end{
-	color = "#444444";
-	dir = 4
+	dir = 4;
+	color = "#444444"
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -122765,8 +123096,8 @@
 /obj/structure/table/wood,
 /obj/effect/spawner/lootdrop/officetoys,
 /obj/item/flashlight/lamp/green{
-	pixel_x = -3;
-	pixel_y = 13
+	pixel_y = 13;
+	pixel_x = -3
 	},
 /obj/machinery/door_control{
 	id = "hopofficedoor";
@@ -123097,8 +123428,8 @@
 /area/hallway/primary/command/west)
 "sdh" = (
 /obj/effect/turf_decal/siding/white/end{
-	color = "#444444";
-	dir = 8
+	dir = 8;
+	color = "#444444"
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -123330,8 +123661,8 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "seC" = (
@@ -123417,9 +123748,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/clothing/suit/armor/bulletproof,
 /obj/item/clothing/suit/armor/bulletproof,
@@ -123782,8 +124113,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medrest)
 "sil" = (
@@ -124060,12 +124391,12 @@
 /area/security/hos)
 "skL" = (
 /obj/machinery/atmospherics/unary/vent_pump{
-	dir = 4;
 	external_pressure_bound = 140;
 	external_pressure_bound_default = 140;
 	name = "server vent";
 	on = 1;
-	pressure_checks = 0
+	pressure_checks = 0;
+	dir = 4
 	},
 /turf/simulated/floor/bluegrid{
 	icon_state = "gcircuit";
@@ -124939,8 +125270,8 @@
 "ssi" = (
 /obj/machinery/atmospherics/binary/volume_pump/on{
 	desc = "Возвращает газ после обработки в трубу смешивания";
-	dir = 1;
-	name = "Выход газа после обработки"
+	name = "Выход газа после обработки";
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -125076,8 +125407,8 @@
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "ste" = (
@@ -125424,8 +125755,8 @@
 	},
 /obj/effect/landmark/start/intern,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medrest)
 "svr" = (
@@ -125759,12 +126090,12 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/storage/box/lights/mixed{
-	pixel_x = 5;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 5
 	},
 /obj/item/storage/box/lights/mixed{
-	pixel_x = 5;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 5
 	},
 /obj/item/grenade/chem_grenade/metalfoam,
 /obj/item/grenade/chem_grenade/metalfoam,
@@ -126094,8 +126425,8 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "sAx" = (
@@ -127007,6 +127338,9 @@
 	name = "Quarantine Lockdown";
 	opacity = 0
 	},
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "whiteblue";
@@ -127030,15 +127364,15 @@
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/clothing/under/retro/engineering,
 /obj/item/clothing/under/retro/medical{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /obj/item/clothing/under/retro/science{
 	pixel_x = 6
 	},
 /obj/item/clothing/under/retro/security{
-	pixel_x = -7;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -7
 	},
 /obj/item/clothing/under/solgov/civ,
 /obj/structure/sign/poster/official/random{
@@ -127344,15 +127678,19 @@
 	},
 /area/mimeoffice)
 "sJJ" = (
-/obj/machinery/camera{
-	c_tag = "Second Floor Central Ring West Hallway 2";
-	dir = 4
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "red"
+/obj/effect/spawner/window/reinforced,
+/obj/structure/curtain/open/shower/security{
+	alpha = 255;
+	icon_state = "closed";
+	name = "backstage";
+	opacity = 1;
+	anchored = 1
 	},
-/area/hallway/primary/central/second/west)
+/turf/simulated/floor/plating,
+/area/security/medbay)
 "sJK" = (
 /obj/machinery/light_switch{
 	pixel_x = 24
@@ -127757,8 +128095,8 @@
 /obj/machinery/teleport/station,
 /obj/machinery/camera/motion{
 	c_tag = "Minisat Teleporter Room";
-	dir = 4;
-	network = list("Minisat","SS13")
+	network = list("Minisat","SS13");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -128443,9 +128781,9 @@
 /obj/item/reagent_containers/food/snacks/candy/mre,
 /obj/item/reagent_containers/food/snacks/candy/mre,
 /obj/structure/closet/secure_closet/medical_wall{
-	name = "Exile item closet";
+	req_access = list(3);
 	pixel_x = -32;
-	req_access = list(3)
+	name = "Exile item closet"
 	},
 /obj/machinery/camera{
 	c_tag = "Gateway Exile";
@@ -128619,11 +128957,11 @@
 /area/hallway/primary/central/east)
 "sTn" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
@@ -128660,10 +128998,10 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -128870,11 +129208,11 @@
 /area/quartermaster/lobby)
 "sVw" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -129244,10 +129582,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/lock_buster,
 /obj/item/storage/box/trackimp,
@@ -129327,9 +129665,9 @@
 /obj/structure/flora/ausbushes/leafybush,
 /obj/machinery/camera{
 	c_tag = "Xenobio Central-North";
-	dir = 1;
 	network = list("Research","SS13");
-	pixel_x = -1
+	pixel_x = -1;
+	dir = 1
 	},
 /turf/simulated/floor/grass,
 /area/toxins/xenobiology)
@@ -129433,8 +129771,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/reception)
 "sZi" = (
@@ -129444,7 +129782,9 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/vending/artvend,
+/obj/machinery/computer/merch{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "brown"
@@ -129505,8 +129845,8 @@
 	pixel_x = 10
 	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_x = -6;
-	pixel_y = 12
+	pixel_y = 12;
+	pixel_x = -6
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -129542,6 +129882,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -129638,12 +129981,12 @@
 /obj/structure/table/wood,
 /obj/item/folder/yellow,
 /obj/item/folder/red{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /obj/item/folder/blue{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/magistrateoffice)
@@ -129860,11 +130203,6 @@
 	icon_state = "dark"
 	},
 /area/chapel/office)
-"tbV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random_spawners/blood_5,
-/turf/simulated/floor/plating,
-/area/maintenance/secpost)
 "tci" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -130300,9 +130638,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -130620,8 +130958,8 @@
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/camera{
 	c_tag = "Atmospherics South";
-	dir = 1;
-	network = list("SS13","Engineering")
+	network = list("SS13","Engineering");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -130745,8 +131083,8 @@
 /obj/structure/barricade/wooden/crude,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	name = "backstage";
+	anchored = 1;
 	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
@@ -130963,8 +131301,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8;
-	pixel_x = -11;
-	pixel_y = 8
+	pixel_y = 8;
+	pixel_x = -11
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
@@ -131232,8 +131570,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	id_tag = "NTRprivate";
-	name = "Privacy Shutters"
+	name = "Privacy Shutters";
+	id_tag = "NTRprivate"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -131253,9 +131591,9 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "brigkpp";
 	layer = 5;
-	pixel_x = -55;
 	pixel_y = 0;
-	range = 3
+	range = 3;
+	pixel_x = -55
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -131594,8 +131932,11 @@
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "toQ" = (
 /obj/structure/table/wood/poker,
 /obj/effect/decal/cleanable/dust,
@@ -131721,9 +132062,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/clothing/gloves/color/black/ballistic,
 /obj/item/clothing/gloves/color/black/ballistic,
@@ -131784,8 +132125,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Gravity Generator Area East";
-	dir = 4;
-	network = list("SS13","Engineering")
+	network = list("SS13","Engineering");
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/gravitygenerator)
@@ -131821,6 +132162,16 @@
 /obj/machinery/suit_storage_unit/engine,
 /turf/simulated/floor/plating,
 /area/storage/secure)
+"tqp" = (
+/obj/machinery/door/window/brigdoor/security{
+	name = "Brig Medical Bay";
+	req_access = list(63)
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/security/medbay)
 "tqr" = (
 /obj/structure/table,
 /obj/item/storage/box/bodybags,
@@ -131968,8 +132319,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay)
 "trq" = (
@@ -132112,14 +132463,13 @@
 	},
 /area/security/prison/cell_block/A)
 "tsd" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/table,
+/obj/item/radio/intercom{
+	pixel_y = -28
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/item/storage/fancy/donut_box,
 /turf/simulated/floor/plasteel{
-	dir = 1
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "tsf" = (
@@ -132209,6 +132559,21 @@
 	icon_state = "neutral"
 	},
 /area/hallway/primary/central/second/east)
+"tsI" = (
+/obj/machinery/suit_storage_unit/brigmed{
+	req_access = list(5)
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/space_cops{
+	pixel_x = 32
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/security/medbay)
 "tsP" = (
 /obj/structure/sink{
 	dir = 4;
@@ -132227,12 +132592,10 @@
 	},
 /area/crew_quarters/chief)
 "tsS" = (
-/obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	icon_state = "red"
 	},
-/area/security/medbay)
+/area/hallway/primary/central/west)
 "tsV" = (
 /obj/structure/table/wood,
 /obj/machinery/computer/security/wooden_tv,
@@ -132417,8 +132780,8 @@
 	pixel_y = 24
 	},
 /obj/structure/closet/walllocker/emerglocker/north{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purplefull"
@@ -132451,11 +132814,11 @@
 	},
 /obj/effect/decal/cleanable/dust,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/carpet,
 /area/maintenance/casino)
@@ -132774,20 +133137,31 @@
 /turf/simulated/floor/plasteel,
 /area/engineering/controlroom)
 "twd" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	name = "west light switch";
+	pixel_x = 23;
+	pixel_y = -24
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "twp" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -132997,20 +133371,6 @@
 	icon_state = "dark"
 	},
 /area/chapel/office)
-"txj" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/trunk/multiz{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "dark"
-	},
-/area/medical/genetics)
 "txo" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -133051,12 +133411,12 @@
 "txA" = (
 /obj/structure/table/reinforced,
 /obj/item/stamp/hos{
-	pixel_x = -7;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = -7
 	},
 /obj/item/reagent_containers/food/drinks/bottle/whiskey{
-	pixel_x = 3;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 3
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -133076,8 +133436,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light_switch{
-	pixel_x = -26;
-	pixel_y = 26
+	pixel_y = 26;
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -133292,8 +133652,8 @@
 "tzg" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/structure/extinguisher_cabinet{
-	pixel_x = -27;
-	pixel_y = 32
+	pixel_y = 32;
+	pixel_x = -27
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -133466,8 +133826,8 @@
 	id = "toilet1";
 	name = "Toilet Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+	specialfunctions = 4;
+	pixel_x = 25
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/structure/sign/poster/secret/lizard{
@@ -133878,12 +134238,12 @@
 	dir = 8
 	},
 /obj/item/organ/external/tail/unathi{
-	pixel_x = 8;
-	pixel_y = 8
+	pixel_y = 8;
+	pixel_x = 8
 	},
 /obj/item/organ/external/tail/tajaran{
-	pixel_x = 6;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 6
 	},
 /obj/item/clothing/head/kitty,
 /obj/effect/decal/cleanable/dirt,
@@ -134180,8 +134540,8 @@
 /area/toxins/mixing)
 "tFY" = (
 /obj/structure/sign/vacuum{
-	icon_state = "space1";
-	pixel_x = -32
+	pixel_x = -32;
+	icon_state = "space1"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -134236,10 +134596,10 @@
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/eastright{
 	base_state = "left";
-	dir = 8;
 	icon_state = "left";
 	name = "Blood Bag Storage";
-	req_access = list(5)
+	req_access = list(5);
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -134283,9 +134643,9 @@
 "tGB" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
 	name = "backstage";
-	pixel_x = 32
+	pixel_x = 32;
+	anchored = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -134676,8 +135036,8 @@
 "tJs" = (
 /obj/machinery/computer/med_data,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medrest)
 "tJu" = (
@@ -135060,8 +135420,8 @@
 /area/quartermaster/delivery)
 "tMV" = (
 /obj/machinery/conveyor/inverted{
-	dir = 10;
-	id = "garbage"
+	id = "garbage";
+	dir = 10
 	},
 /obj/effect/decal/warning_stripes/northwestcorner,
 /turf/simulated/floor/plating,
@@ -135285,6 +135645,18 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/storage/secure)
+"tOg" = (
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	name = "standard air scrubber";
+	on = 1;
+	scrub_N2O = 1;
+	scrub_Toxins = 1;
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "red"
+	},
+/area/security/lobby)
 "tOl" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/carpet/blue,
@@ -135816,8 +136188,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xenosecure";
-	name = "Secure Creature Cell"
+	name = "Secure Creature Cell";
+	id_tag = "xenosecure"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -135846,8 +136218,8 @@
 /obj/structure/table,
 /obj/item/security_voucher,
 /obj/item/security_voucher{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -135894,8 +136266,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno2";
-	name = "Creature Cell #2"
+	name = "Creature Cell #2";
+	id_tag = "xeno2"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -135927,8 +136299,8 @@
 /area/hallway/spacebridge/comcar)
 "tSH" = (
 /obj/machinery/power/apc{
-	dir = 4;
-	pixel_x = 28
+	pixel_x = 28;
+	dir = 4
 	},
 /obj/structure/cable,
 /turf/simulated/floor/wood/fancy/light{
@@ -135966,8 +136338,8 @@
 	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "tSU" = (
@@ -136032,17 +136404,14 @@
 /turf/simulated/wall/r_wall,
 /area/engineering/controlroom)
 "tTq" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/stairs{
+	dir = 1;
+	layer = 2
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	icon_state = "neutralfull"
 	},
-/area/security/medbay)
+/area/hallway/primary/central/west)
 "tTs" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/seeds/tower,
@@ -136091,13 +136460,6 @@
 /area/maintenance/fore2)
 "tTL" = (
 /obj/effect/decal/warning_stripes/east,
-/obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
-	name = "standard air scrubber";
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
-	},
 /obj/machinery/camera{
 	c_tag = "Atmospherics Access";
 	dir = 8;
@@ -136463,8 +136825,8 @@
 	dir = 6
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "It's Officer Commandsky! Here to rule and command.";
-	name = "Officer Commandsky"
+	name = "Officer Commandsky";
+	desc = "It's Officer Commandsky! Here to rule and command."
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -136714,8 +137076,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno4";
-	name = "Creature Cell #4"
+	name = "Creature Cell #4";
+	id_tag = "xeno4"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -138107,14 +138469,22 @@
 /area/medical/surgery/south)
 "uiu" = (
 /obj/structure/table/glass,
+/obj/machinery/newscaster{
+	pixel_x = -32
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/item/reagent_containers/spray/cleaner/janitor,
+/obj/item/hair_dye_bottle{
+	pixel_y = -10;
+	pixel_x = -6
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "uiv" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -138442,7 +138812,7 @@
 	dir = 1;
 	icon_state = "dark"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "ulP" = (
 /obj/structure/table/wood,
 /obj/machinery/status_display{
@@ -139172,8 +139542,8 @@
 "usc" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable{
 	d2 = 4;
@@ -139257,8 +139627,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
-	name = "backstage"
+	name = "backstage";
+	anchored = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -139402,12 +139772,11 @@
 	},
 /area/hallway/primary/central)
 "utz" = (
-/obj/machinery/door/airlock{
-	id_tag = "toilet2";
-	name = "Toilet"
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "neutralcorner"
 	},
-/turf/simulated/floor/plasteel/freezer,
-/area/crew_quarters/toilet2)
+/area/hallway/primary/central/west)
 "utG" = (
 /obj/structure/railing/corner,
 /turf/simulated/floor/glass/reinforced,
@@ -139419,11 +139788,11 @@
 "utP" = (
 /obj/structure/chair,
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 8
 	},
 /obj/structure/sign/poster/official/random{
 	pixel_x = 32
@@ -139467,8 +139836,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/flasher{
-	pixel_x = 23;
-	pixel_y = 32
+	pixel_y = 32;
+	pixel_x = 23
 	},
 /obj/machinery/ai_slipper,
 /turf/simulated/floor/plasteel{
@@ -139541,17 +139910,13 @@
 	},
 /area/quartermaster/office)
 "uuC" = (
-/obj/machinery/suit_storage_unit/brigmed{
-	req_access = list(5)
-	},
-/obj/machinery/light{
-	dir = 4
+/obj/structure/disposalpipe/segment{
+	dir = 10
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
+	dir = 1
 	},
-/area/security/medbay)
+/area/security/processing)
 "uuH" = (
 /obj/structure/closet/secure_closet/ntrep,
 /turf/simulated/floor/carpet/royalblue,
@@ -139764,8 +140129,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 8
 	},
 /area/hallway/primary/fore)
 "uwE" = (
@@ -139875,8 +140240,8 @@
 /area/library)
 "uxu" = (
 /obj/item/candle{
-	pixel_x = -9;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -9
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -140359,8 +140724,8 @@
 "uBa" = (
 /obj/machinery/camera{
 	c_tag = "Research East Central Hallway";
-	dir = 1;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple";
@@ -140764,10 +141129,10 @@
 "uEi" = (
 /obj/machinery/door/window/brigdoor/southleft{
 	base_state = "rightsecure";
-	color = "red";
 	dir = 1;
 	icon_state = "rightsecure";
-	req_access = list(63)
+	req_access = list(63);
+	color = "red"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -141527,10 +141892,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/shield/riot,
 /obj/item/shield/riot,
@@ -141943,29 +142308,6 @@
 	dir = 8
 	},
 /area/crew_quarters/locker)
-"uNu" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10;
-	initialize_directions = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cloning)
 "uNv" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -142321,11 +142663,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -142335,8 +142677,8 @@
 "uQX" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_x = 28;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -142347,8 +142689,8 @@
 /obj/machinery/door_control{
 	id = "xeno6";
 	name = "Containment Control";
-	pixel_x = 32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = 32
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
@@ -142435,8 +142777,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "yellowcorner"
+	icon_state = "yellowcorner";
+	dir = 8
 	},
 /area/maintenance/apmaint)
 "uRy" = (
@@ -142936,10 +143278,10 @@
 "uVH" = (
 /obj/machinery/autolathe,
 /obj/machinery/door/window/brigdoor{
-	dir = 8;
 	id = "Autolathe";
 	name = "Autolathe Access";
-	req_access = list(47)
+	req_access = list(47);
+	dir = 8
 	},
 /obj/item/stack/sheet/metal{
 	amount = 10
@@ -143504,8 +143846,8 @@
 "uZg" = (
 /obj/machinery/door/window/eastleft{
 	dir = 2;
-	name = "Forensic laboratory";
-	req_access = list(3,4)
+	req_access = list(3,4);
+	name = "Forensic laboratory"
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood,
@@ -144131,14 +144473,15 @@
 /turf/simulated/floor/engine,
 /area/engineering/supermatter)
 "vdg" = (
-/obj/structure/chair/comfy/purp{
-	dir = 4
-	},
-/obj/item/radio/intercom{
-	pixel_y = -28
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/turf/simulated/floor/plasteel{
+	dir = 5;
+	icon_state = "dark"
 	},
-/turf/simulated/floor/carpet/purple,
-/area/crew_quarters/captain)
+/area/quartermaster/storage)
 "vdh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -144280,12 +144623,12 @@
 "vep" = (
 /obj/effect/decal/warning_stripes/blue/hollow,
 /obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -144327,8 +144670,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medbay2)
 "veL" = (
@@ -144410,24 +144753,12 @@
 /turf/simulated/floor/grass,
 /area/crew_quarters/serviceyard)
 "vfv" = (
-/obj/structure/toilet{
-	pixel_y = 19
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/door_control{
-	desiredstate = 1;
-	id = "toilet2";
-	name = "Toilet Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel{
+	icon_state = "red"
 	},
-/obj/effect/decal/warning_stripes/yellow/hollow,
-/obj/effect/landmark/start/civilian,
-/turf/simulated/floor/plasteel/freezer,
-/area/crew_quarters/toilet2)
+/area/hallway/primary/central/second/west)
 "vfx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -144608,8 +144939,8 @@
 /area/toxins/test_area)
 "vhE" = (
 /obj/machinery/conveyor{
-	dir = 6;
-	id = "QMLoad"
+	id = "QMLoad";
+	dir = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -144963,6 +145294,10 @@
 /turf/simulated/wall,
 /area/maintenance/disposal)
 "vkD" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -144973,9 +145308,10 @@
 	icon_state = "4-8"
 	},
 /obj/effect/landmark/event/lightsout,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/turf/simulated/floor/plasteel{
+	icon_state = "neutralfull"
+	},
+/area/civilian/barber)
 "vkG" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/machinery/atmospherics/meter,
@@ -145062,8 +145398,8 @@
 /area/maintenance/tourist)
 "vlt" = (
 /obj/structure/chair/sofa/right{
-	color = "#85130b";
-	dir = 8
+	dir = 8;
+	color = "#85130b"
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -145163,8 +145499,8 @@
 	dir = 4
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "It's Officer Leftsky! Powered by a potato and a shot of whiskey.";
-	name = "Officer Leftsky"
+	name = "Officer Leftsky";
+	desc = "It's Officer Leftsky! Powered by a potato and a shot of whiskey."
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -145442,8 +145778,8 @@
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/clothing/under/fluff/soviet_casual_uniform,
 /obj/item/clothing/under/fluff/soviet_casual_uniform{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -145634,8 +145970,8 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "yellowcorner"
+	icon_state = "yellowcorner";
+	dir = 8
 	},
 /area/maintenance/apmaint)
 "vqI" = (
@@ -145786,11 +146122,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
-	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0
+	opacity = 0;
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -146334,8 +146670,8 @@
 	dir = 4
 	},
 /obj/structure/sign/fire{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -146352,8 +146688,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/disposalpipe/sortjunction/reversed{
+	dir = 8;
+	name = "Brig Physician";
+	sortType = 24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -146904,11 +147242,11 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -146951,9 +147289,6 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/obey{
-	pixel_x = -32
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -147212,8 +147547,8 @@
 	dir = 4
 	},
 /obj/structure/sign/directions/security{
-	dir = 1;
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 8
 	},
 /turf/simulated/wall,
 /area/hallway/primary/central)
@@ -147469,6 +147804,22 @@
 	icon_state = "dark"
 	},
 /area/turret_protected/aisat_interior)
+"vFN" = (
+/obj/machinery/camera{
+	c_tag = "Central Bridge Hallway East 2";
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/engine{
+	slowdown = -0.3
+	},
+/area/hallway/primary/central)
 "vFV" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 6
@@ -148327,11 +148678,18 @@
 	},
 /area/hallway/primary/starboard/south)
 "vMH" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/wood,
-/area/hallway/primary/central/west)
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1
+	},
+/area/security/processing)
 "vMI" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -148354,15 +148712,15 @@
 /obj/machinery/door_control{
 	id = "janitorprivatshutters";
 	name = "Janitor Private Shutters Control";
-	pixel_x = 26;
 	pixel_y = -26;
-	req_access = list(26)
+	req_access = list(26);
+	pixel_x = 26
 	},
 /obj/machinery/light_switch{
 	dir = 1;
 	name = "south bump";
-	pixel_x = 26;
-	pixel_y = -35
+	pixel_y = -35;
+	pixel_x = 26
 	},
 /turf/simulated/floor/carpet/purple,
 /area/janitor)
@@ -148572,8 +148930,8 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/item/radio/intercom{
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -148645,6 +149003,25 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/fore2)
+"vOz" = (
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/medical/glass{
+	id = "cloninglab";
+	name = "Cloning Lab";
+	req_access = list(5)
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/cloning)
 "vOB" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -148669,11 +149046,11 @@
 /area/quartermaster/miningstorage)
 "vOX" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -148713,15 +149090,15 @@
 "vPj" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
-	pixel_x = -2;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = -2
 	},
 /obj/item/pen{
 	pixel_y = 5
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitepurple"
+	icon_state = "whitepurple";
+	dir = 4
 	},
 /area/toxins/lab)
 "vPp" = (
@@ -148807,14 +149184,15 @@
 	},
 /area/medical/medbay)
 "vQu" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
+/obj/machinery/camera{
+	c_tag = "Second Floor Central Ring West Hallway 2";
+	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "red"
 	},
-/turf/simulated/floor/wood,
-/area/hallway/primary/central/west)
+/area/hallway/primary/central/second/west)
 "vQE" = (
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -148874,11 +149252,11 @@
 	},
 /area/crew_quarters/fitness)
 "vRd" = (
-/obj/item/twohanded/required/kirbyplants,
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -24
 	},
+/obj/structure/table,
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull";
 	tag = "icon-redfull (NORTHWEST)"
@@ -149024,8 +149402,8 @@
 	},
 /obj/structure/disposalpipe/sortjunction/reversed{
 	dir = 8;
-	name = "Research Junction";
-	sortType = 12
+	sortType = 12;
+	name = "Research Junction"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -149050,8 +149428,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/west,
 /obj/item/weldingtool/hugetank{
-	pixel_x = 6;
-	pixel_y = -3
+	pixel_y = -3;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 0;
@@ -149335,8 +149713,8 @@
 	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medrest)
 "vUP" = (
@@ -149459,9 +149837,9 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -150833,8 +151211,8 @@
 	pixel_x = -3
 	},
 /obj/item/reagent_containers/food/drinks/cans/beer{
-	pixel_x = 5;
-	pixel_y = 10
+	pixel_y = 10;
+	pixel_x = 5
 	},
 /turf/simulated/floor/glass/reinforced,
 /area/quartermaster/office)
@@ -150952,8 +151330,8 @@
 	pixel_x = 2
 	},
 /obj/item/toy/figure/wizard{
-	pixel_x = 16;
-	pixel_y = 6
+	pixel_y = 6;
+	pixel_x = 16
 	},
 /turf/simulated/floor/carpet/green,
 /area/library/game_zone)
@@ -151090,6 +151468,17 @@
 /obj/structure/flora/ausbushes/reedbush,
 /turf/simulated/floor/grass,
 /area/hydroponics)
+"whL" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/obj/effect/landmark/start/civilian,
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_y = 24
+	},
+/turf/simulated/floor/wood,
+/area/library)
 "wih" = (
 /obj/item/stack/medical/bruise_pack,
 /obj/item/stack/medical/bruise_pack/advanced,
@@ -151498,6 +151887,9 @@
 	name = "west fire alarm";
 	pixel_x = -24
 	},
+/obj/item/storage/toolbox/emergency,
+/obj/item/crowbar,
+/obj/item/wrench,
 /turf/simulated/floor/plasteel/white,
 /area/teleporter)
 "wkD" = (
@@ -151910,8 +152302,8 @@
 "wnp" = (
 /obj/structure/rack,
 /obj/item/extinguisher/mini{
-	pixel_x = -4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = -4
 	},
 /obj/item/extinguisher/mini,
 /obj/item/extinguisher/mini{
@@ -151934,8 +152326,8 @@
 /area/security/permabrig)
 "wnt" = (
 /obj/machinery/newscaster{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -152005,8 +152397,8 @@
 	name = "supply dock loading door"
 	},
 /obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad2"
+	id = "QMLoad2";
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -152318,20 +152710,14 @@
 	},
 /area/engineering/break_room)
 "wqf" = (
-/obj/machinery/power/apc{
-	cell_type = 5000;
-	dir = 4;
-	name = "east bump";
-	pixel_x = 26
-	},
-/obj/structure/cable{
-	d2 = 8;
-	icon_state = "0-8"
+/obj/machinery/alarm{
+	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+	dir = 1;
+	icon_state = "red"
 	},
-/area/security/prison/cell_block/A)
+/area/hallway/primary/central/second/west)
 "wqh" = (
 /obj/effect/decal/cleanable/dust,
 /obj/effect/spawner/random_spawners/rodent,
@@ -152345,11 +152731,12 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/item/razor,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
 	},
-/area/maintenance/tourist)
+/area/civilian/barber)
 "wqk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -152413,8 +152800,8 @@
 	normaldoorcontrol = 1;
 	pixel_x = -6;
 	pixel_y = 26;
-	req_access = list(28);
-	specialfunctions = 4
+	specialfunctions = 4;
+	req_access = list(28)
 	},
 /obj/machinery/door_control{
 	id = "vipbar_bolt";
@@ -152422,15 +152809,15 @@
 	normaldoorcontrol = 1;
 	pixel_x = 6;
 	pixel_y = 26;
-	req_access = list(28);
-	specialfunctions = 4
+	specialfunctions = 4;
+	req_access = list(28)
 	},
 /obj/machinery/door_control{
 	id = "Bar";
 	name = "Bar Privacy Shutters Control";
-	pixel_x = 6;
 	pixel_y = 36;
-	req_access = list(28)
+	req_access = list(28);
+	pixel_x = 6
 	},
 /obj/machinery/door_control{
 	id = "Bar Hall";
@@ -152584,19 +152971,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/atmos)
-"wrr" = (
-/obj/machinery/computer/rdconsole/core,
-/obj/effect/decal/warning_stripes/northwest,
-/obj/machinery/requests_console{
-	department = "Research";
-	departmentType = 2;
-	name = "Research Request Console";
-	pixel_x = -30
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/toxins/lab)
 "wrz" = (
 /turf/simulated/openspace,
 /area/security/processing)
@@ -152666,8 +153040,8 @@
 /area/crew_quarters/serviceyard)
 "wsc" = (
 /obj/structure/curtain/open{
-	anchored = 1;
-	color = "#222222"
+	color = "#222222";
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -152790,9 +153164,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -152828,8 +153199,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno3";
-	name = "Creature Cell #3"
+	name = "Creature Cell #3";
+	id_tag = "xeno3"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -152850,9 +153221,9 @@
 /area/space)
 "wts" = (
 /obj/machinery/door/window/westleft{
-	dir = 4;
 	name = "Robotics Desk";
-	req_access = list(29)
+	req_access = list(29);
+	dir = 4
 	},
 /obj/machinery/door/window/eastleft{
 	dir = 8
@@ -152871,9 +153242,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter"
+	name = "Robotics Privacy Shutter";
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -152903,8 +153274,8 @@
 "wtA" = (
 /obj/machinery/camera{
 	c_tag = "Research West Central Hallway";
-	dir = 6;
-	network = list("Research","SS13")
+	network = list("Research","SS13");
+	dir = 6
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -153008,8 +153379,8 @@
 "wuB" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno6";
-	name = "Creature Cell #6"
+	name = "Creature Cell #6";
+	id_tag = "xeno6"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -153392,8 +153763,8 @@
 	id = "MedbayFoyerPort";
 	name = "Medbay Doors Control";
 	normaldoorcontrol = 1;
-	pixel_x = 26;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
@@ -153871,8 +154242,8 @@
 "wBi" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	anchored = 1;
-	name = "backstage"
+	name = "backstage";
+	anchored = 1
 	},
 /obj/structure/table/reinforced,
 /obj/item/phone{
@@ -154365,8 +154736,8 @@
 "wFx" = (
 /obj/machinery/portable_atmospherics/canister,
 /obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -22
+	pixel_y = -22;
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
@@ -154707,9 +155078,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/maintenance/tourist)
+/area/civilian/barber)
 "wJt" = (
 /obj/machinery/recharger{
 	pixel_x = 1;
@@ -154878,8 +155248,8 @@
 	in_use = 1
 	},
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 1
 	},
 /area/hallway/primary/fore)
 "wKE" = (
@@ -155131,17 +155501,13 @@
 /turf/simulated/floor/carpet,
 /area/maintenance/casino)
 "wLT" = (
-/obj/machinery/door/airlock/medical{
-	name = "Brig Physician's Quarters";
-	req_access = list(5);
-	security_level = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -155284,8 +155650,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	id_tag = "xeno1";
-	name = "Creature Cell #1"
+	name = "Creature Cell #1";
+	id_tag = "xeno1"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -155371,11 +155737,11 @@
 /area/storage/primary)
 "wOa" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 4
 	},
 /obj/machinery/camera{
 	c_tag = "Prison Solitary Confinement 1";
@@ -155401,9 +155767,9 @@
 	id = "conferenceroombolts";
 	name = "Conference Room Bolts Control";
 	normaldoorcontrol = 1;
-	pixel_x = 4;
 	req_access = list(19);
-	specialfunctions = 4
+	specialfunctions = 4;
+	pixel_x = 4
 	},
 /obj/machinery/button/windowtint{
 	id = "conferenceroomwindows";
@@ -155631,7 +155997,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/twohanded/required/kirbyplants,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = -2;
+	pixel_y = -1
+	},
+/obj/item/storage/belt/utility,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "purple"
@@ -155802,8 +156173,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch{
 	name = "south light switch";
-	pixel_x = -25;
-	pixel_y = -24
+	pixel_y = -24;
+	pixel_x = -25
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -155985,8 +156356,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = -3;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -3
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 4
@@ -156073,10 +156444,10 @@
 	},
 /obj/machinery/door/window/brigdoor{
 	base_state = "rightsecure";
-	dir = 8;
 	icon_state = "rightsecure";
 	name = "Head of Personnel's Desk";
-	req_access = list(57)
+	req_access = list(57);
+	dir = 8
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -156166,8 +156537,8 @@
 /obj/structure/table/glass,
 /obj/item/book/manual/sop_medical,
 /obj/item/book/manual/sop_command{
-	pixel_x = 4;
-	pixel_y = 4
+	pixel_y = 4;
+	pixel_x = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -156227,11 +156598,13 @@
 	},
 /area/medical/ward)
 "wUn" = (
-/obj/item/radio/intercom{
-	pixel_y = -32
+/obj/effect/turf_decal/number/number_2{
+	dir = 1;
+	pixel_y = -4
 	},
+/obj/effect/turf_decal/arrows/white,
 /turf/simulated/floor/plasteel{
-	icon_state = "neutralcorner"
+	icon_state = "neutralfull"
 	},
 /area/hallway/primary/starboard)
 "wUw" = (
@@ -156378,8 +156751,8 @@
 /obj/machinery/computer/security,
 /obj/machinery/camera{
 	c_tag = "Departure Lounge Security Checkpoint West";
-	dir = 4;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 4
 	},
 /obj/item/radio/intercom{
 	pixel_x = -26
@@ -156505,6 +156878,15 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/reception)
+"wWY" = (
+/obj/effect/turf_decal/siding/red{
+	dir = 8
+	},
+/obj/structure/chair/comfy/red{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/red,
+/area/security/medbay)
 "wWZ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	desc = "Подаёт азот из атмосферки в систему охлаждения реактора, таким образом запитывая её хладагентом";
@@ -156716,8 +157098,8 @@
 	pixel_y = 8
 	},
 /obj/structure/sign/directions/science{
-	dir = 1;
-	pixel_y = -8
+	pixel_y = -8;
+	dir = 1
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 4;
@@ -157303,10 +157685,10 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/glass{
-	id = "tintmagistrateoffice";
 	id_tag = "magistrateoffice";
 	name = "Magistrate's Office";
 	req_access = list(74);
+	id = "tintmagistrateoffice";
 	security_level = 1
 	},
 /obj/structure/cable{
@@ -157526,12 +157908,12 @@
 	name = "Robotics Operating Computer"
 	},
 /obj/machinery/newscaster{
-	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = 32
 	},
 /turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "blue"
+	icon_state = "blue";
+	dir = 6
 	},
 /area/assembly/robotics)
 "xfh" = (
@@ -157719,7 +158101,8 @@
 	security_level = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "redcorner"
+	dir = 0;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "xgS" = (
@@ -157987,10 +158370,10 @@
 	},
 /area/hallway/primary/central/sw)
 "xiz" = (
-/obj/machinery/computer/aiupload/cyborg,
 /obj/item/radio/intercom/private{
 	pixel_y = -28
 	},
+/obj/machinery/computer/aiupload/cyborg,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -158398,8 +158781,8 @@
 /area/toxins/rdoffice)
 "xlz" = (
 /obj/machinery/conveyor{
-	dir = 4;
-	id = "garbage"
+	id = "garbage";
+	dir = 4
 	},
 /obj/machinery/light/small,
 /obj/effect/decal/warning_stripes/north,
@@ -158525,8 +158908,8 @@
 /area/maintenance/medroom)
 "xmq" = (
 /obj/machinery/door/window{
-	dir = 2;
-	req_access = list(20)
+	req_access = list(20);
+	dir = 2
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -158571,8 +158954,8 @@
 /obj/effect/decal/warning_stripes/northeastcorner,
 /obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
 /obj/machinery/newscaster{
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_y = 0;
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel,
 /area/medical/virology/lab)
@@ -158613,14 +158996,6 @@
 /turf/simulated/floor/wood,
 /area/maintenance/livingcomplex)
 "xnd" = (
-/obj/structure/table,
-/obj/machinery/door/window{
-	base_state = "right";
-	icon_state = "right";
-	name = "Core Modules";
-	req_access = list(20)
-	},
-/obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -158632,7 +159007,20 @@
 /obj/item/ai_module/corp,
 /obj/item/ai_module/paladin,
 /obj/item/ai_module/robocop,
-/turf/simulated/floor/bluegrid,
+/obj/structure/table/glass,
+/obj/machinery/door/window{
+	base_state = "right";
+	dir = 4;
+	icon_state = "right";
+	name = "Core Modules";
+	req_access = list(20)
+	},
+/obj/structure/window/reinforced{
+	dir = 2
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
 /area/turret_protected/ai_upload)
 "xnf" = (
 /obj/machinery/ai_status_display,
@@ -158680,6 +159068,9 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
 /obj/effect/decal/warning_stripes/yellow,
+/obj/structure/sign/poster/official/obey{
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "red"
@@ -158708,8 +159099,8 @@
 "xoh" = (
 /obj/machinery/atmospherics/unary/cold_sink/freezer{
 	current_temperature = 80;
-	dir = 4;
-	on = 1
+	on = 1;
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -158921,24 +159312,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/xenozoo)
-"xqb" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/medical/glass{
-	id = "cloninglab";
-	name = "Genetics Lab";
-	req_access = list(9)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "dark"
-	},
-/area/medical/genetics)
 "xqq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -158960,8 +159333,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Permabrig Hallway East";
-	dir = 8;
-	network = list("Prison","SS13","Security")
+	network = list("Prison","SS13","Security");
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -159225,10 +159598,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
-	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/storage/box/teargas,
 /obj/item/storage/box/teargas{
@@ -159236,12 +159609,12 @@
 	pixel_y = -3
 	},
 /obj/item/grenade/chem_grenade/teargas{
-	pixel_x = 6;
-	pixel_y = -6
+	pixel_y = -6;
+	pixel_x = 6
 	},
 /obj/item/grenade/chem_grenade/teargas{
-	pixel_x = 3;
-	pixel_y = -3
+	pixel_y = -3;
+	pixel_x = 3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -159340,8 +159713,8 @@
 "xsH" = (
 /obj/machinery/door/airlock/vault{
 	locked = 1;
-	name = "AI Upload";
-	req_access = list(30)
+	req_access = list(30);
+	name = "AI Upload"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -159736,8 +160109,8 @@
 /obj/structure/lattice,
 /obj/machinery/camera{
 	c_tag = "AI Satellite Exterior 12";
-	dir = 8;
-	network = list("SS13","MiniSat")
+	network = list("SS13","MiniSat");
+	dir = 8
 	},
 /turf/space/openspace,
 /area/maintenance/ai)
@@ -159756,8 +160129,8 @@
 "xwc" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	dir = 8;
-	id_tag = "SKPP"
+	id_tag = "SKPP";
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -159813,8 +160186,8 @@
 	pixel_y = 3
 	},
 /obj/structure/closet/crate/secure/weapon{
-	name = "Brig storage crate";
-	req_access = list(63)
+	req_access = list(63);
+	name = "Brig storage crate"
 	},
 /obj/machinery/light,
 /obj/item/storage/box/flashbangs,
@@ -159912,8 +160285,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_x = -5;
-	pixel_y = -10
+	pixel_y = -10;
+	pixel_x = -5
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -160101,8 +160474,8 @@
 /obj/machinery/door_control{
 	id = "xeno2";
 	name = "Containment Control";
-	pixel_x = -32;
-	req_access = list(55)
+	req_access = list(55);
+	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -160450,14 +160823,21 @@
 /turf/simulated/floor/plating,
 /area/maintenance/brig)
 "xBd" = (
-/obj/structure/closet/secure_closet/security,
-/obj/item/clothing/mask/balaclava,
-/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/sign/security{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/number/number_2{
+	dir = 1;
+	pixel_y = -18
+	},
+/obj/effect/turf_decal/arrows/white{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
+	dir = 8;
 	icon_state = "red"
 	},
-/area/security/reception)
+/area/hallway/primary/central/west)
 "xBh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -160531,8 +160911,8 @@
 	},
 /obj/item/reagent_containers/iv_bag,
 /obj/item/reagent_containers/iv_bag{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 2;
+	pixel_x = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
@@ -160572,12 +160952,10 @@
 /area/toxins/mixing)
 "xBF" = (
 /obj/structure/window/reinforced,
-/obj/structure/sign/goldenplaque{
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Aeterna0. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо от Главного Инженера станции Нова";
-	pixel_y = 32
+/obj/structure/statue/gold/unathi{
+	desc = "Перед собою вы наблюдаете статую унати, которая держит в руках чертежи станции очень похожие на станцию Нова. Надпись на табличке - Один из двух главных инженеров союза Таяр и Унати, по прозвищу PiroMage, принимавших участие в разработке передовой научно-исследовательской станции НаноТрейзен - Nova.";
+	name = "К.А.З"
 	},
-/obj/structure/statue/gold/ce,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -160754,8 +161132,8 @@
 	},
 /obj/item/storage/fancy/cigarettes/cigpack_random,
 /obj/item/lighter/random{
-	pixel_x = 4;
-	pixel_y = 3
+	pixel_y = 3;
+	pixel_x = 4
 	},
 /turf/simulated/floor/carpet/purple,
 /area/janitor)
@@ -161013,21 +161391,6 @@
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
-"xFq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cloning)
 "xFr" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -161092,26 +161455,6 @@
 /obj/effect/decal/ants,
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"xFT" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/disposalpipe/junction/reversed{
-	dir = 2
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/cryo)
 "xGl" = (
 /obj/machinery/alarm{
 	pixel_y = 24
@@ -161241,8 +161584,8 @@
 	},
 /obj/machinery/atmospherics/meter,
 /obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -23
+	pixel_y = -23;
+	dir = 1
 	},
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
@@ -161458,11 +161801,11 @@
 	},
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	id_tag = "arrival_south_airlock";
-	pixel_y = 27;
 	tag_airpump = "arrival_south_pump";
 	tag_chamber_sensor = "arrival_south_sensor";
 	tag_exterior_door = "arrival_south_outer";
-	tag_interior_door = "arrival_south_inner"
+	tag_interior_door = "arrival_south_inner";
+	pixel_y = 27
 	},
 /obj/structure/sign/vacuum{
 	icon_state = "space1";
@@ -161560,8 +161903,8 @@
 	frequency = 1379;
 	layer = 3.3;
 	master_tag = "port4";
-	name = "exterior access button";
-	pixel_x = 24;
+	name = "interior access button";
+	pixel_x = 28;
 	pixel_y = 28
 	},
 /turf/simulated/floor/plasteel,
@@ -162936,17 +163279,13 @@
 /turf/simulated/floor/plating,
 /area/medical/cmo)
 "xTo" = (
-/obj/effect/turf_decal/siding/red{
-	dir = 8
-	},
-/obj/structure/chair/comfy/red{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/firedoor,
+/obj/effect/decal/warning_stripes/yellow,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "red"
 	},
-/turf/simulated/floor/carpet/red,
-/area/security/medbay)
+/area/hallway/primary/central/west)
 "xTp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -162963,8 +163302,8 @@
 	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "whiteblue"
+	icon_state = "whiteblue";
+	dir = 8
 	},
 /area/medical/medrest)
 "xTw" = (
@@ -163040,9 +163379,9 @@
 	},
 /obj/structure/rack/gunrack,
 /obj/machinery/door/window{
-	color = "red";
 	name = "Secure Armory";
-	req_access = list(1)
+	req_access = list(1);
+	color = "red"
 	},
 /obj/item/gun/projectile/shotgun/riot{
 	pixel_x = -9
@@ -163095,8 +163434,16 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/item/radio/intercom{
+	pixel_y = 24
+	},
+/obj/item/storage/ashtray,
+/obj/item/clothing/mask/cigarette/cigar,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "dark"
+	},
+/area/civilian/barber)
 "xUa" = (
 /obj/effect/turf_decal/siding{
 	color = "#444444";
@@ -163112,8 +163459,8 @@
 "xUh" = (
 /obj/machinery/camera{
 	c_tag = "Brig Staff Room";
-	dir = 8;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 8
 	},
 /obj/machinery/firealarm{
 	dir = 8;
@@ -163132,8 +163479,12 @@
 	},
 /area/engineering/engine)
 "xUn" = (
-/obj/machinery/light{
-	dir = 4
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/bananalamp{
+	pixel_y = 6
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -163452,11 +163803,10 @@
 /area/turret_protected/aisat)
 "xWy" = (
 /obj/structure/table,
-/obj/item/storage/fancy/donut_box,
 /obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "redcorner"
+	dir = 5;
+	icon_state = "red"
 	},
 /area/security/prison/cell_block/A)
 "xWA" = (
@@ -163514,8 +163864,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Detective's Lab";
-	dir = 1;
-	network = list("SS13","Security")
+	network = list("SS13","Security");
+	dir = 1
 	},
 /obj/item/reagent_containers/spray/cleaner/brig,
 /obj/structure/sign/poster/official/random{
@@ -163993,10 +164343,10 @@
 /area/quartermaster/lobby)
 "yau" = (
 /obj/machinery/door/window/brigdoor{
-	color = "red";
 	dir = 2;
 	name = "Execution Access";
-	req_access = list(2)
+	req_access = list(2);
+	color = "red"
 	},
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -164047,11 +164397,11 @@
 /area/bridge/checkpoint/south)
 "yaG" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
@@ -164071,6 +164421,21 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/xenobiology)
+"yaM" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	icon_state = "open";
+	id_tag = "rdprivacy";
+	name = "Research Director Office Shutters";
+	opacity = 0;
+	dir = 2
+	},
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/toxins/rdoffice)
 "yaO" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -164185,11 +164550,11 @@
 /area/blueshield)
 "ybv" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1
+	scrub_Toxins = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -164769,9 +165134,9 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plasteel{
-	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs"
+	tag = "icon-stage_stairs";
+	dir = 4
 	},
 /area/security/warden)
 "yeZ" = (
@@ -165615,8 +165980,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1
 	},
@@ -186595,7 +186962,7 @@ wkB
 jOC
 lDx
 lDx
-lDx
+qel
 cTb
 tho
 tgX
@@ -186851,8 +187218,8 @@ jmb
 sbP
 jOC
 oSy
-sbk
-dyL
+ipA
+qel
 geO
 dGr
 iSL
@@ -187109,7 +187476,7 @@ blG
 jOC
 lDx
 lDx
-lDx
+qel
 aRT
 wwd
 wCj
@@ -187364,9 +187731,9 @@ qZX
 hKl
 hKl
 jOC
-oSy
-sbk
-dyL
+jOC
+jOC
+jOC
 qel
 qel
 ejf
@@ -187527,7 +187894,7 @@ tkq
 tkq
 tkq
 tkq
-tkq
+igl
 tWQ
 xEB
 iZn
@@ -187613,18 +187980,18 @@ eJI
 xpR
 eev
 eLc
-vfv
-utz
+hDd
+pBR
 jmb
 brS
-jmb
-pBR
-hDd
+qTF
+hKl
+tTq
+xBd
+onF
+dLR
 jOC
-lDx
-lDx
-lDx
-qel
+whL
 qel
 wMQ
 qog
@@ -187874,20 +188241,20 @@ hKl
 hKl
 xGJ
 nMq
-jmb
-hKl
+sbP
 hKl
+tTq
+dhv
+qYe
+tsS
 jOC
-qel
-qel
-qel
 xUn
-cOi
+qel
 tcq
 fYU
 qel
 qel
-cKt
+qel
 qel
 qel
 qel
@@ -188127,24 +188494,24 @@ gOS
 lWt
 yaO
 eLc
-hVx
-dhv
+ucN
+wtT
 raK
 brS
 nUw
-wtT
-ucN
-jOC
+hKl
+tTq
+pRD
 qYe
 itL
-pSU
-jOC
-gnD
-hoT
-dxl
-svv
-gnD
 jOC
+rIa
+qel
+tcq
+fYU
+qel
+qel
+cKt
 oPu
 wUB
 pSU
@@ -188391,17 +188758,17 @@ pMp
 hKl
 hKl
 hKl
+xTo
+pOZ
+jXF
+jOC
 jOC
 gnD
+hoT
+dxl
+svv
 gnD
-gnD
-qTF
-onF
-vQu
-ldS
-vMH
-onF
-qTF
+jOC
 gnD
 gnD
 gnD
@@ -188649,8 +189016,8 @@ gNr
 iFh
 fhv
 kVT
-svF
-dAF
+qYe
+utz
 dAF
 cLB
 dAF
@@ -189163,7 +189530,7 @@ qUs
 twQ
 xQk
 dJD
-dJD
+hVx
 dJD
 dJD
 mZm
@@ -189884,12 +190251,12 @@ jvn
 tdr
 clY
 qcI
-txj
-xqb
-mRP
-mRP
-xFq
-cZo
+lxy
+nrr
+kOr
+kOr
+lzn
+bil
 nEG
 hya
 fXb
@@ -190146,13 +190513,13 @@ qRz
 eri
 fcC
 hPA
-uNu
-fCz
-cgR
-cgR
-aAP
-cgR
-xFT
+iza
+vOz
+epN
+epN
+mND
+epN
+nBP
 qgs
 rOG
 ieh
@@ -190702,7 +191069,7 @@ tkq
 bje
 mKV
 bvT
-gbK
+hdq
 bje
 tkq
 tkq
@@ -193801,7 +194168,7 @@ jCS
 jCS
 jCS
 wdB
-tel
+hFZ
 rKy
 pDd
 nMQ
@@ -194863,11 +195230,11 @@ fir
 xpx
 imR
 uhA
-bYW
-bYW
-bYW
+lEx
+lEx
+lEx
 edt
-bYW
+lEx
 kOo
 pnI
 bYW
@@ -195121,14 +195488,14 @@ xZW
 pOw
 uhA
 lnQ
-eXZ
+jwc
 mBF
 rJL
-bYW
-bYW
-bYW
-bYW
-bYW
+lEx
+lEx
+lEx
+lEx
+lEx
 ttn
 uYJ
 bYW
@@ -195377,15 +195744,15 @@ hDL
 uhF
 dbe
 uhA
-eXZ
+ipR
 toF
 bLw
 gcQ
-bYW
+lEx
 wqi
 uiu
 ulL
-bYW
+lEx
 nwo
 uYJ
 vxZ
@@ -195642,7 +196009,7 @@ moe
 oRO
 oqt
 laP
-bYW
+lEx
 eXZ
 uYJ
 jNq
@@ -195899,7 +196266,7 @@ gIv
 wJq
 hPR
 myg
-bYW
+lEx
 ttn
 hZS
 ttn
@@ -196148,15 +196515,15 @@ lGn
 jPL
 xax
 uhA
-fZR
-fZR
+bTD
+ePX
 fZR
 twd
 pzh
 rlc
 mkf
 eab
-bYW
+lEx
 oaF
 uYJ
 bYW
@@ -196405,15 +196772,15 @@ wub
 geE
 uhA
 uhA
-bYW
-bYW
-bYW
+cCn
+cCn
+cCn
 bQd
-bYW
-bYW
-bYW
-bYW
-bYW
+lEx
+cCn
+cCn
+cCn
+lEx
 bYW
 iZM
 vVp
@@ -196564,7 +196931,7 @@ qVL
 gxA
 btx
 aIv
-qdt
+iGz
 nZf
 qmd
 qmd
@@ -196661,7 +197028,7 @@ axK
 axK
 oKf
 rBJ
-axK
+keM
 axK
 axK
 axK
@@ -196670,7 +197037,7 @@ vnw
 axK
 axK
 axK
-axK
+keM
 axK
 ecQ
 pZL
@@ -198392,7 +198759,7 @@ wqw
 uVH
 hQo
 jlb
-wrr
+rzi
 iuU
 tYL
 cod
@@ -203038,7 +203405,7 @@ tkq
 bje
 vFC
 bvT
-fgL
+vFN
 bje
 tkq
 tkq
@@ -205321,7 +205688,7 @@ nEs
 bOj
 okN
 jlw
-sbt
+yaM
 yed
 lyx
 xhz
@@ -205608,11 +205975,11 @@ gYL
 vBS
 wOy
 aAg
-vSm
+olq
 bib
-hGX
-uAS
-xQi
+wUn
+bIO
+cbh
 bJk
 xQi
 ipK
@@ -205835,7 +206202,7 @@ fhW
 rnb
 hwe
 tdz
-xOI
+cRz
 yed
 tHV
 hkh
@@ -205867,10 +206234,10 @@ jDY
 aAg
 vSm
 bib
-hGX
-jsN
-fYb
-fYb
+wUn
+bIO
+cbh
+aWH
 fYb
 fYb
 fYb
@@ -206125,9 +206492,9 @@ aAg
 qgK
 bib
 wUn
+bIO
 cbh
-ulh
-ulh
+xQi
 tll
 xQi
 xQi
@@ -206384,7 +206751,7 @@ bib
 hTM
 cbh
 cbh
-olq
+xQi
 xQi
 onM
 kBO
@@ -207415,7 +207782,7 @@ cbh
 sbO
 eaG
 xQi
-ulh
+vdg
 uZS
 xAQ
 jVA
@@ -213069,7 +213436,7 @@ uJm
 qtz
 vAi
 isI
-iKa
+lWD
 fLn
 nvy
 wbD
@@ -213326,7 +213693,7 @@ syE
 gOK
 vbA
 otZ
-iKa
+lWD
 tCN
 ibg
 ujl
@@ -214346,9 +214713,9 @@ pyG
 rfy
 kXM
 drY
-lsl
+fxY
 smY
-nVF
+lsl
 iuZ
 cMD
 kfW
@@ -250064,12 +250431,12 @@ wZD
 pQL
 pQL
 mNo
-arB
-arB
-arB
-arB
+vMH
+pQL
+pQL
+pQL
 enR
-laB
+nNM
 gDv
 qaJ
 mlJ
@@ -250321,7 +250688,7 @@ xJJ
 cZI
 xJJ
 vwC
-xJJ
+enP
 xAc
 xJJ
 xJJ
@@ -250329,7 +250696,7 @@ xJJ
 eVq
 hVc
 pTl
-pTl
+meh
 uHl
 pTl
 uMr
@@ -250586,7 +250953,7 @@ yal
 dlD
 uZW
 pTl
-pTl
+meh
 aor
 txH
 txH
@@ -250843,7 +251210,7 @@ fbQ
 dlD
 opi
 pTl
-pTl
+uuC
 tah
 pTl
 pTl
@@ -252135,7 +252502,7 @@ bLy
 ned
 ned
 kXl
-nNM
+uvt
 dTg
 dLI
 uJf
@@ -252387,12 +252754,12 @@ iif
 sOq
 uKm
 iGe
+lLl
 xkW
 iCq
 reV
-iCq
+kxQ
 hTF
-tTq
 dTg
 kAM
 dyG
@@ -252637,19 +253004,19 @@ vZU
 hqo
 lRi
 kYp
-uWF
+fpy
 tNj
 dlD
 pvc
 qVi
 flR
 dRn
+uvt
 peM
 eSY
 aow
-pfM
+jRZ
 aow
-anR
 dTg
 rUr
 vdY
@@ -252893,20 +253260,20 @@ bpy
 vZU
 lLD
 dlD
-pkl
-kBk
-onQ
+dlD
+dlD
 dlD
 dlD
 vvd
-pOZ
+vvd
+vvd
 kAc
+tqp
 iRC
 vvd
-ipA
-cGc
-fpy
-aag
+vvd
+vvd
+vvd
 aag
 aag
 aag
@@ -253143,28 +253510,28 @@ eeg
 pve
 dlD
 aeF
-kco
-kco
-kco
+dsN
+dsN
+dsN
 jIi
 vZU
 kco
-jIi
-jIi
-jIi
-jIi
-jIi
+dsN
+ovj
+dlD
+hpC
+qpZ
 nBo
-rvo
-tsS
-dRn
-ara
+dQT
 vvd
+anR
+uvt
+ara
+dlT
 wSZ
-xTo
+wWY
 tHG
 aag
-xBd
 cAA
 kzk
 lhJ
@@ -253403,25 +253770,25 @@ dsf
 xzQ
 xzQ
 xzQ
-xzQ
+guO
 oQK
+ldS
+xzQ
 tsd
-tsd
-tsd
-tsd
+dlD
 bvn
-tsd
-tsd
+fnc
+gYr
 dQT
-enP
+vvd
 pyX
 nNK
 wLT
 jKN
 fky
+qwg
 xAm
 aag
-kxQ
 cbk
 aGO
 ylQ
@@ -253657,34 +254024,34 @@ xkH
 wIv
 dlD
 xWy
-vTl
+rvo
 kgG
 omk
 vTl
 idP
-hqo
+cOi
 eqG
 jkm
-qwg
+dlD
 wqf
-hqo
+fnc
 jlI
-dlT
+dQT
+vvd
 aBV
 ich
 sGQ
-vvd
+sJJ
 fwA
-uuC
+tsI
 wac
 aag
-rIa
 sbZ
 kfv
 tIf
 oer
 wuy
-tIf
+dIS
 ctV
 uRS
 reI
@@ -253920,12 +254287,13 @@ dlD
 cjK
 loc
 xgP
-aYk
-dlD
-dlD
-dlD
 dlD
+aYk
 dlD
+pfM
+prN
+vfv
+vvd
 vvd
 vvd
 vvd
@@ -253934,7 +254302,6 @@ vvd
 vvd
 vvd
 vvd
-aag
 dov
 xQG
 taj
@@ -254176,19 +254543,19 @@ nEP
 vBO
 kdp
 dgg
-mvk
+cGc
 vBG
 mvk
-mvk
-mvk
-sJJ
-mvk
+vQu
+boI
+fnc
+fnc
 mvk
 oHk
-mvk
 mSB
-vBG
 mvk
+vBG
+nVF
 mvk
 mvk
 wbN
@@ -254391,7 +254758,7 @@ ozQ
 kux
 ozQ
 ozQ
-rcy
+fkL
 ozQ
 ozQ
 ozQ
@@ -254990,7 +255357,7 @@ ieI
 gtF
 otn
 kZy
-lLc
+wUw
 chE
 ddQ
 bbZ
@@ -255420,8 +255787,8 @@ lVZ
 wdp
 ozQ
 pLK
-rAR
-jfC
+jOe
+loQ
 lnp
 qIY
 tHo
@@ -255488,7 +255855,7 @@ arE
 lFo
 gEz
 umf
-ajH
+tOg
 fBg
 kIz
 weh
@@ -255504,7 +255871,7 @@ orm
 kfz
 xKb
 thB
-nwA
+wre
 xic
 ddQ
 oqM
@@ -256530,7 +256897,7 @@ btM
 syu
 gVD
 bbZ
-jQq
+wre
 mVH
 bRV
 wre
@@ -257047,7 +257414,7 @@ awC
 xRZ
 pWi
 wUw
-jQq
+wre
 ihn
 xXG
 aiQ
@@ -257305,7 +257672,7 @@ xRZ
 wre
 wCs
 rhi
-tbV
+wUw
 uhC
 cPv
 tUk
@@ -257819,7 +258186,7 @@ hoH
 mTa
 mqL
 jYH
-jQq
+wre
 awC
 ibR
 jAH
@@ -264419,7 +264786,7 @@ aFR
 ges
 npi
 rsU
-vdg
+rsU
 qCF
 iOP
 ihk
@@ -265195,7 +265562,7 @@ qCF
 mXr
 ihk
 kjR
-jLR
+mpH
 tbl
 biB
 icw
@@ -271147,11 +271514,11 @@ cUD
 rwI
 rwI
 rwI
-aWH
-eEq
+rwI
+qxP
 pfs
 eEq
-eEq
+cDR
 rQj
 fFn
 gHy
@@ -271404,8 +271771,8 @@ rNE
 rwI
 rwI
 rwI
-bIO
-cSB
+rwI
+nio
 aQz
 cqJ
 cSB
@@ -271661,7 +272028,7 @@ cUD
 rwI
 rwI
 rwI
-cDR
+rwI
 nio
 emS
 sCT
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 5361a73e4bd..035365cd653 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -184,6 +184,14 @@
 	name = "statue of the research director"
 	icon_state = "rd"
 
+/obj/structure/statue/gold/unathi
+	name = "statue of the unati"
+	icon_state = "unathi"
+
+/obj/structure/statue/gold/tajaran
+	name = "statue of the tajaran"
+	icon_state = "tajaran"
+
 /obj/structure/statue/silver
 	max_integrity = 300
 	material_drop_type = /obj/item/stack/sheet/mineral/silver
diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi
index c55db97561f..d59456ef187 100644
Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ