diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm
index f764dbdadea..6cfa07fc8ca 100644
--- a/_maps/map_files/Blueshift/BlueShift_middle.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm
@@ -2263,6 +2263,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/port)
+"arR" = (
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/curtain/bounty,
+/turf/open/floor/iron/dark/side{
+	dir = 1
+	},
+/area/station/service/barber)
 "arU" = (
 /obj/effect/turf_decal/delivery,
 /obj/structure/closet,
@@ -2920,6 +2927,22 @@
 /obj/machinery/oven,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/mess)
+"aBJ" = (
+/obj/structure/table/reinforced/rglass,
+/obj/structure/mirror/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/light/directional/west,
+/obj/item/reagent_containers/dropper{
+	pixel_x = 3;
+	pixel_y = 1
+	},
+/obj/machinery/dryer{
+	pixel_y = 14
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "aBM" = (
 /obj/structure/window{
 	dir = 4
@@ -3198,13 +3221,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/kitchen)
-"aFo" = (
-/obj/structure/stairs/north,
-/obj/structure/railing{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "aFp" = (
 /obj/item/shard,
 /obj/effect/decal/cleanable/glass,
@@ -6874,6 +6890,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
+"bHv" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "bHJ" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/space_heater,
@@ -7969,23 +7994,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"bYo" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
-	name = "Self Care Salon"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "bYz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -10458,21 +10466,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
-"cPW" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "cQI" = (
 /obj/structure/table,
 /obj/item/reagent_containers/spray/cleaner{
@@ -10884,10 +10877,6 @@
 "cXk" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/department/security/prison_upper)
-"cXm" = (
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "cXr" = (
 /obj/structure/table,
 /obj/structure/bedsheetbin,
@@ -11385,6 +11374,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
+"dhs" = (
+/obj/effect/turf_decal/stripes{
+	dir = 6
+	},
+/obj/structure/table/reinforced,
+/obj/item/pai_card,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/engineering/storage/tech)
 "dhx" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -12305,20 +12303,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/customs/auxiliary)
-"dyq" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/chair/sofa/bench/left{
-	dir = 8;
-	pixel_x = 5
-	},
-/obj/structure/cable,
-/obj/effect/landmark/start/assistant,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "dys" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -12680,16 +12664,22 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/education)
-"dEW" = (
-/obj/structure/window,
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
+"dEM" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Spa and Backroom"
 	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/closet/secure_closet/barber,
-/turf/open/floor/iron,
-/area/station/service/salon)
+/obj/structure/curtain/bounty,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/iron/stairs{
+	dir = 4
+	},
+/area/station/service/barber)
 "dEZ" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/spawner/random/vending/colavend,
@@ -13100,6 +13090,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/fore)
+"dMF" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/service/barber)
 "dMK" = (
 /obj/structure/table/wood/poker,
 /obj/item/storage/dice,
@@ -13837,6 +13839,17 @@
 	dir = 8
 	},
 /area/station/common/wrestling/arena)
+"ebt" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/mask/surgical,
+/obj/item/reagent_containers/medigel/sterilizine{
+	pixel_x = 8;
+	pixel_y = 15
+	},
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "ebF" = (
 /obj/effect/turf_decal/box/white/corners{
 	dir = 1
@@ -15412,6 +15425,27 @@
 /obj/effect/turf_decal/stripes,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"eCk" = (
+/obj/structure/table/rolling,
+/obj/item/hhmirror{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/obj/item/hairbrush/comb,
+/obj/item/razor{
+	pixel_x = -7;
+	pixel_y = 3
+	},
+/obj/item/scissors{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/straight_razor{
+	pixel_x = 9;
+	pixel_y = 2
+	},
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "eCR" = (
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
@@ -15481,6 +15515,19 @@
 /obj/effect/spawner/random/trash/garbage,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engineering/engine_aft_starboard)
+"eEB" = (
+/obj/structure/table/wood,
+/obj/structure/window,
+/obj/item/storage/box/lipsticks{
+	pixel_x = -12;
+	pixel_y = 3
+	},
+/obj/item/storage/box/perfume{
+	pixel_x = 4;
+	pixel_y = 5
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "eFr" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -15583,6 +15630,16 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"eHj" = (
+/obj/machinery/modular_computer/console/preset/civilian,
+/obj/effect/turf_decal/bot,
+/obj/machinery/camera{
+	c_tag = "Recreation - Barbershop";
+	dir = 1;
+	name = "hallway camera"
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "eHn" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
@@ -15806,6 +15863,14 @@
 	dir = 10
 	},
 /area/station/engineering/lobby)
+"eLj" = (
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/landmark/start/barber,
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "eLk" = (
 /turf/closed/wall/rust,
 /area/station/maintenance/department/security/greater)
@@ -16488,6 +16553,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
+"eZB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "eZS" = (
 /obj/effect/landmark/start/botanist,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -17132,13 +17204,6 @@
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/engineering/storage/tcomms)
-"fkF" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "fkS" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 9
@@ -17413,6 +17478,15 @@
 /obj/effect/spawner/random/techstorage/rnd_all,
 /turf/open/floor/iron/dark,
 /area/station/engineering/storage/tech)
+"fpr" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "fpw" = (
 /obj/structure/window,
 /obj/structure/flora/bush/jungle/b,
@@ -18044,6 +18118,23 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/external,
 /turf/open/floor/plating,
 /area/station/engineering/lobby)
+"fAl" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/service/barber)
 "fAv" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 8
@@ -18062,6 +18153,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/engineering/storage/tech)
+"fAC" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/tattoo_kit{
+	pixel_y = 4
+	},
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "fAQ" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -19475,6 +19573,20 @@
 /obj/effect/mapping_helpers/airlock/access/all/service/general,
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
+"fZg" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/chair/sofa/bench/left{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/structure/cable,
+/obj/effect/landmark/start/assistant,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "fZL" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
@@ -20413,20 +20525,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
-"gnP" = (
-/obj/structure/table/wood,
-/obj/structure/window,
-/obj/structure/window{
-	dir = 8
-	},
-/obj/item/paper_bin{
-	pixel_y = 3
-	},
-/obj/item/pen{
-	pixel_y = 3
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "gnR" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -21819,15 +21917,6 @@
 	dir = 4
 	},
 /area/station/hallway/primary/port)
-"gKI" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "gKP" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-10"
@@ -22778,21 +22867,6 @@
 	dir = 1
 	},
 /area/station/security/prison/workout)
-"heX" = (
-/obj/structure/table/reinforced/rglass,
-/obj/structure/mirror/directional/west,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/machinery/light/directional/west,
-/obj/item/hhmirror,
-/obj/item/clothing/head/wig/random{
-	pixel_x = 4;
-	pixel_y = 3
-	},
-/obj/item/clothing/head/wig/natural,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "hfd" = (
 /turf/open/floor/iron/stairs/old{
 	dir = 1
@@ -23238,19 +23312,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/fore)
-"hmj" = (
-/obj/structure/sink/directional/east{
-	reclaim_rate = 5
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "hml" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -23350,6 +23411,15 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/hos,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/hos)
+"hnD" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "hod" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/trash/garbage,
@@ -23678,6 +23748,48 @@
 	},
 /turf/open/floor/wood,
 /area/station/maintenance/rus_gambling)
+"hta" = (
+/obj/structure/decorative/shelf,
+/obj/item/perfume/amber{
+	pixel_x = -8;
+	pixel_y = 10
+	},
+/obj/item/perfume/cologne{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/obj/item/perfume/wood{
+	pixel_y = 10
+	},
+/obj/item/perfume/mint{
+	pixel_x = 4;
+	pixel_y = 10
+	},
+/obj/item/perfume/cherry{
+	pixel_x = -8;
+	pixel_y = -5
+	},
+/obj/item/perfume/jasmine{
+	pixel_x = -4;
+	pixel_y = -5
+	},
+/obj/item/perfume/pear{
+	pixel_y = -5
+	},
+/obj/item/perfume/rose{
+	pixel_x = 4;
+	pixel_y = -5
+	},
+/obj/item/perfume/vanilla{
+	pixel_x = 8;
+	pixel_y = 10
+	},
+/obj/item/perfume/strawberry{
+	pixel_x = 8;
+	pixel_y = -5
+	},
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "htd" = (
 /obj/structure/door_assembly/door_assembly_hatch,
 /obj/structure/barricade/wooden,
@@ -24461,6 +24573,20 @@
 	},
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"hJq" = (
+/obj/structure/table/wood,
+/obj/structure/window,
+/obj/structure/window{
+	dir = 8
+	},
+/obj/item/paper_bin{
+	pixel_y = 3
+	},
+/obj/item/pen{
+	pixel_y = 3
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "hJu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/north,
@@ -24742,6 +24868,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/security/prison)
+"hOC" = (
+/obj/item/radio/intercom/directional/north,
+/obj/structure/table/wood,
+/obj/structure/displaycase/forsale/kitchen,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "hOG" = (
 /obj/structure/table/reinforced,
 /obj/item/book/manual/wiki/security_space_law,
@@ -25961,20 +26094,6 @@
 /obj/machinery/status_display/ai/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/construction/engineering)
-"iil" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/service/salon)
 "iip" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/firealarm/directional/east,
@@ -26764,12 +26883,6 @@
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/station/tcommsat/server)
-"iuU" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/turf/open/floor/iron/stairs/old,
-/area/station/service/salon)
 "ivc" = (
 /obj/effect/turf_decal/trimline/blue/line{
 	dir = 8
@@ -28604,6 +28717,11 @@
 /obj/effect/spawner/random/trash/mess,
 /turf/open/floor/plating,
 /area/station/maintenance/law)
+"iZa" = (
+/obj/structure/filingcabinet/chestdrawer/wheeled,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "iZv" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/holopad,
@@ -28663,6 +28781,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/execution/transfer)
+"jav" = (
+/obj/structure/stairs/north,
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "jay" = (
 /obj/machinery/door/airlock/external{
 	name = "Engineering External Access";
@@ -28970,15 +29095,6 @@
 /obj/machinery/power/energy_accumulator/tesla_coil/anchored,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter)
-"jet" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "jex" = (
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
@@ -29344,6 +29460,10 @@
 	},
 /turf/open/openspace,
 /area/station/hallway/primary/starboard)
+"jkD" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/station/service/barber)
 "jkH" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/neutral{
@@ -29638,6 +29758,15 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"jpd" = (
+/obj/machinery/camera{
+	c_tag = "Recreation - Barbershop backroom";
+	dir = 6;
+	name = "hallway camera"
+	},
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "jpn" = (
 /mob/living/simple_animal/hostile/retaliate/goat{
 	name = "Pete"
@@ -30194,14 +30323,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
-"jyT" = (
-/obj/structure/chair/office/light{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/landmark/start/barber,
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "jyZ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -31221,6 +31342,16 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
 /area/station/security/office)
+"jSg" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "jSr" = (
 /obj/effect/decal/cleanable/blood/gibs/old,
 /turf/open/floor/iron,
@@ -31939,21 +32070,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
-"kci" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/folder,
-/obj/item/lipstick/random{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/lipstick/random{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/lipstick/random,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "kcj" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 5
@@ -32379,15 +32495,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"kjD" = (
-/obj/machinery/camera{
-	c_tag = "Recreation - Barbershop backroom";
-	dir = 6;
-	name = "hallway camera"
-	},
-/obj/item/kirbyplants/random,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "kjE" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 1
@@ -32727,13 +32834,6 @@
 	dir = 8
 	},
 /area/station/security/prison/visit)
-"kpM" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-06"
-	},
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "kpW" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{
 	dir = 4
@@ -33941,48 +34041,6 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
-"kJC" = (
-/obj/structure/decorative/shelf,
-/obj/item/perfume/amber{
-	pixel_x = -8;
-	pixel_y = 10
-	},
-/obj/item/perfume/cologne{
-	pixel_x = -4;
-	pixel_y = 10
-	},
-/obj/item/perfume/wood{
-	pixel_y = 10
-	},
-/obj/item/perfume/mint{
-	pixel_x = 4;
-	pixel_y = 10
-	},
-/obj/item/perfume/cherry{
-	pixel_x = -8;
-	pixel_y = -5
-	},
-/obj/item/perfume/jasmine{
-	pixel_x = -4;
-	pixel_y = -5
-	},
-/obj/item/perfume/pear{
-	pixel_y = -5
-	},
-/obj/item/perfume/rose{
-	pixel_x = 4;
-	pixel_y = -5
-	},
-/obj/item/perfume/vanilla{
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/obj/item/perfume/strawberry{
-	pixel_x = 8;
-	pixel_y = -5
-	},
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "kJG" = (
 /obj/structure/sign/directions/command{
 	dir = 4;
@@ -34732,6 +34790,23 @@
 	dir = 4
 	},
 /area/station/hallway/primary/starboard)
+"kWd" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+	name = "Self Care Salon"
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "kWe" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 4
@@ -35757,13 +35832,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/rus_surgery)
-"lqX" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 10
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "lra" = (
 /obj/structure/table,
 /obj/effect/turf_decal/stripes/line{
@@ -35801,6 +35869,13 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/service/library)
+"lrE" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "lsj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{
 	dir = 8
@@ -36868,6 +36943,16 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
+"lLR" = (
+/obj/structure/window,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/closet/secure_closet/barber,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "lMh" = (
 /obj/structure/chair{
 	dir = 4
@@ -38328,15 +38413,6 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/wood,
 /area/station/security/prison/rec)
-"mlV" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = -14
-	},
-/obj/machinery/light/directional/north,
-/obj/item/fur_dyer,
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "mlZ" = (
 /obj/structure/chair{
 	dir = 4
@@ -38349,6 +38425,9 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"mmi" = (
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "mmm" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -40045,22 +40124,6 @@
 	dir = 1
 	},
 /area/station/security/prison/safe)
-"mPL" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Spa and Backroom"
-	},
-/obj/structure/curtain/bounty,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/iron/stairs{
-	dir = 4
-	},
-/area/station/service/salon)
 "mPR" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/bot,
@@ -40899,16 +40962,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/cargo/sorting)
-"nfJ" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/item/kirbyplants/random,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "nfR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -41067,33 +41120,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"nie" = (
-/obj/structure/decorative/shelf,
-/obj/item/dyespray{
-	pixel_x = -6;
-	pixel_y = 11
-	},
-/obj/item/dyespray{
-	pixel_x = 5;
-	pixel_y = 11
-	},
-/obj/item/reagent_containers/spray/quantum_hair_dye{
-	pixel_x = 11
-	},
-/obj/item/reagent_containers/spray/barbers_aid{
-	pixel_x = -3;
-	pixel_y = -2
-	},
-/obj/item/reagent_containers/spray/baldium{
-	pixel_x = -10;
-	pixel_y = -2
-	},
-/obj/item/reagent_containers/spray/super_barbers_aid{
-	pixel_x = 4;
-	pixel_y = -2
-	},
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "nil" = (
 /obj/structure/closet/cardboard,
 /obj/effect/spawner/random/maintenance/two,
@@ -41324,10 +41350,6 @@
 /obj/structure/window,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engineering/central)
-"nmJ" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/service/salon)
 "nmL" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -41894,6 +41916,38 @@
 /obj/item/training_toolbox,
 /turf/open/floor/stone,
 /area/station/common/wrestling/arena)
+"nve" = (
+/obj/structure/table/reinforced/rglass,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/computer/security/telescreen/entertainment/directional/west,
+/obj/item/lipstick{
+	pixel_x = -11;
+	pixel_y = 11
+	},
+/obj/item/lipstick/black{
+	pixel_x = -11;
+	pixel_y = 6
+	},
+/obj/item/lipstick/jade{
+	pixel_x = -11;
+	pixel_y = 1
+	},
+/obj/item/lipstick/purple{
+	pixel_x = -11;
+	pixel_y = -4
+	},
+/obj/item/lipstick/quantum{
+	pixel_x = -11;
+	pixel_y = -9
+	},
+/obj/item/hairbrush{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "nvp" = (
 /turf/closed/wall/r_wall,
 /area/station/security/prison)
@@ -42241,13 +42295,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/service)
-"nBh" = (
-/obj/item/radio/intercom/directional/north,
-/obj/structure/table/wood,
-/obj/structure/displaycase/forsale/kitchen,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "nBu" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/stripes{
@@ -43450,6 +43497,13 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/general,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
+"nWS" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-06"
+	},
+/obj/structure/cable,
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "nWY" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /turf/open/floor/carpet/lone,
@@ -44622,17 +44676,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
-"ota" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 8
-	},
-/obj/structure/table/optable{
-	name = "Tattoo table"
-	},
-/obj/structure/window,
-/obj/effect/turf_decal/siding/wood,
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "otb" = (
 /obj/structure/window{
 	dir = 4
@@ -46185,11 +46228,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/freezer,
 /area/station/service/kitchen/coldroom)
-"oRy" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plating,
-/area/station/service/salon)
 "oRE" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 1
@@ -46347,6 +46385,12 @@
 /obj/effect/spawner/random/structure/crate,
 /turf/open/floor/plating,
 /area/station/maintenance/port/central)
+"oUd" = (
+/obj/structure/chair/comfy/barber_chair{
+	dir = 8
+	},
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "oUi" = (
 /obj/structure/disposalpipe/junction/flip{
 	dir = 1
@@ -46803,6 +46847,9 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/port)
+"pcP" = (
+/turf/closed/wall,
+/area/station/service/barber)
 "pcW" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/structure/cable,
@@ -47081,6 +47128,33 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"pgJ" = (
+/obj/structure/decorative/shelf,
+/obj/item/dyespray{
+	pixel_x = -6;
+	pixel_y = 11
+	},
+/obj/item/dyespray{
+	pixel_x = 5;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/spray/quantum_hair_dye{
+	pixel_x = 11
+	},
+/obj/item/reagent_containers/spray/barbers_aid{
+	pixel_x = -3;
+	pixel_y = -2
+	},
+/obj/item/reagent_containers/spray/baldium{
+	pixel_x = -10;
+	pixel_y = -2
+	},
+/obj/item/reagent_containers/spray/super_barbers_aid{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "pgK" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
@@ -47165,13 +47239,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/construction)
-"phO" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/tattoo_kit{
-	pixel_y = 4
-	},
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "pib" = (
 /obj/machinery/light/floor,
 /obj/effect/turf_decal/bot_white,
@@ -47359,12 +47426,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/wood,
 /area/station/service/bar/atrium)
-"pmz" = (
-/obj/machinery/holopad,
-/obj/structure/cable,
-/obj/effect/landmark/start/barber,
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "pmD" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -47624,6 +47685,21 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/chapel,
 /area/station/service/chapel)
+"pqA" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "pqC" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/space_heater,
@@ -48881,12 +48957,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/construction/engineering)
-"pKB" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/table/reinforced/rglass,
-/obj/structure/window,
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "pKE" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -50065,6 +50135,12 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"qgq" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/iron/stairs/old,
+/area/station/service/barber)
 "qgA" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
@@ -50497,13 +50573,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/engineering/lobby)
-"qoJ" = (
-/obj/structure/chair/comfy/black{
-	dir = 4
-	},
-/obj/effect/landmark/start/barber,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "qoM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -50741,6 +50810,9 @@
 "qte" = (
 /turf/open/floor/iron/stairs/left,
 /area/station/hallway/primary/central/aft)
+"qts" = (
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "qty" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/power/port_gen/pacman,
@@ -52865,17 +52937,6 @@
 /obj/structure/flora/rock/pile,
 /turf/open/floor/grass,
 /area/station/command/heads_quarters/hos)
-"ren" = (
-/obj/machinery/camera{
-	c_tag = "Recreation - Barbershop Lower";
-	dir = 5;
-	name = "hallway camera"
-	},
-/obj/structure/chair/comfy/barber_chair{
-	dir = 8
-	},
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "rev" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -53266,6 +53327,19 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/qm)
+"rmb" = (
+/obj/structure/sink/directional/east{
+	reclaim_rate = 5
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "rmc" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Central Engineering Maintenance"
@@ -53349,6 +53423,20 @@
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/engineering/engine_smes)
+"rnn" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/service/barber)
 "rny" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
@@ -54104,21 +54192,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/stone,
 /area/station/common/wrestling/arena)
-"rBW" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/turf/open/floor/iron,
-/area/station/service/salon)
 "rBX" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Security Maintenance"
@@ -56041,6 +56114,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/fore)
+"shH" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/curtain/bounty,
+/turf/open/floor/plating,
+/area/station/service/barber)
 "shY" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
@@ -56065,6 +56143,17 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/station/service/kitchen/diner)
+"siG" = (
+/obj/machinery/camera{
+	c_tag = "Recreation - Barbershop Lower";
+	dir = 5;
+	name = "hallway camera"
+	},
+/obj/structure/chair/comfy/barber_chair{
+	dir = 8
+	},
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "siK" = (
 /obj/structure/chair/sofa/corp/right{
 	dir = 1
@@ -56264,6 +56353,10 @@
 	},
 /turf/open/floor/iron/freezer,
 /area/station/command/heads_quarters/qm)
+"smM" = (
+/obj/structure/cable,
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "smN" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -57121,13 +57214,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
-"szW" = (
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/curtain/bounty,
-/turf/open/floor/iron/dark/side{
-	dir = 1
-	},
-/area/station/service/salon)
 "szY" = (
 /obj/effect/turf_decal/delivery/white{
 	color = "#00ff00";
@@ -57456,21 +57542,6 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
-"sIo" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "sIq" = (
 /obj/machinery/navbeacon{
 	codes_txt = "delivery;dir=4";
@@ -58155,19 +58226,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/central)
-"sTp" = (
-/obj/structure/table/wood,
-/obj/structure/window,
-/obj/item/storage/box/lipsticks{
-	pixel_x = -12;
-	pixel_y = 3
-	},
-/obj/item/storage/box/perfume{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "sTr" = (
 /obj/machinery/light_switch/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -58668,22 +58726,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
-"tfP" = (
-/obj/structure/table/reinforced/rglass,
-/obj/structure/mirror/directional/west,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/machinery/light/directional/west,
-/obj/item/reagent_containers/dropper{
-	pixel_x = 3;
-	pixel_y = 1
-	},
-/obj/machinery/dryer{
-	pixel_y = 14
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "tfT" = (
 /obj/structure/window{
 	dir = 8
@@ -58929,38 +58971,6 @@
 /obj/item/wrench,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
-"tjJ" = (
-/obj/structure/table/reinforced/rglass,
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/obj/item/lipstick{
-	pixel_x = -11;
-	pixel_y = 11
-	},
-/obj/item/lipstick/black{
-	pixel_x = -11;
-	pixel_y = 6
-	},
-/obj/item/lipstick/jade{
-	pixel_x = -11;
-	pixel_y = 1
-	},
-/obj/item/lipstick/purple{
-	pixel_x = -11;
-	pixel_y = -4
-	},
-/obj/item/lipstick/quantum{
-	pixel_x = -11;
-	pixel_y = -9
-	},
-/obj/item/hairbrush{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "tjK" = (
 /obj/effect/turf_decal/tile/yellow,
 /obj/effect/turf_decal/tile/yellow{
@@ -59419,9 +59429,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
-"tqV" = (
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "tqY" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/vending/dinnerware,
@@ -59565,6 +59572,21 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
+"tus" = (
+/obj/structure/table/reinforced/rglass,
+/obj/structure/mirror/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/light/directional/west,
+/obj/item/hhmirror,
+/obj/item/clothing/head/wig/random{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/item/clothing/head/wig/natural,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "tut" = (
 /obj/effect/turf_decal/stripes{
 	dir = 8
@@ -59687,17 +59709,6 @@
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/wood,
 /area/station/service/bar/atrium)
-"twM" = (
-/obj/structure/window,
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/light/directional/east,
-/obj/machinery/vending/barbervend,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "twR" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/tile/yellow,
@@ -60960,9 +60971,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
-"tPV" = (
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "tPY" = (
 /obj/effect/turf_decal/siding/wood/corner,
 /obj/structure/hedge/opaque,
@@ -61544,6 +61552,21 @@
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
+"tYW" = (
+/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/item/folder,
+/obj/item/lipstick/random{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/lipstick/random{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/lipstick/random,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "tZl" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/dark/side,
@@ -61638,13 +61661,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
-"uap" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "uat" = (
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
@@ -61965,16 +61981,6 @@
 	name = "Holodeck Projector Floor"
 	},
 /area/station/holodeck/rec_center)
-"uhL" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "uhQ" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -62138,6 +62144,16 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
+"ujS" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/item/kirbyplants/random,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "ukd" = (
 /obj/effect/landmark/start/security_officer,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
@@ -62335,6 +62351,12 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/station/common/night_club)
+"umG" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/table/reinforced/rglass,
+/obj/structure/window,
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "umI" = (
 /turf/open/floor/carpet,
 /area/station/security/courtroom)
@@ -62691,23 +62713,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/security/execution/transfer)
-"usG" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/service/salon)
 "usO" = (
 /obj/effect/spawner/random/entertainment/arcade{
 	dir = 8
@@ -63435,27 +63440,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/bar)
-"uGv" = (
-/obj/structure/table/rolling,
-/obj/item/hhmirror{
-	pixel_x = 5;
-	pixel_y = 9
-	},
-/obj/item/hairbrush/comb,
-/obj/item/razor{
-	pixel_x = -7;
-	pixel_y = 3
-	},
-/obj/item/scissors{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/straight_razor{
-	pixel_x = 9;
-	pixel_y = 2
-	},
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "uGF" = (
 /obj/effect/turf_decal/tile/red,
 /obj/item/radio/intercom/directional/east,
@@ -63970,17 +63954,6 @@
 	dir = 1
 	},
 /area/station/service/hydroponics)
-"uPX" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/clothing/suit/apron/surgical,
-/obj/item/clothing/mask/surgical,
-/obj/item/reagent_containers/medigel/sterilizine{
-	pixel_x = 8;
-	pixel_y = 15
-	},
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/iron/white,
-/area/station/service/salon)
 "uQl" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/delivery,
@@ -64195,6 +64168,17 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"uSP" = (
+/obj/structure/window,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/machinery/light/directional/east,
+/obj/machinery/vending/barbervend,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "uTc" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -65348,12 +65332,6 @@
 	dir = 1
 	},
 /area/station/cargo/sorting)
-"voy" = (
-/obj/structure/chair/comfy/barber_chair{
-	dir = 8
-	},
-/turf/open/floor/wood/tile,
-/area/station/service/salon)
 "voz" = (
 /mob/living/simple_animal/hostile/russian,
 /obj/effect/decal/cleanable/blood/gibs/old,
@@ -65907,9 +65885,6 @@
 /obj/machinery/suit_storage_unit/open,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/aux_eva)
-"vxY" = (
-/turf/closed/wall,
-/area/station/service/salon)
 "vyd" = (
 /obj/effect/spawner/structure/window/reinforced/tinted,
 /turf/open/floor/plating,
@@ -66647,6 +66622,21 @@
 "vJf" = (
 /turf/closed/wall/r_wall,
 /area/station/security/prison/upper)
+"vJt" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "vJH" = (
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/flora/bush/grassy,
@@ -66956,18 +66946,6 @@
 /obj/effect/landmark/start/customs_agent,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/supply)
-"vNj" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/service/salon)
 "vNr" = (
 /obj/structure/table,
 /obj/item/instrument/piano_synth,
@@ -67235,6 +67213,17 @@
 /obj/structure/flora/bush/flowers_pp,
 /turf/open/floor/grass,
 /area/station/hallway/primary/central/fore)
+"vRk" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/structure/table/optable{
+	name = "Tattoo table"
+	},
+/obj/structure/window,
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "vRm" = (
 /obj/structure/dresser,
 /obj/item/book/manual/wiki/security_space_law,
@@ -67688,20 +67677,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/security/medical)
-"waw" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/structure/chair/sofa/bench/right{
-	dir = 8;
-	pixel_x = 5
-	},
-/obj/structure/cable,
-/obj/effect/landmark/start/assistant,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "waA" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -68255,11 +68230,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/common/arcade)
-"wjV" = (
-/obj/structure/filingcabinet/chestdrawer/wheeled,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "wjX" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
@@ -68384,15 +68354,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engineering/engie_aft_starboard)
-"wlR" = (
-/obj/effect/turf_decal/stripes{
-	dir = 6
-	},
-/obj/structure/table/reinforced,
-/obj/item/pai_card,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/engineering/storage/tech)
 "wmv" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/stairs,
@@ -68800,6 +68761,13 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
+"wtX" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "wtY" = (
 /turf/open/floor/iron/dark/side{
 	dir = 8
@@ -69274,15 +69242,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/service)
-"wCa" = (
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/service/salon)
 "wCd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -71272,6 +71231,12 @@
 /obj/item/storage/secure/briefcase,
 /turf/open/floor/carpet,
 /area/station/service/library/printer)
+"xgZ" = (
+/obj/machinery/holopad,
+/obj/structure/cable,
+/obj/effect/landmark/start/barber,
+/turf/open/floor/wood/tile,
+/area/station/service/barber)
 "xhc" = (
 /obj/machinery/door/airlock/bathroom{
 	name = "Service Restroom"
@@ -71560,6 +71525,15 @@
 	dir = 4
 	},
 /area/station/security/prison)
+"xmN" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = -14
+	},
+/obj/machinery/light/directional/north,
+/obj/item/fur_dyer,
+/turf/open/floor/iron/white,
+/area/station/service/barber)
 "xmO" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
@@ -72331,6 +72305,20 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/white,
 /area/station/security/medical)
+"xyt" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/chair/sofa/bench/right{
+	dir = 8;
+	pixel_x = 5
+	},
+/obj/structure/cable,
+/obj/effect/landmark/start/assistant,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "xyv" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing,
@@ -72348,6 +72336,13 @@
 	},
 /turf/open/openspace,
 /area/station/maintenance/department/engineering/engine_aft_port)
+"xyz" = (
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/obj/effect/landmark/start/barber,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "xyB" = (
 /obj/structure/chair{
 	dir = 8
@@ -73261,16 +73256,6 @@
 "xMn" = (
 /turf/open/floor/iron,
 /area/station/maintenance/port/aft)
-"xMp" = (
-/obj/machinery/modular_computer/console/preset/civilian,
-/obj/effect/turf_decal/bot,
-/obj/machinery/camera{
-	c_tag = "Recreation - Barbershop";
-	dir = 1;
-	name = "hallway camera"
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "xML" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security/glass{
@@ -74979,6 +74964,21 @@
 	},
 /turf/open/floor/carpet/royalblack,
 /area/station/command/heads_quarters/qm)
+"ylV" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/iron,
+/area/station/service/barber)
 "ylX" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/main)
@@ -94905,9 +94905,9 @@ wJk
 wJk
 wJk
 ugb
-aFo
-iuU
-uap
+jav
+qgq
+wtX
 xPa
 xJi
 dzd
@@ -95162,9 +95162,9 @@ wVm
 wVm
 wVm
 ugb
-uPX
-pKB
-fkF
+ebt
+umG
+eZB
 xPa
 xPa
 xPa
@@ -95419,10 +95419,10 @@ wnf
 wnf
 iHZ
 ugb
-mlV
-jyT
-lqX
-hmj
+xmN
+eLj
+lrE
+rmb
 xPa
 gBN
 kIm
@@ -95676,10 +95676,10 @@ pnN
 wnf
 wCX
 ugb
-phO
-ota
-kjD
-uhL
+fAC
+vRk
+jpd
+jSg
 xPa
 wqN
 gOr
@@ -95933,10 +95933,10 @@ wnf
 wnf
 eEo
 ugb
-oRy
-oRy
-vxY
-mPL
+shH
+shH
+pcP
+dEM
 xPa
 qlI
 pBR
@@ -96190,10 +96190,10 @@ wVm
 wVm
 wVm
 ugb
-wjV
-tPV
-szW
-sIo
+iZa
+mmi
+arR
+pqA
 xPa
 xPa
 xPa
@@ -96447,14 +96447,14 @@ bDv
 oeX
 hwc
 ugb
-xMp
-qoJ
-gnP
-cPW
-vxY
-tfP
-tjJ
-heX
+eHj
+xyz
+hJq
+vJt
+pcP
+aBJ
+nve
+tus
 ymi
 agc
 rgb
@@ -96704,14 +96704,14 @@ eiC
 tOS
 cwG
 ugb
-nBh
-kci
-sTp
-iil
-dEW
-voy
-tqV
-ren
+hOC
+tYW
+eEB
+rnn
+lLR
+oUd
+qts
+siG
 ymi
 wSv
 jlP
@@ -96961,14 +96961,14 @@ vFs
 clK
 keV
 ugb
-jet
-gKI
-wCa
-rBW
-vNj
-cXm
-pmz
-kpM
+fpr
+hnD
+bHv
+ylV
+dMF
+smM
+xgZ
+nWS
 pcW
 tRY
 pvr
@@ -97218,14 +97218,14 @@ mxi
 wZp
 acq
 ugb
-nfJ
-waw
-dyq
-usG
-twM
-nie
-uGv
-kJC
+ujS
+xyt
+fZg
+fAl
+uSP
+pgJ
+eCk
+hta
 ymi
 ukn
 xjS
@@ -97475,14 +97475,14 @@ nct
 nct
 ugb
 ugb
-nmJ
-nmJ
-nmJ
-bYo
-vxY
-nmJ
-nmJ
-nmJ
+jkD
+jkD
+jkD
+kWd
+pcP
+jkD
+jkD
+jkD
 ymi
 ymi
 ymi
@@ -112666,7 +112666,7 @@ saE
 vqf
 oja
 yeK
-wlR
+dhs
 uSc
 uSc
 iPU
diff --git a/_maps/map_files/Blueshift/BlueShift_upper.dmm b/_maps/map_files/Blueshift/BlueShift_upper.dmm
index 87f72d10b98..a34ee36f86e 100644
--- a/_maps/map_files/Blueshift/BlueShift_upper.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_upper.dmm
@@ -1868,14 +1868,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/central)
-"aok" = (
-/obj/structure/bed/pod{
-	pixel_y = 1
-	},
-/obj/structure/window,
-/obj/structure/mirror/directional/east,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "aoq" = (
 /obj/machinery/door/poddoor/preopen{
 	name = "Retrograde Thruster Blast Door"
@@ -2457,6 +2449,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/department/eva)
+"atk" = (
+/obj/structure/chair/pew/right{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "atz" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/effect/turf_decal/bot_blue,
@@ -2874,6 +2872,11 @@
 /obj/effect/mapping_helpers/airlock/access/all/medical/psychology,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science/upper)
+"azs" = (
+/obj/structure/cable,
+/obj/effect/landmark/start/barber,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "azu" = (
 /obj/structure/grille,
 /obj/structure/window{
@@ -3206,6 +3209,10 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/service/theater)
+"aGq" = (
+/obj/structure/cable,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "aGL" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
@@ -3904,6 +3911,13 @@
 	},
 /turf/open/floor/carpet,
 /area/station/commons/dorms)
+"aRd" = (
+/obj/structure/water_source/puddle,
+/obj/structure/flora/bush/reed{
+	pixel_y = 8
+	},
+/turf/open/misc/grass,
+/area/station/service/barber)
 "aRn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/trash/popcorn,
@@ -3929,6 +3943,10 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/science/ordnance/office)
+"aRT" = (
+/obj/structure/hedge/opaque,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "aRZ" = (
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
@@ -6977,10 +6995,6 @@
 	},
 /turf/open/floor/iron/grimy,
 /area/station/ai_monitored/turret_protected/aisat_interior)
-"bNy" = (
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "bNF" = (
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
 /turf/open/floor/iron,
@@ -7380,13 +7394,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
 /area/station/maintenance/aft/upper)
-"bUp" = (
-/obj/structure/railing/corner,
-/obj/machinery/light/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "bUy" = (
 /turf/closed/wall/r_wall/rust,
 /area/station/maintenance/coffin_supply)
@@ -7869,6 +7876,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
+"ccL" = (
+/obj/structure/table,
+/obj/item/pai_card,
+/turf/open/floor/glass,
+/area/station/commons/dorms)
 "ccR" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 6
@@ -7970,6 +7982,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/upper)
+"cfw" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "cfC" = (
 /obj/machinery/vending/coffee,
 /obj/effect/turf_decal/bot,
@@ -8422,6 +8440,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/xenobiology)
+"cpB" = (
+/obj/item/reagent_containers/glass/bucket/wooden,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "cpE" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/mapping_helpers/burnt_floor,
@@ -9456,6 +9478,9 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
+"cKv" = (
+/turf/closed/wall,
+/area/station/service/barber)
 "cKw" = (
 /obj/effect/turf_decal/stripes/end{
 	dir = 8
@@ -10019,12 +10044,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"cXQ" = (
-/obj/structure/chair/pew/right{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "cXW" = (
 /obj/structure/bodycontainer/morgue,
 /obj/effect/turf_decal/bot_white,
@@ -10728,27 +10747,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/central)
-"dgW" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/machinery/button/door/directional/west{
-	id = "Dorm10";
-	name = "Spa Door Lock";
-	normaldoorcontrol = 1;
-	specialfunctions = 4
-	},
-/obj/machinery/light/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "dgX" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/cable,
@@ -11099,6 +11097,12 @@
 /obj/effect/turf_decal/stripes,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
+"dnt" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
+	},
+/turf/open/misc/beach/sand,
+/area/station/service/barber)
 "dny" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -11635,6 +11639,12 @@
 /obj/structure/cable,
 /turf/open/floor/carpet/blue,
 /area/station/command/heads_quarters/cmo)
+"dwJ" = (
+/obj/structure/flora/bush/fullgrass,
+/obj/structure/flora/bush/flowers_pp,
+/obj/structure/bed/pillow_tiny,
+/turf/open/misc/grass,
+/area/station/service/barber)
 "dwV" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 1
@@ -12242,6 +12252,9 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/command)
+"dHE" = (
+/turf/open/misc/beach/sand,
+/area/station/service/barber)
 "dHH" = (
 /obj/effect/turf_decal/stripes,
 /obj/structure/cable,
@@ -14251,6 +14264,16 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
+"ewa" = (
+/obj/structure/table/reinforced/rglass,
+/obj/structure/window{
+	dir = 8
+	},
+/obj/structure/curtain/cloth,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "ewm" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -15836,20 +15859,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/port/upper)
-"fdZ" = (
-/obj/structure/window{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/machinery/shower/directional/north,
-/obj/structure/drain,
-/obj/effect/turf_decal/trimline/blue/end{
-	dir = 1
-	},
-/turf/open/floor/iron/dark/textured_large,
-/area/station/service/salon)
 "fea" = (
 /obj/machinery/deepfryer,
 /obj/effect/turf_decal/bot,
@@ -15895,10 +15904,6 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/science/genetics)
-"feQ" = (
-/obj/structure/cable,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "ffl" = (
 /obj/structure/railing,
 /obj/effect/turf_decal/stripes,
@@ -16710,9 +16715,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/department/crew_quarters/dorms)
-"fqP" = (
-/turf/open/floor/wood,
-/area/station/service/salon)
 "fri" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -17107,12 +17109,6 @@
 /obj/structure/chair,
 /turf/open/floor/carpet/blue,
 /area/station/medical/patients_rooms)
-"fyj" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "fyl" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -17326,16 +17322,6 @@
 /obj/effect/spawner/random/entertainment/wallet_storage,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/upper)
-"fCn" = (
-/obj/structure/bed/pod{
-	pixel_y = 1
-	},
-/obj/structure/mirror/directional/east,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
-"fCt" = (
-/turf/closed/wall,
-/area/station/service/salon)
 "fCF" = (
 /obj/structure/chair/sofa/right{
 	dir = 4
@@ -17372,6 +17358,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"fDH" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/structure/sink/directional/south,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/barber)
 "fDJ" = (
 /obj/effect/spawner/random/trash/mess,
 /obj/effect/decal/cleanable/dirt,
@@ -17462,6 +17455,15 @@
 	},
 /turf/open/floor/iron,
 /area/command/heads_quarters/captain/private/nt_rep)
+"fFa" = (
+/obj/structure/table/wood,
+/obj/item/pai_card,
+/obj/structure/noticeboard{
+	dir = 4;
+	pixel_x = -32
+	},
+/turf/open/floor/wood,
+/area/station/command/meeting_room/council)
 "fFv" = (
 /obj/structure/rack,
 /obj/item/fuel_pellet,
@@ -17911,10 +17913,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
-"fOX" = (
-/obj/structure/hedge/opaque,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "fOZ" = (
 /turf/open/floor/iron/stairs/medium,
 /area/station/hallway/primary/upper)
@@ -18362,6 +18360,11 @@
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"fWZ" = (
+/obj/structure/sauna_oven,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "fXd" = (
 /obj/structure/bookcase/manuals/research_and_development,
 /obj/machinery/status_display/ai/directional/north,
@@ -19383,6 +19386,16 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat_interior)
+"gqa" = (
+/obj/structure/chair/sofa/bench/left{
+	dir = 4;
+	pixel_x = -5
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "gqf" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2{
@@ -19610,6 +19623,12 @@
 "gvP" = (
 /turf/open/floor/plating/airless,
 /area/station/maintenance/fore/upper)
+"gvX" = (
+/obj/structure/table/wood/fancy/purple,
+/obj/item/pai_card,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/purple,
+/area/station/command/heads_quarters/rd)
 "gwn" = (
 /obj/structure/curtain/cloth/fancy/mechanical/start_closed{
 	desc = "A set of curtains serving as a fancy theater backdrop. They can only be opened by a button.";
@@ -20000,6 +20019,9 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
+"gDO" = (
+/turf/open/openspace,
+/area/station/service/barber)
 "gDP" = (
 /obj/item/trash/syndi_cakes,
 /obj/structure/cable,
@@ -20775,11 +20797,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
-"gSk" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plating,
-/area/station/service/salon)
 "gSn" = (
 /obj/effect/spawner/random/trash/mess,
 /obj/effect/decal/cleanable/dirt,
@@ -21069,6 +21086,19 @@
 /obj/structure/sign/departments/science/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/upper)
+"gWK" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "gWP" = (
 /obj/machinery/disposal/bin,
 /obj/effect/turf_decal/delivery,
@@ -21979,6 +22009,20 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/upper)
+"hnM" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/personal,
+/obj/item/clothing/under/costume/bathrobe,
+/obj/item/clothing/under/costume/bathrobe,
+/obj/item/clothing/shoes/sandal,
+/obj/item/clothing/shoes/sandal,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "hnU" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -22336,6 +22380,27 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/lab)
+"htI" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/button/door/directional/west{
+	id = "Dorm10";
+	name = "Spa Door Lock";
+	normaldoorcontrol = 1;
+	specialfunctions = 4
+	},
+/obj/machinery/light/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "htQ" = (
 /obj/structure/mopbucket,
 /turf/open/floor/plating,
@@ -22569,6 +22634,17 @@
 	dir = 10
 	},
 /area/station/ai_monitored/command/storage/eva)
+"hxD" = (
+/obj/structure/table/glass,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
+/obj/machinery/dryer{
+	dir = 4;
+	pixel_x = -6;
+	pixel_y = 13
+	},
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "hxZ" = (
 /obj/structure/rack,
 /obj/item/storage/medkit/regular,
@@ -23301,6 +23377,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/command/gateway)
+"hMa" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/curtain/bounty,
+/turf/open/floor/plating,
+/area/station/service/barber)
 "hMq" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/athletic_mixed,
@@ -24512,6 +24593,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/upper)
+"iiu" = (
+/obj/machinery/light/directional/north,
+/obj/item/toy/seashell,
+/turf/open/misc/beach/sand,
+/area/station/service/barber)
 "iiw" = (
 /obj/item/cigbutt,
 /obj/structure/cable,
@@ -25303,6 +25389,11 @@
 	dir = 5
 	},
 /area/station/hallway/secondary/command)
+"iwY" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "ixp" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -25513,14 +25604,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/chemistry)
-"iAm" = (
-/obj/structure/chair/office/light{
-	dir = 4;
-	pixel_y = 3
-	},
-/obj/structure/window,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "iAE" = (
 /obj/effect/turf_decal/stripes{
 	dir = 5
@@ -25887,15 +25970,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/upper)
-"iFO" = (
-/obj/structure/table/wood,
-/obj/item/pai_card,
-/obj/structure/noticeboard{
-	dir = 4;
-	pixel_x = -32
-	},
-/turf/open/floor/wood,
-/area/station/command/meeting_room/council)
 "iFQ" = (
 /obj/effect/turf_decal/stripes/white/corner{
 	dir = 1
@@ -26737,11 +26811,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
-"iUG" = (
-/obj/structure/cable,
-/obj/effect/landmark/start/barber,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "iUK" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -27583,13 +27652,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"jfT" = (
-/obj/structure/hedge/opaque,
-/obj/structure/railing{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "jfW" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
@@ -29370,12 +29432,6 @@
 "jLE" = (
 /turf/open/floor/iron,
 /area/station/science/ordnance)
-"jLW" = (
-/obj/structure/curtain/bounty,
-/turf/open/floor/iron/stairs/old{
-	dir = 8
-	},
-/area/station/service/salon)
 "jMb" = (
 /obj/structure/railing{
 	dir = 8
@@ -29564,6 +29620,16 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/station/science/robotics/lab)
+"jPP" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/wood{
+	name = "Sauna"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "jPV" = (
 /obj/structure/extinguisher_cabinet/directional/south,
 /obj/machinery/light/directional/south,
@@ -30096,20 +30162,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/science/robotics)
-"kdG" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/costume/bathrobe,
-/obj/item/clothing/under/costume/bathrobe,
-/obj/item/clothing/shoes/sandal,
-/obj/item/clothing/shoes/sandal,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "kdH" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
 	dir = 4
@@ -30166,6 +30218,10 @@
 /obj/effect/turf_decal/vg_decals/numbers/three,
 /turf/open/floor/iron,
 /area/station/engineering/transit_tube)
+"kfd" = (
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "kfp" = (
 /obj/effect/landmark/event_spawn,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -30341,6 +30397,12 @@
 /obj/structure/window/reinforced,
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
+"kif" = (
+/obj/structure/chair/pew/left{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "kio" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{
@@ -31995,6 +32057,14 @@
 	dir = 4
 	},
 /area/station/commons/dorms)
+"kLr" = (
+/obj/structure/chair/office/light{
+	dir = 4;
+	pixel_y = 3
+	},
+/obj/structure/window,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "kLA" = (
 /obj/effect/turf_decal/trimline/blue/filled/warning{
 	dir = 8
@@ -32304,6 +32374,10 @@
 	},
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/hop)
+"kQO" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/service/barber)
 "kQT" = (
 /obj/structure/tank_dispenser,
 /obj/effect/turf_decal/stripes/box,
@@ -32945,16 +33019,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/medical/aslyum)
-"leg" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/wood{
-	name = "Sauna"
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "lek" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -33775,6 +33839,25 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/wood,
 /area/station/commons/dorms)
+"lrs" = (
+/obj/structure/table/reinforced/rglass,
+/obj/structure/curtain/cloth,
+/obj/machinery/light/directional/east,
+/obj/item/reagent_containers/medigel/aiuri{
+	desc = "A medicinal massage oil containing aiuri, normally gives a nice cooling effect on the bodypart where it's applied whilst also healing minor burns.";
+	name = "Cooling massage oil";
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/medigel/libital{
+	desc = "A medicinal massage oil that warms up and relaxes the skin and muscles, great at both treating backpains, cramps and bruises.";
+	name = "Relaxing massage oil";
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/obj/item/radio/intercom/directional/east,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "lrt" = (
 /obj/item/radio/intercom/directional/east,
 /obj/machinery/light/directional/east,
@@ -34489,6 +34572,10 @@
 /obj/effect/landmark/start/paramedic,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/lobby)
+"lDo" = (
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "lDD" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/airlock/highsecurity{
@@ -34535,6 +34622,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"lDW" = (
+/obj/structure/flora/rock/pile,
+/obj/structure/flora/bush/sparsegrass,
+/turf/open/misc/grass,
+/area/station/service/barber)
 "lEo" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -34662,10 +34754,6 @@
 /obj/effect/landmark/start/psychologist,
 /turf/open/floor/carpet,
 /area/station/medical/psychology)
-"lGg" = (
-/obj/item/reagent_containers/glass/bucket/wooden,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "lGL" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Toxins Maintenance"
@@ -35254,12 +35342,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/stairs,
 /area/station/maintenance/thruster_room/central)
-"lNH" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light/directional/south,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "lNM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -35324,6 +35406,9 @@
 "lPh" = (
 /turf/open/floor/iron,
 /area/station/hallway/primary/upper)
+"lPs" = (
+/turf/closed/wall/r_wall,
+/area/station/service/barber)
 "lPw" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin{
@@ -35829,12 +35914,6 @@
 	},
 /turf/open/floor/wood,
 /area/station/command/meeting_room/council)
-"lXy" = (
-/obj/structure/chair/pew/left{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "lXz" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
@@ -36294,18 +36373,6 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
-"mhw" = (
-/obj/structure/table,
-/obj/item/pai_card{
-	pixel_x = 6;
-	pixel_y = 3
-	},
-/obj/item/book/manual/wiki/robotics_cyborgs{
-	pixel_x = -7
-	},
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics)
 "mhx" = (
 /obj/structure/closet/crate,
 /obj/structure/grille/broken,
@@ -37363,17 +37430,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
-"mCs" = (
-/obj/structure/table/glass,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
-/obj/machinery/dryer{
-	dir = 4;
-	pixel_x = -6;
-	pixel_y = 13
-	},
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "mCz" = (
 /obj/structure/chair/comfy/brown{
 	dir = 4
@@ -37714,6 +37770,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/upper)
+"mJn" = (
+/obj/effect/turf_decal/weather/sand,
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/lavendergrass,
+/turf/open/misc/grass,
+/area/station/service/barber)
 "mJt" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -37787,13 +37849,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/aft/upper)
-"mKa" = (
-/obj/structure/chair/sofa/bench/right{
-	dir = 4;
-	pixel_x = -5
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "mKw" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -37827,6 +37882,12 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"mKN" = (
+/obj/structure/chair/pew/left{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "mLl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice,
@@ -37983,6 +38044,11 @@
 /obj/structure/barricade/wooden/crude,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/upper)
+"mNW" = (
+/obj/item/radio/intercom/directional/east,
+/obj/effect/landmark/start/barber,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "mOc" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Morgue"
@@ -38221,6 +38287,9 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/iron,
 /area/station/science/explab)
+"mTc" = (
+/turf/closed/wall/mineral/wood,
+/area/station/service/barber)
 "mTl" = (
 /obj/structure/ladder,
 /turf/open/floor/plating,
@@ -40089,17 +40158,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/command/gateway)
-"nzs" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "nzG" = (
 /obj/machinery/power/floodlight,
 /obj/effect/turf_decal/bot,
@@ -40140,14 +40198,6 @@
 /obj/effect/landmark/start/head_of_personnel,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/hop)
-"nzZ" = (
-/obj/machinery/shower/directional/north,
-/obj/structure/drain,
-/obj/effect/turf_decal/trimline/blue/end{
-	dir = 1
-	},
-/turf/open/floor/iron/dark/textured_large,
-/area/station/service/salon)
 "nAn" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/curtain/cloth/fancy/mechanical{
@@ -40275,6 +40325,14 @@
 	dir = 8
 	},
 /area/station/commons/dorms)
+"nCG" = (
+/obj/structure/bed/pod{
+	pixel_y = 1
+	},
+/obj/structure/window,
+/obj/structure/mirror/directional/east,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "nCO" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/bot,
@@ -40527,12 +40585,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
-"nHv" = (
-/obj/effect/turf_decal/weather/sand,
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/lavendergrass,
-/turf/open/misc/grass,
-/area/station/service/salon)
 "nHw" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
@@ -40579,6 +40631,10 @@
 /obj/structure/dresser,
 /turf/open/floor/carpet/blue,
 /area/station/command/heads_quarters/captain/private)
+"nIA" = (
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "nID" = (
 /obj/structure/window{
 	dir = 1
@@ -41723,11 +41779,6 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/xenobiology)
-"ocm" = (
-/obj/item/radio/intercom/directional/east,
-/obj/effect/landmark/start/barber,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "ocp" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -42145,6 +42196,13 @@
 /obj/item/food/burger/superbite,
 /turf/open/floor/iron/dark,
 /area/station/command/captain_dining)
+"ojl" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "ojp" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
 	dir = 10
@@ -42735,12 +42793,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/upper)
-"otO" = (
-/obj/structure/table/wood/fancy/purple,
-/obj/item/pai_card,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/purple,
-/area/station/command/heads_quarters/rd)
 "ouq" = (
 /obj/machinery/door/airlock/vault{
 	name = "Vault Door"
@@ -42786,15 +42838,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/engineering/atmos_aux_port)
-"ouX" = (
-/obj/structure/chair/office/light{
-	dir = 4
-	},
-/obj/machinery/dryer{
-	pixel_y = 14
-	},
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "ove" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/command/glass{
@@ -42819,6 +42862,12 @@
 /obj/effect/turf_decal/delivery/blue,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/engineering/atmos_aux_port)
+"ovW" = (
+/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/south,
+/obj/structure/cable,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "ovX" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced,
@@ -43182,12 +43231,6 @@
 	},
 /turf/closed/wall,
 /area/station/hallway/primary/upper)
-"oCz" = (
-/obj/structure/flora/bush/fullgrass,
-/obj/structure/flora/bush/flowers_pp,
-/obj/structure/bed/pillow_tiny,
-/turf/open/misc/grass,
-/area/station/service/salon)
 "oCS" = (
 /obj/effect/turf_decal/trimline/blue/filled/warning{
 	dir = 4
@@ -43930,13 +43973,6 @@
 /obj/structure/cable,
 /turf/open/floor/glass/reinforced,
 /area/station/science)
-"oPz" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/obj/structure/sink/directional/south,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/service/salon)
 "oPG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -45308,6 +45344,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/maintenance/thruster_room/aft)
+"ppa" = (
+/obj/structure/flora/bush/sparsegrass,
+/obj/structure/flora/bush/grassy,
+/turf/open/misc/grass,
+/area/station/service/barber)
 "ppl" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/secure/briefcase,
@@ -46805,6 +46846,14 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"pPn" = (
+/obj/structure/table/glass,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
+/obj/item/hairbrush,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "pPu" = (
 /obj/effect/turf_decal/vg_decals/numbers/two{
 	dir = 4
@@ -46872,12 +46921,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/station/medical/aslyum)
-"pRE" = (
-/obj/structure/chair/pew/right{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "pRK" = (
 /obj/effect/turf_decal/trimline/purple/filled/line{
 	dir = 9
@@ -47414,18 +47457,6 @@
 /obj/effect/turf_decal/bot_white/left,
 /turf/open/floor/iron/dark,
 /area/station/command/gateway)
-"qbG" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "qck" = (
 /obj/structure/disposaloutlet,
 /obj/structure/disposalpipe/trunk{
@@ -47661,10 +47692,6 @@
 "qiu" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/solars/starboard/fore)
-"qiF" = (
-/obj/machinery/light_switch/directional/east,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "qiI" = (
 /obj/effect/turf_decal/trimline/purple/filled/warning{
 	dir = 1
@@ -48266,11 +48293,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"qqH" = (
-/obj/machinery/light/directional/north,
-/obj/item/toy/seashell,
-/turf/open/misc/beach/sand,
-/area/station/service/salon)
 "qqM" = (
 /obj/effect/turf_decal/trimline/purple/filled/corner{
 	dir = 8
@@ -49209,6 +49231,13 @@
 /obj/machinery/status_display/evac/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/office)
+"qHG" = (
+/obj/structure/bed/pod{
+	pixel_y = 1
+	},
+/obj/structure/mirror/directional/east,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "qHS" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
@@ -49299,10 +49328,6 @@
 "qJI" = (
 /turf/closed/wall,
 /area/station/maintenance/eva_shed/starboard)
-"qJJ" = (
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "qJK" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -50787,16 +50812,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
-"riw" = (
-/obj/structure/chair/sofa/bench/left{
-	dir = 4;
-	pixel_x = -5
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "riB" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
@@ -51330,11 +51345,6 @@
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
-"rsq" = (
-/obj/structure/sauna_oven,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "rsA" = (
 /obj/item/trash/chips,
 /obj/effect/decal/cleanable/dirt,
@@ -52141,6 +52151,12 @@
 "rIo" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/department/science/ordnance_maint_lesser)
+"rIq" = (
+/obj/structure/curtain/bounty,
+/turf/open/floor/iron/stairs/old{
+	dir = 8
+	},
+/area/station/service/barber)
 "rIA" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/stripes/line{
@@ -52442,11 +52458,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/science/robotics/mechbay)
-"rOs" = (
-/obj/structure/flora/rock/pile,
-/obj/structure/flora/bush/sparsegrass,
-/turf/open/misc/grass,
-/area/station/service/salon)
 "rOB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -52774,9 +52785,6 @@
 	},
 /turf/open/floor/wood,
 /area/station/command/meeting_room/council)
-"rUO" = (
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "rUP" = (
 /turf/open/floor/iron/stairs/right{
 	dir = 8
@@ -53532,6 +53540,10 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/engine,
 /area/station/ai_monitored/turret_protected/aisat/hallway)
+"siA" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/wood,
+/area/station/service/barber)
 "siD" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{
 	dir = 1
@@ -53557,9 +53569,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plating,
 /area/station/maintenance/console_room)
-"siK" = (
-/turf/open/misc/beach/sand,
-/area/station/service/salon)
 "siO" = (
 /obj/effect/turf_decal/trimline/blue/filled/warning,
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
@@ -53589,20 +53598,6 @@
 	},
 /turf/open/floor/glass/reinforced,
 /area/station/ai_monitored/turret_protected/aisat_interior)
-"sjo" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
-	pixel_x = -2;
-	pixel_y = 6
-	},
-/obj/item/pai_card,
-/obj/effect/turf_decal/tile/purple/half{
-	dir = 8
-	},
-/turf/open/floor/iron/white/side{
-	dir = 8
-	},
-/area/station/science)
 "sjI" = (
 /obj/effect/turf_decal/siding/purple/end,
 /turf/open/floor/glass/reinforced,
@@ -53953,6 +53948,13 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white,
 /area/station/science/lab)
+"snw" = (
+/obj/structure/railing/corner,
+/obj/machinery/light/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "snC" = (
 /obj/structure/chair{
 	dir = 4
@@ -54144,10 +54146,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/patients_rooms)
-"sqd" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/salon)
 "sqz" = (
 /obj/machinery/vending/coffee,
 /turf/open/floor/iron/white,
@@ -54385,6 +54383,15 @@
 	dir = 8
 	},
 /area/station/hallway/primary/upper)
+"sur" = (
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/machinery/dryer{
+	pixel_y = 14
+	},
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "sux" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
@@ -54533,6 +54540,17 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/upper)
+"swO" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/machinery/light/directional/north,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "swT" = (
 /obj/structure/cable,
 /turf/open/floor/plating,
@@ -55629,6 +55647,12 @@
 	icon_state = "submarine_perf"
 	},
 /area/space/nearstation)
+"sRj" = (
+/obj/structure/flora/bush/fullgrass,
+/obj/structure/flora/bush/flowers_br,
+/obj/structure/bed/pillow_large,
+/turf/open/misc/grass,
+/area/station/service/barber)
 "sRk" = (
 /obj/machinery/griddle,
 /obj/machinery/power/apc/auto_name/directional/north,
@@ -56596,25 +56620,6 @@
 	},
 /turf/open/floor/circuit,
 /area/station/ai_monitored/turret_protected/ai)
-"tha" = (
-/obj/structure/table/reinforced/rglass,
-/obj/structure/curtain/cloth,
-/obj/machinery/light/directional/east,
-/obj/item/reagent_containers/medigel/aiuri{
-	desc = "A medicinal massage oil containing aiuri, normally gives a nice cooling effect on the bodypart where it's applied whilst also healing minor burns.";
-	name = "Cooling massage oil";
-	pixel_x = 2;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/medigel/libital{
-	desc = "A medicinal massage oil that warms up and relaxes the skin and muscles, great at both treating backpains, cramps and bruises.";
-	name = "Relaxing massage oil";
-	pixel_x = -4;
-	pixel_y = 5
-	},
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "thd" = (
 /obj/machinery/door/airlock{
 	name = "Bedroom"
@@ -56725,6 +56730,14 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron/white,
 /area/station/science)
+"tiG" = (
+/obj/machinery/shower/directional/north,
+/obj/structure/drain,
+/obj/effect/turf_decal/trimline/blue/end{
+	dir = 1
+	},
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/barber)
 "tiH" = (
 /obj/structure/bookcase/manuals/engineering,
 /turf/open/floor/wood,
@@ -58083,6 +58096,18 @@
 "tHN" = (
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
+"tHT" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "tHV" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
@@ -58106,6 +58131,13 @@
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/station/medical/aslyum)
+"tHY" = (
+/obj/structure/hedge/opaque,
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "tHZ" = (
 /obj/structure/shuttle/engine/router,
 /obj/effect/turf_decal/stripes{
@@ -58342,6 +58374,11 @@
 /obj/structure/window/reinforced,
 /turf/open/floor/grass,
 /area/station/hallway/secondary/exit)
+"tOs" = (
+/obj/structure/curtain/bounty,
+/obj/structure/cable,
+/turf/open/floor/iron/stairs/old,
+/area/station/service/barber)
 "tOD" = (
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
@@ -58984,9 +59021,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/medical/psychology)
-"uap" = (
-/turf/open/openspace,
-/area/station/service/salon)
 "uat" = (
 /obj/structure/table,
 /obj/machinery/microwave{
@@ -60520,6 +60554,13 @@
 /obj/structure/bookcase/manuals/engineering,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain/private)
+"uBA" = (
+/obj/structure/chair/sofa/bench/right{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "uBN" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
@@ -61036,6 +61077,18 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
+"uLv" = (
+/obj/structure/table,
+/obj/item/pai_card{
+	pixel_x = 6;
+	pixel_y = 3
+	},
+/obj/item/book/manual/wiki/robotics_cyborgs{
+	pixel_x = -7
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/science/robotics)
 "uLM" = (
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 4
@@ -61049,6 +61102,20 @@
 	},
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
+"uLO" = (
+/obj/structure/window{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/shower/directional/north,
+/obj/structure/drain,
+/obj/effect/turf_decal/trimline/blue/end{
+	dir = 1
+	},
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/barber)
 "uLS" = (
 /obj/structure/chair{
 	dir = 1
@@ -62380,13 +62447,6 @@
 /obj/structure/marker_beacon/burgundy,
 /turf/open/floor/engine/hull/reinforced,
 /area/space/nearstation)
-"vlK" = (
-/obj/structure/water_source/puddle,
-/obj/structure/flora/bush/reed{
-	pixel_y = 8
-	},
-/turf/open/misc/grass,
-/area/station/service/salon)
 "vlL" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/stripes{
@@ -62786,10 +62846,6 @@
 /obj/item/clothing/glasses/betterunshit,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/upper)
-"vsO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "vtq" = (
 /obj/effect/turf_decal/delivery/white,
 /obj/structure/bodycontainer/morgue{
@@ -63127,6 +63183,9 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/upper)
+"vyF" = (
+/turf/open/floor/wood,
+/area/station/service/barber)
 "vyY" = (
 /obj/machinery/vending/boozeomat,
 /obj/effect/turf_decal/siding/wood,
@@ -63165,11 +63224,6 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/command/heads_quarters/captain/private/nt_rep)
-"vzJ" = (
-/obj/structure/curtain/bounty,
-/obj/structure/cable,
-/turf/open/floor/iron/stairs/old,
-/area/station/service/salon)
 "vzM" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -63440,6 +63494,12 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/upper)
+"vEX" = (
+/obj/structure/chair/pew/right{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/station/service/barber)
 "vFB" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/machinery/newscaster/directional/north,
@@ -64358,16 +64418,6 @@
 	icon = 'modular_skyrat/modules/advanced_shuttles/icons/evac_shuttle.dmi'
 	},
 /area/space/nearstation)
-"vUJ" = (
-/obj/structure/table/reinforced/rglass,
-/obj/structure/window{
-	dir = 8
-	},
-/obj/structure/curtain/cloth,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "vVd" = (
 /obj/effect/spawner/structure/window/reinforced/tinted,
 /turf/open/floor/plating,
@@ -64512,9 +64562,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
-"vYu" = (
-/turf/closed/wall/mineral/wood,
-/area/station/service/salon)
 "vYC" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/stripes{
@@ -65248,6 +65295,20 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/station/science/tele_sci)
+"wmq" = (
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+	pixel_x = -2;
+	pixel_y = 6
+	},
+/obj/item/pai_card,
+/obj/effect/turf_decal/tile/purple/half{
+	dir = 8
+	},
+/turf/open/floor/iron/white/side{
+	dir = 8
+	},
+/area/station/science)
 "wmI" = (
 /obj/structure/easel,
 /obj/item/canvas/twentythree_twentythree{
@@ -65769,9 +65830,6 @@
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
-"wuT" = (
-/turf/open/floor/iron/dark/textured_large,
-/area/station/service/salon)
 "wvh" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -66619,19 +66677,6 @@
 /obj/structure/shuttle/engine/router,
 /turf/open/floor/plating/airless,
 /area/station/maintenance/fore/upper)
-"wKV" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "wLa" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -66695,12 +66740,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
-"wMM" = (
-/obj/structure/flora/bush/fullgrass,
-/obj/structure/flora/bush/flowers_br,
-/obj/structure/bed/pillow_large,
-/turf/open/misc/grass,
-/area/station/service/salon)
 "wMW" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
@@ -66819,6 +66858,9 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white,
 /area/station/medical/pharmacy)
+"wNE" = (
+/turf/open/floor/iron/dark/textured_large,
+/area/station/service/barber)
 "wNJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
@@ -66898,11 +66940,6 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/central)
-"wOS" = (
-/obj/structure/flora/bush/sparsegrass,
-/obj/structure/flora/bush/grassy,
-/turf/open/misc/grass,
-/area/station/service/salon)
 "wPt" = (
 /obj/structure/railing,
 /obj/effect/decal/cleanable/dirt,
@@ -66996,12 +67033,6 @@
 /obj/item/grown/bananapeel,
 /turf/open/floor/noslip,
 /area/station/maintenance/gag_room)
-"wRB" = (
-/obj/structure/chair/pew/left{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "wRD" = (
 /turf/open/floor/wood,
 /area/station/service/theater)
@@ -67155,13 +67186,6 @@
 "wUs" = (
 /turf/open/floor/iron,
 /area/station/ai_monitored/command/storage/eva)
-"wUB" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/station/service/salon)
 "wUL" = (
 /obj/structure/table/reinforced,
 /obj/item/food/meat/slab/human{
@@ -67270,6 +67294,9 @@
 /obj/structure/sign/poster/contraband/random/directional/west,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/upper)
+"wWa" = (
+/turf/open/floor/carpet/black,
+/area/station/service/barber)
 "wWb" = (
 /obj/structure/rack,
 /obj/effect/turf_decal/bot,
@@ -67430,11 +67457,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/solars/starboard/fore)
-"wYE" = (
-/obj/structure/table,
-/obj/item/pai_card,
-/turf/open/floor/glass,
-/area/station/commons/dorms)
 "wYO" = (
 /obj/structure/barricade/wooden/crude,
 /obj/machinery/door/airlock{
@@ -69498,12 +69520,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/upper)
-"xJE" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
-	},
-/turf/open/misc/beach/sand,
-/area/station/service/salon)
 "xJK" = (
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
 	dir = 9
@@ -69772,9 +69788,6 @@
 	dir = 8
 	},
 /area/station/hallway/secondary/command)
-"xOq" = (
-/turf/closed/wall/r_wall,
-/area/station/service/salon)
 "xOr" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -70833,11 +70846,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/command/captain_kitchen)
-"ygR" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/station/service/salon)
 "yha" = (
 /obj/machinery/door/firedoor,
 /obj/structure/sign/nanotrasen{
@@ -70899,14 +70907,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical)
-"yhQ" = (
-/obj/structure/table/glass,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4,
-/obj/item/hairbrush,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/black,
-/area/station/service/salon)
 "yic" = (
 /turf/closed/wall,
 /area/station/maintenance/aft/upper)
@@ -88769,11 +88769,11 @@ xBG
 xBG
 xBG
 xBG
-xOq
-sqd
-sqd
-sqd
-xOq
+lPs
+kQO
+kQO
+kQO
+lPs
 xBG
 xBG
 xBG
@@ -89026,12 +89026,12 @@ xuf
 xuf
 xuf
 xuf
-sqd
-wOS
-oCz
-vlK
-xOq
-xOq
+kQO
+ppa
+dwJ
+aRd
+lPs
+lPs
 xBG
 xBG
 xBG
@@ -89283,12 +89283,12 @@ gny
 gny
 gny
 gny
-sqd
-wMM
-rOs
-nHv
-siK
-sqd
+kQO
+sRj
+lDW
+mJn
+dHE
+kQO
 xuf
 xuf
 xuf
@@ -89538,14 +89538,14 @@ ulF
 heb
 heb
 iUe
-sqd
-sqd
-xOq
-vYu
-vYu
-fCt
-qqH
-sqd
+kQO
+kQO
+lPs
+mTc
+mTc
+cKv
+iiu
+kQO
 gny
 gny
 gny
@@ -89794,15 +89794,15 @@ heb
 heb
 alH
 heb
-sqd
-sqd
-nzZ
-vYu
-pRE
-lXy
-vYu
-xJE
-sqd
+kQO
+kQO
+tiG
+mTc
+vEX
+kif
+mTc
+dnt
+kQO
 xIb
 xIb
 cMr
@@ -90051,17 +90051,17 @@ heb
 heb
 heb
 heb
-sqd
-wuT
-wuT
-leg
-lGg
-rsq
-vYu
-jLW
-xOq
-xOq
-xOq
+kQO
+wNE
+wNE
+jPP
+cpB
+fWZ
+mTc
+rIq
+lPs
+lPs
+lPs
 heb
 alH
 heb
@@ -90304,21 +90304,21 @@ idJ
 fdI
 fdI
 fdI
-xOq
-gSk
-gSk
-gSk
-xOq
-oPz
-fdZ
-vYu
-wRB
-cXQ
-vYu
-fyj
-riw
-mKa
-xOq
+lPs
+hMa
+hMa
+hMa
+lPs
+fDH
+uLO
+mTc
+mKN
+atk
+mTc
+cfw
+gqa
+uBA
+lPs
 uwp
 uwp
 uwp
@@ -90562,19 +90562,19 @@ dJV
 idJ
 olp
 oiy
-feQ
-iUG
-feQ
-vzJ
-qJJ
-lNH
-vYu
-vYu
-vYu
-vYu
-nzs
-wUB
-qJJ
+aGq
+azs
+aGq
+tOs
+lDo
+ovW
+mTc
+mTc
+mTc
+mTc
+swO
+ojl
+lDo
 mID
 gnv
 dlx
@@ -90818,20 +90818,20 @@ qpS
 qpS
 gwT
 idJ
-fCt
-ouX
-vUJ
-iAm
-jfT
-vsO
-ygR
-dgW
-yhQ
-mCs
-bUp
-wKV
-kdG
-kdG
+cKv
+sur
+ewa
+kLr
+tHY
+siA
+iwY
+htI
+pPn
+hxD
+snw
+gWK
+hnM
+hnM
 xgb
 xgb
 xgb
@@ -91075,20 +91075,20 @@ idJ
 idJ
 idJ
 tgI
-fCt
-fCn
-tha
-aok
-fOX
-fqP
-bNy
-qbG
-ocm
-qiF
-rUO
-uap
-uap
-uap
+cKv
+qHG
+lrs
+nCG
+aRT
+vyF
+kfd
+tHT
+mNW
+nIA
+wWa
+gDO
+gDO
+gDO
 xgb
 qpv
 sZD
@@ -94154,7 +94154,7 @@ ykY
 ykY
 ykY
 xeX
-wYE
+ccL
 gAL
 nQl
 tSH
@@ -94961,7 +94961,7 @@ vmE
 cJg
 qIC
 bGo
-otO
+gvX
 ykh
 fAN
 vmE
@@ -100860,7 +100860,7 @@ wXS
 jKI
 nKa
 abt
-mhw
+uLv
 wXS
 vrn
 nnh
@@ -102401,7 +102401,7 @@ tbU
 uiS
 mrv
 dki
-sjo
+wmq
 lLx
 ggq
 kyN
@@ -103897,7 +103897,7 @@ ajn
 ajm
 plV
 jwl
-iFO
+fFa
 bLW
 xXA
 vAH
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
index 2d82b8c2421..dddd5262a70 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_barber.dmm
@@ -14,7 +14,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "d" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -22,7 +22,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "e" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -41,7 +41,7 @@
 	pixel_x = 6
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "h" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -55,7 +55,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "i" = (
 /obj/structure/cable,
 /obj/effect/landmark/start/hangover,
@@ -77,7 +77,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "k" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
@@ -94,7 +94,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "l" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -104,7 +104,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "m" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -130,7 +130,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "o" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -142,11 +142,11 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "p" = (
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall,
-/area/station/service/salon)
+/area/station/service/barber)
 "q" = (
 /obj/machinery/airalarm/directional/north,
 /obj/effect/turf_decal/tile/purple{
@@ -156,7 +156,7 @@
 /obj/machinery/light/warm/directional/north,
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "r" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -164,14 +164,14 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/holopad,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "s" = (
 /obj/effect/spawner/structure/window,
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains1"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "t" = (
 /turf/open/openspace,
 /area/station/hallway/primary/central)
@@ -183,7 +183,7 @@
 	},
 /obj/item/lipstick/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "v" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -193,7 +193,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "w" = (
 /obj/structure/mirror/directional/west,
 /obj/structure/table/reinforced/rglass,
@@ -205,7 +205,7 @@
 	pixel_y = 14
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "x" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -215,7 +215,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "y" = (
 /obj/machinery/newscaster/directional/north,
 /obj/effect/turf_decal/tile/purple{
@@ -232,7 +232,7 @@
 	c_tag = "Salon"
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "z" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -241,7 +241,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "A" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -251,7 +251,7 @@
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "B" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -261,7 +261,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "C" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -272,7 +272,7 @@
 /obj/item/hairbrush,
 /obj/item/lipstick/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "D" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/turf_decal/tile/purple{
@@ -280,7 +280,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "E" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -291,7 +291,7 @@
 	},
 /obj/machinery/vending/barbervend,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "F" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -300,14 +300,14 @@
 	req_access = list("maint_tunnels")
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "G" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "H" = (
 /obj/item/storage/secure/safe/directional/south,
 /obj/machinery/light/directional/south,
@@ -320,7 +320,7 @@
 	},
 /obj/structure/closet/secure_closet/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "I" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -331,7 +331,7 @@
 	},
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "J" = (
 /obj/structure/cable,
 /obj/structure/railing{
@@ -349,7 +349,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "L" = (
 /obj/structure/sign/barber{
 	pixel_x = -13
@@ -371,7 +371,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "O" = (
 /obj/effect/spawner/random/maintenance,
 /obj/structure/disposalpipe/segment{
@@ -386,7 +386,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/structure/sink/directional/east,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Q" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -395,10 +395,10 @@
 /obj/structure/table/reinforced/rglass,
 /obj/item/hairbrush,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "R" = (
 /turf/closed/wall,
-/area/station/service/salon)
+/area/station/service/barber)
 "S" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
@@ -413,14 +413,14 @@
 	pixel_y = -6
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "T" = (
 /obj/effect/spawner/structure/window,
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "U" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -434,7 +434,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "W" = (
 /obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/tile/purple{
@@ -444,7 +444,7 @@
 /obj/structure/bed/pod,
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "X" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -453,7 +453,7 @@
 /obj/structure/bed/pod,
 /obj/structure/window,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Y" = (
 /obj/effect/landmark/event_spawn,
 /obj/structure/cable,
@@ -473,7 +473,7 @@
 	pixel_y = 24
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 
 (1,1,1) = {"
 f
diff --git a/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm b/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
index a5d74d87557..4362ce73d16 100644
--- a/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
+++ b/_maps/skyrat/automapper/templates/kilostation/kilostation_ert_bay.dmm
@@ -4,50 +4,16 @@
 /obj/structure/lattice/catwalk,
 /turf/open/space/basic,
 /area/space/nearstation)
-"ag" = (
-/obj/machinery/door/airlock/corporate{
-	name = "NT Consultant's Office"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/dark/corner{
-	dir = 4
-	},
-/area/command/heads_quarters/captain/private/nt_rep)
-"aj" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/table/reinforced/rglass,
-/obj/item/hairbrush{
-	pixel_x = 6;
-	pixel_y = 9
-	},
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "an" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/official/random/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"az" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/wood,
+"aK" = (
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
-"aB" = (
-/obj/structure/chair/sofa/bench/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/machinery/camera/directional/south,
-/turf/open/floor/iron/dark/corner,
-/area/station/hallway/primary/fore)
 "bb" = (
 /obj/machinery/door/airlock/maintenance/external{
 	name = "Transit Intersection"
@@ -77,6 +43,15 @@
 "bn" = (
 /turf/closed/wall,
 /area/station/maintenance/port/fore)
+"bB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random/directional/south,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
 "bH" = (
 /obj/structure/transit_tube/diagonal/crossing/topleft,
 /obj/structure/lattice/catwalk,
@@ -91,22 +66,11 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"bZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
-	dir = 4
-	},
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
+"ca" = (
+/obj/machinery/airalarm/directional/north,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "cc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -118,15 +82,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"cE" = (
-/obj/machinery/door/airlock/public{
-	name = "Massage Parlour"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/service/salon)
+"cm" = (
+/obj/structure/filingcabinet/employment,
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "cW" = (
 /obj/structure/fans/tiny/forcefield{
 	dir = 1
@@ -137,13 +96,11 @@
 	},
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"cY" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
-	name = "Privacy Shutter";
-	id = "nt_rep_priv"
-	},
-/turf/open/floor/plating,
+"cX" = (
+/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/item/assembly/flash/handheld,
+/obj/machinery/status_display/ai/directional/north,
+/turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
 "df" = (
 /obj/machinery/disposal/bin,
@@ -167,19 +124,6 @@
 /obj/effect/turf_decal/tile/green,
 /turf/open/floor/iron/dark/corner,
 /area/station/hallway/primary/fore)
-"dt" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/dropper,
-/obj/item/hairbrush/comb{
-	pixel_y = 10
-	},
-/obj/machinery/button/curtain{
-	id = "barbershopcurtains";
-	pixel_x = 10;
-	pixel_y = -26
-	},
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "dw" = (
 /obj/effect/spawner/structure/window/hollow/reinforced/directional{
 	dir = 10
@@ -187,6 +131,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
+"dC" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "dG" = (
 /obj/machinery/camera/directional/north,
 /obj/effect/decal/cleanable/dirt,
@@ -215,17 +165,18 @@
 /obj/structure/lattice,
 /turf/open/space/basic,
 /area/space/nearstation)
-"ea" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/machinery/holopad,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "ew" = (
 /obj/structure/sign/departments/custodian,
 /turf/closed/wall,
 /area/station/maintenance/fore)
+"ey" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/machinery/vending/barbervend,
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "eC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
@@ -318,18 +269,18 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"fx" = (
+/obj/structure/cable,
+/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "fA" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/window/reinforced/spawner/north,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"fE" = (
-/obj/structure/cable,
-/obj/machinery/status_display/ai/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "fF" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -337,15 +288,21 @@
 /obj/effect/spawner/random/vending/snackvend,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"fJ" = (
-/obj/machinery/newscaster/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "fR" = (
 /obj/structure/sign/warning/secure_area,
 /turf/closed/wall,
 /area/space/nearstation)
+"fT" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
 "fY" = (
 /obj/structure/transit_tube/crossing,
 /obj/effect/turf_decal/sand/plating,
@@ -406,15 +363,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"gB" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/chair/office{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "gH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -439,6 +387,13 @@
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"gX" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/machinery/holopad,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "ha" = (
 /obj/structure/sign/departments/holy{
 	pixel_y = 30
@@ -476,11 +431,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"hF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "hS" = (
 /obj/structure/transit_tube/diagonal/crossing/topleft,
 /turf/open/misc/asteroid/airless,
@@ -518,17 +468,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"iJ" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
 "iM" = (
 /obj/structure/fans/tiny/forcefield{
 	dir = 1
@@ -546,12 +485,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"jd" = (
-/obj/structure/chair/office,
-/obj/effect/landmark/start/nanotrasen_consultant,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "jC" = (
 /obj/structure/chair/sofa/bench{
 	dir = 8
@@ -600,14 +533,6 @@
 /obj/effect/landmark/carpspawn,
 /turf/open/space/basic,
 /area/space)
-"kc" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "kh" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -647,6 +572,14 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"kz" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+	name = "Privacy Shutter";
+	id = "nt_rep_priv_2"
+	},
+/turf/open/floor/plating,
+/area/command/heads_quarters/captain/private/nt_rep)
 "kE" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -697,6 +630,19 @@
 /obj/structure/transit_tube/crossing,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
+"lU" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/barber,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/pushbroom,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "mi" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -707,9 +653,6 @@
 /obj/structure/grille,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
-"mC" = (
-/turf/closed/wall,
-/area/space/nearstation)
 "mU" = (
 /obj/structure/chair/sofa/bench{
 	dir = 8
@@ -717,9 +660,12 @@
 /obj/effect/landmark/start/assistant,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"no" = (
-/turf/closed/wall/rust,
+"mZ" = (
+/turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
+"ne" = (
+/turf/closed/wall,
+/area/space/nearstation)
 "nv" = (
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/iron,
@@ -764,13 +710,18 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
+"nS" = (
+/obj/structure/chair/sofa/bench/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/machinery/camera/directional/south,
+/turf/open/floor/iron/dark/corner,
+/area/station/hallway/primary/fore)
 "nW" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"oe" = (
-/turf/closed/wall/r_wall/rust,
-/area/command/heads_quarters/captain/private/nt_rep)
 "oi" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/extinguisher_cabinet/directional/east,
@@ -794,14 +745,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
-"ou" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/curtain/cloth/fancy/mechanical{
-	id = "barbershopcurtains";
-	name = "Barber Shop Drapes"
-	},
-/turf/open/floor/plating,
-/area/station/service/salon)
 "oC" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -810,33 +753,21 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"pb" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
+"oR" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
+	name = "Privacy Shutter";
+	id = "nt_rep_priv"
 	},
-/obj/machinery/button/curtain{
-	id = "barbershopcurtains1";
-	pixel_x = -25;
-	pixel_y = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/command/heads_quarters/captain/private/nt_rep)
+"oZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
+/turf/closed/wall/r_wall/rust,
+/area/command/heads_quarters/captain/private/nt_rep)
 "pf" = (
 /turf/closed/wall,
 /area/station/maintenance/fore)
-"pp" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/obj/machinery/light_switch/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "qg" = (
 /obj/structure/closet/crate,
 /obj/item/hand_labeler,
@@ -861,6 +792,30 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"qM" = (
+/obj/machinery/button/door/directional/north{
+	name = "Privacy Shutters Control";
+	id = "nt_rep_priv"
+	},
+/obj/structure/table/wood,
+/obj/item/folder/yellow{
+	pixel_x = 8;
+	pixel_y = -1
+	},
+/obj/item/folder/red{
+	pixel_x = -4;
+	pixel_y = -2
+	},
+/obj/item/folder/white{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/item/folder/blue{
+	pixel_y = 6;
+	pixel_x = -2
+	},
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "qS" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -882,22 +837,20 @@
 /obj/effect/turf_decal/tile/green,
 /turf/open/floor/iron/dark/corner,
 /area/station/hallway/primary/fore)
+"rk" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/newscaster/directional/west,
+/obj/effect/landmark/start/barber,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "rt" = (
 /obj/structure/window/reinforced/spawner/north,
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"rv" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/chair/office{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "rz" = (
 /obj/structure/closet/crate/bin,
 /obj/machinery/camera/directional/north,
@@ -911,6 +864,16 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"rL" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/machinery/light_switch/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "rT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
@@ -925,10 +888,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"sm" = (
-/obj/structure/table/wood,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "su" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -962,12 +921,6 @@
 /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/fore)
-"sO" = (
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 4
-	},
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "sX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -986,14 +939,6 @@
 /obj/machinery/newscaster/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/fore)
-"tc" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/machinery/newscaster/directional/west,
-/obj/effect/landmark/start/barber,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "tg" = (
 /turf/closed/wall/rust,
 /area/station/maintenance/fore)
@@ -1010,8 +955,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"ue" = (
-/turf/closed/wall/r_wall,
+"uf" = (
+/obj/effect/landmark/start/nanotrasen_consultant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/wood,
 /area/command/heads_quarters/captain/private/nt_rep)
 "uj" = (
 /obj/structure/lattice,
@@ -1025,6 +972,20 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
+"uM" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/button/curtain{
+	id = "barbershopcurtains1";
+	pixel_x = -25;
+	pixel_y = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "uX" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -1047,17 +1008,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"vq" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/machinery/camera/directional/east{
-	c_tag = "NT Consultant's Office";
-	name = "command camera"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "vs" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/structure/disposalpipe/segment{
@@ -1084,6 +1034,14 @@
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"vJ" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "vM" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -1097,6 +1055,18 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/fore)
+"vS" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/camera_film{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/camera_film,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "vV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line,
@@ -1115,17 +1085,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"wB" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
 "wF" = (
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"wK" = (
+/obj/machinery/door/airlock/public{
+	name = "Massage Parlour"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/service/barber)
 "wL" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Ferry Dock"
@@ -1136,6 +1107,24 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
+"wQ" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Barbershop"
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron,
+/area/station/service/barber)
+"wT" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "wX" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -1145,15 +1134,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"wY" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
+"xV" = (
+/turf/closed/wall/r_wall/rust,
+/area/command/heads_quarters/captain/private/nt_rep)
 "yd" = (
 /obj/structure/chair/sofa/bench/left{
 	dir = 1
@@ -1172,6 +1155,9 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
+"yC" = (
+/turf/closed/wall/rust,
+/area/station/service/barber)
 "yM" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/structure/disposalpipe/segment{
@@ -1186,6 +1172,9 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
+"zb" = (
+/turf/closed/wall/r_wall,
+/area/command/heads_quarters/captain/private/nt_rep)
 "ze" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/stripes/corner{
@@ -1193,14 +1182,32 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"zV" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+"zf" = (
+/obj/structure/lattice,
+/obj/structure/sign/warning/secure_area/directional/south,
+/turf/open/space/basic,
+/area/space/nearstation)
+"zu" = (
+/obj/machinery/light/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
+"zF" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
+/obj/item/pen/fountain,
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
+"zR" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/curtain/cloth/fancy/mechanical{
+	id = "barbershopcurtains1";
+	name = "Massage Parlour Drapes"
+	},
+/turf/open/floor/plating,
+/area/station/service/barber)
 "zZ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
@@ -1222,14 +1229,6 @@
 "Ag" = (
 /turf/closed/wall/rust,
 /area/station/maintenance/fore/lesser)
-"Ah" = (
-/obj/structure/chair/comfy/barber_chair,
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "AB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1238,11 +1237,15 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"Bb" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
+"Be" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/bed/pod,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "Bf" = (
 /obj/structure/chair{
 	dir = 8
@@ -1252,22 +1255,16 @@
 	},
 /turf/open/floor/wood,
 /area/station/maintenance/port/fore)
-"Bi" = (
-/obj/structure/table/wood,
-/obj/item/stamp{
-	pixel_y = 8;
-	pixel_x = -6
+"Bs" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/obj/item/stamp/denied{
-	pixel_x = -6;
-	pixel_y = 2
+/obj/machinery/camera/directional/east{
+	c_tag = "NT Consultant's Office";
+	name = "command camera"
 	},
-/obj/item/stamp/centcom{
-	pixel_x = 6;
-	pixel_y = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet/executive,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
 /area/command/heads_quarters/captain/private/nt_rep)
 "Bx" = (
 /obj/structure/disposalpipe/segment{
@@ -1277,14 +1274,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"BN" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_y = 4
-	},
-/obj/item/pen/fountain,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "BP" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -1300,6 +1289,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/fore)
+"BU" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/effect/landmark/start/barber,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "BZ" = (
 /obj/structure/transit_tube/diagonal/crossing/topleft,
 /turf/open/space/basic,
@@ -1315,6 +1314,12 @@
 	dir = 4
 	},
 /area/station/hallway/primary/fore)
+"Cf" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Cm" = (
 /obj/structure/flora/rock/style_random,
 /turf/open/misc/asteroid/airless,
@@ -1367,6 +1372,9 @@
 /obj/effect/turf_decal/caution/stand_clear,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
+"DJ" = (
+/turf/closed/wall/rust,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Ef" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/stripes/line{
@@ -1406,9 +1414,10 @@
 /obj/effect/turf_decal/caution/stand_clear,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"Ew" = (
-/obj/machinery/airalarm/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+"Ev" = (
+/obj/structure/chair/office,
+/obj/effect/landmark/start/nanotrasen_consultant,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet/executive,
 /area/command/heads_quarters/captain/private/nt_rep)
 "Ey" = (
@@ -1422,6 +1431,29 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
+"EG" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
+"EI" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/directional/west,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "EM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/random{
@@ -1431,15 +1463,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"EN" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/bed/pod,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/camera/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
 "EO" = (
 /obj/structure/transit_tube/curved/flipped,
 /turf/open/space/basic,
@@ -1449,6 +1472,23 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
+"EX" = (
+/obj/structure/table/wood,
+/obj/item/stamp{
+	pixel_y = 8;
+	pixel_x = -6
+	},
+/obj/item/stamp/denied{
+	pixel_x = -6;
+	pixel_y = 2
+	},
+/obj/item/stamp/centcom{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Fg" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1460,6 +1500,9 @@
 	dir = 8
 	},
 /area/station/hallway/primary/fore)
+"Fi" = (
+/turf/closed/wall,
+/area/station/service/barber)
 "Fl" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1468,19 +1511,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"Fo" = (
-/obj/effect/spawner/structure/window,
-/obj/structure/curtain/cloth/fancy/mechanical{
-	id = "barbershopcurtains1";
-	name = "Massage Parlour Drapes"
-	},
-/turf/open/floor/plating,
-/area/station/service/salon)
 "Fz" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"FD" = (
+"FM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
@@ -1496,6 +1531,15 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"FU" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "Gh" = (
 /turf/open/space/basic,
 /area/space)
@@ -1511,6 +1555,22 @@
 	dir = 4
 	},
 /area/station/hallway/primary/fore)
+"GN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/maintenance,
+/obj/effect/mapping_helpers/airlock/unres{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/fore)
 "GX" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -1519,37 +1579,37 @@
 	dir = 8
 	},
 /area/station/hallway/primary/fore)
-"Hl" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/razor{
-	pixel_x = -6
+"Ho" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
 	},
-/obj/item/reagent_containers/spray/barbers_aid{
-	pixel_x = 6
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
 	},
-/obj/machinery/light/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
-"Hm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/preopen{
-	name = "Privacy Shutter";
-	id = "nt_rep_priv_2"
-	},
-/turf/open/floor/plating,
-/area/command/heads_quarters/captain/private/nt_rep)
-"Hp" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
-/obj/item/assembly/flash/handheld,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
+/area/station/service/barber)
 "HJ" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/stripes/corner,
 /obj/structure/noticeboard/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"HV" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/table/reinforced/rglass,
+/obj/item/hairbrush{
+	pixel_x = 6;
+	pixel_y = 9
+	},
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "HW" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -1575,10 +1635,7 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"Iy" = (
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
-"IT" = (
+"IX" = (
 /obj/structure/table/wood,
 /obj/item/taperecorder{
 	pixel_y = 5;
@@ -1605,6 +1662,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"Jm" = (
+/obj/structure/cable,
+/obj/machinery/status_display/ai/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Jn" = (
 /obj/structure/chair/sofa/bench{
 	dir = 8
@@ -1623,31 +1687,20 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"Jv" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "JP" = (
 /obj/machinery/camera/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"KC" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Barbershop"
+"KA" = (
+/obj/machinery/photocopier,
+/obj/machinery/button/door/directional/north{
+	id = "nt_rep_priv_2";
+	name = "Privacy Shutters Control"
 	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/service/salon)
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "KE" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1715,42 +1768,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/fore)
-"LL" = (
-/obj/effect/landmark/start/nanotrasen_consultant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
-"LW" = (
-/obj/structure/lattice,
-/obj/structure/sign/warning/secure_area/directional/south,
-/turf/open/space/basic,
-/area/space/nearstation)
 "Me" = (
 /obj/structure/lattice,
 /obj/structure/grille,
 /turf/open/space/basic,
 /area/space/nearstation)
-"Mj" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
-"Mq" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/machinery/vending/barbervend,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "Mt" = (
 /turf/closed/wall/rust,
 /area/station/hallway/primary/fore)
@@ -1758,22 +1780,15 @@
 /obj/structure/flora/rock/pile/style_2,
 /turf/open/misc/asteroid/airless,
 /area/space/nearstation)
-"Mx" = (
-/obj/effect/turf_decal/siding/wood/corner{
+"Mw" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
 	dir = 8
 	},
-/obj/structure/table/wood,
-/obj/item/camera_film{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/camera_film,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
-"MA" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
-/turf/closed/wall/r_wall/rust,
-/area/command/heads_quarters/captain/private/nt_rep)
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "MG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -1800,6 +1815,15 @@
 "MP" = (
 /turf/closed/wall/rust,
 /area/space/nearstation)
+"Ng" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Nt" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -1874,12 +1898,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"Ot" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "Ox" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -1925,6 +1943,12 @@
 	dir = 1
 	},
 /area/station/hallway/primary/fore)
+"OR" = (
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 4
+	},
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "OY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1950,6 +1974,19 @@
 /obj/structure/window/reinforced/spawner,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"Po" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/reagent_containers/dropper,
+/obj/item/hairbrush/comb{
+	pixel_y = 10
+	},
+/obj/machinery/button/curtain{
+	id = "barbershopcurtains";
+	pixel_x = 10;
+	pixel_y = -26
+	},
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "Pt" = (
 /obj/structure/fans/tiny/forcefield{
 	dir = 1
@@ -1960,9 +1997,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"Pu" = (
-/turf/closed/wall/rust,
-/area/station/service/salon)
 "Pw" = (
 /obj/structure/transit_tube,
 /obj/effect/turf_decal/sand/plating,
@@ -1975,27 +2009,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/fore)
-"PF" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/chair/office/light{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/effect/landmark/start/barber,
-/turf/open/floor/iron/dark,
-/area/station/service/salon)
-"Qw" = (
-/obj/machinery/photocopier,
-/obj/machinery/button/door/directional/north{
-	id = "nt_rep_priv_2";
-	name = "Privacy Shutters Control"
-	},
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "Qy" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -2004,6 +2017,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"Re" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners{
+	dir = 8
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/barber)
 "Rf" = (
 /obj/structure/chair/sofa/bench{
 	dir = 8
@@ -2038,15 +2060,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/lesser)
-"RM" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "RU" = (
 /obj/structure/table,
 /obj/effect/turf_decal/tile/neutral,
@@ -2093,6 +2106,23 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"SC" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
+"SH" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/chair/office{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "SN" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -2127,15 +2157,6 @@
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
-"Ts" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/contraband/random/directional/south,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/fore)
 "Tt" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/blood/old,
@@ -2161,19 +2182,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
-"TM" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/barber,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/pushbroom,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/machinery/firealarm/directional/west,
-/obj/effect/decal/cleanable/cobweb,
-/obj/machinery/light_switch/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
 "TS" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/abandoned,
@@ -2185,14 +2193,21 @@
 /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/port/fore)
+"TU" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/razor{
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/spray/barbers_aid{
+	pixel_x = 6
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "Uc" = (
 /obj/structure/transit_tube/diagonal/topleft,
 /turf/open/misc/asteroid/airless,
 /area/space/nearstation)
-"Ui" = (
-/obj/structure/filingcabinet/employment,
-/turf/open/floor/carpet/executive,
-/area/command/heads_quarters/captain/private/nt_rep)
 "Ul" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/food/pie_smudge,
@@ -2225,41 +2240,14 @@
 	dir = 4
 	},
 /area/station/hallway/primary/fore)
-"Vj" = (
-/obj/machinery/button/door/directional/north{
-	name = "Privacy Shutters Control";
-	id = "nt_rep_priv"
+"Vp" = (
+/obj/structure/chair/comfy/barber_chair,
+/obj/effect/turf_decal/siding/white{
+	dir = 1
 	},
-/obj/structure/table/wood,
-/obj/item/folder/yellow{
-	pixel_x = 8;
-	pixel_y = -1
-	},
-/obj/item/folder/red{
-	pixel_x = -4;
-	pixel_y = -2
-	},
-/obj/item/folder/white{
-	pixel_x = 4;
-	pixel_y = 3
-	},
-/obj/item/folder/blue{
-	pixel_y = 6;
-	pixel_x = -2
-	},
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
-"Vs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
-"VB" = (
-/obj/structure/cable,
-/obj/machinery/light/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/command/heads_quarters/captain/private/nt_rep)
+/obj/effect/landmark/start/hangover,
+/turf/open/floor/iron/dark,
+/area/station/service/barber)
 "VG" = (
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
@@ -2298,28 +2286,40 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/hallway/primary/fore)
-"Wq" = (
-/obj/machinery/power/apc/auto_name/directional/north,
+"WA" = (
+/obj/effect/spawner/structure/window,
+/obj/structure/curtain/cloth/fancy/mechanical{
+	id = "barbershopcurtains";
+	name = "Barber Shop Drapes"
+	},
+/turf/open/floor/plating,
+/area/station/service/barber)
+"WE" = (
+/obj/machinery/door/airlock/corporate{
+	name = "NT Consultant's Office"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door,
 /obj/structure/cable,
-/obj/effect/turf_decal/siding/wood{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/iron/dark/corner{
 	dir = 4
 	},
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/wood,
 /area/command/heads_quarters/captain/private/nt_rep)
-"Xc" = (
-/obj/effect/turf_decal/siding/white{
-	dir = 1
+"WY" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
+/obj/structure/chair/office/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
 	},
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
-"Xi" = (
-/turf/closed/wall,
-/area/station/service/salon)
+/area/station/service/barber)
 "Xo" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/firealarm/directional/east,
@@ -2362,27 +2362,7 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
-"Yq" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/directional/west,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/salon)
-"YS" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"Za" = (
+"Yl" = (
 /obj/structure/table/reinforced/rglass,
 /obj/structure/mirror/directional/south,
 /obj/item/lipstick/random{
@@ -2394,7 +2374,23 @@
 	pixel_x = 9
 	},
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
+"YD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
+"YS" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
+"Zb" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain/private/nt_rep)
 "Ze" = (
 /obj/structure/transit_tube/crossing,
 /obj/effect/turf_decal/sand/plating,
@@ -2406,6 +2402,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/fore)
+"ZN" = (
+/obj/structure/table/wood,
+/turf/open/floor/carpet/executive,
+/area/command/heads_quarters/captain/private/nt_rep)
 "ZO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/vending/cigarette,
@@ -2936,12 +2936,12 @@ dZ
 Gh
 dZ
 dZ
-Xi
-Xi
-Pu
-Xi
-Xi
-Pu
+Fi
+Fi
+yC
+Fi
+Fi
+yC
 Ib
 bb
 Ag
@@ -2976,16 +2976,16 @@ kE
 nN
 Gh
 Gh
-Xi
-Pu
-Xi
-Pu
-Pu
-TM
-Yq
-kc
-tc
-dt
+Fi
+yC
+Fi
+yC
+yC
+lU
+EI
+vJ
+rk
+Po
 Ib
 vp
 Ib
@@ -3020,16 +3020,16 @@ nW
 nN
 Gh
 Gh
-Pu
-EN
-pb
-Mj
-Pu
-Mq
-RM
-Ot
-Ah
-Za
+yC
+Be
+uM
+Ho
+yC
+ey
+Mw
+dC
+Vp
+Yl
 Ib
 iv
 Ag
@@ -3064,16 +3064,16 @@ nW
 nN
 Gh
 Gh
-Pu
-aj
-PF
-zV
-cE
-wY
-Jv
-Jv
-Xc
-Hl
+yC
+HV
+WY
+SC
+wK
+FU
+Re
+Re
+BU
+TU
 Ib
 EM
 Ib
@@ -3108,16 +3108,16 @@ HJ
 Eg
 nN
 nN
-Xi
-Fo
-Fo
-Fo
-Xi
-ou
-ou
-KC
-ou
-ou
+Fi
+zR
+zR
+zR
+Fi
+WA
+WA
+wQ
+WA
+WA
 Ag
 iy
 Ib
@@ -3205,7 +3205,7 @@ Zv
 Xo
 su
 su
-FD
+FM
 su
 dY
 bj
@@ -3246,12 +3246,12 @@ Eg
 OO
 wF
 qU
-ue
-cY
-cY
-ag
-MA
-bZ
+zb
+oR
+oR
+WE
+oZ
+GN
 pf
 tg
 "}
@@ -3290,12 +3290,12 @@ Mt
 gk
 wF
 yd
-oe
-Vj
-Mx
-pp
-ue
-Ts
+xV
+qM
+vS
+rL
+zb
+bB
 pf
 qg
 "}
@@ -3333,13 +3333,13 @@ Um
 Mt
 df
 ds
-aB
-ue
-IT
-LL
-fE
-oe
-iJ
+nS
+zb
+IX
+uf
+Jm
+xV
+fT
 pf
 pf
 "}
@@ -3376,13 +3376,13 @@ Dl
 Dl
 Eg
 Mt
-oe
-Hm
-oe
-Wq
-wB
-VB
-ue
+xV
+kz
+xV
+Ng
+wT
+fx
+zb
 Ek
 Ja
 qr
@@ -3420,13 +3420,13 @@ Gh
 XL
 XL
 XL
-oe
-Qw
-sO
-sm
-ea
-hF
-ue
+xV
+KA
+OR
+ZN
+gX
+Zb
+zb
 XJ
 OY
 KL
@@ -3464,13 +3464,13 @@ Gh
 XL
 XL
 XL
-ue
-Ew
-jd
-Bi
-rv
-az
-oe
+zb
+ca
+Ev
+EX
+EG
+Cf
+xV
 ew
 eZ
 pf
@@ -3508,13 +3508,13 @@ jY
 Gh
 XL
 XL
-no
-Hp
-Iy
-BN
-gB
-Vs
-ue
+DJ
+cX
+mZ
+zF
+SH
+YD
+zb
 RU
 PD
 nA
@@ -3552,13 +3552,13 @@ Gh
 Gh
 Gh
 XL
-ue
-Ui
-fJ
-Bb
-vq
-Vs
-ue
+zb
+cm
+aK
+zu
+Bs
+YD
+zb
 eL
 Nu
 vV
@@ -3594,15 +3594,15 @@ Me
 Me
 Me
 Me
-LW
-mC
-oe
-ue
-ue
-ue
-ue
-ue
-oe
+zf
+ne
+xV
+zb
+zb
+zb
+zb
+zb
+xV
 eQ
 Ul
 uI
diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
index 40517c44c3f..f335a057b0f 100644
--- a/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
+++ b/_maps/skyrat/automapper/templates/metastation/metastation_barber.dmm
@@ -11,7 +11,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "c" = (
 /turf/closed/wall,
 /area/station/command/gateway)
@@ -22,7 +22,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "f" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -30,7 +30,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/structure/chair/sofa/bench/left,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "g" = (
 /obj/item/radio/intercom/directional/north,
 /obj/effect/turf_decal/tile/purple{
@@ -44,14 +44,14 @@
 	pixel_y = 24
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "h" = (
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains1"
 	},
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "i" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -63,7 +63,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "j" = (
 /obj/machinery/light/warm/directional/north,
 /obj/effect/turf_decal/tile/purple{
@@ -74,14 +74,14 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "k" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "m" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -90,7 +90,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "n" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple{
@@ -98,7 +98,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "o" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -110,7 +110,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "p" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/tile/purple{
@@ -120,7 +120,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "q" = (
 /obj/structure/bed/pod,
 /obj/machinery/light/warm/directional/north,
@@ -130,7 +130,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "r" = (
 /obj/structure/table/reinforced/rglass,
 /obj/item/hairbrush,
@@ -140,7 +140,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/item/lipstick/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "s" = (
 /obj/structure/table/reinforced/rglass,
 /obj/effect/turf_decal/tile/purple{
@@ -155,7 +155,7 @@
 	pixel_x = -6
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "t" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple{
@@ -164,7 +164,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "v" = (
 /turf/closed/wall/r_wall,
 /area/station/command/gateway)
@@ -178,7 +178,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "x" = (
 /obj/structure/table/reinforced/rglass,
 /obj/effect/turf_decal/tile/purple{
@@ -191,7 +191,7 @@
 	pixel_y = 10
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "z" = (
 /obj/structure/table/reinforced/rglass,
 /obj/item/hairbrush,
@@ -204,17 +204,17 @@
 	c_tag = "Salon - Massage Parlour"
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "A" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "C" = (
 /turf/closed/wall,
-/area/station/service/salon)
+/area/station/service/barber)
 "D" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -227,7 +227,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "E" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple{
@@ -239,7 +239,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "F" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -251,7 +251,7 @@
 	pixel_y = -6
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "G" = (
 /obj/structure/chair/office/light{
 	dir = 4
@@ -266,7 +266,7 @@
 	pixel_y = 24
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "H" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -274,7 +274,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/light_switch/directional/south,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "I" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/power/apc/auto_name/directional/east,
@@ -289,7 +289,7 @@
 	pixel_x = 6
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "J" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -299,7 +299,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "K" = (
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
@@ -312,7 +312,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "L" = (
 /obj/machinery/light/warm/directional/west,
 /obj/effect/turf_decal/tile/purple{
@@ -327,7 +327,7 @@
 	},
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "M" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -335,7 +335,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "N" = (
 /turf/closed/wall/r_wall,
 /area/station/command/teleporter)
@@ -348,7 +348,7 @@
 /obj/item/book/fish_catalog,
 /obj/structure/table/wood,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "P" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/purple{
@@ -358,14 +358,14 @@
 /obj/item/lipstick/random,
 /obj/structure/table/wood,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Q" = (
 /obj/effect/spawner/structure/window,
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "R" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -374,7 +374,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "S" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
@@ -382,7 +382,7 @@
 	name = "Barbershop"
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "T" = (
 /obj/structure/bed/pod,
 /obj/effect/turf_decal/tile/purple{
@@ -390,7 +390,7 @@
 	},
 /obj/effect/turf_decal/tile/purple,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "U" = (
 /obj/machinery/firealarm/directional/east,
 /obj/effect/turf_decal/tile/purple{
@@ -399,7 +399,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "V" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -412,14 +412,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "W" = (
 /obj/structure/curtain/cloth/fancy/mechanical{
 	id = "barbershopcurtains1"
 	},
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "X" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -428,7 +428,7 @@
 /obj/structure/closet/secure_closet/barber,
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Y" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -438,7 +438,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Z" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Salon"
@@ -449,7 +449,7 @@
 /obj/effect/turf_decal/tile/purple,
 /obj/structure/chair/sofa/bench/right,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 
 (1,1,1) = {"
 N
diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm
index abfd82822f4..5b580225a67 100644
--- a/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm
+++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_barber.dmm
@@ -12,7 +12,7 @@
 "eX" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "gN" = (
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
@@ -54,13 +54,13 @@
 /obj/structure/sink/directional/east,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "hT" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "hZ" = (
 /turf/closed/wall,
 /area/station/security/courtroom)
@@ -69,7 +69,7 @@
 /obj/machinery/light/warm/directional/west,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "iG" = (
 /obj/effect/turf_decal/trimline/green/filled/corner{
 	dir = 4
@@ -86,7 +86,7 @@
 /area/station/service/hydroponics)
 "iX" = (
 /turf/closed/wall,
-/area/station/service/salon)
+/area/station/service/barber)
 "jM" = (
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
@@ -137,7 +137,7 @@
 "ob" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "oB" = (
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -162,7 +162,7 @@
 /obj/item/radio/intercom/directional/east,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "qi" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/disposal/bin,
@@ -171,7 +171,7 @@
 	},
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "qn" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/structure/rack,
@@ -186,7 +186,7 @@
 	},
 /obj/structure/window/reinforced/spawner/north,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "qp" = (
 /obj/machinery/door/window/left/directional/south,
 /turf/open/floor/grass,
@@ -196,7 +196,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "qP" = (
 /obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/trimline/green/line{
@@ -215,7 +215,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "sX" = (
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 1
@@ -249,7 +249,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "vd" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/iron/smooth,
@@ -260,7 +260,7 @@
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "vU" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 1
@@ -293,7 +293,7 @@
 /obj/structure/mirror/directional/north,
 /obj/item/hairbrush,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "AB" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/structure/cable,
@@ -301,14 +301,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "AK" = (
 /obj/structure/table/glass,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/item/clothing/gloves/color/latex,
 /obj/machinery/light/warm/directional/north,
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "AO" = (
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/grass,
@@ -355,11 +355,11 @@
 	dir = 6
 	},
 /turf/open/floor/iron/large,
-/area/station/service/salon)
+/area/station/service/barber)
 "CC" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "CE" = (
 /obj/machinery/dryer{
 	dir = 4;
@@ -368,7 +368,7 @@
 	},
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "CV" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -381,7 +381,7 @@
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "DU" = (
 /obj/machinery/hydroponics/constructable,
 /turf/open/floor/grass,
@@ -395,7 +395,7 @@
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "FQ" = (
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
@@ -430,7 +430,7 @@
 	c_tag = "Salon - Massage Parlor"
 	},
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "Gx" = (
 /obj/effect/turf_decal/trimline/green/corner,
 /obj/effect/turf_decal/trimline/green/corner{
@@ -454,7 +454,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "IE" = (
 /obj/structure/table/glass,
 /obj/structure/mirror/directional/north,
@@ -463,7 +463,7 @@
 	},
 /obj/item/reagent_containers/dropper,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "JO" = (
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -498,14 +498,14 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Lr" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/camera/directional/west{
 	c_tag = "Salon"
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "LQ" = (
 /obj/machinery/vending/wardrobe/hydro_wardrobe,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -530,7 +530,7 @@
 "Mp" = (
 /obj/machinery/vending/barbervend,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "MB" = (
 /turf/open/floor/grass,
 /area/station/service/hydroponics)
@@ -538,7 +538,7 @@
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Ng" = (
 /obj/structure/chair/sofa/bench{
 	dir = 8
@@ -547,7 +547,7 @@
 /obj/machinery/light/warm/directional/east,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "NA" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -556,13 +556,13 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "NE" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "Oa" = (
 /turf/closed/wall,
 /area/station/maintenance/central/greater)
@@ -577,7 +577,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "OI" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 4
@@ -608,7 +608,7 @@
 /obj/structure/chair/stool/bar/directional/west,
 /obj/effect/landmark/start/barber,
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "Qh" = (
 /obj/structure/bed/pod{
 	dir = 4
@@ -621,7 +621,7 @@
 	id = "barbershopcurtains"
 	},
 /turf/open/floor/iron/white,
-/area/station/service/salon)
+/area/station/service/barber)
 "Qy" = (
 /obj/structure/beebox,
 /turf/open/floor/grass,
@@ -649,13 +649,13 @@
 	id = "massage_curtains"
 	},
 /turf/open/floor/plating,
-/area/station/service/salon)
+/area/station/service/barber)
 "Sc" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "SE" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 8
@@ -665,7 +665,7 @@
 /area/station/hallway/primary/central)
 "Uq" = (
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "Vs" = (
 /obj/effect/turf_decal/trimline/green/corner,
 /turf/open/floor/iron/dark,
@@ -689,7 +689,7 @@
 	},
 /obj/machinery/light/warm/directional/north,
 /turf/open/floor/iron/dark,
-/area/station/service/salon)
+/area/station/service/barber)
 "Xf" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -740,7 +740,7 @@
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/structure/closet/secure_closet/barber,
 /turf/open/floor/iron,
-/area/station/service/salon)
+/area/station/service/barber)
 "YC" = (
 /obj/effect/turf_decal/trimline/green/filled/corner{
 	dir = 4
diff --git a/tools/UpdatePaths/Scripts_Skyrat/_salon_to_barber.txt b/tools/UpdatePaths/Scripts_Skyrat/_salon_to_barber.txt
new file mode 100644
index 00000000000..1d193413d4b
--- /dev/null
+++ b/tools/UpdatePaths/Scripts_Skyrat/_salon_to_barber.txt
@@ -0,0 +1,3 @@
+#comment Converts Salon area defines to Barber defines.
+
+/area/station/service/salon : /area/station/service/barber
diff --git a/tools/UpdatePaths/Scripts/replace_turnstiles.txt b/tools/UpdatePaths/Scripts_Skyrat/replace_turnstiles.txt
similarity index 100%
rename from tools/UpdatePaths/Scripts/replace_turnstiles.txt
rename to tools/UpdatePaths/Scripts_Skyrat/replace_turnstiles.txt