From 325cd3abf41447cdb9ed79ec8f35044ac15c593f Mon Sep 17 00:00:00 2001 From: Venuska1117 <89580971+Venuska1117@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:08:44 +0100 Subject: [PATCH] fix that unisex restroom on box (#23072) --- _maps/map_files/cyberiad/cyberiad.dmm | 307 +++++++++++----------- code/game/area/ss13_areas/public_areas.dm | 3 + 2 files changed, 155 insertions(+), 155 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 17b30fff3cd..365eba255fe 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -8558,12 +8558,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/brig) -"aBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/engineering/gravitygenerator) "aBG" = ( /obj/structure/cable{ d1 = 4; @@ -14960,7 +14954,7 @@ /area/station/medical/reception) "aUQ" = ( /turf/simulated/wall, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "aUR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -15747,14 +15741,13 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "aWZ" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "aXa" = ( /obj/structure/cable{ d1 = 1; @@ -22721,6 +22714,17 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/central/nw) +"bpq" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/station/command/bridge) "bpr" = ( /obj/structure/table/reinforced, /obj/item/flash, @@ -24924,6 +24928,15 @@ }, /turf/simulated/floor/plasteel, /area/station/public/locker) +"bvU" = ( +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "blue" + }, +/area/station/command/bridge) "bvW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26923,6 +26936,16 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/supply/office) +"bDZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/bluegrid, +/area/station/turret_protected/ai_upload) +"bEc" = ( +/obj/machinery/economy/vending/cigarette, +/turf/simulated/floor/wood, +/area/station/command/meeting_room) "bEf" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, @@ -28470,6 +28493,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) +"bJn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/gravitygenerator) "bJr" = ( /obj/machinery/computer/guestpass{ pixel_y = 30 @@ -28613,7 +28644,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "bJV" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker, @@ -28707,20 +28738,7 @@ }, /area/station/science/robotics) "bKl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bKn" = ( @@ -29352,6 +29370,12 @@ "bMG" = ( /turf/simulated/wall/r_wall, /area/station/command/office/hop) +"bMI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/gravitygenerator) "bMJ" = ( /obj/machinery/light{ dir = 8 @@ -31299,6 +31323,9 @@ icon_state = "whiteyellow" }, /area/station/medical/chemistry) +"bTJ" = ( +/turf/simulated/wall/r_wall, +/area/station/command/server) "bTK" = ( /obj/structure/cable{ d1 = 4; @@ -31493,6 +31520,21 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/primary) +"bUv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/gravitygenerator) +"bUw" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/engineering/gravitygenerator) "bUx" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, @@ -32599,6 +32641,10 @@ icon_state = "blue" }, /area/station/hallway/primary/central/sw) +"bYU" = ( +/obj/machinery/blackbox_recorder, +/turf/simulated/floor/bluegrid, +/area/station/command/server) "bYW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -38151,12 +38197,6 @@ icon_state = "whitepurple" }, /area/station/science/toxins/mixing) -"csv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/bluegrid, -/area/station/turret_protected/ai_upload) "csw" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -43883,22 +43923,6 @@ icon_state = "whitepurple" }, /area/station/science/xenobiology) -"cLa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/camera{ - c_tag = "Research Hallway South"; - dir = 4; - network = list("Research","SS13") - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/station/science/hallway) "cLb" = ( /turf/simulated/wall/r_wall, /area/station/science/test_chamber) @@ -46966,7 +46990,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "cVw" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -50201,13 +50225,12 @@ }, /area/station/engineering/control) "dhw" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "dhx" = ( /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -50283,7 +50306,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "dhO" = ( /obj/machinery/recharge_station, /obj/machinery/door_control{ @@ -50296,7 +50319,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "dhQ" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -50315,7 +50338,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "dhV" = ( /obj/structure/sink/kitchen{ pixel_y = 25 @@ -53656,9 +53679,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) -"dvc" = ( -/turf/simulated/wall/r_wall, -/area/station/command/server) "dvv" = ( /mob/living/simple_animal/pet/sloth/paperwork, /turf/simulated/floor/carpet, @@ -54353,7 +54373,7 @@ "dMK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "dMM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/effect/spawner/random_spawners/oil_maybe, @@ -55588,6 +55608,23 @@ icon_state = "neutralcorner" }, /area/station/public/dorms) +"ekh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "ekp" = ( /obj/machinery/flasher{ id = "AI"; @@ -59175,7 +59212,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "fXt" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/binary/valve{ @@ -60273,7 +60310,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "gyA" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61231,6 +61268,22 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/station/maintenance/port) +"gVu" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/camera{ + c_tag = "Research Hallway South"; + dir = 4; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/hallway) "gVD" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/item/restraints/handcuffs/cable/blue, @@ -61748,7 +61801,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "hhX" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Cafeteria" @@ -66136,7 +66189,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "juH" = ( /obj/item/storage/fancy/cigarettes/cigpack_random, /turf/simulated/floor/plating, @@ -67084,7 +67137,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "jUt" = ( /obj/machinery/light{ dir = 4 @@ -68065,10 +68118,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"ksk" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint2) "kso" = ( /obj/structure/chair/sofa/left{ dir = 8 @@ -69316,7 +69365,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "kYS" = ( /obj/structure/cable{ d1 = 1; @@ -69335,14 +69384,6 @@ icon_state = "white" }, /area/station/science/robotics) -"kZG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/engineering/gravitygenerator) "laa" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -69549,15 +69590,6 @@ /obj/item/pen/multi/fountain, /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) -"ldQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/gravitygenerator) "ldS" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating/airless, @@ -70066,7 +70098,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "lqw" = ( /obj/machinery/alarm{ dir = 1; @@ -70755,7 +70787,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "lHw" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/structure/closet/crate/freezer, @@ -73542,10 +73574,6 @@ icon_state = "darkred" }, /area/station/hallway/secondary/exit) -"ndY" = ( -/obj/machinery/blackbox_recorder, -/turf/simulated/floor/bluegrid, -/area/station/command/server) "neo" = ( /obj/effect/spawner/window/reinforced/tinted, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -74735,7 +74763,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "nNh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/mineral/equipment_vendor, @@ -74861,9 +74889,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) "nPU" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74872,10 +74897,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "nQD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research, @@ -76645,10 +76672,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/engine, /area/station/engineering/control) -"oDY" = ( -/obj/machinery/economy/vending/cigarette, -/turf/simulated/floor/wood, -/area/station/command/meeting_room) "oEm" = ( /obj/machinery/computer/security/telescreen/entertainment/television, /turf/simulated/floor/carpet/royalblack, @@ -76713,15 +76736,6 @@ /obj/machinery/light, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) -"oFn" = ( -/obj/item/radio/intercom{ - name = "south bump"; - pixel_y = -28 - }, -/turf/simulated/floor/plasteel{ - icon_state = "blue" - }, -/area/station/command/bridge) "oFq" = ( /obj/item/assembly/timer{ pixel_x = -5; @@ -79623,7 +79637,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "qcM" = ( /obj/machinery/door/airlock/command/glass{ id_tag = "ntrepofficedoor"; @@ -82521,7 +82535,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "rrg" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -83429,7 +83443,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "rPS" = ( /obj/structure/grille/broken, /obj/item/stack/rods, @@ -84453,7 +84467,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "ssL" = ( /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -85875,7 +85889,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "thV" = ( /obj/structure/cable{ d1 = 1; @@ -88009,12 +88023,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) -"uhX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/engineering/gravitygenerator) "uhY" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -90214,17 +90222,6 @@ }, /turf/simulated/floor/plasteel, /area/station/command/bridge) -"vre" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" - }, -/area/station/command/bridge) "vro" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -92486,7 +92483,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "wuZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -95493,7 +95490,7 @@ /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, -/area/station/public/toilet) +/area/station/public/toilet/unisex) "xVr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -119684,7 +119681,7 @@ jtw vLf jqk fWC -aBD +bMI ejF wwz bFE @@ -119938,7 +119935,7 @@ euD tHh kkk fFi -uhX +bUw tWe nst eWl @@ -120195,7 +120192,7 @@ tEU ssr kkk rne -ldQ +bUv qlp eac osT @@ -120454,7 +120451,7 @@ bFC sOz uyk tWe -kZG +bJn bDV qis oXq @@ -124008,7 +124005,7 @@ bMs fEw lgV jOD -dvc +bTJ nSl nSl izs @@ -124260,12 +124257,12 @@ wsz gJD mdR jxq -oFn +bvU bMs ooI uhc waK -dvc +bTJ ppz huU mbk @@ -124519,10 +124516,10 @@ niB uoQ kAV bMs -ndY +bYU dJf mdS -dvc +bTJ huU mbk gAK @@ -124760,7 +124757,7 @@ bnd bkz uco jvs -vre +bpq bqX nJv dHw @@ -124775,11 +124772,11 @@ iCI dCe ocy gmQ -dvc -dvc -dvc +bTJ +bTJ +bTJ dxW -dvc +bTJ oWR fdz fdz @@ -126316,7 +126313,7 @@ rkp mUF gwd jxq -oFn +bvU bQo frn bUr @@ -128371,7 +128368,7 @@ rgq pVb isA afq -oDY +bEc bMG bMG kBl @@ -140487,7 +140484,7 @@ cKQ jxu oyY bGG -ksk +bKl dgy dbg cLQ @@ -142537,7 +142534,7 @@ cDv bvX tMd bxq -csv +bDZ bxq tGv bvX @@ -142547,7 +142544,7 @@ cMS stX jxy cpR -bKl +ekh bGG qZN cSf @@ -143825,7 +143822,7 @@ pSY cNx wEs sYr -cLa +gVu cHi mHH cKT diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm index 16bb95c70e6..a0baa65505e 100644 --- a/code/game/area/ss13_areas/public_areas.dm +++ b/code/game/area/ss13_areas/public_areas.dm @@ -182,6 +182,9 @@ /area/station/public/toilet/female name = "\improper Female Toilets" +/area/station/public/toilet/unisex + name = "\improper Unisex Restroom" + /area/station/public/toilet/lockerroom name = "\improper Locker Toilets"