diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm
index 39cf9b92a0f6..198d4a7f8653 100644
--- a/_maps/map_files/DonutStation/DonutStation.dmm
+++ b/_maps/map_files/DonutStation/DonutStation.dmm
@@ -2502,9 +2502,24 @@
 /obj/structure/table,
 /obj/item/paper_bin{
 	pixel_x = -3;
-	pixel_y = 7
+	pixel_y = 4
+	},
+/obj/item/stamp/hop{
+	pixel_x = -9;
+	pixel_y = 6
+	},
+/obj/item/stamp{
+	pixel_x = -9;
+	pixel_y = 2
+	},
+/obj/item/stamp/denied{
+	pixel_x = -9;
+	pixel_y = -4
+	},
+/obj/item/storage/pencil_holder/crew/fancy{
+	pixel_x = 9;
+	pixel_y = -1
 	},
-/obj/item/stamp/hop,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "aWv" = (
@@ -6460,6 +6475,17 @@
 	},
 /turf/open/floor/wood,
 /area/library)
+"cBx" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "hop";
+	name = "Privacy Shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
 "cCh" = (
 /turf/closed/wall/r_wall,
 /area/science/storage)
@@ -8906,6 +8932,9 @@
 /obj/machinery/modular_computer/console/preset/command/hop{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "dCb" = (
@@ -11656,6 +11685,34 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/maintenance/fore)
+"eKA" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "hop";
+	name = "Privacy Shutters"
+	},
+/obj/machinery/inspector_booth{
+	dir = 8
+	},
+/obj/machinery/door/window/northleft{
+	dir = 8;
+	name = "Reception Window"
+	},
+/obj/machinery/door/window/brigdoor{
+	base_state = "rightsecure";
+	dir = 4;
+	name = "Head of Personnel's Desk"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
 "eKB" = (
 /obj/machinery/door/airlock/security{
 	name = "Security Office"
@@ -12813,6 +12870,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "fkH" = (
@@ -14505,8 +14565,6 @@
 /turf/open/floor/plasteel/chapel,
 /area/chapel/main)
 "fXS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -17123,6 +17181,12 @@
 /area/crew_quarters/kitchen)
 "hbi" = (
 /obj/machinery/papershredder,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "hbj" = (
@@ -18185,6 +18249,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "hyJ" = (
@@ -23896,10 +23963,16 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "jYW" = (
-/obj/machinery/computer/cargo,
 /obj/machinery/light_switch{
 	pixel_y = 24
 	},
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Ian,
+/obj/item/toy/figure/hop{
+	layer = 2.89;
+	pixel_x = 8;
+	pixel_y = -5
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "jZb" = (
@@ -25506,18 +25579,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office,
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
-"kJc" = (
-/obj/machinery/airalarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/machinery/camera{
-	c_tag = "Bridge - Head of Personnel's Office";
-	dir = 8
-	},
-/obj/machinery/vending/wardrobe/hop_wardrobe,
-/turf/open/floor/wood,
-/area/crew_quarters/heads/hop)
 "kJg" = (
 /obj/effect/spawner/structure/window/reinforced/shutter,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -26517,6 +26578,12 @@
 	name = "Privacy Shutters"
 	},
 /obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "leU" = (
@@ -27089,16 +27156,13 @@
 	pixel_x = -5;
 	pixel_y = 5
 	},
-/obj/machinery/door/window/brigdoor{
-	base_state = "rightsecure";
-	dir = 4;
-	icon_state = "rightsecure";
-	name = "Head of Personnel's Desk"
-	},
 /obj/machinery/door/window/northleft{
 	dir = 8;
 	name = "Reception Window"
 	},
+/obj/machinery/door/window/brigdoor/eastright{
+	name = "Head of Personnel's Desk"
+	},
 /obj/effect/mapping_helpers/windoor/access/all/service/hop{
 	dir = 4
 	},
@@ -29179,13 +29243,13 @@
 /turf/open/floor/engine,
 /area/science/xenobiology)
 "mkY" = (
-/obj/machinery/disposal/bin/tagger,
 /obj/machinery/newscaster/security_unit{
 	pixel_y = -32
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
+/obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "mln" = (
@@ -29440,21 +29504,12 @@
 /turf/open/floor/grass,
 /area/medical/genetics)
 "mqb" = (
-/obj/structure/bed/dogbed/ian,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/mob/living/simple_animal/pet/dog/corgi/Ian{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -30178,9 +30233,6 @@
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
 "mEx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
 /obj/machinery/requests_console{
 	announcementConsole = 1;
 	department = "Head of Personnel's Desk";
@@ -30188,12 +30240,16 @@
 	name = "Head of Personnel RC";
 	pixel_y = -30
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
+/obj/machinery/disposal/bin/tagger,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "mEP" = (
@@ -30919,16 +30975,14 @@
 /turf/open/floor/plasteel,
 /area/engine/atmos)
 "mTZ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "mUk" = (
@@ -36294,7 +36348,6 @@
 /turf/closed/wall,
 /area/quartermaster/warehouse)
 "pkR" = (
-/obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
@@ -40365,14 +40418,17 @@
 /turf/open/floor/plating,
 /area/security/brig)
 "qQr" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -40459,6 +40515,17 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port)
+"qRN" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "hop";
+	name = "Privacy Shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/crew_quarters/heads/hop)
 "qRU" = (
 /obj/machinery/conveyor/inverted,
 /turf/open/floor/plating,
@@ -43494,7 +43561,6 @@
 /turf/open/floor/wood,
 /area/maintenance/port/fore)
 "sjZ" = (
-/obj/machinery/computer/bounty,
 /obj/machinery/power/apc{
 	areastring = "/area/crew_quarters/heads/hop";
 	dir = 1;
@@ -43504,6 +43570,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/computer/cargo,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "skC" = (
@@ -45186,6 +45253,20 @@
 	},
 /turf/open/floor/plasteel,
 /area/storage/primary)
+"sTl" = (
+/obj/machinery/airalarm{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/machinery/camera{
+	c_tag = "Bridge - Head of Personnel's Office";
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/vending/wardrobe/hop_wardrobe,
+/turf/open/floor/wood,
+/area/crew_quarters/heads/hop)
 "sTU" = (
 /obj/structure/grille/broken,
 /turf/open/floor/plating,
@@ -51572,14 +51653,11 @@
 /turf/open/floor/plating,
 /area/maintenance/central)
 "vwv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -103722,11 +103800,11 @@ rGQ
 vdL
 wBL
 ouG
+qRN
 leC
-leC
-leC
+eKA
 lqF
-leC
+cBx
 ouG
 pLR
 eRv
@@ -104752,7 +104830,7 @@ siL
 ouG
 ouG
 hbi
-kJc
+sTl
 mqb
 mTZ
 sIT
diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm
index 77e5176f68cf..a028253a71ea 100644
--- a/_maps/map_files/GaxStation/GaxStation.dmm
+++ b/_maps/map_files/GaxStation/GaxStation.dmm
@@ -2131,16 +2131,6 @@
 /obj/effect/turf_decal/trimline/green/filled/corner/lower,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
-"bah" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/vending/wardrobe/hop_wardrobe,
-/turf/open/floor/carpet/blue,
-/area/crew_quarters/heads/hop)
 "bal" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -14154,12 +14144,6 @@
 /turf/open/floor/plating,
 /area/maintenance/department/science)
 "gCk" = (
-/obj/machinery/modular_computer/console/preset/command/hop{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/hop)
 "gCt" = (
@@ -15571,10 +15555,9 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
 "hnx" = (
-/obj/machinery/firealarm{
-	pixel_y = 28
+/obj/machinery/modular_computer/console/preset/command/hop{
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/hop)
 "hnH" = (
@@ -17672,13 +17655,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/machinery/photocopier/faxmachine{
 	department = "Head of Personnel";
 	name = "Head of Personnel's Fax Machine"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "inD" = (
@@ -18275,6 +18258,7 @@
 /turf/open/floor/plasteel,
 /area/security/checkpoint/engineering)
 "izV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "iAA" = (
@@ -22532,8 +22516,24 @@
 /turf/open/floor/plasteel,
 /area/teleporter)
 "kJB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/carpet/blue,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "hop";
+	name = "Privacy Shutters"
+	},
+/obj/machinery/inspector_booth{
+	dir = 8
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	name = "Head of Personnel's Desk"
+	},
+/obj/machinery/door/window/northleft{
+	dir = 8;
+	name = "Reception Window"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 4
+	},
+/turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "kJU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -28202,6 +28202,9 @@
 	dir = 1
 	},
 /obj/machinery/pdapainter,
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "nzN" = (
@@ -28540,9 +28543,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
 /turf/open/floor/carpet/blue,
 /area/crew_quarters/heads/hop)
 "nHs" = (
@@ -32553,7 +32553,6 @@
 /obj/machinery/door/window/brigdoor{
 	base_state = "rightsecure";
 	dir = 4;
-	icon_state = "rightsecure";
 	name = "Head of Personnel's Desk"
 	},
 /obj/machinery/flasher{
@@ -37245,6 +37244,10 @@
 /area/medical/storage)
 "rWx" = (
 /obj/structure/closet/secure_closet/hop,
+/obj/structure/sign/painting{
+	persistence_id = "public";
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "rWP" = (
@@ -41839,6 +41842,14 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
+"ulW" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Ian,
+/turf/open/floor/carpet/blue,
+/area/crew_quarters/heads/hop)
 "umn" = (
 /obj/machinery/door/airlock/engineering{
 	name = "AI Ship Access"
@@ -41972,11 +41983,10 @@
 /turf/open/floor/plasteel,
 /area/hydroponics)
 "urY" = (
-/obj/structure/bed/dogbed/ian,
-/mob/living/simple_animal/pet/dog/corgi/Ian,
 /obj/machinery/light_switch{
 	pixel_x = 24
 	},
+/obj/machinery/vending/wardrobe/hop_wardrobe,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "usc" = (
@@ -95103,7 +95113,7 @@ xPn
 tCL
 xdL
 pKI
-mUc
+kJB
 mUc
 omw
 omw
@@ -95361,7 +95371,7 @@ baa
 xdL
 cov
 gCk
-bah
+ulW
 pdq
 omw
 viA
@@ -95617,7 +95627,7 @@ qot
 hXw
 xdL
 hnx
-kJB
+gCk
 nHr
 gqN
 omw
diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm
index b6e8936ba17a..b7e4b7558b04 100644
--- a/_maps/map_files/IceMeta/IceMeta.dmm
+++ b/_maps/map_files/IceMeta/IceMeta.dmm
@@ -4176,8 +4176,17 @@
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/storage/eva)
 "biJ" = (
-/obj/machinery/computer/secure_data{
-	dir = 1
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/item/storage/pencil_holder/crew/fancy{
+	pixel_x = 8
+	},
+/obj/item/stamp/hop{
+	pixel_x = -4;
+	pixel_y = 4
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -26216,14 +26225,10 @@
 	c_tag = "Head of Personnel's Office";
 	dir = 1
 	},
-/obj/structure/table/wood,
-/obj/item/storage/box/PDAs{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/storage/box/silver_ids,
-/obj/item/storage/box/ids,
 /obj/machinery/light,
+/obj/machinery/computer/secure_data{
+	dir = 1
+	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "hIs" = (
@@ -26398,12 +26403,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
-"hJv" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/hop)
 "hJK" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/structure/cable/yellow{
@@ -33279,12 +33278,6 @@
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "jJb" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/modular_computer/console/preset/command/hop{
-	dir = 4
-	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "jJf" = (
@@ -42224,9 +42217,6 @@
 /area/security/brig)
 "mkZ" = (
 /obj/structure/chair/office/dark,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /obj/machinery/light_switch{
 	pixel_x = 38;
 	pixel_y = -35
@@ -42643,17 +42633,8 @@
 /turf/open/floor/plasteel,
 /area/construction/storage_wing)
 "mqP" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_x = -2;
-	pixel_y = 4
-	},
-/obj/item/stamp/hop{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/storage/pencil_holder/crew/fancy{
-	pixel_x = 8
+/obj/machinery/modular_computer/console/preset/command/hop{
+	dir = 8
 	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
@@ -47816,12 +47797,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/mine/laborcamp)
-"nMh" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/carpet,
-/area/crew_quarters/heads/hop)
 "nMi" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -54347,19 +54322,6 @@
 /area/medical/storage)
 "pES" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor{
-	base_state = "rightsecure";
-	dir = 1;
-	icon_state = "rightsecure";
-	name = "Head of Personnel's Desk"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/window/northleft{
-	dir = 2;
-	name = "Reception Window"
-	},
 /obj/machinery/door/poddoor/preopen{
 	id = "hop";
 	name = "privacy shutters"
@@ -54375,6 +54337,14 @@
 /obj/effect/mapping_helpers/windoor/access/all/service/hop{
 	dir = 1
 	},
+/obj/machinery/door/window/eastright{
+	dir = 2;
+	name = "Reception Window"
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	name = "Head of Personnel's Desk";
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "pFu" = (
@@ -57622,13 +57592,28 @@
 /turf/open/floor/plasteel/cafeteria,
 /area/crew_quarters/dorms)
 "qEA" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/machinery/inspector_booth,
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/machinery/door/window/northleft{
+	dir = 2;
+	name = "Reception Window"
 	},
-/turf/open/floor/carpet,
+/obj/machinery/door/window/brigdoor{
+	base_state = "rightsecure";
+	dir = 1;
+	name = "Head of Personnel's Desk"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "hop";
+	name = "privacy shutters"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "qEG" = (
 /obj/machinery/conveyor_switch/oneway{
@@ -57783,9 +57768,6 @@
 /turf/open/floor/plasteel,
 /area/mine/living_quarters)
 "qGb" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hopqueue";
 	name = "HoP Queue Shutters"
@@ -60702,7 +60684,7 @@
 /area/solar/port/aft/icemoon)
 "rzP" = (
 /obj/structure/window/reinforced,
-/obj/machinery/computer/cargo/request{
+/obj/machinery/computer/cargo{
 	dir = 8
 	},
 /turf/open/floor/wood,
@@ -66455,9 +66437,6 @@
 /turf/open/floor/plasteel/white,
 /area/security/prison/hallway)
 "tcV" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
@@ -85414,9 +85393,6 @@
 /turf/open/floor/wood,
 /area/library)
 "ylr" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /obj/machinery/flasher{
 	id = "hopflash";
 	pixel_x = 28;
@@ -240822,7 +240798,7 @@ hMv
 sYq
 jkl
 bjT
-nMh
+ibB
 biJ
 sYq
 iPW
@@ -241079,9 +241055,9 @@ kHW
 sYq
 mTR
 ibB
-qEA
+ibB
 jJb
-tKY
+qEA
 bjk
 eUW
 kvD
@@ -241336,7 +241312,7 @@ qVI
 sYq
 uEW
 ibB
-hJv
+ibB
 mkZ
 pES
 ylr
diff --git a/_maps/map_files/ManateeStation/ManateeStation.dmm b/_maps/map_files/ManateeStation/ManateeStation.dmm
index af08a241e0e0..14f755ec0673 100644
--- a/_maps/map_files/ManateeStation/ManateeStation.dmm
+++ b/_maps/map_files/ManateeStation/ManateeStation.dmm
@@ -763,9 +763,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -10050,9 +10047,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2
 	},
@@ -19048,9 +19042,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -29185,13 +29176,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower,
 /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "inw" = (
@@ -38448,21 +38439,14 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/lobby)
 "lip" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hop";
 	name = "Privacy Shutters"
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "liC" = (
@@ -42144,6 +42128,7 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 9
 	},
+/obj/machinery/modular_computer/console/preset/command/hop,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "mpS" = (
@@ -43308,9 +43293,6 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 2
 	},
@@ -54087,7 +54069,6 @@
 /obj/machinery/door/window/brigdoor{
 	base_state = "rightsecure";
 	dir = 4;
-	icon_state = "rightsecure";
 	name = "Head of Personnel's Desk"
 	},
 /obj/machinery/door/window/northleft{
@@ -54105,9 +54086,6 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -54122,10 +54100,16 @@
 /obj/item/storage/pencil_holder/crew{
 	pixel_y = 9
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /obj/effect/mapping_helpers/windoor/access/all/service/hop{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "pUG" = (
 /obj/machinery/door/firedoor/border_only,
@@ -63777,21 +63761,29 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "sMb" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "hop";
+	name = "Privacy Shutters"
+	},
+/obj/machinery/inspector_booth{
+	dir = 8
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	name = "Head of Personnel's Desk"
+	},
+/obj/machinery/door/window/northleft{
+	dir = 8;
+	name = "Reception Window"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 4
+	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "hop";
-	name = "Privacy Shutters"
-	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "sMi" = (
@@ -72272,9 +72264,6 @@
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "vwa" = (
-/obj/machinery/modular_computer/console/preset/command/hop{
-	dir = 1
-	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 8
 	},
@@ -73023,9 +73012,6 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
@@ -74332,9 +74318,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -74389,9 +74372,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm
index f2614629e215..2048b5fe90e6 100644
--- a/_maps/map_files/MiniStation/MiniStation.dmm
+++ b/_maps/map_files/MiniStation/MiniStation.dmm
@@ -11709,9 +11709,6 @@
 /obj/effect/turf_decal/siding/wood/corner/thin{
 	dir = 1
 	},
-/obj/machinery/modular_computer/console/preset/command/hop{
-	dir = 1
-	},
 /obj/machinery/button/flasher{
 	id = "hopflash";
 	pixel_x = 7;
@@ -11720,9 +11717,6 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/button/door{
 	id = "hop";
 	name = "Privacy Shutters Control";
@@ -22633,12 +22627,6 @@
 /area/ai_monitored/turret_protected/ai)
 "jBb" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/window/brigdoor{
-	base_state = "rightsecure";
-	dir = 8;
-	icon_state = "rightsecure";
-	name = "Head of Personnel's Desk"
-	},
 /obj/machinery/door/window/northleft{
 	dir = 4;
 	name = "Reception Window"
@@ -22651,13 +22639,17 @@
 	id = "hopflash";
 	pixel_y = 28
 	},
-/obj/effect/mapping_helpers/windoor/access/all/service/hop{
-	dir = 8
-	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hop";
 	name = "Privacy Shutters"
 	},
+/obj/machinery/door/window/brigdoor/eastright{
+	dir = 8;
+	name = "Head of Personnel's Desk"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "jBh" = (
@@ -30123,9 +30115,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "oad" = (
@@ -40680,14 +40669,31 @@
 /turf/open/floor/plasteel/white,
 /area/hallway/primary/starboard)
 "uyM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/door/window/northleft{
+	dir = 4;
+	name = "Reception Window"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/inspector_booth{
+	dir = 4
 	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hop";
 	name = "Privacy Shutters"
 	},
+/obj/machinery/door/window/brigdoor{
+	base_state = "rightsecure";
+	dir = 8;
+	name = "Head of Personnel's Desk"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
 "uza" = (
diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm
index 30ba3d8f2257..c8c87c41125c 100644
--- a/_maps/map_files/YogStation/YogStation.dmm
+++ b/_maps/map_files/YogStation/YogStation.dmm
@@ -87,25 +87,17 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
 "aap" = (
-/obj/structure/bed/dogbed/ian,
 /obj/structure/sign/painting{
 	persistence_id = "public";
 	pixel_y = 32
 	},
-/obj/item/toy/figure/hop{
-	layer = 2.89;
-	pixel_x = 8;
-	pixel_y = -5
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
 	},
-/mob/living/simple_animal/pet/dog/corgi/Ian{
-	dir = 8
+/obj/structure/disposalpipe/trunk{
+	dir = 4
 	},
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "aaq" = (
@@ -12596,10 +12588,10 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "bYm" = (
-/obj/structure/chair/office/dark{
+/obj/effect/turf_decal/trimline/dark_blue/warning/lower{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/dark_blue/warning/lower{
+/obj/structure/chair/office/dark{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -18611,7 +18603,7 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 9
 	},
-/obj/machinery/pdapainter,
+/obj/machinery/modular_computer/console/preset/command/hop,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "dQj" = (
@@ -19130,13 +19122,13 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/bar)
 "eaw" = (
-/obj/machinery/newscaster/security_unit{
-	pixel_y = 32
-	},
-/obj/machinery/papershredder,
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
 	},
+/obj/machinery/computer/security/telescreen/vault{
+	pixel_y = 30
+	},
+/obj/machinery/pdapainter,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "eaO" = (
@@ -22914,6 +22906,7 @@
 	dir = 8
 	},
 /obj/effect/mapping_helpers/mail_sorting/medbay/general,
+/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "fnr" = (
@@ -31112,16 +31105,13 @@
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "ien" = (
-/obj/machinery/computer/security/telescreen/vault{
-	pixel_y = 30
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
 	},
-/obj/machinery/disposal/bin/tagger,
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32
+	},
+/obj/machinery/vending/wardrobe/hop_wardrobe,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "ieo" = (
@@ -31284,16 +31274,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
-"iin" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
-	dir = 8
-	},
-/obj/machinery/vending/wardrobe/hop_wardrobe,
-/turf/open/floor/plasteel,
-/area/crew_quarters/heads/hop)
 "iix" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -33686,6 +33666,16 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
+"iXa" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
+	dir = 8
+	},
+/obj/machinery/papershredder,
+/turf/open/floor/plasteel,
+/area/crew_quarters/heads/hop)
 "iXg" = (
 /obj/effect/turf_decal/trimline/secred/filled/line/lower{
 	dir = 1
@@ -39079,9 +39069,24 @@
 	id = "hop";
 	name = "Privacy Shutters"
 	},
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/inspector_booth{
+	dir = 8
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	name = "Head of Personnel's Desk"
+	},
+/obj/machinery/door/window/northleft{
+	dir = 8;
+	name = "Reception Window"
+	},
+/obj/effect/mapping_helpers/windoor/access/all/service/hop{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hop)
@@ -50887,10 +50892,16 @@
 /turf/closed/wall,
 /area/escapepodbay)
 "ptS" = (
-/obj/machinery/modular_computer/console/preset/command/hop{
-	dir = 1
+/obj/effect/turf_decal/trimline/dark_blue/warning/lower{
+	dir = 8
 	},
-/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
+/obj/item/toy/figure/hop{
+	layer = 2.89;
+	pixel_x = 8;
+	pixel_y = -5
+	},
+/obj/structure/bed/dogbed/ian,
+/mob/living/simple_animal/pet/dog/corgi/Ian{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -52090,9 +52101,6 @@
 	name = "Privacy Shutters"
 	},
 /obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -54957,20 +54965,6 @@
 /area/crew_quarters/heads/captain)
 "qPS" = (
 /obj/structure/table/reinforced,
-/obj/machinery/door/window/northleft{
-	dir = 8;
-	name = "Reception Window"
-	},
-/obj/machinery/door/window/brigdoor{
-	base_state = "rightsecure";
-	dir = 4;
-	icon_state = "rightsecure";
-	name = "Head of Personnel's Desk"
-	},
-/obj/machinery/flasher{
-	id = "hopflash";
-	pixel_y = 28
-	},
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "hop";
 	name = "Privacy Shutters"
@@ -54988,6 +54982,19 @@
 /obj/effect/mapping_helpers/windoor/access/all/service/hop{
 	dir = 4
 	},
+/obj/machinery/door/window/brigdoor{
+	base_state = "rightsecure";
+	dir = 4;
+	name = "Head of Personnel's Desk"
+	},
+/obj/machinery/door/window/eastright{
+	dir = 8;
+	name = "Reception Window"
+	},
+/obj/machinery/flasher{
+	id = "hopflash";
+	pixel_y = 28
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads/hop)
 "qQa" = (
@@ -101985,7 +101992,7 @@ dEb
 dPP
 bYm
 ptS
-iin
+iXa
 qhG
 evI
 vTR