From f7cbd7df0515d4b99204bcd474fceae015dc6964 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 7 Mar 2024 15:54:33 +0100 Subject: [PATCH] [MIRROR] Makes Metastation Pharmacy and Chemistry more consistent with other maps. (#26786) * Makes Metastation Pharmacy and Chemistry more consistent with other maps. (#81788) ## About The Pull Request Makes the pharma airlocks not use general medical access, Also changes the Chemistry and Pharma airlocks to medical airlocks so they're more consistent with other maps ## Why It's Good For The Game Pharma shouldn't be accessible with general medical access (Medical Security Officers, HoS and Paramedics) also the airlocks being more consistent with other maps is nice ## Changelog :cl: fix: MetaStation Pharmacy is no longer accessible with general medical access, Also changes the Chemistry and Pharmacy airlocks into medical ones. /:cl: * Makes Metastation Pharmacy and Chemistry more consistent with other maps. --------- Co-authored-by: starrm4nn <139372157+starrm4nn@users.noreply.github.com> --- _maps/map_files/MetaStation/MetaStation.dmm | 314 ++++++++++---------- 1 file changed, 156 insertions(+), 158 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c882645023a..ace855350b8 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1122,6 +1122,19 @@ "avK" = ( /turf/closed/wall, /area/station/maintenance/fore/lesser) +"avU" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/button/door/directional/east{ + id = "Cabin2"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "awy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1308,6 +1321,14 @@ dir = 8 }, /area/station/medical/morgue) +"aAd" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Surgery C Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "aAg" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, @@ -3567,20 +3588,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/captain, /turf/open/floor/plating, /area/station/maintenance/central) -"bng" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/button/door/directional/west{ - id = "Cabin4"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "bnl" = ( /obj/structure/sign/departments/chemistry/pharmacy/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6783,19 +6790,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/robotics/lab) -"cwD" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/button/door/directional/east{ - id = "Cabin2"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "cwF" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -15384,13 +15378,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) -"fFI" = ( -/obj/machinery/conveyor{ - id = "mining" - }, -/obj/machinery/brm, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "fGp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -16066,21 +16053,6 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"fTW" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/button/door/directional/west{ - id = "Cabin7"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/dorms) "fUg" = ( /obj/machinery/camera/directional/north{ c_tag = "Engineering - Storage" @@ -23865,6 +23837,13 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/engine, /area/station/science/xenobiology) +"iId" = ( +/obj/machinery/conveyor{ + id = "mining" + }, +/obj/machinery/brm, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "iIf" = ( /obj/machinery/camera/directional/north{ c_tag = "Locker Room Entrance" @@ -27426,20 +27405,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"jNR" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/button/door/directional/east{ - id = "Cabin3"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/dorms) "jNZ" = ( /obj/machinery/camera/directional/west{ c_tag = "Telecomms - Server Room - Aft-Port"; @@ -29580,21 +29545,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) -"kBK" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/west{ - id = "Cabin6"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/carpet, -/area/station/commons/dorms) "kBQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/directional/north, @@ -32038,6 +31988,19 @@ }, /turf/open/floor/grass, /area/station/medical/virology) +"lxf" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/west{ + id = "Cabin5"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) "lxm" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4 @@ -41822,6 +41785,20 @@ /obj/machinery/light/small/red/directional/west, /turf/open/floor/plating/airless, /area/space/nearstation) +"oYv" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/button/door/directional/west{ + id = "Cabin4"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "oYz" = ( /obj/machinery/camera/directional/south{ c_tag = "Cargo Bay - Mailroom" @@ -43202,23 +43179,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"pyM" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "chem_lockdown"; - name = "Chemistry Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/research/glass{ - name = "Chemistry Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "pyP" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -43394,6 +43354,23 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"pCf" = ( +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "chem_lockdown"; + name = "Chemistry Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "pCh" = ( /obj/machinery/camera/directional/east{ c_tag = "Prison Laundry"; @@ -45198,16 +45175,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) -"qhG" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Pharmacy Maintenance" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, -/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, -/turf/open/floor/plating, -/area/station/maintenance/department/medical/central) "qhI" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 8 @@ -50123,14 +50090,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -"rTF" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Surgery C Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "rTL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50158,6 +50117,21 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"rUo" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/button/door/directional/west{ + id = "Cabin7"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) "rUp" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, @@ -51813,6 +51787,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +"sBa" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/button/door/directional/east{ + id = "Cabin3"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/dorms) "sBd" = ( /obj/structure/lattice, /obj/item/stack/cable_coil, @@ -56632,6 +56620,11 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) +"uhI" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/station/security/checkpoint/customs) "uhP" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58534,6 +58527,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/cryo) +"uPj" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Pharmacy Maintenance" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) "uPp" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 4 @@ -60219,6 +60221,20 @@ /obj/item/pen, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"vte" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/medical/glass{ + name = "Pharmacy" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/landmark/navigate_destination, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "vth" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -62649,21 +62665,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"whx" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/research/glass{ - name = "Pharmacy" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, -/obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/effect/landmark/navigate_destination, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "why" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -64185,6 +64186,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"wNp" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/landmark/start/hangover, +/obj/machinery/button/door/directional/west{ + id = "Cabin6"; + name = "Cabin Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/item/pillow/random, +/turf/open/floor/carpet, +/area/station/commons/dorms) "wND" = ( /obj/effect/turf_decal/arrows/red{ dir = 4 @@ -66271,19 +66287,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -"xyh" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/button/door/directional/west{ - id = "Cabin5"; - name = "Cabin Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/dorms) "xyp" = ( /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, @@ -66674,11 +66677,6 @@ }, /turf/open/floor/engine, /area/station/science/cytology) -"xDH" = ( -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/security/checkpoint/customs) "xDQ" = ( /obj/structure/chair/office{ dir = 4 @@ -83258,7 +83256,7 @@ fcq uEw fcq rxP -xDH +uhI vrP hve dRH @@ -87169,7 +87167,7 @@ tzE ucc tSw tSw -rTF +aAd tSw tSw tSw @@ -87348,7 +87346,7 @@ fMr hKg pVV cgk -fFI +iId tkf wZo jXu @@ -91793,7 +91791,7 @@ yfg yfg bqX iMr -pyM +pCf oNy bqX bqX @@ -93830,7 +93828,7 @@ vLf kXD kWO rvE -whx +vte cIK hoN eIO @@ -94351,7 +94349,7 @@ gtb fJW xWE kzj -qhG +uPj iqq qWK cdk @@ -104046,10 +104044,10 @@ tgo lOU nmI lnc -jNR +sBa obw lnc -cwD +avU cKC lnc crL @@ -105588,19 +105586,19 @@ kZq gNh aTD lnc -bng +oYv cKC lnc -xyh +lxf obw qXB icS qXB -kBK +wNp xej lnc obw -fTW +rUo lqQ fzr iCJ