Merge remote-tracking branch 'upstream/master' into skill-issue

_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" = (
@@ -22216,6 +22283,8 @@
 	dir = 1;
 	network = list("ss13","Medical")
 	},
+/obj/item/clothing/mask/breath/vox,
+/obj/item/tank/internals/emergency_oxygen/vox,
 /turf/open/floor/plasteel/white,
 /area/medical/genetics/cloning)
 "jnO" = (
@@ -23894,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" = (
@@ -26503,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" = (
@@ -27075,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
 	},
@@ -29165,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" = (
@@ -29426,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)
@@ -30164,22 +30233,23 @@
 /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";
 	departmentType = 5;
 	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" = (
@@ -30905,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" = (
@@ -36280,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
 	},
@@ -40351,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)
@@ -40445,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,
@@ -43480,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;
@@ -43490,6 +43570,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/computer/cargo,
 /turf/open/floor/wood,
 /area/crew_quarters/heads/hop)
 "skC" = (
@@ -45173,7 +45254,6 @@
 /turf/open/floor/plasteel,
 /area/storage/primary)
 "sTl" = (
-/obj/machinery/vending/cart,
 /obj/machinery/airalarm{
 	dir = 8;
 	pixel_x = 24
@@ -45182,6 +45262,9 @@
 	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" = (
@@ -51570,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)
@@ -103720,11 +103800,11 @@ rGQ
 vdL
 wBL
 ouG
+qRN
 leC
-leC
-leC
+eKA
 lqF
-leC
+cBx
 ouG
 pLR
 eRv