From 24c365abac6e0667e67ad8c9685d3df7815db514 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 23 Oct 2024 22:32:46 +0200 Subject: [PATCH 1/2] Adds an inspector booth at hop to all maps --- _maps/map_files/DonutStation/DonutStation.dmm | 184 +++++++++++++----- _maps/map_files/GaxStation/GaxStation.dmm | 56 +++--- _maps/map_files/IceMeta/IceMeta.dmm | 122 +++++------- .../ManateeStation/ManateeStation.dmm | 78 +++----- _maps/map_files/MiniStation/MiniStation.dmm | 48 +++-- _maps/map_files/YogStation/YogStation.dmm | 105 +++++----- 6 files changed, 323 insertions(+), 270 deletions(-) diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 7eef201a068d..2dfbcbaf416a 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -2468,9 +2468,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" = ( @@ -6459,6 +6474,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) @@ -8957,6 +8983,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" = ( @@ -11680,6 +11709,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" @@ -12871,6 +12928,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" = ( @@ -14640,8 +14700,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" }, @@ -17133,6 +17191,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" = ( @@ -18187,6 +18251,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" = ( @@ -23986,10 +24053,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jYW" = ( -/obj/machinery/computer/cargo, /obj/machinery/light_switch{ pixel_y = 24 }, +/obj/machinery/computer/cargo, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "jZb" = ( @@ -26555,6 +26622,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) "lfj" = ( @@ -27125,16 +27198,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 }, @@ -29187,13 +29257,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" = ( @@ -29455,21 +29525,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) @@ -30213,9 +30274,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"; @@ -30223,12 +30281,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" = ( @@ -30923,16 +30985,14 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "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" = ( @@ -36359,7 +36419,6 @@ /turf/closed/wall, /area/quartermaster/warehouse) "pkR" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, @@ -40406,14 +40465,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) @@ -40498,6 +40560,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, @@ -43393,7 +43466,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; @@ -43403,6 +43475,15 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/bed/dogbed/ian, +/mob/living/simple_animal/pet/dog/corgi/Ian{ + dir = 8 + }, +/obj/item/toy/figure/hop{ + layer = 2.89; + pixel_x = 8; + pixel_y = -5 + }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "skz" = ( @@ -45145,6 +45226,8 @@ 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, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "sTs" = ( @@ -51509,14 +51592,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) @@ -103776,11 +103856,11 @@ rGQ vdL wBL ouG +qRN leC -leC -leC +eKA lqF -leC +cBx ouG pLR eRv diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 91c5410754ca..6bf85d67cfb1 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -14143,12 +14143,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" = ( @@ -15560,10 +15554,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" = ( @@ -17657,13 +17650,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" = ( @@ -18260,6 +18253,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" = ( @@ -22517,8 +22511,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, @@ -28185,6 +28195,9 @@ dir = 1 }, /obj/machinery/pdapainter, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "nzN" = ( @@ -28523,9 +28536,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" = ( @@ -32536,7 +32546,6 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 4; - icon_state = "rightsecure"; name = "Head of Personnel's Desk" }, /obj/machinery/flasher{ @@ -37228,6 +37237,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" = ( @@ -41827,9 +41840,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) "umn" = ( @@ -95096,7 +95106,7 @@ xPn tCL xdL pKI -mUc +kJB mUc omw omw @@ -95610,7 +95620,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 159c7190e3a9..7fbb72c5fd68 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{ @@ -33270,12 +33269,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" = ( @@ -42215,9 +42208,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 @@ -42634,17 +42624,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) @@ -47807,12 +47788,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" @@ -54338,19 +54313,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" @@ -54366,6 +54328,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" = ( @@ -57613,13 +57583,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{ @@ -57774,9 +57759,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" @@ -60693,7 +60675,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, @@ -66446,9 +66428,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" }, @@ -85412,9 +85391,6 @@ /turf/open/floor/wood, /area/library) "ylr" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/flasher{ id = "hopflash"; pixel_x = 28; @@ -240820,7 +240796,7 @@ hMv sYq vue bjT -nMh +ibB biJ sYq iPW @@ -241077,9 +241053,9 @@ kHW sYq mTR ibB -qEA +ibB jJb -tKY +qEA bjk eUW kvD @@ -241334,7 +241310,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 14efb761b3cf..a6e0ba5f1e1c 100644 --- a/_maps/map_files/ManateeStation/ManateeStation.dmm +++ b/_maps/map_files/ManateeStation/ManateeStation.dmm @@ -761,9 +761,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10048,9 +10045,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -19046,9 +19040,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -29181,13 +29172,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" = ( @@ -38432,21 +38423,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" = ( @@ -42128,6 +42112,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" = ( @@ -43292,9 +43277,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/disposalpipe/segment{ dir = 2 }, @@ -54067,7 +54049,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{ @@ -54085,9 +54066,6 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -54102,10 +54080,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, @@ -63765,20 +63749,22 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "sMb" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 +/obj/machinery/door/poddoor/shutters/preopen{ + id = "hop"; + name = "Privacy Shutters" }, -/obj/machinery/door/firedoor/border_only{ +/obj/machinery/inspector_booth{ dir = 8 }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/door/window/brigdoor/eastright{ + name = "Head of Personnel's Desk" }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "hop"; - name = "Privacy Shutters" +/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) @@ -72260,9 +72246,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 }, @@ -73011,9 +72994,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 }, @@ -74320,9 +74300,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -74377,9 +74354,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 3232121a4c85..573635093747 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -11742,9 +11742,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; @@ -11753,9 +11750,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"; @@ -22661,12 +22655,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" @@ -22679,13 +22667,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" = ( @@ -30137,9 +30129,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" = ( @@ -40667,14 +40656,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 001f19154f83..ed1a0426eb01 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/cart, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "ieo" = ( @@ -33677,13 +33667,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "iXa" = ( -/obj/machinery/vending/cart, /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" = ( @@ -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" = ( From ef3d6b3944ca7087de96e5f454a46fc353850f19 Mon Sep 17 00:00:00 2001 From: AMyriad Date: Wed, 23 Oct 2024 22:55:39 +0200 Subject: [PATCH 2/2] Missing firelocks on manatee --- _maps/map_files/ManateeStation/ManateeStation.dmm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_maps/map_files/ManateeStation/ManateeStation.dmm b/_maps/map_files/ManateeStation/ManateeStation.dmm index a6e0ba5f1e1c..b31ba33212d5 100644 --- a/_maps/map_files/ManateeStation/ManateeStation.dmm +++ b/_maps/map_files/ManateeStation/ManateeStation.dmm @@ -63766,6 +63766,12 @@ /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) "sMi" = (