From cdc7f5578e73a91b6fee9de3121e195eb846720d Mon Sep 17 00:00:00 2001
From: FlitchTime <karamaclo@gmail.com>
Date: Wed, 25 Dec 2024 22:08:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=20=D1=81=D0=B5=D0=BA=D1=81=20?=
 =?UTF-8?q?=D1=88=D0=BE=D0=BF=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD=D0=BE?=
 =?UTF-8?q?,=20=D0=BD=D0=BE=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _maps/map_files/Delta/delta.dmm             |  252 +-
 _maps/map_files/celestation/celestation.dmm |  165 +-
 _maps/map_files/cerestation/cerestation.dmm |  165 +-
 _maps/map_files/cyberiad/cyberiad.dmm       |  210 +-
 _maps/map_files/nova/nova.dmm               | 2948 +++++++++----------
 5 files changed, 1594 insertions(+), 2146 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index c7eb23c4b24..66c8bbc4617 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -17268,21 +17268,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/bar)
-"bZY" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -22
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "cac" = (
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -19838,22 +19823,17 @@
 	},
 /area/chapel/office)
 "cmL" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/area/civilian/barber)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "cmP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
@@ -21503,8 +21483,9 @@
 	},
 /area/crew_quarters/cabin1)
 "cwa" = (
-/turf/simulated/wall,
-/area/civilian/barber)
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/turf/simulated/floor/wood/fancy/oak,
+/area/maintenance/trading)
 "cwd" = (
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -22601,10 +22582,6 @@
 "cAr" = (
 /turf/simulated/wall/rust,
 /area/maintenance/asmaint2)
-"cAt" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/simulated/floor/plating,
-/area/maintenance/trading)
 "cAv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -22621,19 +22598,24 @@
 	},
 /area/hallway/secondary/entry)
 "cAy" = (
-/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
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/area/civilian/barber)
+/obj/item/razor,
+/obj/structure/rack,
+/obj/item/razor{
+	pixel_x = -4;
+	pixel_y = 2
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "cAz" = (
 /turf/simulated/wall,
 /area/maintenance/trading)
@@ -24368,10 +24350,6 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/reception)
-"cHP" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall,
-/area/civilian/barber)
 "cHT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -33276,8 +33254,8 @@
 	},
 /obj/structure/filingcabinet/chestdrawer,
 /obj/item/radio/intercom{
-	pixel_y = -26;
-	pixel_x = 0
+	pixel_x = 0;
+	pixel_y = -26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -34857,18 +34835,10 @@
 	},
 /area/library)
 "dBN" = (
-/obj/structure/table/reinforced,
-/obj/structure/mirror{
-	pixel_x = 28
-	},
-/obj/item/razor,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "dBO" = (
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "vir2"
@@ -35554,10 +35524,6 @@
 	icon_state = "grimy"
 	},
 /area/bridge/meeting_room)
-"dFe" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/civilian/barber)
 "dFg" = (
 /turf/simulated/wall,
 /area/maintenance/library)
@@ -56724,15 +56690,6 @@
 	icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'
 	},
 /area/toxins/test_area)
-"hSo" = (
-/obj/machinery/newscaster{
-	pixel_x = -30
-	},
-/obj/structure/dresser,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "hSs" = (
 /obj/structure/chair/comfy/brown,
 /obj/effect/landmark/start/detective,
@@ -66713,15 +66670,13 @@
 /turf/simulated/wall,
 /area/quartermaster/storage)
 "krc" = (
-/obj/item/twohanded/required/kirbyplants,
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = 26
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/machinery/dye_generator,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "krh" = (
 /obj/effect/turf_decal/siding/brown{
 	dir = 4
@@ -69873,12 +69828,6 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/carpet/arcade,
 /area/crew_quarters/fitness)
-"lko" = (
-/obj/machinery/dye_generator,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "lkA" = (
 /obj/structure/chair/office/dark{
 	dir = 1
@@ -84128,15 +84077,15 @@
 	},
 /area/crew_quarters/theatre)
 "oBA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = 32
+/obj/structure/mirror{
+	pixel_x = 28
 	},
-/obj/item/paper/deltainfo,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/barber{
+	dir = 4
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "oBH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -87572,20 +87521,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/hor)
-"prr" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "prs" = (
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -87860,13 +87795,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/airlock/maintenance{
-	req_access = list(12)
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/structure/grille/broken,
+/turf/simulated/floor/plating,
+/area/maintenance/fpmaint)
 "pus" = (
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -88761,6 +88692,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge)
+"pDl" = (
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plating,
+/area/maintenance/trading)
 "pDt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
@@ -91934,21 +91869,6 @@
 "qni" = (
 /turf/simulated/wall/r_wall,
 /area/turret_protected/aisat_interior)
-"qnk" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	pixel_y = 26
-	},
-/obj/structure/chair/barber{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "qnB" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -93226,14 +93146,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/crew_quarters/locker)
-"qAX" = (
-/obj/item/twohanded/required/kirbyplants,
-/obj/structure/sign/barber{
-	pixel_x = 22;
-	pixel_y = 32
-	},
-/turf/simulated/floor/wood,
-/area/crew_quarters/serviceyard)
 "qAY" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -103828,20 +103740,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
-"tdC" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass{
-	name = "Barber Shop"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "tdH" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -105652,15 +105550,6 @@
 	icon_state = "neutralfull"
 	},
 /area/engineering/engine)
-"tzR" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/landmark/start/barber,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "tzV" = (
 /obj/machinery/door/airlock/medical{
 	glass = 1;
@@ -125151,21 +125040,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/bridge/checkpoint/south)
-"xWn" = (
-/obj/structure/table/reinforced,
-/obj/structure/mirror{
-	pixel_x = 28
-	},
-/obj/machinery/camera{
-	c_tag = "Barber Shop"
-	},
-/obj/item/radio/intercom{
-	pixel_y = 28
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "xWx" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/structure/morgue{
@@ -156391,7 +156265,7 @@ wAK
 cmh
 bTv
 cNg
-cAt
+bTv
 cAK
 xQW
 cjn
@@ -157418,12 +157292,12 @@ aTA
 aoe
 cnf
 btQ
+pDl
 cwa
-cwa
-cwa
-cHP
+cAz
+cbs
 puk
-cwa
+iTZ
 eYX
 bev
 iTZ
@@ -157675,12 +157549,12 @@ cAz
 cAz
 cAz
 dDf
-cwa
-lko
-hSo
-bZY
+cAz
+cAz
+cAz
+cbs
 cAy
-dFe
+iTZ
 dFW
 dFW
 iTZ
@@ -157932,12 +157806,12 @@ cno
 jHA
 cno
 lEk
-cwa
-qnk
-tzR
-prr
+gbI
+cbs
+aVS
+aVS
 cmL
-tdC
+scT
 eSU
 eSU
 bGy
@@ -158189,13 +158063,13 @@ aVS
 bWL
 cbs
 crN
-cwa
-xWn
+cku
+cbs
 oBA
 dBN
 krc
-dFe
-qAX
+iTZ
+oNr
 dFW
 dFW
 dFW
diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
index 93674e986d9..a6fa0374f00 100644
--- a/_maps/map_files/celestation/celestation.dmm
+++ b/_maps/map_files/celestation/celestation.dmm
@@ -182,7 +182,6 @@
 /obj/structure/chair/barber{
 	dir = 8
 	},
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	icon_state = "1-4"
 	},
@@ -191,10 +190,9 @@
 	dir = 5
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "acj" = (
 /obj/structure/holohoop{
 	dir = 8
@@ -7207,7 +7205,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "beN" = (
-/obj/machinery/light,
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -26
@@ -7218,10 +7215,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "beQ" = (
 /obj/structure/table/wood,
 /obj/item/eftpos,
@@ -9019,9 +9015,6 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/reception)
-"bpQ" = (
-/turf/simulated/wall,
-/area/civilian/barber)
 "bpV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -11632,14 +11625,11 @@
 	dir = 4;
 	pixel_x = 26
 	},
-/obj/structure/dresser,
-/obj/machinery/camera/autoname{
-	dir = 8
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "bFp" = (
 /obj/machinery/computer/security/engineering{
 	dir = 8
@@ -13219,9 +13209,9 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite Secondary Antechamber";
 	name = "AI Satellite Secondary Antechamber Turret Control";
-	req_access = list(75);
 	pixel_x = -30;
-	pixel_y = -24
+	pixel_y = -24;
+	req_access = list(75)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -15907,8 +15897,8 @@
 /obj/machinery/cryopod/robot,
 /obj/effect/landmark/join_late_cyborg,
 /obj/item/radio/intercom{
-	pixel_y = 22;
-	pixel_x = 0
+	pixel_x = 0;
+	pixel_y = 22
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -18902,9 +18892,9 @@
 /obj/machinery/turretid/lethal{
 	check_synth = 1;
 	name = "AI Chamber Turret Control";
-	req_access = list(75);
 	pixel_x = 32;
-	pixel_y = 0
+	pixel_y = 0;
+	req_access = list(75)
 	},
 /turf/simulated/floor/glass/reinforced,
 /area/turret_protected/ai)
@@ -22395,14 +22385,11 @@
 /area/bridge)
 "cVr" = (
 /obj/structure/table/reinforced,
-/obj/item/eftpos,
 /obj/structure/mirror{
 	pixel_x = -26
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "cVs" = (
 /obj/structure/bed,
 /obj/item/bedsheet/clown,
@@ -27550,9 +27537,9 @@
 "dOS" = (
 /obj/machinery/turretid/stun{
 	name = "AI Satellite Turret Control";
-	req_access = list(75);
 	pixel_x = 0;
-	pixel_y = -26
+	pixel_y = -26;
+	req_access = list(75)
 	},
 /turf/simulated/floor/plating,
 /area/turret_protected/aisat)
@@ -38977,16 +38964,12 @@
 /turf/simulated/floor/glass/reinforced,
 /area/security/checkpoint/south)
 "gbk" = (
-/obj/structure/cable/orange{
-	icon_state = "2-8"
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "gbp" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 9
@@ -48353,10 +48336,11 @@
 /area/security/permabrig)
 "hPZ" = (
 /obj/machinery/dye_generator,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "hQg" = (
 /turf/simulated/floor/carpet/black,
 /area/chapel/office)
@@ -51577,14 +51561,6 @@
 	icon_state = "bcircuit"
 	},
 /area/turret_protected/ai_upload)
-"iwo" = (
-/obj/machinery/status_display{
-	pixel_y = 32
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "iws" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/disposalpipe/junction/reversed,
@@ -60521,9 +60497,9 @@
 "kiQ" = (
 /obj/machinery/turretid/stun{
 	name = "AI Satellite Turret Control";
-	req_access = list(75);
 	pixel_x = 0;
-	pixel_y = 28
+	pixel_y = 28;
+	req_access = list(75)
 	},
 /turf/simulated/floor/plating,
 /area/turret_protected/aisat)
@@ -83732,10 +83708,6 @@
 	icon_state = "darkyellow"
 	},
 /area/engineering/engine/smes)
-"oNQ" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/civilian/barber)
 "oOd" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -92227,10 +92199,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "qqZ" = (
 /obj/effect/spawner/lootdrop/maintenance/double,
 /turf/simulated/floor/mech_bay_recharge_floor,
@@ -98970,13 +98940,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/captain/bedroom)
-"rIl" = (
-/obj/item/razor,
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "rIo" = (
 /obj/structure/girder,
 /turf/simulated/floor/plating,
@@ -104054,10 +104017,8 @@
 "sIL" = (
 /obj/structure/table/reinforced,
 /obj/item/razor,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "sIT" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -105745,20 +105706,15 @@
 	},
 /area/chapel/office)
 "sZm" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Barber Shop"
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/cable/orange{
-	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 = "barber"
+/obj/machinery/door/airlock/maintenance{
+	locked = 1;
+	req_access = list(12)
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "sZp" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -118352,9 +118308,9 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite Antechamber";
 	name = "AI Satellite Antechamber Turret Control";
-	req_access = list(75);
 	pixel_x = -28;
-	pixel_y = 0
+	pixel_y = 0;
+	req_access = list(75)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -122807,17 +122763,17 @@
 /turf/simulated/floor/plating/airless,
 /area/solar/west)
 "wlC" = (
-/obj/structure/cable/orange,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/machinery/power/apc{
 	pixel_y = -28
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "wlI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -122908,10 +122864,11 @@
 /obj/item/radio/intercom{
 	pixel_y = -28
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "wmC" = (
 /obj/machinery/door/airlock/research{
 	name = "Research Division Access";
@@ -131687,9 +131644,9 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite Antechamber";
 	name = "AI Satellite Antechamber Turret Control";
-	req_access = list(75);
 	pixel_x = 0;
-	pixel_y = -26
+	pixel_y = -26;
+	req_access = list(75)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "navyblue"
@@ -213511,11 +213468,11 @@ nJS
 bWb
 ren
 qwS
-bpQ
-oNQ
-bpQ
-oNQ
-bpQ
+kwS
+kwS
+kwS
+kwS
+kwS
 oYJ
 oYJ
 sXn
@@ -213768,11 +213725,11 @@ jgv
 tnS
 rsa
 tnS
-bpQ
-rIl
+kwS
+wXU
 cVr
 sIL
-bpQ
+kwS
 isY
 pXT
 oqO
@@ -214029,7 +213986,7 @@ sZm
 qqW
 acd
 beN
-bpQ
+kwS
 mfh
 vxY
 eBu
@@ -214282,11 +214239,11 @@ uuf
 mJW
 oEM
 vfV
-bpQ
-iwo
+kwS
+uUy
 gbk
 wlC
-bpQ
+kwS
 bkY
 woK
 cix
@@ -214539,11 +214496,11 @@ fDL
 tnS
 urC
 nAn
-bpQ
+kwS
 hPZ
 bFm
 wmA
-bpQ
+kwS
 rSN
 mzx
 caO
@@ -214796,11 +214753,11 @@ kMG
 tnS
 oYt
 xRO
-bpQ
-bpQ
-bpQ
-bpQ
-bpQ
+kwS
+kwS
+kwS
+kwS
+kwS
 oYJ
 oYJ
 hGj
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index dd37d32655f..8353e79880f 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -3633,14 +3633,11 @@
 "aFA" = (
 /obj/structure/table/reinforced,
 /obj/item/razor,
-/obj/item/eftpos,
 /obj/structure/mirror{
 	pixel_x = -27
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "aFE" = (
 /obj/effect/turf_decal/stripes/red/full,
 /turf/simulated/floor/engine,
@@ -7100,10 +7097,11 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -28
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "beQ" = (
 /obj/structure/table/wood,
 /obj/item/eftpos,
@@ -7984,10 +7982,8 @@
 /obj/item/radio/intercom{
 	pixel_y = 28
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "bjq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8275,16 +8271,13 @@
 	},
 /area/quartermaster/storage)
 "bkY" = (
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "bla" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -23739,13 +23732,6 @@
 "dcw" = (
 /turf/simulated/wall/r_wall,
 /area/hallway/spacebridge/serveng)
-"dcy" = (
-/obj/item/razor,
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "dcz" = (
 /obj/machinery/door/airlock/maintenance/external{
 	name = "External Airlock Access";
@@ -35873,23 +35859,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/civilian/vacantoffice)
-"gyW" = (
-/obj/structure/sign/barber{
-	pixel_y = -30
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutral"
-	},
-/area/hallway/primary/port/east)
 "gza" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -42426,12 +42395,6 @@
 	icon_state = "redfull"
 	},
 /area/security/seceqstorage)
-"isY" = (
-/obj/structure/table/reinforced,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "itf" = (
 /turf/simulated/mineral/ancient,
 /area/maintenance/starboard)
@@ -50995,10 +50958,6 @@
 	icon_state = "neutral"
 	},
 /area/hallway/primary/port/south)
-"kOk" = (
-/obj/effect/spawner/window/reinforced,
-/turf/simulated/floor/plating,
-/area/civilian/barber)
 "kOr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -55806,11 +55765,6 @@
 	icon_state = "whitepurplecorner"
 	},
 /area/toxins/xenobiology)
-"mfh" = (
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "mfA" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -61964,17 +61918,14 @@
 	},
 /area/hallway/primary/port/south)
 "nQC" = (
-/obj/machinery/newscaster{
-	dir = 8;
-	pixel_x = 28
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "nQM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/extinguisher_cabinet{
@@ -65234,9 +65185,6 @@
 	icon_state = "white"
 	},
 /area/medical/medbreak)
-"oOg" = (
-/turf/simulated/wall,
-/area/civilian/barber)
 "oOu" = (
 /obj/structure/morgue{
 	dir = 8
@@ -76282,11 +76230,11 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/structure/dresser,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "rTo" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/machinery/light{
@@ -78977,14 +78925,8 @@
 /area/medical/virology/lab)
 "sIL" = (
 /obj/structure/table/reinforced,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -24
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "sJe" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -84660,19 +84602,14 @@
 /area/security/main)
 "uqB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/public/glass{
-	name = "Barber Shop"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/machinery/door/airlock/maintenance{
+	locked = 1;
+	req_access = list(12)
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "uqM" = (
 /obj/structure/sign/security{
 	pixel_x = -32
@@ -86132,10 +86069,8 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "uNx" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 24
@@ -88251,11 +88186,8 @@
 /obj/structure/chair/barber{
 	dir = 8
 	},
-/obj/effect/landmark/start/barber,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "vyy" = (
 /obj/machinery/newscaster{
 	dir = 4;
@@ -88358,17 +88290,15 @@
 	},
 /area/hallway/primary/central)
 "vzG" = (
-/obj/structure/cable/orange{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
 /obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "vzX" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -89123,10 +89053,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/port)
 "vLV" = (
 /obj/effect/spawner/airlock/e_to_w,
 /turf/simulated/wall,
@@ -91018,10 +90946,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "wlV" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -91068,7 +90997,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/port)
 "wmE" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -114915,12 +114844,12 @@ fGN
 xsr
 kzm
 nXl
-oOg
-oOg
-kOk
-oOg
-kOk
-oOg
+pXy
+pXy
+pXy
+pXy
+pXy
+pXy
 aZZ
 oGW
 aZZ
@@ -115172,12 +115101,12 @@ fGN
 tmw
 jBM
 txu
-kOk
-dcy
-isY
+pXy
+jee
+sIL
 aFA
 sIL
-oOg
+pXy
 dNF
 wlu
 liD
@@ -115428,13 +115357,13 @@ pYw
 rVw
 tmw
 jBM
-gyW
-oOg
+txu
+pXy
 uNw
-mfh
+jee
 vxY
 beN
-oOg
+pXy
 gCy
 bTu
 cpP
@@ -115691,7 +115620,7 @@ vLS
 bkY
 vzG
 wlC
-oOg
+pXy
 xUc
 ogY
 xLH
@@ -115943,12 +115872,12 @@ rVw
 tmw
 jBM
 kwE
-oOg
+pXy
 bjo
 rSN
 nQC
 wmA
-oOg
+pXy
 dHb
 iio
 kSA
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 9342f86ef13..fc9c8ae87c3 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -9264,10 +9264,11 @@
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "aDQ" = (
 /obj/structure/table,
 /obj/item/folder/blue{
@@ -10075,13 +10076,10 @@
 /area/maintenance/fsmaint)
 "aGG" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = -32
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "aGI" = (
 /obj/structure/weightmachine/stacklifter,
 /obj/effect/decal/cleanable/dirt,
@@ -10099,10 +10097,11 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "aGL" = (
 /obj/structure/chair/comfy/black,
 /obj/effect/landmark/start/civilian,
@@ -10507,18 +10506,16 @@
 /turf/simulated/wall,
 /area/clownoffice)
 "aId" = (
-/obj/structure/table/reinforced,
-/obj/item/razor,
 /obj/structure/mirror{
 	pixel_x = -28
 	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper_bin{
+	pixel_y = 5
 	},
-/area/civilian/barber)
+/obj/item/pen,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "aIe" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -10563,14 +10560,8 @@
 /area/security/main)
 "aIi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/landmark/start/barber,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "aIj" = (
 /obj/structure/chair{
 	dir = 8
@@ -10985,19 +10976,6 @@
 	icon_state = "darkblue"
 	},
 /area/security/detectives_office)
-"aJp" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
-	pixel_y = 5
-	},
-/obj/item/pen,
-/obj/machinery/computer/security/telescreen/entertainment{
-	pixel_x = -32
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "aJr" = (
 /obj/structure/closet/secure_closet/brig,
 /obj/machinery/light_switch{
@@ -11386,26 +11364,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "aKE" = (
-/obj/machinery/newscaster{
-	name = "east newscaster";
-	pixel_x = 32;
-	pixel_y = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/hologram/holopad,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "aKF" = (
 /obj/structure/table,
 /turf/simulated/floor/carpet/arcade,
@@ -12887,9 +12854,6 @@
 	},
 /area/crew_quarters/sleep)
 "aPP" = (
-/obj/structure/sign/barber{
-	pixel_y = 30
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -22877,7 +22841,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "buG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -22933,13 +22897,11 @@
 	layer = 4;
 	pixel_y = 32
 	},
-/obj/machinery/camera{
-	c_tag = "Barber Shop"
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "buM" = (
 /obj/machinery/vending/cart,
 /turf/simulated/floor/carpet/arcade,
@@ -23725,12 +23687,12 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "bxu" = (
-/obj/structure/dresser,
 /obj/machinery/firealarm{
 	dir = 4;
 	name = "east fire alarm";
@@ -23739,10 +23701,11 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
-/area/civilian/barber)
+/area/maintenance/fsmaint)
 "bxv" = (
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/captain)
@@ -24355,11 +24318,9 @@
 	},
 /area/hallway/secondary/exit)
 "bzm" = (
-/obj/item/twohanded/required/kirbyplants,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/machinery/arcade/minesweeper,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bzo" = (
 /obj/structure/chair/stool,
 /turf/simulated/floor/carpet/arcade,
@@ -24813,10 +24774,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bAK" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -26192,19 +26152,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
 "bFL" = (
-/obj/item/radio/intercom{
-	name = "east station intercom (General)";
-	pixel_x = 28
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bFM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/oil/streak,
@@ -27020,17 +26972,12 @@
 /area/medical/reception)
 "bIs" = (
 /obj/machinery/disposal,
-/obj/machinery/light_switch{
-	name = "west light switch";
-	pixel_x = -24
-	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bIt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -27062,10 +27009,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bIB" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -27104,10 +27050,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "bIM" = (
 /obj/structure/table/wood,
 /obj/item/folder/blue,
@@ -58874,10 +58819,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "fcS" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -60293,9 +60236,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/starboard/west)
-"gel" = (
-/turf/simulated/wall,
-/area/civilian/barber)
 "gff" = (
 /obj/structure/closet/crate/trashcart{
 	desc = "A heavy, metal laundrycart with wheels.";
@@ -64153,14 +64093,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/port)
-"iHY" = (
-/obj/structure/chair/barber{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "iIh" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
@@ -70255,19 +70187,17 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Barber Shop"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
+/obj/machinery/door/airlock/maintenance{
+	locked = 1;
+	req_access = list(12)
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/fsmaint)
 "mOp" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/transit_tube/horizontal,
@@ -79005,16 +78935,6 @@
 /obj/structure/sign/biohazard,
 /turf/simulated/wall/r_wall,
 /area/medical/research)
-"sDN" = (
-/obj/structure/table/reinforced,
-/obj/item/razor,
-/obj/structure/mirror{
-	pixel_x = -28
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "barber"
-	},
-/area/civilian/barber)
 "sDO" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -120186,14 +120106,14 @@ azW
 tjI
 aCw
 aIq
-gel
-gel
-gel
-gel
-gel
-gel
-gel
-gel
+awl
+awl
+awl
+awl
+aRF
+awl
+awl
+awl
 bUC
 aQn
 aSx
@@ -120443,14 +120363,14 @@ aCw
 aCw
 aCw
 aIq
-gel
+awl
 buF
 aGG
 aId
-aJp
-sDN
+axW
+axW
 bIs
-gel
+awl
 aPP
 bbo
 aZt
@@ -120700,14 +120620,14 @@ azY
 avq
 wCH
 aIq
-gel
+awl
 buL
 bxt
-iHY
+avq
 bAH
-iHY
+axW
 bIz
-gel
+awl
 bUD
 aQp
 aZv
@@ -120957,7 +120877,7 @@ azX
 aKK
 aKK
 bpg
-gel
+awl
 aGK
 fbY
 aIi
@@ -121214,7 +121134,7 @@ avq
 avq
 aBq
 avq
-gel
+awl
 aDP
 bxu
 bzm
diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
index 1ff16844f16..c652b69fe12 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";
-	dir = 1
+	name = "Janitor Shutters"
 	},
 /turf/simulated/floor/plating,
 /area/janitor)
@@ -332,8 +332,8 @@
 	req_access = list(50)
 	},
 /obj/machinery/conveyor{
-	id = "packageExternal";
-	dir = 8
+	dir = 8;
+	id = "packageExternal"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -571,8 +571,8 @@
 	},
 /obj/item/storage/box/lights/mixed,
 /obj/item/storage/box/lights/mixed{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -784,8 +784,8 @@
 	pixel_y = 24
 	},
 /obj/machinery/light_switch{
-	pixel_y = 34;
-	pixel_x = -24
+	pixel_x = -24;
+	pixel_y = 34
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -1544,8 +1544,8 @@
 /obj/structure/table/wood,
 /obj/item/folder/blue,
 /obj/item/folder/blue{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/clothing/mask/cigarette/cigar/havana{
 	pixel_x = -3;
@@ -1553,8 +1553,8 @@
 	},
 /obj/item/clothing/mask/cigarette/cigar/havana,
 /obj/item/flashlight/lamp/green{
-	pixel_y = 13;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = 13
 	},
 /obj/item/radio/intercom{
 	pixel_x = -28
@@ -2350,8 +2350,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -2835,8 +2835,8 @@
 /area/medical/virology/lab)
 "avV" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -3155,8 +3155,8 @@
 	dir = 4
 	},
 /obj/machinery/newscaster{
-	pixel_y = 32;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -3481,11 +3481,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /obj/machinery/light,
 /turf/simulated/floor/wood,
@@ -3985,8 +3985,8 @@
 	pixel_x = 32
 	},
 /obj/item/radio/intercom{
-	pixel_y = -26;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = -26
 	},
 /turf/simulated/floor/carpet/royalblue,
 /area/crew_quarters/captain/bedroom)
@@ -4090,11 +4090,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;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -4251,12 +4251,12 @@
 	},
 /obj/structure/table/wood/fancy/red,
 /obj/item/lighter/zippo/hos{
-	pixel_y = 1;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 1
 	},
 /obj/item/reagent_containers/food/drinks/mug/hos{
-	pixel_y = 1;
-	pixel_x = 9
+	pixel_x = 9;
+	pixel_y = 1
 	},
 /obj/item/paper/safe_code{
 	owner = "hos"
@@ -4489,8 +4489,8 @@
 	pixel_y = 9
 	},
 /obj/item/clothing/mask/cigarette/cigar/cohiba{
-	pixel_y = 4;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 4
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/bridge/meeting_room)
@@ -4723,8 +4723,8 @@
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/camera{
 	c_tag = "HoS Office South";
-	network = list("SS13","Security");
-	dir = 10
+	dir = 10;
+	network = list("SS13","Security")
 	},
 /obj/item/radio/intercom{
 	pixel_y = -28
@@ -4931,8 +4931,8 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "permacell2";
 	layer = 5;
-	range = 3;
-	pixel_x = -24
+	pixel_x = -24;
+	range = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -4960,9 +4960,9 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/crew_quarters/sleep)
 "aKR" = (
@@ -5337,9 +5337,9 @@
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
 /obj/structure/sign/beautyplaque{
-	pixel_y = 32;
+	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Saad603. Слава НаноТрейзен!";
 	name = "Благодарственное Письмо от Главного Инженера станции Нова";
-	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Saad603. Слава НаноТрейзен!"
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -5466,8 +5466,8 @@
 	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "aPf" = (
@@ -5651,14 +5651,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;
-	area_type = /area/quartermaster/miningdock
+	width = 7
 	},
 /turf/space/openspace{
 	icon_state = "black"
@@ -5876,8 +5876,8 @@
 /area/maintenance/fsmaint3)
 "aRp" = (
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -5966,11 +5966,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/wood,
 /area/library)
@@ -6225,8 +6225,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Research West Hallway 2";
-	network = list("Research","SS13");
-	dir = 9
+	dir = 9;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -7133,11 +7133,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7275,11 +7275,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel,
 /area/crew_quarters/toilet3)
@@ -7617,8 +7617,8 @@
 	dir = 6
 	},
 /obj/item/twohanded/required/kirbyplants{
-	pixel_y = 7;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 7
 	},
 /obj/effect/turf_decal/siding/wideplating/light{
 	dir = 6
@@ -7674,8 +7674,8 @@
 	},
 /obj/machinery/door/poddoor{
 	id_tag = "transitlock";
-	name = "Transit AI Sattelite Blast Doors";
-	layer = 3
+	layer = 3;
+	name = "Transit AI Sattelite Blast Doors"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -7801,8 +7801,8 @@
 	},
 /obj/item/paper/tcommskey,
 /obj/item/paper/monitorkey{
-	pixel_y = 2;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 2
 	},
 /obj/effect/turf_decal/siding/white{
 	dir = 1
@@ -8918,20 +8918,20 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/item/folder/white{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/folder/red{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /obj/item/folder/blue{
-	pixel_y = 6;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 6
 	},
 /obj/item/folder/yellow{
-	pixel_y = 8;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 8
 	},
 /obj/item/stamp/rep,
 /obj/structure/cable{
@@ -8958,8 +8958,8 @@
 	layer = 2.9
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 4
+	dir = 4;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "boZ" = (
@@ -9027,8 +9027,8 @@
 /area/hallway/secondary/entry/lounge)
 "bpt" = (
 /obj/machinery/conveyor_switch/oneway{
-	id = "packageExternal";
-	dir = 8
+	dir = 8;
+	id = "packageExternal"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -9795,8 +9795,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay Genetics Office";
-	network = list("Medical","SS13");
-	dir = 4
+	dir = 4;
+	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -10438,8 +10438,8 @@
 	opacity = 0
 	},
 /obj/machinery/door/airlock/atmos{
-	req_access = list(24);
 	name = "Supermatter Chamber";
+	req_access = list(24);
 	security_level = 1
 	},
 /turf/simulated/floor/plasteel/dark,
@@ -10464,9 +10464,9 @@
 /area/gateway)
 "byN" = (
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter";
-	dir = 8
+	name = "Robotics Privacy Shutter"
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -10717,8 +10717,8 @@
 	},
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/cans/beer{
-	pixel_y = 10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 10
 	},
 /obj/item/storage/ashtray,
 /turf/simulated/floor/plating,
@@ -11185,12 +11185,12 @@
 /area/maintenance/fpmaint)
 "bDG" = (
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /obj/machinery/conveyor{
-	id = "QMLoad2";
 	dir = 8;
+	id = "QMLoad2";
 	layer = 2.494
 	},
 /turf/simulated/floor/plasteel{
@@ -11214,8 +11214,8 @@
 	dir = 1
 	},
 /obj/structure/sign/directions/engineering{
-	pixel_y = 8;
-	dir = 4
+	dir = 4;
+	pixel_y = 8
 	},
 /turf/simulated/wall,
 /area/hallway/primary/fore)
@@ -12254,17 +12254,14 @@
 	},
 /obj/item/lipstick/random,
 /obj/item/lipstick/random{
-	pixel_y = -3;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = -3
 	},
 /obj/item/lipstick/random{
 	pixel_y = 6
 	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "bLy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12359,8 +12356,8 @@
 "bMf" = (
 /obj/effect/decal/warning_stripes/west,
 /obj/structure/sign/poster/official/random{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -12861,9 +12858,6 @@
 /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
 	},
@@ -12873,14 +12867,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
+/obj/machinery/door/airlock/maintenance{
+	locked = 1;
+	req_access = list(12)
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "bQg" = (
 /turf/simulated/wall,
 /area/quartermaster/office)
@@ -12930,8 +12922,8 @@
 /area/engineering/mechanic_workshop/hangar)
 "bQv" = (
 /obj/machinery/conveyor/inverted{
-	id = "garbage";
-	dir = 9
+	dir = 9;
+	id = "garbage"
 	},
 /obj/effect/decal/warning_stripes/northeastcorner,
 /turf/simulated/floor/plating,
@@ -13317,8 +13309,8 @@
 	c_tag = "Engineering SM Access";
 	dir = 10;
 	network = list("Engineering","SS13");
-	pixel_y = -1;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = -1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -13391,16 +13383,6 @@
 /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{
@@ -13646,8 +13628,8 @@
 	icon_state = "NStation4"
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	name = "Officer Uploadsky";
-	desc = "It's Officer Uploadsky! Powered by a potato and a shot of whiskey."
+	desc = "It's Officer Uploadsky! Powered by a potato and a shot of whiskey.";
+	name = "Officer Uploadsky"
 	},
 /turf/simulated/floor/engine{
 	slowdown = -0.3
@@ -13865,8 +13847,8 @@
 	pixel_x = -4
 	},
 /obj/item/folder/white{
-	pixel_y = 3;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 3
 	},
 /obj/item/folder/blue,
 /obj/item/folder/blue{
@@ -13876,8 +13858,8 @@
 	pixel_x = 3
 	},
 /obj/item/folder{
-	pixel_y = 3;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /obj/item/folder/yellow{
 	pixel_x = 6
@@ -14656,8 +14638,8 @@
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -14751,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -15249,8 +15231,8 @@
 /obj/machinery/door_control{
 	id = "ceprivacy1";
 	name = "Privacy Shutters";
-	pixel_y = -26;
-	pixel_x = 38
+	pixel_x = 38;
+	pixel_y = -26
 	},
 /obj/machinery/button/windowtint{
 	dir = 1;
@@ -15290,8 +15272,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "chZ" = (
@@ -15414,9 +15396,9 @@
 	network = list("SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/security/warden)
 "ciO" = (
@@ -15689,9 +15671,9 @@
 "clx" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	name = "backstage";
-	pixel_x = 32;
-	anchored = 1
+	pixel_x = 32
 	},
 /obj/structure/disposalpipe/junction{
 	dir = 2
@@ -16325,8 +16307,8 @@
 	pixel_y = -2
 	},
 /obj/item/flashlight/flare{
-	pixel_y = 8;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 8
 	},
 /obj/item/flashlight/flare{
 	pixel_y = 4
@@ -16702,11 +16684,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;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -16826,8 +16808,8 @@
 	pixel_y = 12
 	},
 /obj/item/reagent_containers/food/drinks/mug/serv{
-	pixel_y = 6;
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = 6
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/quartermaster/qm)
@@ -17144,15 +17126,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);
-	dir = 1
+	req_access = list(35)
 	},
 /obj/item/reagent_containers/food/snacks/grown/apple,
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters";
-	dir = 1
+	name = "Hydroponics Shutters"
 	},
 /obj/structure/window/reinforced{
 	dir = 8
@@ -18040,10 +18022,6 @@
 	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"
@@ -18523,10 +18501,10 @@
 /obj/effect/spawner/window/reinforced,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /turf/simulated/floor/plating,
 /area/security/medbay)
@@ -19037,8 +19015,8 @@
 "cKy" = (
 /obj/effect/spawner/lootdrop/maintenance/double,
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /obj/structure/plasticflaps/mining,
 /turf/simulated/floor/plating,
@@ -19671,8 +19649,8 @@
 	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "cPm" = (
@@ -19684,11 +19662,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 8
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -19876,8 +19854,8 @@
 	network = list("Research","SS13")
 	},
 /obj/item/clothing/glasses/welding/superior{
-	pixel_y = 5;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 5
 	},
 /obj/structure/table/glass,
 /obj/structure/cable{
@@ -19900,8 +19878,8 @@
 	dir = 10
 	},
 /obj/item/twohanded/required/kirbyplants{
-	pixel_y = 7;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 7
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -20003,9 +19981,9 @@
 /area/security/hos)
 "cRf" = (
 /obj/machinery/door/window/eastleft{
+	dir = 8;
 	name = "Mail";
-	req_access = list(50);
-	dir = 8
+	req_access = list(50)
 	},
 /obj/structure/window/reinforced,
 /obj/effect/decal/warning_stripes/yellow,
@@ -20073,21 +20051,6 @@
 	},
 /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
@@ -20248,8 +20211,8 @@
 /area/maintenance/tourist)
 "cSM" = (
 /obj/machinery/vending/wallmed{
-	pixel_y = 0;
-	pixel_x = 28
+	pixel_x = 28;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -20720,8 +20683,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance{
-	req_access = list(12);
 	locked = 1;
+	req_access = list(12);
 	welded = 1
 	},
 /obj/structure/barricade/wooden{
@@ -21080,8 +21043,8 @@
 	dir = 4
 	},
 /obj/structure/sign/directions/engineering{
-	pixel_y = -8;
-	dir = 1
+	dir = 1;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/medical{
 	dir = 1;
@@ -21723,8 +21686,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -21925,8 +21888,8 @@
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/camera{
 	c_tag = "Engine Room West";
-	network = list("Engineering","SS13");
-	dir = 4
+	dir = 4;
+	network = list("Engineering","SS13")
 	},
 /obj/machinery/alarm{
 	dir = 4;
@@ -22006,8 +21969,8 @@
 /obj/machinery/turretid/stun{
 	control_area = "AI Satellite";
 	name = "AI Antechamber Turret Control";
-	req_access = list(75);
-	pixel_y = -32
+	pixel_y = -32;
+	req_access = list(75)
 	},
 /obj/machinery/light,
 /obj/machinery/camera{
@@ -22673,8 +22636,8 @@
 /obj/machinery/fishtank/bowl,
 /obj/item/fish_net,
 /obj/item/fishfood{
-	pixel_y = 3;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 3
 	},
 /obj/item/stack/wrapping_paper,
 /turf/simulated/floor/wood,
@@ -22827,9 +22790,9 @@
 /area/crew_quarters/serviceyard)
 "doq" = (
 /obj/machinery/door/airlock/security{
+	id = "execution";
 	name = "Execution Room";
-	req_access = list(2);
-	id = "execution"
+	req_access = list(2)
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23772,8 +23735,8 @@
 /obj/effect/decal/warning_stripes/yellow/partial,
 /obj/item/radio/intercom{
 	dir = 1;
-	pixel_y = 28;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 28
 	},
 /obj/effect/landmark/join_late_cyborg,
 /obj/machinery/light{
@@ -24454,8 +24417,8 @@
 "dzV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/contraband/random{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint6)
@@ -24488,8 +24451,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/door/window{
-	name = "Atmospherics Desk";
-	dir = 8
+	dir = 8;
+	name = "Atmospherics Desk"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/door/poddoor{
@@ -24653,11 +24616,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 8
+	opacity = 0
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -24908,11 +24871,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -24949,8 +24912,8 @@
 /obj/effect/decal/warning_stripes/west,
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_y = 0;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -25188,8 +25151,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #6";
-	id_tag = "xeno6"
+	id_tag = "xeno6";
+	name = "Creature Cell #6"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -25798,8 +25761,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Gravity Generator Area West";
-	network = list("SS13","Engineering");
-	dir = 8
+	dir = 8;
+	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/gravitygenerator)
@@ -26249,23 +26212,15 @@
 /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,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "dOx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -26332,8 +26287,8 @@
 	pixel_y = -8
 	},
 /obj/structure/sign/directions/security{
-	pixel_y = 8;
-	dir = 1
+	dir = 1;
+	pixel_y = 8
 	},
 /obj/structure/sign/directions/medical{
 	dir = 1
@@ -26489,8 +26444,8 @@
 	scrub_Toxins = 1
 	},
 /obj/structure/sign/poster/random{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -26527,8 +26482,8 @@
 /obj/structure/table,
 /obj/machinery/camera{
 	c_tag = "Research Break Room";
-	network = list("Research","SS13");
-	dir = 10
+	dir = 10;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria"
@@ -27028,8 +26983,8 @@
 /area/maintenance/trading)
 "dTN" = (
 /obj/structure/chair/sofa/right{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -27246,11 +27201,6 @@
 /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";
@@ -27258,11 +27208,8 @@
 	scrub_N2O = 1;
 	scrub_Toxins = 1
 	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "dWg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -27747,12 +27694,9 @@
 /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/civilian/barber)
+/area/maintenance/tourist)
 "eae" = (
 /obj/machinery/computer/station_alert,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -28035,8 +27979,8 @@
 	},
 /obj/machinery/light_switch{
 	name = "north light switch";
-	pixel_y = 24;
-	pixel_x = 24
+	pixel_x = 24;
+	pixel_y = 24
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -28205,9 +28149,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";
-	dir = 2
+	name = "Kitchen Shutters"
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -28244,9 +28188,6 @@
 /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
 	},
@@ -28259,7 +28200,7 @@
 /obj/machinery/door/airlock/maintenance{
 	req_access = list(12)
 	},
-/turf/simulated/floor/wood/fancy/cherry,
+/turf/simulated/floor/plating,
 /area/maintenance/tourist)
 "edu" = (
 /obj/structure/table/wood,
@@ -28387,8 +28328,8 @@
 "eeb" = (
 /obj/machinery/camera{
 	c_tag = "Prisoners Lockers";
-	network = list("SS13","Security");
-	dir = 4
+	dir = 4;
+	network = list("SS13","Security")
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -28940,8 +28881,8 @@
 	id = "Evidence Storage";
 	name = "Evidence Storage Privacy Shutters Control";
 	pixel_x = -24;
-	req_access = list(63);
-	pixel_y = -24
+	pixel_y = -24;
+	req_access = list(63)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 0;
@@ -29195,9 +29136,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/energy/gun{
 	pixel_x = 3
@@ -29862,10 +29803,10 @@
 "enZ" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "BrigRight";
+	locked = 1;
 	name = "Brig Mechbay";
 	req_access = list(63);
-	welded = 1;
-	locked = 1
+	welded = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/secpost)
@@ -30088,10 +30029,11 @@
 	},
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "eqc" = (
 /obj/structure/chair/comfy/black{
 	dir = 1
@@ -30245,10 +30187,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "erL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -30343,11 +30286,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -30380,8 +30323,8 @@
 /area/solar/port)
 "esR" = (
 /obj/structure/sign/vacuum{
-	pixel_x = -32;
-	icon_state = "space1"
+	icon_state = "space1";
+	pixel_x = -32
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -30575,8 +30518,8 @@
 "eut" = (
 /obj/machinery/computer/card,
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = 0;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -30694,8 +30637,8 @@
 /area/medical/medrest)
 "evm" = (
 /obj/machinery/light_switch{
-	pixel_y = 0;
-	pixel_x = -24
+	pixel_x = -24;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -30883,8 +30826,8 @@
 "ewT" = (
 /obj/structure/table/wood,
 /obj/item/grenade/chem_grenade{
-	pixel_y = 5;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 5
 	},
 /obj/item/grenade/chem_grenade{
 	pixel_x = 7
@@ -30922,8 +30865,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/item/radio/intercom{
-	pixel_y = 23;
-	pixel_x = -28
+	pixel_x = -28;
+	pixel_y = 23
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -31004,8 +30947,8 @@
 /obj/item/twohanded/required/kirbyplants,
 /obj/item/radio/intercom{
 	dir = 1;
-	pixel_y = 0;
-	pixel_x = 28
+	pixel_x = 28;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -31302,10 +31245,10 @@
 	pixel_y = 4
 	},
 /obj/machinery/door/window/brigdoor{
-	name = "Security Reception";
-	req_access = list(1);
+	color = "red";
 	dir = 2;
-	color = "red"
+	name = "Security Reception";
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull";
@@ -31483,11 +31426,11 @@
 	pixel_x = -28
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/carpet/royalblue,
 /area/ntrep)
@@ -31657,8 +31600,8 @@
 /area/crew_quarters/captain)
 "eBd" = (
 /obj/structure/chair/sofa/right{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 8
@@ -32071,8 +32014,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "eEY" = (
@@ -32148,8 +32091,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "eFF" = (
@@ -32487,8 +32430,8 @@
 	icon_state = "1-2"
 	},
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "rampbottom"
@@ -32832,8 +32775,8 @@
 "eKM" = (
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_y = 28;
-	pixel_x = 28
+	pixel_x = 28;
+	pixel_y = 28
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -32932,8 +32875,8 @@
 	pixel_y = 2
 	},
 /obj/item/flashlight/lamp/green{
-	pixel_y = 10;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -33016,8 +32959,8 @@
 "eLS" = (
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/reagent_containers/glass/bucket{
-	pixel_y = 3;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /obj/structure/table,
 /obj/structure/window/reinforced/polarized,
@@ -33034,8 +32977,8 @@
 	pixel_y = 5
 	},
 /obj/item/reagent_containers/spray/cleaner{
-	pixel_y = 2;
-	pixel_x = -1
+	pixel_x = -1;
+	pixel_y = 2
 	},
 /obj/item/reagent_containers/spray/cleaner{
 	pixel_x = 2;
@@ -33450,8 +33393,8 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 1
+	dir = 1;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "ePu" = (
@@ -33509,19 +33452,6 @@
 /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;
@@ -33577,9 +33507,9 @@
 "eQD" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/maintenance/fsmaint2)
 "eQG" = (
@@ -33892,9 +33822,9 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/sortjunction{
+	dir = 1;
 	name = "CE's Junction";
-	sortType = 5;
-	dir = 1
+	sortType = 5
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -34391,8 +34321,8 @@
 "eYo" = (
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 9
+	dir = 9;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "eYp" = (
@@ -34542,8 +34472,8 @@
 /obj/item/shard,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
 	anchored = 1;
+	name = "backstage";
 	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
@@ -34693,8 +34623,8 @@
 /area/engineering/controlroom)
 "eZN" = (
 /mob/living/simple_animal/bot/secbot/beepsky{
-	name = "Officer Rightsky";
-	desc = "It's Officer Rightsky! Powered by a potato and a shot of whiskey."
+	desc = "It's Officer Rightsky! Powered by a potato and a shot of whiskey.";
+	name = "Officer Rightsky"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -35582,8 +35512,8 @@
 	pixel_y = 15
 	},
 /obj/item/storage/box/masks{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /obj/item/storage/box/gloves,
 /obj/machinery/door_control{
@@ -36068,8 +35998,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #4";
-	id_tag = "xeno4"
+	id_tag = "xeno4";
+	name = "Creature Cell #4"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -36130,8 +36060,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "fkd" = (
@@ -36517,8 +36447,8 @@
 /area/bridge/checkpoint/south)
 "fmX" = (
 /obj/machinery/door/airlock/maintenance{
-	req_access = list(12);
-	name = "Cargo maintenance access"
+	name = "Cargo maintenance access";
+	req_access = list(12)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -36898,10 +36828,10 @@
 /obj/effect/spawner/window/reinforced,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /turf/simulated/floor/plating,
 /area/security/medbay)
@@ -36944,8 +36874,8 @@
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 4
+	dir = 4;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "fpW" = (
@@ -36962,8 +36892,8 @@
 "fpZ" = (
 /obj/machinery/computer/rdconsole/mechanics,
 /obj/item/radio/intercom{
-	pixel_y = 22;
-	pixel_x = 30
+	pixel_x = 30;
+	pixel_y = 22
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -37129,8 +37059,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/airlock/maintenance{
-	req_access = list(18,48,70,71);
-	name = "Hangar access"
+	name = "Hangar access";
+	req_access = list(18,48,70,71)
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/maintcentral)
@@ -38317,8 +38247,8 @@
 /obj/machinery/door_control{
 	id = "xeno5";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = 32
+	pixel_x = 32;
+	req_access = list(55)
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -38366,15 +38296,15 @@
 /obj/structure/table/wood/fancy/blue,
 /obj/item/lighter/zippo/hop,
 /obj/item/paper/monitorkey{
-	pixel_y = 4;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 4
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
 /obj/item/toy/figure/hop{
-	pixel_y = 10;
-	pixel_x = -8
+	pixel_x = -8;
+	pixel_y = 10
 	},
 /turf/simulated/floor/wood/fancy/light,
 /area/crew_quarters/heads/hop)
@@ -38391,8 +38321,8 @@
 	pixel_x = 28
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 6
+	dir = 6;
+	icon_state = "blue"
 	},
 /area/bridge/checkpoint/south)
 "fAu" = (
@@ -38440,8 +38370,8 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Secure Creature Cell";
-	id_tag = "xenosecure"
+	id_tag = "xenosecure";
+	name = "Secure Creature Cell"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -38481,8 +38411,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/chair/stool,
 /obj/structure/sign/poster/official/the_owl{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/apmaint)
@@ -39049,8 +38979,8 @@
 "fEJ" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
-	anchored = 1
+	anchored = 1;
+	name = "backstage"
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
@@ -39071,8 +39001,8 @@
 "fES" = (
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -10
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 8
@@ -40037,8 +39967,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/reception)
 "fMT" = (
@@ -40222,8 +40152,8 @@
 	req_access = list(24)
 	},
 /obj/machinery/door/window{
-	name = "Atmospherics Desk";
-	dir = 8
+	dir = 8;
+	name = "Atmospherics Desk"
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -40343,8 +40273,8 @@
 /area/maintenance/casino)
 "fOY" = (
 /obj/structure/sign/directions/security{
-	pixel_y = 8;
-	dir = 8
+	dir = 8;
+	pixel_y = 8
 	},
 /obj/structure/sign/directions/medical,
 /obj/structure/sign/directions/evac{
@@ -40416,8 +40346,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #5";
-	id_tag = "xeno5"
+	id_tag = "xeno5";
+	name = "Creature Cell #5"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -40618,8 +40548,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = -10
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -40661,11 +40591,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/courtroom)
@@ -41401,8 +41331,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = -10
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -41486,8 +41416,8 @@
 /obj/structure/table/reinforced,
 /obj/item/gps,
 /obj/item/gps{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -41674,8 +41604,8 @@
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/camera{
 	c_tag = "Experimentation Lab";
-	network = list("Research","SS13");
-	dir = 10
+	dir = 10;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/engine,
 /area/toxins/explab)
@@ -41827,8 +41757,8 @@
 "fZz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/drip{
-	pixel_y = 12;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 12
 	},
 /obj/effect/decal/cleanable/blood/drip{
 	pixel_x = -11;
@@ -41846,16 +41776,16 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/structure/window/reinforced{
 	color = "red";
@@ -41898,13 +41828,11 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/structure/chair/sofa/corp/left{
-	dir = 8
-	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "gab" = (
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/carpet/black,
@@ -42252,23 +42180,15 @@
 	},
 /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/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "gdc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -42914,11 +42834,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -43036,8 +42956,8 @@
 /obj/machinery/firealarm{
 	dir = 1;
 	name = "south fire alarm";
-	pixel_y = -25;
-	pixel_x = 29
+	pixel_x = 29;
+	pixel_y = -25
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -43626,8 +43546,8 @@
 /area/maintenance/asmaint)
 "gmA" = (
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 4
+	dir = 4;
+	id = "QMLoad2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -43666,8 +43586,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/cryo)
 "gmI" = (
@@ -43735,11 +43655,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";
-	pixel_y = -3
+	tag_interior_door = "ai_inner"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "ai_sensor";
@@ -44022,8 +43942,8 @@
 /area/hallway/primary/port/south)
 "gph" = (
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -44256,12 +44176,12 @@
 	pixel_y = 7
 	},
 /obj/item/clothing/mask/cigarette/syndicate{
-	pixel_y = 7;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 7
 	},
 /obj/item/lighter{
-	pixel_y = 2;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 2
 	},
 /obj/structure/cable,
 /turf/simulated/floor/plating,
@@ -44320,8 +44240,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #2";
-	id_tag = "xeno2"
+	id_tag = "xeno2";
+	name = "Creature Cell #2"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -44622,8 +44542,8 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "permacell1";
 	layer = 5;
-	range = 3;
-	pixel_x = 24
+	pixel_x = 24;
+	range = 3
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -44726,8 +44646,8 @@
 /area/crew_quarters/locker)
 "guH" = (
 /obj/machinery/door/window/northleft{
-	name = "Cafe";
-	dir = 2
+	dir = 2;
+	name = "Cafe"
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dust,
@@ -44841,9 +44761,9 @@
 	icon_state = "4-8"
 	},
 /obj/structure/disposalpipe/sortjunction{
+	dir = 4;
 	name = "Atmospherics Junction";
-	sortType = 6;
-	dir = 4
+	sortType = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -45138,9 +45058,9 @@
 "gxY" = (
 /obj/structure/window/reinforced,
 /obj/structure/sign/goldenplaque{
-	pixel_y = 32;
 	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Zhojaba. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо от Главного Инженера станции Нова"
+	name = "Благодарственное Письмо от Главного Инженера станции Нова";
+	pixel_y = 32
 	},
 /obj/structure/statue/gold/hos{
 	pixel_y = 7
@@ -45342,8 +45262,8 @@
 /obj/structure/closet/radiation,
 /obj/machinery/camera{
 	c_tag = "Medbay GenCells";
-	network = list("Medical","SS13");
-	dir = 1
+	dir = 1;
+	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple"
@@ -45763,10 +45683,10 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/structure/window/reinforced{
 	color = "red"
@@ -46356,19 +46276,10 @@
 /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/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "gIw" = (
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -46400,8 +46311,8 @@
 	pixel_y = 3
 	},
 /obj/machinery/defibrillator_mount/loaded{
-	pixel_y = 26;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 26
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -46806,8 +46717,8 @@
 "gLP" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_y = 0;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -47170,8 +47081,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Secure Creature Cell";
-	id_tag = "xenosecure"
+	id_tag = "xenosecure";
+	name = "Secure Creature Cell"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -47320,8 +47231,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/newscaster/security_unit{
-	pixel_y = -30;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = -30
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -47401,8 +47312,8 @@
 /area/solar/auxport)
 "gRO" = (
 /obj/structure/chair/sofa/right{
-	dir = 8;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 8
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 5
@@ -47533,8 +47444,8 @@
 	opacity = 0
 	},
 /obj/machinery/conveyor{
-	id = "packageExternal";
-	dir = 8
+	dir = 8;
+	id = "packageExternal"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -48196,8 +48107,8 @@
 /obj/item/paper_bin,
 /obj/item/pen,
 /obj/item/lighter/zippo/ce{
-	pixel_y = 2;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 2
 	},
 /obj/effect/turf_decal/siding/white{
 	dir = 5
@@ -48289,9 +48200,9 @@
 /obj/structure/flora/ausbushes/grassybush,
 /obj/machinery/camera{
 	c_tag = "Xenobio Central-South";
+	dir = 6;
 	network = list("Research","SS13");
-	pixel_x = -1;
-	dir = 6
+	pixel_x = -1
 	},
 /turf/simulated/floor/grass,
 /area/toxins/xenobiology)
@@ -48415,8 +48326,8 @@
 	pixel_x = 3
 	},
 /obj/machinery/alarm{
-	pixel_x = -24;
-	dir = 4
+	dir = 4;
+	pixel_x = -24
 	},
 /obj/machinery/light{
 	dir = 8
@@ -48975,11 +48886,11 @@
 /area/atmos)
 "hcF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/maintenance/starboardaux)
@@ -49026,9 +48937,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);
-	pixel_x = 26
+	req_access = list(2)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
@@ -49148,8 +49059,8 @@
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/drinks/mug/hop{
-	pixel_y = -11;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = -11
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
@@ -49191,20 +49102,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";
-	pixel_y = 28
+	tag_interior_door = "aisole_inner"
 	},
 /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";
-	dir = 8
+	id_tag = "aisole_pump"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -49353,8 +49264,8 @@
 	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "hft" = (
@@ -49856,8 +49767,8 @@
 /area/maintenance/engineering)
 "hjr" = (
 /obj/machinery/power/apc{
-	pixel_x = 28;
-	dir = 4
+	dir = 4;
+	pixel_x = 28
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -50509,18 +50420,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";
-	pixel_x = 25
+	tag_interior_door = "engineering_west_inner"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "engineering_west_sensor";
-	pixel_y = 3;
-	pixel_x = 25
+	pixel_x = 25;
+	pixel_y = 3
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -50559,8 +50470,8 @@
 /area/maintenance/secpost)
 "hoR" = (
 /obj/structure/sign/directions/evac{
-	pixel_y = -8;
-	dir = 1
+	dir = 1;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/security{
 	dir = 8
@@ -50598,8 +50509,8 @@
 	dir = 4
 	},
 /obj/machinery/door/window/brigdoor/southright{
-	req_access = list(17,75);
-	dir = 8
+	dir = 8;
+	req_access = list(17,75)
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -51138,8 +51049,8 @@
 /area/engineering/gravitygenerator)
 "htU" = (
 /obj/machinery/conveyor/inverted{
-	id = "QMLoad2";
-	dir = 10
+	dir = 10;
+	id = "QMLoad2"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -51673,8 +51584,8 @@
 /obj/machinery/door_control{
 	id = "xeno3";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = -32
+	pixel_x = -32;
+	req_access = list(55)
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/xenobiology)
@@ -51811,8 +51722,8 @@
 	department = "Head of Security's Desk";
 	departmentType = 5;
 	name = "Head of Security Requests Console";
-	pixel_y = 30;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 30
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -51845,8 +51756,8 @@
 "hAk" = (
 /obj/machinery/computer/sm_monitor,
 /obj/machinery/camera/autoname{
-	dir = 1;
-	c_tag = "Chief Engineer's Office"
+	c_tag = "Chief Engineer's Office";
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -51970,8 +51881,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 9
+	dir = 9;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "hBv" = (
@@ -52057,16 +51968,16 @@
 "hCi" = (
 /obj/structure/table/wood/fancy/black,
 /obj/item/mining_voucher{
-	pixel_y = 6;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 6
 	},
 /obj/item/lighter/zippo/qm{
 	pixel_x = 7;
 	pixel_y = 5
 	},
 /obj/item/mining_voucher{
-	pixel_y = 6;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 6
 	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
@@ -52105,8 +52016,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "HoS Bedroom";
-	network = list("SS13","Security");
-	dir = 9
+	dir = 9;
+	network = list("SS13","Security")
 	},
 /obj/item/radio/intercom{
 	pixel_x = 28;
@@ -52165,8 +52076,8 @@
 	id = "toilet4";
 	name = "cyborg recharging cabin Bolt Control";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	pixel_x = 25
+	pixel_x = 25;
+	specialfunctions = 4
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -52328,8 +52239,8 @@
 /area/gateway)
 "hEB" = (
 /obj/effect/turf_decal/siding/white/end{
-	dir = 1;
-	color = "#444444"
+	color = "#444444";
+	dir = 1
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -52539,8 +52450,8 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/vending/wallmed{
-	pixel_y = 32;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/controlroom)
@@ -52572,8 +52483,8 @@
 "hGF" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/firealarm{
-	pixel_y = -28;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = -28
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue";
@@ -52885,9 +52796,9 @@
 /area/medical/reception)
 "hJE" = (
 /obj/machinery/door/window/eastright{
+	dir = 2;
 	name = "Forensic laboratory";
-	req_access = list(3,4);
-	dir = 2
+	req_access = list(3,4)
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood,
@@ -53118,8 +53029,8 @@
 "hMn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/statue/bone/rib{
-	dir = 1;
-	anchored = 1
+	anchored = 1;
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -53392,8 +53303,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredcorners"
@@ -53495,8 +53406,9 @@
 /area/storage/tech)
 "hPR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "hPZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -53721,10 +53633,10 @@
 "hRC" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/plating,
@@ -53959,8 +53871,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8;
-	pixel_y = 10;
-	pixel_x = 9
+	pixel_x = 9;
+	pixel_y = 10
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
@@ -53993,8 +53905,8 @@
 /area/crew_quarters/captain)
 "hTz" = (
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = -30
+	pixel_x = -30;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -54037,16 +53949,16 @@
 	},
 /obj/structure/table/glass,
 /obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_y = 2;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 2
 	},
 /obj/item/reagent_containers/food/drinks/mug/sec{
 	pixel_x = 3;
 	pixel_y = 14
 	},
 /obj/item/reagent_containers/glass/bottle/charcoal{
-	pixel_y = 2;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 2
 	},
 /obj/item/reagent_containers/hypospray/autoinjector,
 /turf/simulated/floor/plasteel{
@@ -54086,8 +53998,8 @@
 "hTW" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	desc = "Труба содержит газ для обработки и после возвращает его обратно в трубу смешивания";
-	name = "Труба обработки";
-	dir = 9
+	dir = 9;
+	name = "Труба обработки"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -54295,8 +54207,8 @@
 	id = "toilet3";
 	name = "Toilet Bolt Control";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	pixel_x = 25
+	pixel_x = 25;
+	specialfunctions = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel/freezer,
@@ -54314,8 +54226,8 @@
 /area/civilian/pet_store)
 "hVU" = (
 /obj/item/stack/packageWrap{
-	pixel_y = -4;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = -4
 	},
 /obj/item/stack/packageWrap,
 /obj/item/stack/packageWrap{
@@ -54396,12 +54308,12 @@
 "hWy" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/snacks/fried_vox{
-	pixel_y = 4;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 4
 	},
 /obj/item/cigbutt{
-	pixel_y = 12;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 12
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -54682,8 +54594,8 @@
 /obj/machinery/recharge_station,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/reception)
 "hYo" = (
@@ -54707,8 +54619,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #7";
-	id_tag = "xeno7"
+	id_tag = "xeno7";
+	name = "Creature Cell #7"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -54968,8 +54880,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "ibg" = (
@@ -55069,8 +54981,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Briefing Room South";
-	network = list("SS13","Security");
-	dir = 1
+	dir = 1;
+	network = list("SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
@@ -56026,8 +55938,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = -10
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -56266,9 +56178,9 @@
 /obj/machinery/door_control{
 	id = "HoSBPriv";
 	name = "HoS Bedroom Privacy Shutters Control";
+	pixel_x = 26;
 	pixel_y = -24;
-	req_access = list(58);
-	pixel_x = 26
+	req_access = list(58)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -56277,9 +56189,9 @@
 /area/security/hos)
 "ijI" = (
 /obj/machinery/door/window/eastright{
+	dir = 8;
 	name = "Mime Delivery";
-	req_access = list(46);
-	dir = 8
+	req_access = list(46)
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
@@ -56389,11 +56301,11 @@
 /area/bridge)
 "iks" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -56411,8 +56323,8 @@
 "ikv" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/item/healthupgrade,
 /turf/simulated/floor/plasteel{
@@ -56738,11 +56650,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluealt"
@@ -56979,17 +56891,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);
-	color = "red"
+	req_access = list(1)
 	},
 /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);
-	color = "red"
+	req_access = list(3)
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -57119,10 +57031,10 @@
 /obj/effect/spawner/window/reinforced,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /turf/simulated/floor/plating,
 /area/security/medbay)
@@ -57139,19 +57051,6 @@
 	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{
@@ -57349,8 +57248,8 @@
 "irg" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -58537,8 +58436,8 @@
 /obj/machinery/flasher_button{
 	id = "permacell2";
 	name = "Perma cell 2 flasher button";
-	pixel_y = -32;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = -32
 	},
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
@@ -58567,11 +58466,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -59105,8 +59004,8 @@
 /area/maintenance/fsmaint3)
 "iEQ" = (
 /obj/machinery/conveyor{
-	id = "garbage";
-	dir = 4
+	dir = 4;
+	id = "garbage"
 	},
 /obj/machinery/recycler,
 /obj/effect/decal/warning_stripes/north,
@@ -59194,8 +59093,8 @@
 "iFv" = (
 /obj/structure/table/wood,
 /obj/machinery/keycard_auth{
-	pixel_y = -1;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -59267,14 +59166,6 @@
 	},
 /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"
@@ -59305,8 +59196,8 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "iGM" = (
@@ -59383,8 +59274,8 @@
 /obj/machinery/door/airlock/multi_tile{
 	dir = 1;
 	glass = 1;
-	req_access = list(5);
-	name = "Medical Emergency Ward"
+	name = "Medical Emergency Ward";
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bcarpet05"
@@ -59426,8 +59317,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #1";
-	id_tag = "xeno1"
+	id_tag = "xeno1";
+	name = "Creature Cell #1"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -60886,11 +60777,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -61089,10 +60980,10 @@
 	},
 /obj/machinery/door/window/eastleft{
 	base_state = "right";
+	dir = 2;
 	icon_state = "right";
 	layer = 3;
-	req_access = list(50);
-	dir = 2
+	req_access = list(50)
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/disposalpipe/trunk{
@@ -61822,10 +61713,10 @@
 /obj/structure/table/reinforced,
 /obj/item/gun/energy/laser/practice,
 /obj/machinery/door/window/brigdoor{
-	name = "Security Reception";
-	req_access = list(1);
+	color = "red";
 	dir = 2;
-	color = "red"
+	name = "Security Reception";
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull";
@@ -61852,11 +61743,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/engine,
@@ -62324,10 +62215,10 @@
 "jfx" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/snacks/grown/tomato,
@@ -62369,15 +62260,15 @@
 "jfO" = (
 /obj/structure/table/reinforced,
 /obj/item/flashlight/sectaclight{
-	pixel_y = 2;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 2
 	},
 /obj/item/flashlight/sectaclight{
 	pixel_y = 0
 	},
 /obj/item/flashlight/sectaclight{
-	pixel_y = -2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = -2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -62435,9 +62326,9 @@
 	req_access = list(7)
 	},
 /obj/machinery/door/window/southright{
+	dir = 4;
 	name = "Toxins Launcher";
-	req_access = list(7);
-	dir = 4
+	req_access = list(7)
 	},
 /turf/simulated/floor/plating,
 /area/toxins/launch)
@@ -62704,9 +62595,9 @@
 "jhT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/westright{
+	dir = 2;
 	name = "Mechanic's Desk";
-	req_access = list(70);
-	dir = 2
+	req_access = list(70)
 	},
 /obj/machinery/cell_charger{
 	pixel_x = -1;
@@ -62760,8 +62651,8 @@
 	dir = 8
 	},
 /obj/machinery/vending/wallmed{
-	pixel_y = 0;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -62804,8 +62695,8 @@
 "jiH" = (
 /obj/machinery/camera{
 	c_tag = "Medbay Suit Storage";
-	network = list("Medical","SS13");
-	dir = 8
+	dir = 8;
+	network = list("Medical","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -63137,8 +63028,8 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "jlb" = (
@@ -63405,8 +63296,8 @@
 	dir = 1
 	},
 /obj/structure/sign/directions/science{
-	pixel_y = 8;
-	dir = 1
+	dir = 1;
+	pixel_y = 8
 	},
 /obj/structure/sign/directions/evac{
 	pixel_y = -8
@@ -63435,9 +63326,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -63489,8 +63380,8 @@
 /area/security/permabrig)
 "jnD" = (
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable,
 /obj/effect/spawner/window/reinforced,
@@ -64558,16 +64449,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);
-	dir = 1
+	req_access = list(35)
 	},
 /obj/item/clipboard,
 /obj/item/toy/figure/botanist,
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters";
-	dir = 1
+	name = "Hydroponics Shutters"
 	},
 /obj/structure/window/reinforced{
 	dir = 4
@@ -64636,15 +64527,6 @@
 	},
 /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
@@ -65523,21 +65405,21 @@
 	pixel_y = -32
 	},
 /obj/item/circuitboard/smes{
-	pixel_y = -4;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = -4
 	},
 /obj/item/circuitboard/powermonitor{
-	pixel_y = -2;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = -2
 	},
 /obj/item/circuitboard/stationalert,
 /obj/item/circuitboard/atmos_alert{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/circuitboard/thermomachine{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "caution"
@@ -66026,8 +65908,8 @@
 	color = "#996633"
 	},
 /obj/item/paper/ntrep{
-	pixel_y = 3;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /obj/item/book/manual/sop_command,
 /turf/simulated/floor/wood/dark,
@@ -66178,8 +66060,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "jIz" = (
@@ -66555,8 +66437,8 @@
 /area/security/medbay)
 "jKU" = (
 /obj/structure/chair/sofa/right{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood{
@@ -66755,10 +66637,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "jLR" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -67487,8 +67370,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #1";
-	id_tag = "xeno1"
+	id_tag = "xeno1";
+	name = "Creature Cell #1"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -68085,8 +67968,8 @@
 	pixel_y = 24
 	},
 /obj/machinery/light_switch{
-	pixel_y = 24;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 24
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -68216,8 +68099,8 @@
 "jXw" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #5";
-	id_tag = "xeno5"
+	id_tag = "xeno5";
+	name = "Creature Cell #5"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -68350,8 +68233,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Research Outpost Temporary Storage";
-	network = list("Research Outpost");
-	dir = 1
+	dir = 1;
+	network = list("Research Outpost")
 	},
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel{
@@ -68670,8 +68553,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -68963,16 +68846,6 @@
 	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,
@@ -68996,11 +68869,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -69318,8 +69191,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #6";
-	id_tag = "xeno6"
+	id_tag = "xeno6";
+	name = "Creature Cell #6"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -69388,8 +69261,8 @@
 "khZ" = (
 /obj/structure/sign/directions/cargo{
 	dir = 4;
-	pixel_y = -8;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = -8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -69414,8 +69287,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #3";
-	id_tag = "xeno3"
+	id_tag = "xeno3";
+	name = "Creature Cell #3"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -69516,8 +69389,8 @@
 /obj/machinery/door_control{
 	id = "xeno7";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = -32
+	pixel_x = -32;
+	req_access = list(55)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -69564,11 +69437,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -69804,8 +69677,8 @@
 /obj/structure/cable,
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	name = "Privacy Shutters";
-	id_tag = "NTRprivate"
+	id_tag = "NTRprivate";
+	name = "Privacy Shutters"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -69934,11 +69807,11 @@
 /area/atmos)
 "kmi" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Prison Solitary Confinement 2";
@@ -70091,8 +69964,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair/sofa/left{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/maintenance/backstage)
@@ -70124,8 +69997,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #7";
-	id_tag = "xeno7"
+	id_tag = "xeno7";
+	name = "Creature Cell #7"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -70269,11 +70142,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -70290,8 +70163,8 @@
 /obj/machinery/door_control{
 	id = "FRange";
 	name = "Firing Range Privacy Shutters Control";
-	req_access = list(63);
-	pixel_y = 26
+	pixel_y = 26;
+	req_access = list(63)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -70411,14 +70284,14 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/eastleft{
+	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35);
-	dir = 1
+	req_access = list(35)
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters";
-	dir = 1
+	name = "Hydroponics Shutters"
 	},
 /obj/item/desk_bell{
 	anchored = 1;
@@ -70607,8 +70480,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -70799,10 +70672,10 @@
 /area/hallway/primary/central/second/west)
 "ktN" = (
 /obj/machinery/door/window/brigdoor{
-	name = "Security Reception";
-	req_access = list(1);
+	color = "red";
 	dir = 2;
-	color = "red"
+	name = "Security Reception";
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -71070,11 +70943,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -71119,8 +70992,8 @@
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	desc = "Труба хранит в себе набор газов для смешивания";
-	name = "Труба смешивания";
-	dir = 1
+	dir = 1;
+	name = "Труба смешивания"
 	},
 /turf/space,
 /area/space)
@@ -71165,8 +71038,8 @@
 "kwl" = (
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/gavelblock{
-	pixel_y = 6;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 6
 	},
 /obj/item/gavelhammer{
 	pixel_y = 7
@@ -71188,10 +71061,10 @@
 	id = "courtroombolts";
 	name = "Courtroom Bolts Control";
 	normaldoorcontrol = 1;
-	req_access = list(74);
-	specialfunctions = 4;
+	pixel_x = -6;
 	pixel_y = 7;
-	pixel_x = -6
+	req_access = list(74);
+	specialfunctions = 4
 	},
 /turf/simulated/floor/carpet/royalblack,
 /area/crew_quarters/courtroom)
@@ -71221,8 +71094,8 @@
 	dir = 1
 	},
 /obj/machinery/light_switch{
-	pixel_y = -24;
-	pixel_x = -24
+	pixel_x = -24;
+	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -71512,11 +71385,8 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "kzi" = (
 /obj/structure/closet/wardrobe/atmospherics_yellow,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -71872,10 +71742,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{
@@ -71948,8 +71818,8 @@
 /area/security/evidence)
 "kCH" = (
 /obj/structure/chair/sofa/left{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 9
@@ -72053,8 +71923,8 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 9
+	dir = 9;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "kDD" = (
@@ -72076,8 +71946,8 @@
 /area/quartermaster/miningstorage)
 "kDG" = (
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/wood/dark,
 /area/crew_quarters/bar/atrium)
@@ -72553,9 +72423,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,
@@ -72583,8 +72453,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #2";
-	id_tag = "xeno2"
+	id_tag = "xeno2";
+	name = "Creature Cell #2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -72669,9 +72539,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);
-	pixel_x = 32
+	req_access = list(75)
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/turret_protected/ai_upload)
@@ -72726,8 +72596,8 @@
 	pixel_y = 9
 	},
 /obj/item/clothing/mask/cigarette/rollie{
-	pixel_y = 3;
-	pixel_x = 9
+	pixel_x = 9;
+	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -72832,8 +72702,8 @@
 	},
 /obj/structure/table/wood/fancy/red,
 /obj/item/candle{
-	pixel_y = 4;
-	pixel_x = -9
+	pixel_x = -9;
+	pixel_y = 4
 	},
 /turf/simulated/floor/carpet/red,
 /area/crew_quarters/theatre)
@@ -73097,8 +72967,8 @@
 /area/hallway/secondary/exit)
 "kMk" = (
 /obj/machinery/door/window/brigdoor{
-	dir = 2;
-	color = "red"
+	color = "red";
+	dir = 2
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -73135,8 +73005,8 @@
 	pixel_x = 32
 	},
 /obj/item/radio/intercom{
-	pixel_y = -26;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = -26
 	},
 /turf/simulated/floor/plasteel/white,
 /area/teleporter)
@@ -73363,8 +73233,8 @@
 /area/maintenance/garden)
 "kOP" = (
 /obj/machinery/conveyor{
-	id = "QMLoad";
-	dir = 4
+	dir = 4;
+	id = "QMLoad"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -74254,12 +74124,12 @@
 /obj/structure/table/wood,
 /obj/item/folder/yellow,
 /obj/item/folder/red{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/folder/blue{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/magistrateoffice)
@@ -74630,8 +74500,8 @@
 "kYo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/clown{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -74920,8 +74790,8 @@
 "laf" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/item/clothing/gloves/color/black,
 /turf/simulated/floor/plasteel{
@@ -74991,9 +74861,6 @@
 	},
 /area/security/permabrig)
 "laP" = (
-/obj/structure/chair/barber{
-	dir = 8
-	},
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -24
@@ -75001,8 +74868,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/light,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "laS" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/controlroom)
@@ -75145,8 +75014,8 @@
 "lbI" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
-	anchored = 1
+	anchored = 1;
+	name = "backstage"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -75187,8 +75056,8 @@
 /area/maintenance/casino)
 "lbO" = (
 /obj/machinery/conveyor{
-	id = "garbage";
-	dir = 4
+	dir = 4;
+	id = "garbage"
 	},
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/plating,
@@ -75263,8 +75132,8 @@
 	},
 /obj/item/storage/belt/medical,
 /obj/machinery/computer/security/telescreen/entertainment{
-	pixel_y = 0;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/carpet/green,
 /area/medical/virology)
@@ -76552,8 +76421,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	name = "Privacy Shutters";
-	id_tag = "NTRprivate"
+	id_tag = "NTRprivate";
+	name = "Privacy Shutters"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -76593,11 +76462,8 @@
 	icon_state = "0-2"
 	},
 /obj/structure/filingcabinet/filingcabinet,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "lnY" = (
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "psychoffice"
@@ -77005,8 +76871,8 @@
 /obj/machinery/light,
 /obj/item/reagent_containers/iv_bag,
 /obj/item/reagent_containers/iv_bag{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -77694,8 +77560,8 @@
 "lxw" = (
 /obj/machinery/disposal,
 /obj/structure/sign/deathsposal{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /obj/effect/decal/warning_stripes/red,
 /obj/structure/disposalpipe/trunk{
@@ -77763,10 +77629,10 @@
 "lyd" = (
 /obj/machinery/atmospherics/trinary/filter/flipped{
 	desc = "Отфильтровывает азот из трубы и отправляет их в камеру хранения";
+	filter_type = 2;
 	name = "Фильтр Азота (N2)";
 	on = 1;
-	target_pressure = 4500;
-	filter_type = 2
+	target_pressure = 4500
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -77948,9 +77814,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";
-	dir = 2
+	name = "Kitchen Shutters"
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -78059,8 +77925,8 @@
 	req_access = list(22)
 	},
 /obj/machinery/mass_driver{
-	id_tag = "chapelgun";
-	dir = 1
+	dir = 1;
+	id_tag = "chapelgun"
 	},
 /obj/structure/window/reinforced{
 	dir = 4
@@ -78155,8 +78021,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #5";
-	id_tag = "xeno5"
+	id_tag = "xeno5";
+	name = "Creature Cell #5"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -78315,11 +78181,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 2;
 	icon_state = "open";
 	id_tag = "rdprivacy";
 	name = "Research Director Office Shutters";
-	opacity = 0;
-	dir = 2
+	opacity = 0
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -78566,9 +78432,6 @@
 	icon_state = "purple"
 	},
 /area/hallway/primary/central/ne)
-"lEx" = (
-/turf/simulated/wall,
-/area/civilian/barber)
 "lEz" = (
 /obj/machinery/camera{
 	c_tag = "Psychiatrist";
@@ -78789,8 +78652,8 @@
 /obj/structure/lattice,
 /obj/machinery/camera{
 	c_tag = "AI Satellite Exterior 11";
-	network = list("SS13","MiniSat");
-	dir = 8
+	dir = 8;
+	network = list("SS13","MiniSat")
 	},
 /turf/space/openspace,
 /area/maintenance/ai)
@@ -78939,8 +78802,8 @@
 "lGS" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/curtain/open{
-	color = "purple";
-	anchored = 1
+	anchored = 1;
+	color = "purple"
 	},
 /turf/simulated/floor/plating,
 /area/janitor)
@@ -79179,9 +79042,9 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/energy/laser,
 /obj/item/gun/energy/laser{
@@ -79360,8 +79223,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purple"
@@ -79405,8 +79268,8 @@
 /obj/machinery/light/small,
 /obj/machinery/camera{
 	c_tag = "Brig Cells";
-	network = list("SS13","Security");
-	dir = 10
+	dir = 10;
+	network = list("SS13","Security")
 	},
 /obj/machinery/door_timer/cell_6{
 	pixel_y = -32
@@ -79897,12 +79760,12 @@
 	},
 /obj/item/folder/yellow,
 /obj/item/folder/blue{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/folder/red{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /obj/effect/turf_decal{
 	icon_state = "golden_stripes"
@@ -80846,16 +80709,6 @@
 /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
@@ -81281,8 +81134,8 @@
 	pixel_y = -10
 	},
 /obj/item/radio/intercom{
-	pixel_y = 3;
-	pixel_x = -28
+	pixel_x = -28;
+	pixel_y = 3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -81389,11 +81242,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
@@ -81544,8 +81397,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #7";
-	id_tag = "xeno7"
+	id_tag = "xeno7";
+	name = "Creature Cell #7"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -81700,8 +81553,8 @@
 	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hydroponics)
 "mcM" = (
@@ -82172,12 +82025,12 @@
 /obj/structure/table,
 /obj/item/reagent_containers/food/snacks/grown/moonlight,
 /obj/item/reagent_containers/food/snacks/grown/moonlight{
-	pixel_y = 3;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/snacks/grown/moonlight{
-	pixel_y = 5;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -82446,9 +82299,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/clothing/shoes/jackboots/armored,
 /obj/item/clothing/shoes/jackboots/armored,
@@ -82855,9 +82708,8 @@
 /area/chapel/main)
 "mkf" = (
 /obj/structure/table,
-/obj/item/storage/box/lip_stick,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "mki" = (
 /obj/effect/spawner/random_spawners/rodent,
 /turf/simulated/floor/carpet/red,
@@ -83121,8 +82973,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/radio/intercom{
-	pixel_y = -28;
-	pixel_x = 28
+	pixel_x = 28;
+	pixel_y = -28
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plasteel{
@@ -83419,18 +83271,11 @@
 /area/maintenance/trading)
 "moe" = (
 /obj/structure/window/reinforced,
-/obj/structure/dresser,
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_x = -32
 	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "moh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/reinforced,
@@ -83537,8 +83382,8 @@
 /obj/machinery/door_control{
 	id = "xeno4";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = 32
+	pixel_x = 32;
+	req_access = list(55)
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/warning_stripes/yellow,
@@ -83913,8 +83758,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "mtI" = (
@@ -84048,9 +83893,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";
-	dir = 2
+	name = "Kitchen Shutters"
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -84414,8 +84259,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "HoS Office North";
-	network = list("SS13","Security");
-	dir = 6
+	dir = 6;
+	network = list("SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -84471,8 +84316,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "myk" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -84628,8 +84474,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/alarm{
-	pixel_x = 24;
-	dir = 8
+	dir = 8;
+	pixel_x = 24
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter East";
@@ -84735,11 +84581,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/engine,
 /area/engineering/controlroom)
@@ -84814,32 +84660,32 @@
 	dir = 8
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/structure/window/reinforced{
 	color = "red";
 	dir = 4
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_y = 0;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 0
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_y = 0;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 0
 	},
 /obj/item/gun/projectile/automatic/pistol/enforcer/lethal{
-	pixel_y = 0;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -84861,15 +84707,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/tile/purple,
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 5
+	anchored = 1;
+	color = "#222222"
 	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "mBI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -84975,8 +84818,8 @@
 "mCK" = (
 /obj/effect/decal/cleanable/dust,
 /obj/item/pen{
-	pixel_y = -13;
-	pixel_x = -13
+	pixel_x = -13;
+	pixel_y = -13
 	},
 /turf/simulated/floor/wood,
 /area/maintenance/library)
@@ -85173,8 +85016,8 @@
 	icon_state = "2-4"
 	},
 /obj/structure/disposalpipe/sortjunction/reversed{
-	sortType = 23;
-	name = "Genetics"
+	name = "Genetics";
+	sortType = 23
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -85196,8 +85039,8 @@
 	dir = 8
 	},
 /obj/machinery/recharger/wallcharger{
-	pixel_y = 24;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -85396,8 +85239,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Medbay Exam Room North";
-	network = list("SS13","Medical");
-	dir = 5
+	dir = 5;
+	network = list("SS13","Medical")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
@@ -85783,8 +85626,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = -10
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 4
@@ -86953,8 +86796,8 @@
 	pixel_y = 24
 	},
 /obj/item/radio/intercom{
-	pixel_y = 24;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -87031,8 +86874,8 @@
 /area/maintenance/casino)
 "mRb" = (
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
@@ -87262,8 +87105,8 @@
 	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 4
+	dir = 4;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "mSI" = (
@@ -87363,8 +87206,8 @@
 	dir = 5
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "mSW" = (
@@ -87488,8 +87331,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
-	pixel_y = 28;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 28
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "cult"
@@ -87498,8 +87341,8 @@
 "mTT" = (
 /obj/structure/table/reinforced,
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plasteel{
@@ -87925,10 +87768,10 @@
 "mXe" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/crew_quarters/theatre)
@@ -87946,9 +87789,9 @@
 /obj/structure/window/reinforced,
 /obj/item/flag/nt,
 /obj/structure/sign/atmosplaque{
-	pixel_y = 32;
 	desc = "Важное Уточнение! Главный Инженер пожелал оставаться анонимным, поэтому, обойдёмся прозвищем. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование станции Нова по всем стандартам НаноТрейзен. Благодарим вас за труд, PiroMage. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо Для Главного Инженера Команды Архитекторов Станции Нова"
+	name = "Благодарственное Письмо Для Главного Инженера Команды Архитекторов Станции Нова";
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -88030,10 +87873,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
@@ -88285,16 +88128,16 @@
 "mZZ" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_y = 13;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 13
 	},
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_y = 1;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = 1
 	},
 /obj/effect/spawner/lootdrop/maintenance{
-	pixel_y = -1;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = -1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/brig)
@@ -88410,8 +88253,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -88562,9 +88405,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/c9mm{
@@ -88635,11 +88478,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -88670,8 +88513,8 @@
 "nbN" = (
 /obj/machinery/camera{
 	c_tag = "Supermatter Second Floor South";
-	network = list("SS13","Engineering");
-	dir = 1
+	dir = 1;
+	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/engineering/controlroom)
@@ -88816,8 +88659,8 @@
 	},
 /obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 4
+	dir = 4;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "ndp" = (
@@ -89296,8 +89139,8 @@
 /area/space)
 "ngP" = (
 /obj/item/cigbutt{
-	pixel_y = 5;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -90087,15 +89930,15 @@
 /obj/structure/safe/floor,
 /obj/item/seeds/wheat/meat,
 /obj/item/gun/energy/floragun{
-	selfcharge = 0;
-	emagged = 1;
-	name = "old floral somatoray";
+	ammo_type = list(/obj/item/ammo_casing/energy/flora/beta,/obj/item/ammo_casing/energy/flora/gamma);
 	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 режима стрельбы: бета и гамма. Бета изменяет геном растений. Гамма ускоряет рост растений. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия.";
-	desc = "Старый ботанический инструмент, испускающий контролируемое излучение, вызывающее мутации в клетках растений, не имеет самозарядки. Чтобы перезарядить это оружие, используйте устройство для подзарядки оружия."
+	emagged = 1;
+	name = "old floral somatoray";
+	selfcharge = 0
 	},
 /turf/simulated/floor/grass,
 /area/maintenance/garden)
@@ -90742,9 +90585,9 @@
 "nrY" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
 	id_tag = "Bar Hall";
-	name = "Bar Privacy Shutters";
-	dir = 8
+	name = "Bar Privacy Shutters"
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/bar)
@@ -91124,12 +90967,12 @@
 	pixel_y = 9
 	},
 /obj/item/storage/box/syringes{
-	pixel_y = 11;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 11
 	},
 /obj/item/storage/lockbox/vials{
-	pixel_y = -3;
-	pixel_x = 1
+	pixel_x = 1;
+	pixel_y = -3
 	},
 /obj/item/storage/fancy/vials{
 	pixel_x = 6;
@@ -91537,8 +91380,8 @@
 "nyr" = (
 /obj/machinery/camera{
 	c_tag = "Permabrig Hallway North";
-	network = list("SS13","Security");
-	dir = 4
+	dir = 4;
+	network = list("SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -92159,11 +92002,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/carpet,
 /area/library)
@@ -92286,8 +92129,8 @@
 	dir = 4
 	},
 /obj/machinery/vending/wallmed{
-	pixel_y = 0;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -92354,8 +92197,8 @@
 	dir = 8
 	},
 /obj/machinery/door/window/brigdoor/southright{
-	req_access = list(17,75);
-	dir = 4
+	dir = 4;
+	req_access = list(17,75)
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -92849,8 +92692,8 @@
 	},
 /obj/item/radio/intercom{
 	name = "north station intercom (General)";
-	pixel_y = 35;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 35
 	},
 /turf/simulated/floor/carpet/blue,
 /area/medical/cmo)
@@ -93132,8 +92975,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = -10
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -93412,8 +93255,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 9
+	dir = 9;
+	icon_state = "blue"
 	},
 /area/hallway/primary/central/north)
 "nMj" = (
@@ -93469,17 +93312,17 @@
 /obj/machinery/button/windowtint{
 	dir = 8;
 	id = "psychprivate";
+	name = "Door tint control";
 	pixel_x = 23;
-	pixel_y = 25;
-	name = "Door tint control"
+	pixel_y = 25
 	},
 /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);
-	pixel_x = 24
+	req_access = list(64)
 	},
 /turf/simulated/floor/carpet,
 /area/medical/psych)
@@ -94183,12 +94026,12 @@
 /obj/structure/table/reinforced,
 /obj/item/kitchen/knife/combat/survival,
 /obj/item/kitchen/knife/combat/survival{
-	pixel_y = -4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = -4
 	},
 /obj/item/kitchen/knife/combat/survival{
-	pixel_y = 4;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
@@ -94500,9 +94343,9 @@
 	},
 /obj/item/reagent_containers/food/condiment/peppermill,
 /obj/machinery/door/window{
+	dir = 1;
 	name = "Kitchen";
-	req_access = list(28);
-	dir = 1
+	req_access = list(28)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -94578,8 +94421,8 @@
 	pixel_y = 36
 	},
 /obj/machinery/keycard_auth{
-	pixel_y = 27;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 27
 	},
 /obj/machinery/door_control{
 	id = "Biohazard";
@@ -94809,8 +94652,8 @@
 /area/medical/chemistry)
 "nWU" = (
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 5
+	dir = 5;
+	id = "QMLoad2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -95008,8 +94851,8 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "nZu" = (
@@ -95073,8 +94916,8 @@
 "nZN" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #4";
-	id_tag = "xeno4"
+	id_tag = "xeno4";
+	name = "Creature Cell #4"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -95352,11 +95195,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
@@ -95367,8 +95210,8 @@
 	in_use = 1
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_y = 28;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 28
 	},
 /obj/machinery/alarm{
 	pixel_y = 25
@@ -95761,8 +95604,8 @@
 /obj/item/clothing/glasses/hud/hydroponic,
 /obj/item/clothing/mask/cigarette/rollie,
 /obj/item/storage/fancy/cigarettes{
-	pixel_y = 8;
-	pixel_x = -11
+	pixel_x = -11;
+	pixel_y = 8
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -95884,20 +95727,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";
-	pixel_x = 25;
-	pixel_y = -2
+	tag_interior_door = "sw_maint2_inner"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "sw_maint2_sensor";
-	pixel_y = 5;
-	pixel_x = 25
+	pixel_x = 25;
+	pixel_y = 5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
@@ -95914,9 +95757,9 @@
 /area/hallway/secondary/entry)
 "ofJ" = (
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter";
-	dir = 8
+	name = "Robotics Privacy Shutter"
 	},
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -96031,8 +95874,8 @@
 /obj/machinery/door_control{
 	id = "Chemistry2";
 	name = "Chem Hallway Desk Shutters";
-	pixel_y = 24;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 24
 	},
 /turf/simulated/floor/engine,
 /area/medical/chemistry)
@@ -96116,8 +95959,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Minisat AI Core Centre";
-	network = list("Minisat","SS13");
-	dir = 10
+	dir = 10;
+	network = list("Minisat","SS13")
 	},
 /turf/simulated/floor/greengrid,
 /area/turret_protected/ai)
@@ -96602,9 +96445,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);
-	id = "Morgue"
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -96751,11 +96594,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -96767,9 +96610,9 @@
 /obj/item/stack/cable_coil,
 /obj/item/stack/cable_coil,
 /obj/structure/closet/secure_closet/medical_wall{
-	req_access = list(3);
+	name = "Exile item closet";
 	pixel_x = -32;
-	name = "Exile item closet"
+	req_access = list(3)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -96806,9 +96649,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;
-	dir = 1
+	sortType = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -97079,9 +96922,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint3)
 "oqt" = (
-/obj/effect/landmark/start/barber,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "oqu" = (
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -97651,8 +97494,8 @@
 	icon_state = "0-2"
 	},
 /obj/structure/sign/electricshock{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /obj/machinery/light{
 	dir = 4
@@ -97767,10 +97610,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/clothing/suit/armor/riot,
 /obj/item/clothing/suit/armor/riot,
@@ -97880,8 +97723,8 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "ovQ" = (
@@ -98640,8 +98483,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/camera/motion{
 	c_tag = "Minisat AI Core South";
-	network = list("Minisat","SS13");
-	dir = 10
+	dir = 10;
+	network = list("Minisat","SS13")
 	},
 /turf/simulated/floor/redgrid,
 /area/turret_protected/ai)
@@ -98926,20 +98769,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";
-	pixel_y = 28
+	tag_interior_door = "aisolw_inner"
 	},
 /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";
-	dir = 4
+	id_tag = "aisolw_pump"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -99037,8 +98880,8 @@
 	dir = 4
 	},
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -99665,9 +99508,9 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/security/hos)
 "oKr" = (
@@ -99940,9 +99783,9 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/structure/window/reinforced{
 	color = "red"
@@ -100067,8 +99910,8 @@
 /area/maintenance/asmaint2)
 "oNn" = (
 /obj/machinery/conveyor/inverted{
-	id = "QMLoad";
-	dir = 9
+	dir = 9;
+	id = "QMLoad"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -100106,8 +99949,8 @@
 /area/maintenance/secpost)
 "oNw" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay)
 "oNx" = (
@@ -100150,11 +99993,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purplefull"
@@ -100223,8 +100066,8 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "oOA" = (
@@ -100237,9 +100080,9 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/windowtint{
 	id = "Interrogation";
+	pixel_x = 24;
 	pixel_y = -24;
-	req_access = list(63);
-	pixel_x = 24
+	req_access = list(63)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -100262,8 +100105,8 @@
 "oOJ" = (
 /obj/machinery/camera{
 	c_tag = "Research Central Hallway";
-	network = list("Research","SS13");
-	dir = 10
+	dir = 10;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple";
@@ -100672,7 +100515,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "oRT" = (
 /obj/machinery/vending/snack,
 /obj/effect/turf_decal/siding/wood{
@@ -101000,8 +100843,8 @@
 /area/chapel/main)
 "oUd" = (
 /obj/machinery/door/window/brigdoor{
-	dir = 1;
-	color = "red"
+	color = "red";
+	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -101088,9 +100931,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);
-	pixel_x = 26
+	req_access = list(2)
 	},
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -101101,9 +100944,9 @@
 /obj/machinery/door_control{
 	id = "HoSPriv";
 	name = "HoS Office Privacy Shutters Control";
+	pixel_x = 26;
 	pixel_y = -10;
-	req_access = list(58);
-	pixel_x = 26
+	req_access = list(58)
 	},
 /obj/machinery/door_control{
 	id = "Brig_lockdown";
@@ -101508,8 +101351,8 @@
 /area/security/prisonershuttle)
 "oXJ" = (
 /obj/machinery/conveyor{
-	id = "packageExternal";
-	dir = 8
+	dir = 8;
+	id = "packageExternal"
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plasteel{
@@ -101755,11 +101598,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/tourist)
@@ -101770,18 +101613,18 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced{
-	layer = 2.9;
-	color = "orange"
+	color = "orange";
+	layer = 2.9
 	},
 /obj/structure/window/reinforced{
+	color = "orange";
 	dir = 4;
-	layer = 2.9;
-	color = "orange"
+	layer = 2.9
 	},
 /obj/structure/window/reinforced{
+	color = "orange";
 	dir = 8;
-	layer = 2.9;
-	color = "orange"
+	layer = 2.9
 	},
 /turf/simulated/floor/grass,
 /area/quartermaster/miningstorage)
@@ -102172,8 +102015,8 @@
 /area/medical/cryo)
 "pch" = (
 /obj/structure/chair/sofa/corner{
-	dir = 4;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 4
 	},
 /turf/simulated/floor/wood{
 	icon_state = "wood-broken3";
@@ -102369,8 +102212,8 @@
 /obj/machinery/atmospherics/meter,
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	desc = "Труба хранит в себе набор газов для смешивания";
-	name = "Труба смешивания";
-	dir = 1
+	dir = 1;
+	name = "Труба смешивания"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -102465,8 +102308,8 @@
 /obj/machinery/door_control{
 	id = "SecPilotPriv";
 	name = "Pilot Privacy Shutters Control";
-	req_access = list(3,71);
-	pixel_x = -24
+	pixel_x = -24;
+	req_access = list(3,71)
 	},
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -102949,8 +102792,8 @@
 /obj/machinery/door_control{
 	id = "xeno1";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = -32
+	pixel_x = -32;
+	req_access = list(55)
 	},
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
@@ -103631,10 +103474,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);
-	dir = 8
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -103730,8 +103573,8 @@
 "pns" = (
 /obj/machinery/camera{
 	c_tag = "Research West Hallway 1";
-	network = list("Research","SS13");
-	dir = 9
+	dir = 9;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -103983,19 +103826,19 @@
 /obj/structure/flora/ausbushes/sunnybush,
 /obj/machinery/light,
 /obj/structure/window/reinforced{
+	color = "orange";
 	dir = 1;
-	layer = 2.9;
-	color = "orange"
+	layer = 2.9
 	},
 /obj/structure/window/reinforced{
+	color = "orange";
 	dir = 4;
-	layer = 2.9;
-	color = "orange"
+	layer = 2.9
 	},
 /obj/structure/window/reinforced{
+	color = "orange";
 	dir = 8;
-	layer = 2.9;
-	color = "orange"
+	layer = 2.9
 	},
 /turf/simulated/floor/grass,
 /area/quartermaster/miningstorage)
@@ -104922,8 +104765,8 @@
 "pxf" = (
 /obj/machinery/light_switch{
 	name = "north bump";
-	pixel_y = -24;
-	pixel_x = 24
+	pixel_x = 24;
+	pixel_y = -24
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue";
@@ -105228,13 +105071,8 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "pzl" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -105991,8 +105829,8 @@
 /obj/item/tank/internals/plasma,
 /obj/machinery/camera{
 	c_tag = "Engine Room East";
-	network = list("Engineering","SS13");
-	dir = 8
+	dir = 8;
+	network = list("Engineering","SS13")
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/engine)
@@ -106364,17 +106202,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";
-	pixel_x = 57
+	tag_interior_door = "station_ai_inner"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "station_ai_sensor";
-	pixel_y = 7;
-	pixel_x = 57
+	pixel_x = 57;
+	pixel_y = 7
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -106582,16 +106420,16 @@
 	layer = 2.9
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 2;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/energy/dominator,
 /obj/structure/window/reinforced{
@@ -106627,9 +106465,9 @@
 	},
 /obj/item/reagent_containers/food/condiment/saltshaker,
 /obj/machinery/door/window{
+	dir = 1;
 	name = "Kitchen";
-	req_access = list(28);
-	dir = 1
+	req_access = list(28)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -106719,8 +106557,8 @@
 /obj/structure/table/reinforced,
 /obj/item/folder/red,
 /obj/item/folder/red{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -107010,8 +106848,8 @@
 /area/toxins/mixing)
 "pMN" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "pMW" = (
@@ -107137,8 +106975,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Supermatter South";
-	network = list("SS13","Engineering");
-	dir = 1
+	dir = 1;
+	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/redgrid,
 /area/engineering/controlroom)
@@ -107468,12 +107306,12 @@
 	dir = 4
 	},
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /obj/machinery/conveyor{
-	id = "QMLoad2";
 	dir = 8;
+	id = "QMLoad2";
 	layer = 2.494
 	},
 /turf/simulated/floor/plasteel{
@@ -107780,8 +107618,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "yellowcorner";
-	dir = 8
+	dir = 8;
+	icon_state = "yellowcorner"
 	},
 /area/maintenance/apmaint)
 "pSo" = (
@@ -107948,10 +107786,10 @@
 	dir = 8
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 1;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/structure/rack{
 	dir = 8;
@@ -108183,10 +108021,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);
-	dir = 8
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -108350,8 +108188,8 @@
 /obj/structure/closet/radiation,
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 9
+	dir = 9;
+	icon_state = "whitepurple"
 	},
 /area/toxins/explab)
 "pVY" = (
@@ -108549,9 +108387,9 @@
 /area/security/brig)
 "pWX" = (
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/security/hos)
 "pXa" = (
@@ -108562,11 +108400,11 @@
 	tag = "plant-dead"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 10;
@@ -108603,8 +108441,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Secure Creature Cell";
-	id_tag = "xenosecure"
+	id_tag = "xenosecure";
+	name = "Secure Creature Cell"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -108847,8 +108685,8 @@
 "pYO" = (
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/brigdoor/southright{
-	req_access = list(17,75);
-	dir = 1
+	dir = 1;
+	req_access = list(17,75)
 	},
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plasteel{
@@ -109204,10 +109042,10 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/plating,
@@ -109275,8 +109113,8 @@
 /obj/item/clipboard,
 /obj/item/toy/figure/virologist,
 /obj/item/reagent_containers/food/drinks/coffee{
-	pixel_y = 4;
-	pixel_x = 10
+	pixel_x = 10;
+	pixel_y = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -109625,8 +109463,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -110215,8 +110053,8 @@
 "qjD" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable,
 /obj/structure/cable{
@@ -110352,15 +110190,15 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/biogenerator,
 /obj/machinery/door/window/eastleft{
+	dir = 1;
 	name = "Hydroponics Desk";
-	req_access = list(35);
-	dir = 1
+	req_access = list(35)
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 1;
 	id_tag = "Hydroponics Shutters";
-	name = "Hydroponics Shutters";
-	dir = 1
+	name = "Hydroponics Shutters"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5
@@ -110491,8 +110329,8 @@
 /area/engineering/mechanic_workshop/hangar)
 "qmd" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "qmk" = (
@@ -110650,8 +110488,8 @@
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/power/apc{
 	cell_type = 25000;
-	shock_proof = 1;
-	pixel_y = -26
+	pixel_y = -26;
+	shock_proof = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellow"
@@ -110824,11 +110662,11 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/wood,
 /area/library/game_zone)
@@ -110999,8 +110837,8 @@
 /obj/structure/table/reinforced,
 /obj/item/storage/box/bodybags,
 /obj/item/storage/box/masks{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/storage/box/gloves{
 	pixel_x = 4;
@@ -111164,10 +111002,10 @@
 "qsm" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	icon_state = "closed";
 	name = "backstage";
-	opacity = 1;
-	anchored = 1
+	opacity = 1
 	},
 /obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel{
@@ -111281,8 +111119,8 @@
 /area/maintenance/cafeteria)
 "qta" = (
 /obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_y = 5;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dust,
@@ -111354,9 +111192,9 @@
 "qtz" = (
 /obj/machinery/atmospherics/binary/pump/on{
 	desc = "Отправляет дыхательную смесь из трубы распространяться по станции через вентиляции";
+	dir = 1;
 	name = "Дыхательную смесь на станцию";
-	target_pressure = 303.325;
-	dir = 1
+	target_pressure = 303.325
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -111494,11 +111332,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;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -111518,8 +111356,8 @@
 /area/engineering/mechanic_workshop)
 "quj" = (
 /turf/simulated/floor/plasteel{
-	icon_state = "yellowcorner";
-	dir = 8
+	dir = 8;
+	icon_state = "yellowcorner"
 	},
 /area/maintenance/apmaint)
 "quk" = (
@@ -111683,8 +111521,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "yellowcorner";
-	dir = 8
+	dir = 8;
+	icon_state = "yellowcorner"
 	},
 /area/maintenance/apmaint)
 "qvy" = (
@@ -112032,8 +111870,8 @@
 "qya" = (
 /obj/effect/turf_decal/siding/yellow,
 /obj/structure/tribune{
-	pixel_y = 0;
-	anchored = 1
+	anchored = 1;
+	pixel_y = 0
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -112162,8 +112000,8 @@
 /obj/machinery/shower{
 	dir = 1;
 	layer = 5;
-	pixel_y = -5;
-	on = 1
+	on = 1;
+	pixel_y = -5
 	},
 /obj/structure/curtain/open/shower/security,
 /obj/item/radio/intercom{
@@ -112226,8 +112064,8 @@
 /area/security/customs)
 "qyW" = (
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = -30
+	pixel_x = -30;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -112292,8 +112130,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #3";
-	id_tag = "xeno3"
+	id_tag = "xeno3";
+	name = "Creature Cell #3"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -112558,8 +112396,8 @@
 "qBq" = (
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/closet/walllocker/emerglocker/north{
-	pixel_y = 0;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 0
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -112678,9 +112516,9 @@
 	name = "Abandoned Kitchen Shutters"
 	},
 /obj/machinery/door/window{
+	dir = 1;
 	name = "Kitchen";
-	req_access = list(28);
-	dir = 1
+	req_access = list(28)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "stage_bleft"
@@ -113039,8 +112877,8 @@
 /area/storage/secure)
 "qEH" = (
 /obj/machinery/door/airlock/glass{
-	req_access = list(63);
-	name = "Break room"
+	name = "Break room";
+	req_access = list(63)
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -113196,11 +113034,11 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -113626,9 +113464,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/projectile/automatic/wt550{
 	pixel_x = 3
@@ -113679,8 +113517,8 @@
 	pixel_y = 8
 	},
 /obj/structure/sign/directions/engineering{
-	pixel_y = -8;
-	dir = 1
+	dir = 1;
+	pixel_y = -8
 	},
 /turf/simulated/wall,
 /area/hallway/primary/central/second/north)
@@ -113919,10 +113757,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/energy/gun/advtaser{
 	pixel_x = -3;
@@ -114803,9 +114641,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,
@@ -115252,8 +115090,8 @@
 /area/maintenance/casino)
 "qWk" = (
 /obj/structure/rack/gunrack{
-	name = "shelf";
-	desc = "A sturdy metal shelf to store a variety of items on."
+	desc = "A sturdy metal shelf to store a variety of items on.";
+	name = "shelf"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -116098,10 +115936,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/storage/box/barrier,
 /obj/item/grenade/barrier{
@@ -116586,8 +116424,8 @@
 	},
 /obj/effect/turf_decal/number/number_2{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "blue"
@@ -116652,8 +116490,8 @@
 /area/security/permabrig)
 "ris" = (
 /obj/machinery/atmospherics/unary/portables_connector{
-	layer = 2;
-	dir = 8
+	dir = 8;
+	layer = 2
 	},
 /obj/machinery/portable_atmospherics/canister/air,
 /turf/simulated/floor/plating,
@@ -117006,12 +116844,11 @@
 /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/civilian/barber)
+/area/maintenance/tourist)
 "rlg" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/turretid/stun{
@@ -118022,9 +117859,9 @@
 "rsK" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical/glass{
+	id = "Morgue";
 	name = "Morgue";
-	req_access = list(5);
-	id = "Morgue"
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -118119,8 +117956,8 @@
 "rtn" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -118307,19 +118144,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";
-	pixel_x = -25
+	tag_interior_door = "n_tool_inner"
 	},
 /obj/machinery/airlock_sensor{
 	id_tag = "n_tool_sensor";
 	layer = 3.3;
-	pixel_y = 7;
-	pixel_x = -25
+	pixel_x = -25;
+	pixel_y = 7
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -119248,8 +119085,8 @@
 	pixel_y = 4
 	},
 /obj/item/lipstick/black{
-	pixel_y = -1;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -1
 	},
 /obj/effect/decal/cleanable/dust,
 /turf/simulated/floor/wood,
@@ -119265,10 +119102,10 @@
 	dir = 4
 	},
 /obj/machinery/button/windowtint{
-	pixel_y = -24;
-	pixel_x = 24;
 	id = "ntrepprivate";
-	name = "Door tint control"
+	name = "Door tint control";
+	pixel_x = 24;
+	pixel_y = -24
 	},
 /obj/machinery/door_control{
 	id = "NTRprivate";
@@ -119330,8 +119167,8 @@
 	},
 /obj/effect/decal/warning_stripes/southwest,
 /obj/machinery/firealarm{
-	pixel_y = -27;
-	pixel_x = 27
+	pixel_x = 27;
+	pixel_y = -27
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -120489,10 +120326,6 @@
 /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"
 	},
@@ -120505,10 +120338,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "rJR" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/poddoor/preopen{
@@ -121213,8 +121044,8 @@
 	dir = 8
 	},
 /obj/item/reagent_containers/food/drinks/mug/sci{
-	pixel_y = 10;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 10
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -122076,8 +121907,8 @@
 /obj/machinery/vending/wallmed{
 	layer = 3.3;
 	name = "Emergency NanoMed";
-	pixel_y = 0;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/livingcomplex)
@@ -122145,8 +121976,8 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Secure Creature Cell";
-	id_tag = "xenosecure"
+	id_tag = "xenosecure";
+	name = "Secure Creature Cell"
 	},
 /obj/effect/spawner/window/reinforced/plasma,
 /turf/simulated/floor/plating,
@@ -122327,9 +122158,9 @@
 	id = "conferenceroombolts";
 	name = "Conference Room Bolts Control";
 	normaldoorcontrol = 1;
+	pixel_x = -4;
 	req_access = list(19);
-	specialfunctions = 4;
-	pixel_x = -4
+	specialfunctions = 4
 	},
 /obj/machinery/button/windowtint{
 	id = "conferenceroomwindows";
@@ -122427,9 +122258,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";
-	dir = 2
+	name = "Kitchen Shutters"
 	},
 /obj/machinery/door/window/westright{
 	dir = 2;
@@ -122571,8 +122402,8 @@
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/reception)
 "rYB" = (
@@ -122833,8 +122664,8 @@
 /area/quartermaster/delivery)
 "saW" = (
 /obj/effect/turf_decal/siding/white/end{
-	dir = 4;
-	color = "#444444"
+	color = "#444444";
+	dir = 4
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -122930,8 +122761,8 @@
 /obj/structure/table/wood,
 /obj/effect/spawner/lootdrop/officetoys,
 /obj/item/flashlight/lamp/green{
-	pixel_y = 13;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = 13
 	},
 /obj/machinery/door_control{
 	id = "hopofficedoor";
@@ -123262,8 +123093,8 @@
 /area/hallway/primary/command/west)
 "sdh" = (
 /obj/effect/turf_decal/siding/white/end{
-	dir = 8;
-	color = "#444444"
+	color = "#444444";
+	dir = 8
 	},
 /turf/simulated/floor/glass{
 	slowdown = -0.3
@@ -123495,8 +123326,8 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/warning_stripes/yellow,
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "seC" = (
@@ -123582,9 +123413,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/clothing/suit/armor/bulletproof,
 /obj/item/clothing/suit/armor/bulletproof,
@@ -123947,8 +123778,8 @@
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medrest)
 "sil" = (
@@ -124225,12 +124056,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;
-	dir = 4
+	pressure_checks = 0
 	},
 /turf/simulated/floor/bluegrid{
 	icon_state = "gcircuit";
@@ -125104,8 +124935,8 @@
 "ssi" = (
 /obj/machinery/atmospherics/binary/volume_pump/on{
 	desc = "Возвращает газ после обработки в трубу смешивания";
-	name = "Выход газа после обработки";
-	dir = 1
+	dir = 1;
+	name = "Выход газа после обработки"
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -125241,8 +125072,8 @@
 /obj/effect/decal/warning_stripes/yellow,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "ste" = (
@@ -125589,8 +125420,8 @@
 	},
 /obj/effect/landmark/start/intern,
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medrest)
 "svr" = (
@@ -125924,12 +125755,12 @@
 	},
 /obj/structure/table/reinforced,
 /obj/item/storage/box/lights/mixed{
-	pixel_y = 6;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 6
 	},
 /obj/item/storage/box/lights/mixed{
-	pixel_y = 6;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 6
 	},
 /obj/item/grenade/chem_grenade/metalfoam,
 /obj/item/grenade/chem_grenade/metalfoam,
@@ -126259,8 +126090,8 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "sAx" = (
@@ -127195,15 +127026,15 @@
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/clothing/under/retro/engineering,
 /obj/item/clothing/under/retro/medical{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /obj/item/clothing/under/retro/science{
 	pixel_x = 6
 	},
 /obj/item/clothing/under/retro/security{
-	pixel_y = 4;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 4
 	},
 /obj/item/clothing/under/solgov/civ,
 /obj/structure/sign/poster/official/random{
@@ -127922,8 +127753,8 @@
 /obj/machinery/teleport/station,
 /obj/machinery/camera/motion{
 	c_tag = "Minisat Teleporter Room";
-	network = list("Minisat","SS13");
-	dir = 4
+	dir = 4;
+	network = list("Minisat","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -128608,9 +128439,9 @@
 /obj/item/reagent_containers/food/snacks/candy/mre,
 /obj/item/reagent_containers/food/snacks/candy/mre,
 /obj/structure/closet/secure_closet/medical_wall{
-	req_access = list(3);
+	name = "Exile item closet";
 	pixel_x = -32;
-	name = "Exile item closet"
+	req_access = list(3)
 	},
 /obj/machinery/camera{
 	c_tag = "Gateway Exile";
@@ -128784,11 +128615,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutral"
@@ -128825,10 +128656,10 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -129035,11 +128866,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -129409,10 +129240,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/lock_buster,
 /obj/item/storage/box/trackimp,
@@ -129492,9 +129323,9 @@
 /obj/structure/flora/ausbushes/leafybush,
 /obj/machinery/camera{
 	c_tag = "Xenobio Central-North";
+	dir = 1;
 	network = list("Research","SS13");
-	pixel_x = -1;
-	dir = 1
+	pixel_x = -1
 	},
 /turf/simulated/floor/grass,
 /area/toxins/xenobiology)
@@ -129598,8 +129429,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/reception)
 "sZi" = (
@@ -129670,8 +129501,8 @@
 	pixel_x = 10
 	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_y = 12;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 12
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
@@ -129803,12 +129634,12 @@
 /obj/structure/table/wood,
 /obj/item/folder/yellow,
 /obj/item/folder/red{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /obj/item/folder/blue{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/magistrateoffice)
@@ -130465,9 +130296,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -130785,8 +130616,8 @@
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/camera{
 	c_tag = "Atmospherics South";
-	network = list("SS13","Engineering");
-	dir = 1
+	dir = 1;
+	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -130910,8 +130741,8 @@
 /obj/structure/barricade/wooden/crude,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
 	anchored = 1;
+	name = "backstage";
 	pixel_y = 0
 	},
 /turf/simulated/floor/plating,
@@ -131128,8 +130959,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 8;
-	pixel_y = 8;
-	pixel_x = -11
+	pixel_x = -11;
+	pixel_y = 8
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint4)
@@ -131397,8 +131228,8 @@
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	dir = 2;
-	name = "Privacy Shutters";
-	id_tag = "NTRprivate"
+	id_tag = "NTRprivate";
+	name = "Privacy Shutters"
 	},
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "ntrepprivate"
@@ -131418,9 +131249,9 @@
 	desc = "A floor-mounted flashbulb device.";
 	id = "brigkpp";
 	layer = 5;
+	pixel_x = -55;
 	pixel_y = 0;
-	range = 3;
-	pixel_x = -55
+	range = 3
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -131759,12 +131590,8 @@
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
-/obj/effect/landmark/start/barber,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "dark"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "toQ" = (
 /obj/structure/table/wood/poker,
 /obj/effect/decal/cleanable/dust,
@@ -131890,9 +131717,9 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/clothing/gloves/color/black/ballistic,
 /obj/item/clothing/gloves/color/black/ballistic,
@@ -131953,8 +131780,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Gravity Generator Area East";
-	network = list("SS13","Engineering");
-	dir = 4
+	dir = 4;
+	network = list("SS13","Engineering")
 	},
 /turf/simulated/floor/plasteel,
 /area/engineering/gravitygenerator)
@@ -132137,8 +131964,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay)
 "trq" = (
@@ -132586,8 +132413,8 @@
 	pixel_y = 24
 	},
 /obj/structure/closet/walllocker/emerglocker/north{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "purplefull"
@@ -132620,11 +132447,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/carpet,
 /area/maintenance/casino)
@@ -132943,31 +132770,20 @@
 /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/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "twp" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -133231,12 +133047,12 @@
 "txA" = (
 /obj/structure/table/reinforced,
 /obj/item/stamp/hos{
-	pixel_y = 3;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/drinks/bottle/whiskey{
-	pixel_y = 3;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /turf/simulated/floor/carpet/red,
 /area/security/hos)
@@ -133256,8 +133072,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light_switch{
-	pixel_y = 26;
-	pixel_x = -26
+	pixel_x = -26;
+	pixel_y = 26
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -133472,8 +133288,8 @@
 "tzg" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/structure/extinguisher_cabinet{
-	pixel_y = 32;
-	pixel_x = -27
+	pixel_x = -27;
+	pixel_y = 32
 	},
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -133646,8 +133462,8 @@
 	id = "toilet1";
 	name = "Toilet Bolt Control";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	pixel_x = 25
+	pixel_x = 25;
+	specialfunctions = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/structure/sign/poster/secret/lizard{
@@ -134058,12 +133874,12 @@
 	dir = 8
 	},
 /obj/item/organ/external/tail/unathi{
-	pixel_y = 8;
-	pixel_x = 8
+	pixel_x = 8;
+	pixel_y = 8
 	},
 /obj/item/organ/external/tail/tajaran{
-	pixel_y = 6;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 6
 	},
 /obj/item/clothing/head/kitty,
 /obj/effect/decal/cleanable/dirt,
@@ -134360,8 +134176,8 @@
 /area/toxins/mixing)
 "tFY" = (
 /obj/structure/sign/vacuum{
-	pixel_x = -32;
-	icon_state = "space1"
+	icon_state = "space1";
+	pixel_x = -32
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -134416,10 +134232,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);
-	dir = 8
+	req_access = list(5)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -134463,9 +134279,9 @@
 "tGB" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
+	anchored = 1;
 	name = "backstage";
-	pixel_x = 32;
-	anchored = 1
+	pixel_x = 32
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -134856,8 +134672,8 @@
 "tJs" = (
 /obj/machinery/computer/med_data,
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medrest)
 "tJu" = (
@@ -135240,8 +135056,8 @@
 /area/quartermaster/delivery)
 "tMV" = (
 /obj/machinery/conveyor/inverted{
-	id = "garbage";
-	dir = 10
+	dir = 10;
+	id = "garbage"
 	},
 /obj/effect/decal/warning_stripes/northwestcorner,
 /turf/simulated/floor/plating,
@@ -135465,18 +135281,6 @@
 	},
 /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,
@@ -136008,8 +135812,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Secure Creature Cell";
-	id_tag = "xenosecure"
+	id_tag = "xenosecure";
+	name = "Secure Creature Cell"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -136038,8 +135842,8 @@
 /obj/structure/table,
 /obj/item/security_voucher,
 /obj/item/security_voucher{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -136086,8 +135890,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #2";
-	id_tag = "xeno2"
+	id_tag = "xeno2";
+	name = "Creature Cell #2"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -136119,8 +135923,8 @@
 /area/hallway/spacebridge/comcar)
 "tSH" = (
 /obj/machinery/power/apc{
-	pixel_x = 28;
-	dir = 4
+	dir = 4;
+	pixel_x = 28
 	},
 /obj/structure/cable,
 /turf/simulated/floor/wood/fancy/light{
@@ -136158,8 +135962,8 @@
 	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "tSU" = (
@@ -136655,8 +136459,8 @@
 	dir = 6
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	name = "Officer Commandsky";
-	desc = "It's Officer Commandsky! Here to rule and command."
+	desc = "It's Officer Commandsky! Here to rule and command.";
+	name = "Officer Commandsky"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -136906,8 +136710,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #4";
-	id_tag = "xeno4"
+	id_tag = "xeno4";
+	name = "Creature Cell #4"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -138299,22 +138103,14 @@
 /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/civilian/barber)
+/area/maintenance/tourist)
 "uiv" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -138642,7 +138438,7 @@
 	dir = 1;
 	icon_state = "dark"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "ulP" = (
 /obj/structure/table/wood,
 /obj/machinery/status_display{
@@ -139372,8 +139168,8 @@
 "usc" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable{
 	d2 = 4;
@@ -139457,8 +139253,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
-	anchored = 1
+	anchored = 1;
+	name = "backstage"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -139619,11 +139415,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;
-	dir = 8
+	scrub_Toxins = 1
 	},
 /obj/structure/sign/poster/official/random{
 	pixel_x = 32
@@ -139667,8 +139463,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/flasher{
-	pixel_y = 32;
-	pixel_x = 23
+	pixel_x = 23;
+	pixel_y = 32
 	},
 /obj/machinery/ai_slipper,
 /turf/simulated/floor/plasteel{
@@ -139964,8 +139760,8 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 8
+	dir = 8;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "uwE" = (
@@ -140075,8 +139871,8 @@
 /area/library)
 "uxu" = (
 /obj/item/candle{
-	pixel_y = 4;
-	pixel_x = -9
+	pixel_x = -9;
+	pixel_y = 4
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -140559,8 +140355,8 @@
 "uBa" = (
 /obj/machinery/camera{
 	c_tag = "Research East Central Hallway";
-	network = list("Research","SS13");
-	dir = 1
+	dir = 1;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whitepurple";
@@ -140964,10 +140760,10 @@
 "uEi" = (
 /obj/machinery/door/window/brigdoor/southleft{
 	base_state = "rightsecure";
+	color = "red";
 	dir = 1;
 	icon_state = "rightsecure";
-	req_access = list(63);
-	color = "red"
+	req_access = list(63)
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -141727,10 +141523,10 @@
 	dir = 4
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/shield/riot,
 /obj/item/shield/riot,
@@ -142521,11 +142317,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 8;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 8
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -142535,8 +142331,8 @@
 "uQX" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
-	pixel_y = 0;
-	pixel_x = 28
+	pixel_x = 28;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -142547,8 +142343,8 @@
 /obj/machinery/door_control{
 	id = "xeno6";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = 32
+	pixel_x = 32;
+	req_access = list(55)
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel,
@@ -142635,8 +142431,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "yellowcorner";
-	dir = 8
+	dir = 8;
+	icon_state = "yellowcorner"
 	},
 /area/maintenance/apmaint)
 "uRy" = (
@@ -143136,10 +142932,10 @@
 "uVH" = (
 /obj/machinery/autolathe,
 /obj/machinery/door/window/brigdoor{
+	dir = 8;
 	id = "Autolathe";
 	name = "Autolathe Access";
-	req_access = list(47);
-	dir = 8
+	req_access = list(47)
 	},
 /obj/item/stack/sheet/metal{
 	amount = 10
@@ -143704,8 +143500,8 @@
 "uZg" = (
 /obj/machinery/door/window/eastleft{
 	dir = 2;
-	req_access = list(3,4);
-	name = "Forensic laboratory"
+	name = "Forensic laboratory";
+	req_access = list(3,4)
 	},
 /obj/effect/turf_decal/siding/wood,
 /turf/simulated/floor/wood,
@@ -144527,8 +144323,8 @@
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medbay2)
 "veL" = (
@@ -144621,8 +144417,8 @@
 	id = "toilet2";
 	name = "Toilet Bolt Control";
 	normaldoorcontrol = 1;
-	specialfunctions = 4;
-	pixel_x = 25
+	pixel_x = 25;
+	specialfunctions = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/effect/landmark/start/civilian,
@@ -144808,8 +144604,8 @@
 /area/toxins/test_area)
 "vhE" = (
 /obj/machinery/conveyor{
-	id = "QMLoad";
-	dir = 6
+	dir = 6;
+	id = "QMLoad"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "brown"
@@ -145163,10 +144959,6 @@
 /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
 	},
@@ -145177,10 +144969,9 @@
 	icon_state = "4-8"
 	},
 /obj/effect/landmark/event/lightsout,
-/turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
-	},
-/area/civilian/barber)
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "vkG" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/machinery/atmospherics/meter,
@@ -145267,8 +145058,8 @@
 /area/maintenance/tourist)
 "vlt" = (
 /obj/structure/chair/sofa/right{
-	dir = 8;
-	color = "#85130b"
+	color = "#85130b";
+	dir = 8
 	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -145368,8 +145159,8 @@
 	dir = 4
 	},
 /mob/living/simple_animal/bot/secbot/beepsky{
-	name = "Officer Leftsky";
-	desc = "It's Officer Leftsky! Powered by a potato and a shot of whiskey."
+	desc = "It's Officer Leftsky! Powered by a potato and a shot of whiskey.";
+	name = "Officer Leftsky"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1
@@ -145647,8 +145438,8 @@
 /obj/structure/table/wood/fancy/royalblack,
 /obj/item/clothing/under/fluff/soviet_casual_uniform,
 /obj/item/clothing/under/fluff/soviet_casual_uniform{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
@@ -145839,8 +145630,8 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "yellowcorner";
-	dir = 8
+	dir = 8;
+	icon_state = "yellowcorner"
 	},
 /area/maintenance/apmaint)
 "vqI" = (
@@ -145991,11 +145782,11 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
+	dir = 1;
 	icon_state = "open";
 	id_tag = "blueshield";
 	name = "Privacy Shutters";
-	opacity = 0;
-	dir = 1
+	opacity = 0
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -146539,8 +146330,8 @@
 	dir = 4
 	},
 /obj/structure/sign/fire{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -147109,11 +146900,11 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 4;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -147417,8 +147208,8 @@
 	dir = 4
 	},
 /obj/structure/sign/directions/security{
-	pixel_y = 8;
-	dir = 1
+	dir = 1;
+	pixel_y = 8
 	},
 /turf/simulated/wall,
 /area/hallway/primary/central)
@@ -148559,15 +148350,15 @@
 /obj/machinery/door_control{
 	id = "janitorprivatshutters";
 	name = "Janitor Private Shutters Control";
+	pixel_x = 26;
 	pixel_y = -26;
-	req_access = list(26);
-	pixel_x = 26
+	req_access = list(26)
 	},
 /obj/machinery/light_switch{
 	dir = 1;
 	name = "south bump";
-	pixel_y = -35;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = -35
 	},
 /turf/simulated/floor/carpet/purple,
 /area/janitor)
@@ -148777,8 +148568,8 @@
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
 /obj/item/radio/intercom{
-	pixel_y = 0;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -148874,11 +148665,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -148918,15 +148709,15 @@
 "vPj" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
-	pixel_y = 6;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 6
 	},
 /obj/item/pen{
 	pixel_y = 5
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whitepurple";
-	dir = 4
+	dir = 4;
+	icon_state = "whitepurple"
 	},
 /area/toxins/lab)
 "vPp" = (
@@ -149229,8 +149020,8 @@
 	},
 /obj/structure/disposalpipe/sortjunction/reversed{
 	dir = 8;
-	sortType = 12;
-	name = "Research Junction"
+	name = "Research Junction";
+	sortType = 12
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
@@ -149255,8 +149046,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/west,
 /obj/item/weldingtool/hugetank{
-	pixel_y = -3;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -3
 	},
 /turf/simulated/floor/plasteel{
 	dir = 0;
@@ -149540,8 +149331,8 @@
 	pixel_y = -10
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medrest)
 "vUP" = (
@@ -149664,9 +149455,9 @@
 	color = "red"
 	},
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -151038,8 +150829,8 @@
 	pixel_x = -3
 	},
 /obj/item/reagent_containers/food/drinks/cans/beer{
-	pixel_y = 10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 10
 	},
 /turf/simulated/floor/glass/reinforced,
 /area/quartermaster/office)
@@ -151157,8 +150948,8 @@
 	pixel_x = 2
 	},
 /obj/item/toy/figure/wizard{
-	pixel_y = 6;
-	pixel_x = 16
+	pixel_x = 16;
+	pixel_y = 6
 	},
 /turf/simulated/floor/carpet/green,
 /area/library/game_zone)
@@ -152115,8 +151906,8 @@
 "wnp" = (
 /obj/structure/rack,
 /obj/item/extinguisher/mini{
-	pixel_y = 4;
-	pixel_x = -4
+	pixel_x = -4;
+	pixel_y = 4
 	},
 /obj/item/extinguisher/mini,
 /obj/item/extinguisher/mini{
@@ -152139,8 +151930,8 @@
 /area/security/permabrig)
 "wnt" = (
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 0
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -152210,8 +152001,8 @@
 	name = "supply dock loading door"
 	},
 /obj/machinery/conveyor{
-	id = "QMLoad2";
-	dir = 1
+	dir = 1;
+	id = "QMLoad2"
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/delivery)
@@ -152550,12 +152341,11 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/item/razor,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
 	},
-/area/civilian/barber)
+/area/maintenance/tourist)
 "wqk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -152619,8 +152409,8 @@
 	normaldoorcontrol = 1;
 	pixel_x = -6;
 	pixel_y = 26;
-	specialfunctions = 4;
-	req_access = list(28)
+	req_access = list(28);
+	specialfunctions = 4
 	},
 /obj/machinery/door_control{
 	id = "vipbar_bolt";
@@ -152628,15 +152418,15 @@
 	normaldoorcontrol = 1;
 	pixel_x = 6;
 	pixel_y = 26;
-	specialfunctions = 4;
-	req_access = list(28)
+	req_access = list(28);
+	specialfunctions = 4
 	},
 /obj/machinery/door_control{
 	id = "Bar";
 	name = "Bar Privacy Shutters Control";
+	pixel_x = 6;
 	pixel_y = 36;
-	req_access = list(28);
-	pixel_x = 6
+	req_access = list(28)
 	},
 /obj/machinery/door_control{
 	id = "Bar Hall";
@@ -152872,8 +152662,8 @@
 /area/crew_quarters/serviceyard)
 "wsc" = (
 /obj/structure/curtain/open{
-	color = "#222222";
-	anchored = 1
+	anchored = 1;
+	color = "#222222"
 	},
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -153034,8 +152824,8 @@
 	},
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #3";
-	id_tag = "xeno3"
+	id_tag = "xeno3";
+	name = "Creature Cell #3"
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -153056,9 +152846,9 @@
 /area/space)
 "wts" = (
 /obj/machinery/door/window/westleft{
+	dir = 4;
 	name = "Robotics Desk";
-	req_access = list(29);
-	dir = 4
+	req_access = list(29)
 	},
 /obj/machinery/door/window/eastleft{
 	dir = 8
@@ -153077,9 +152867,9 @@
 	opacity = 0
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
+	dir = 8;
 	id_tag = "RoboDesk";
-	name = "Robotics Privacy Shutter";
-	dir = 8
+	name = "Robotics Privacy Shutter"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -153109,8 +152899,8 @@
 "wtA" = (
 /obj/machinery/camera{
 	c_tag = "Research West Central Hallway";
-	network = list("Research","SS13");
-	dir = 6
+	dir = 6;
+	network = list("Research","SS13")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -153214,8 +153004,8 @@
 "wuB" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #6";
-	id_tag = "xeno6"
+	id_tag = "xeno6";
+	name = "Creature Cell #6"
 	},
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -153598,8 +153388,8 @@
 	id = "MedbayFoyerPort";
 	name = "Medbay Doors Control";
 	normaldoorcontrol = 1;
-	pixel_y = 0;
-	pixel_x = 26
+	pixel_x = 26;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
@@ -154077,8 +153867,8 @@
 "wBi" = (
 /obj/structure/curtain/open/shower/security{
 	alpha = 255;
-	name = "backstage";
-	anchored = 1
+	anchored = 1;
+	name = "backstage"
 	},
 /obj/structure/table/reinforced,
 /obj/item/phone{
@@ -154571,8 +154361,8 @@
 "wFx" = (
 /obj/machinery/portable_atmospherics/canister,
 /obj/machinery/alarm{
-	pixel_y = -22;
-	dir = 1
+	dir = 1;
+	pixel_y = -22
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
@@ -154913,8 +154703,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/oak,
-/area/civilian/barber)
+/area/maintenance/tourist)
 "wJt" = (
 /obj/machinery/recharger{
 	pixel_x = 1;
@@ -155083,8 +154874,8 @@
 	in_use = 1
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 1
+	dir = 1;
+	icon_state = "blue"
 	},
 /area/hallway/primary/fore)
 "wKE" = (
@@ -155489,8 +155280,8 @@
 	req_access = list(47)
 	},
 /obj/machinery/door/poddoor/preopen{
-	name = "Creature Cell #1";
-	id_tag = "xeno1"
+	id_tag = "xeno1";
+	name = "Creature Cell #1"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -155576,11 +155367,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;
-	dir = 4
+	scrub_Toxins = 1
 	},
 /obj/machinery/camera{
 	c_tag = "Prison Solitary Confinement 1";
@@ -155606,9 +155397,9 @@
 	id = "conferenceroombolts";
 	name = "Conference Room Bolts Control";
 	normaldoorcontrol = 1;
+	pixel_x = 4;
 	req_access = list(19);
-	specialfunctions = 4;
-	pixel_x = 4
+	specialfunctions = 4
 	},
 /obj/machinery/button/windowtint{
 	id = "conferenceroomwindows";
@@ -156007,8 +155798,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch{
 	name = "south light switch";
-	pixel_y = -24;
-	pixel_x = -25
+	pixel_x = -25;
+	pixel_y = -24
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -156190,8 +155981,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -3
+	pixel_x = -3;
+	pixel_y = -10
 	},
 /obj/effect/turf_decal/arrows/white{
 	dir = 4
@@ -156278,10 +156069,10 @@
 	},
 /obj/machinery/door/window/brigdoor{
 	base_state = "rightsecure";
+	dir = 8;
 	icon_state = "rightsecure";
 	name = "Head of Personnel's Desk";
-	req_access = list(57);
-	dir = 8
+	req_access = list(57)
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -156371,8 +156162,8 @@
 /obj/structure/table/glass,
 /obj/item/book/manual/sop_medical,
 /obj/item/book/manual/sop_command{
-	pixel_y = 4;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -156583,8 +156374,8 @@
 /obj/machinery/computer/security,
 /obj/machinery/camera{
 	c_tag = "Departure Lounge Security Checkpoint West";
-	network = list("SS13","Security");
-	dir = 4
+	dir = 4;
+	network = list("SS13","Security")
 	},
 /obj/item/radio/intercom{
 	pixel_x = -26
@@ -156921,8 +156712,8 @@
 	pixel_y = 8
 	},
 /obj/structure/sign/directions/science{
-	pixel_y = -8;
-	dir = 1
+	dir = 1;
+	pixel_y = -8
 	},
 /obj/structure/sign/directions/engineering{
 	dir = 4;
@@ -157508,10 +157299,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{
@@ -157731,12 +157522,12 @@
 	name = "Robotics Operating Computer"
 	},
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "blue";
-	dir = 6
+	dir = 6;
+	icon_state = "blue"
 	},
 /area/assembly/robotics)
 "xfh" = (
@@ -158603,8 +158394,8 @@
 /area/toxins/rdoffice)
 "xlz" = (
 /obj/machinery/conveyor{
-	id = "garbage";
-	dir = 4
+	dir = 4;
+	id = "garbage"
 	},
 /obj/machinery/light/small,
 /obj/effect/decal/warning_stripes/north,
@@ -158730,8 +158521,8 @@
 /area/maintenance/medroom)
 "xmq" = (
 /obj/machinery/door/window{
-	req_access = list(20);
-	dir = 2
+	dir = 2;
+	req_access = list(20)
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -158776,8 +158567,8 @@
 /obj/effect/decal/warning_stripes/northeastcorner,
 /obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
 /obj/machinery/newscaster{
-	pixel_y = 0;
-	pixel_x = -32
+	pixel_x = -32;
+	pixel_y = 0
 	},
 /turf/simulated/floor/plasteel,
 /area/medical/virology/lab)
@@ -158913,8 +158704,8 @@
 "xoh" = (
 /obj/machinery/atmospherics/unary/cold_sink/freezer{
 	current_temperature = 80;
-	on = 1;
-	dir = 4
+	dir = 4;
+	on = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 6;
@@ -159165,8 +158956,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Permabrig Hallway East";
-	network = list("Prison","SS13","Security");
-	dir = 8
+	dir = 8;
+	network = list("Prison","SS13","Security")
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -159430,10 +159221,10 @@
 	dir = 1
 	},
 /obj/machinery/door/window{
+	color = "red";
 	dir = 8;
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/storage/box/teargas,
 /obj/item/storage/box/teargas{
@@ -159441,12 +159232,12 @@
 	pixel_y = -3
 	},
 /obj/item/grenade/chem_grenade/teargas{
-	pixel_y = -6;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = -6
 	},
 /obj/item/grenade/chem_grenade/teargas{
-	pixel_y = -3;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = -3
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -159545,8 +159336,8 @@
 "xsH" = (
 /obj/machinery/door/airlock/vault{
 	locked = 1;
-	req_access = list(30);
-	name = "AI Upload"
+	name = "AI Upload";
+	req_access = list(30)
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -159941,8 +159732,8 @@
 /obj/structure/lattice,
 /obj/machinery/camera{
 	c_tag = "AI Satellite Exterior 12";
-	network = list("SS13","MiniSat");
-	dir = 8
+	dir = 8;
+	network = list("SS13","MiniSat")
 	},
 /turf/space/openspace,
 /area/maintenance/ai)
@@ -159961,8 +159752,8 @@
 "xwc" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id_tag = "SKPP";
-	dir = 8
+	dir = 8;
+	id_tag = "SKPP"
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -160018,8 +159809,8 @@
 	pixel_y = 3
 	},
 /obj/structure/closet/crate/secure/weapon{
-	req_access = list(63);
-	name = "Brig storage crate"
+	name = "Brig storage crate";
+	req_access = list(63)
 	},
 /obj/machinery/light,
 /obj/item/storage/box/flashbangs,
@@ -160117,8 +159908,8 @@
 	},
 /obj/effect/turf_decal/number/number_1{
 	dir = 1;
-	pixel_y = -10;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = -10
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -160306,8 +160097,8 @@
 /obj/machinery/door_control{
 	id = "xeno2";
 	name = "Containment Control";
-	req_access = list(55);
-	pixel_x = -32
+	pixel_x = -32;
+	req_access = list(55)
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -160736,8 +160527,8 @@
 	},
 /obj/item/reagent_containers/iv_bag,
 /obj/item/reagent_containers/iv_bag{
-	pixel_y = 2;
-	pixel_x = 2
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"
@@ -160778,9 +160569,9 @@
 "xBF" = (
 /obj/structure/window/reinforced,
 /obj/structure/sign/goldenplaque{
-	pixel_y = 32;
 	desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За помощь Главному Инженеру Новы в поисках и устранении неисправностей на станции НаноТрейзен. С благодарностью, Aeterna0. Слава НаноТрейзен!";
-	name = "Благодарственное Письмо от Главного Инженера станции Нова"
+	name = "Благодарственное Письмо от Главного Инженера станции Нова";
+	pixel_y = 32
 	},
 /obj/structure/statue/gold/ce,
 /turf/simulated/floor/plasteel{
@@ -160959,8 +160750,8 @@
 	},
 /obj/item/storage/fancy/cigarettes/cigpack_random,
 /obj/item/lighter/random{
-	pixel_y = 3;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 3
 	},
 /turf/simulated/floor/carpet/purple,
 /area/janitor)
@@ -161446,8 +161237,8 @@
 	},
 /obj/machinery/atmospherics/meter,
 /obj/machinery/alarm{
-	pixel_y = -23;
-	dir = 1
+	dir = 1;
+	pixel_y = -23
 	},
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
@@ -161663,11 +161454,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";
-	pixel_y = 27
+	tag_interior_door = "arrival_south_inner"
 	},
 /obj/structure/sign/vacuum{
 	icon_state = "space1";
@@ -163168,8 +162959,8 @@
 	pixel_x = -24
 	},
 /turf/simulated/floor/plasteel{
-	icon_state = "whiteblue";
-	dir = 8
+	dir = 8;
+	icon_state = "whiteblue"
 	},
 /area/medical/medrest)
 "xTw" = (
@@ -163245,9 +163036,9 @@
 	},
 /obj/structure/rack/gunrack,
 /obj/machinery/door/window{
+	color = "red";
 	name = "Secure Armory";
-	req_access = list(1);
-	color = "red"
+	req_access = list(1)
 	},
 /obj/item/gun/projectile/shotgun/riot{
 	pixel_x = -9
@@ -163300,16 +163091,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/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)
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "xUa" = (
 /obj/effect/turf_decal/siding{
 	color = "#444444";
@@ -163325,8 +163108,8 @@
 "xUh" = (
 /obj/machinery/camera{
 	c_tag = "Brig Staff Room";
-	network = list("SS13","Security");
-	dir = 8
+	dir = 8;
+	network = list("SS13","Security")
 	},
 /obj/machinery/firealarm{
 	dir = 8;
@@ -163727,8 +163510,8 @@
 	},
 /obj/machinery/camera{
 	c_tag = "Detective's Lab";
-	network = list("SS13","Security");
-	dir = 1
+	dir = 1;
+	network = list("SS13","Security")
 	},
 /obj/item/reagent_containers/spray/cleaner/brig,
 /obj/structure/sign/poster/official/random{
@@ -164206,10 +163989,10 @@
 /area/quartermaster/lobby)
 "yau" = (
 /obj/machinery/door/window/brigdoor{
+	color = "red";
 	dir = 2;
 	name = "Execution Access";
-	req_access = list(2);
-	color = "red"
+	req_access = list(2)
 	},
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/atmospherics/unary/outlet_injector/on,
@@ -164260,11 +164043,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;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
@@ -164284,21 +164067,6 @@
 	},
 /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{
@@ -164413,11 +164181,11 @@
 /area/blueshield)
 "ybv" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 1;
 	name = "standard air scrubber";
 	on = 1;
 	scrub_N2O = 1;
-	scrub_Toxins = 1;
-	dir = 1
+	scrub_Toxins = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -164997,9 +164765,9 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plasteel{
+	dir = 4;
 	icon_state = "rampbottom";
-	tag = "icon-stage_stairs";
-	dir = 4
+	tag = "icon-stage_stairs"
 	},
 /area/security/warden)
 "yeZ" = (
@@ -195091,11 +194859,11 @@ fir
 xpx
 imR
 uhA
-lEx
-lEx
-lEx
+bYW
+bYW
+bYW
 edt
-lEx
+bYW
 kOo
 pnI
 bYW
@@ -195349,14 +195117,14 @@ xZW
 pOw
 uhA
 lnQ
-jwc
+eXZ
 mBF
 rJL
-lEx
-lEx
-lEx
-lEx
-lEx
+bYW
+bYW
+bYW
+bYW
+bYW
 ttn
 uYJ
 bYW
@@ -195605,15 +195373,15 @@ hDL
 uhF
 dbe
 uhA
-ipR
+eXZ
 toF
 bLw
 gcQ
-lEx
+bYW
 wqi
 uiu
 ulL
-lEx
+bYW
 nwo
 uYJ
 vxZ
@@ -195870,7 +195638,7 @@ moe
 oRO
 oqt
 laP
-lEx
+bYW
 eXZ
 uYJ
 jNq
@@ -196127,7 +195895,7 @@ gIv
 wJq
 hPR
 myg
-lEx
+bYW
 ttn
 hZS
 ttn
@@ -196376,15 +196144,15 @@ lGn
 jPL
 xax
 uhA
-bTD
-ePX
+fZR
+fZR
 fZR
 twd
 pzh
 rlc
 mkf
 eab
-lEx
+bYW
 oaF
 uYJ
 bYW
@@ -196633,15 +196401,15 @@ wub
 geE
 uhA
 uhA
-cCn
-cCn
-cCn
+bYW
+bYW
+bYW
 bQd
-lEx
-cCn
-cCn
-cCn
-lEx
+bYW
+bYW
+bYW
+bYW
+bYW
 bYW
 iZM
 vVp
@@ -196792,7 +196560,7 @@ qVL
 gxA
 btx
 aIv
-iGz
+qdt
 nZf
 qmd
 qmd
@@ -196889,7 +196657,7 @@ axK
 axK
 oKf
 rBJ
-keM
+axK
 axK
 axK
 axK
@@ -196898,7 +196666,7 @@ vnw
 axK
 axK
 axK
-keM
+axK
 axK
 ecQ
 pZL
@@ -205549,7 +205317,7 @@ nEs
 bOj
 okN
 jlw
-yaM
+sbt
 yed
 lyx
 xhz
@@ -206063,7 +205831,7 @@ fhW
 rnb
 hwe
 tdz
-cRz
+xOI
 yed
 tHV
 hkh
@@ -213297,7 +213065,7 @@ uJm
 qtz
 vAi
 isI
-lWD
+iKa
 fLn
 nvy
 wbD
@@ -213554,7 +213322,7 @@ syE
 gOK
 vbA
 otZ
-lWD
+iKa
 tCN
 ibg
 ujl
@@ -255716,7 +255484,7 @@ arE
 lFo
 gEz
 umf
-tOg
+ajH
 fBg
 kIz
 weh