Skip to content

Commit

Permalink
[MIRROR] Pharmacy map fixes [MDB IGNORE] (#24287)
Browse files Browse the repository at this point in the history
* Pharmacy map fixes (#78848)

## About The Pull Request

- Adds a few missing firelocks in the pharmacy areas of maps
- Rotates windoor so it's not covered by blast shutters
- Adds a shower to Icebox, consistent with other maps
- Removes New IDs and You paper misplaced in the icemoon wastes

## Why It's Good For The Game

Windoors under shutters are a pain. Firedoor/shower consistency.

## Changelog

:cl: LT3
fix: After the untimely loss of too many novice HoPs, the Icebox "New
IDs and You" instructions have been moved from the icemoon wastes to the
HoP's office, ending this rite of passage
fix: Added some missing firelocks in the pharmacy area. Icebox pharmacy
now has a shower
/:cl:

* Pharmacy map fixes

---------

Co-authored-by: lessthanthree <[email protected]>
  • Loading branch information
2 people authored and Iajret committed Oct 12, 2023
1 parent 3ab93db commit 73698bf
Show file tree
Hide file tree
Showing 5 changed files with 421 additions and 388 deletions.
65 changes: 32 additions & 33 deletions _maps/map_files/Birdshot/birdshot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3177,6 +3177,24 @@
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron,
/area/station/commons)
"bnl" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/tile/yellow/full,
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/right/directional/east{
name = "Pharmacy Desk";
req_access = list("pharmacy")
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "pharmacy_shutters";
name = "Pharmacy Shutters"
},
/turf/open/floor/iron/dark/textured_large,
/area/station/medical/pharmacy)
"bno" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -7272,6 +7290,12 @@
/obj/effect/turf_decal/tile/brown/full,
/turf/open/floor/iron/smooth_large,
/area/station/service/bar)
"cOL" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
"cOQ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/sorting/mail/flip{
Expand Down Expand Up @@ -20089,11 +20113,6 @@
/obj/structure/broken_flooring/singular/directional/east,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/central)
"hln" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
"hlo" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/machinery/camera/autoname/directional/north,
Expand Down Expand Up @@ -21160,12 +21179,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"hDn" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
"hDt" = (
/obj/structure/toilet{
pixel_y = 8
Expand Down Expand Up @@ -42298,6 +42311,11 @@
},
/turf/open/floor/iron,
/area/station/science/cytology)
"pdW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/station/maintenance/department/engine/atmos)
"pdY" = (
/obj/machinery/portable_atmospherics/canister/bz,
/turf/open/floor/iron/diagonal,
Expand Down Expand Up @@ -53075,25 +53093,6 @@
dir = 8
},
/area/station/commons/dorms)
"svU" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/tile/yellow/full,
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/right/directional/east{
dir = 8;
name = "Pharmacy Desk";
req_access = list("pharmacy")
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "pharmacy_shutters";
name = "Pharmacy Shutters"
},
/turf/open/floor/iron/dark/textured_large,
/area/station/medical/pharmacy)
"svZ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -84213,7 +84212,7 @@ yjE
fPv
dja
bNq
hln
pdW
dIm
dQY
ecq
Expand Down Expand Up @@ -84470,7 +84469,7 @@ yjE
uYG
djC
bNq
hDn
cOL
dIe
dRE
ecF
Expand Down Expand Up @@ -104613,7 +104612,7 @@ wfr
nPd
wfr
nPd
svU
bnl
uxJ
wfr
wfr
Expand Down
102 changes: 52 additions & 50 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17333,6 +17333,12 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/ai_upload)
"enj" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/wood,
/area/station/engineering/break_room)
"enq" = (
/obj/item/folder/yellow,
/obj/item/multitool,
Expand Down Expand Up @@ -24959,6 +24965,16 @@
},
/turf/open/floor/iron,
/area/station/science/xenobiology)
"gfK" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "chemisttop";
name = "Pharmacy Shutters"
},
/obj/machinery/smartfridge/chemistry/preloaded,
/obj/machinery/door/firedoor,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"gfR" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -51828,6 +51844,39 @@
/obj/effect/turf_decal/tile/neutral/full,
/turf/open/floor/iron/dark/smooth_large,
/area/station/security/interrogation)
"mUh" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/structure/desk_bell{
pixel_x = 7;
pixel_y = 6
},
/obj/item/folder/yellow{
pixel_x = -3;
pixel_y = -6
},
/obj/item/pen{
pixel_x = -3;
pixel_y = -2
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "chemisttop";
name = "Pharmacy Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/window/left/directional/west{
name = "Pharmacy Desk";
req_access = list("pharmacy");
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
"mUt" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -53609,12 +53658,6 @@
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/area/station/commons/fitness/recreation)
"ntU" = (
/obj/structure/table/reinforced,
/obj/machinery/microwave,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/wood,
/area/station/engineering/break_room)
"ntX" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
Expand Down Expand Up @@ -63456,38 +63499,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hos)
"pTz" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/structure/desk_bell{
pixel_x = 7;
pixel_y = 6
},
/obj/item/folder/yellow{
pixel_x = -3;
pixel_y = -6
},
/obj/item/pen{
pixel_x = -3;
pixel_y = -2
},
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "chemisttop";
name = "Pharmacy Shutters"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/window/left/directional/west{
name = "Pharmacy Desk";
req_access = list("pharmacy")
},
/turf/open/floor/iron/dark,
/area/station/medical/pharmacy)
"pTB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
Expand Down Expand Up @@ -68598,15 +68609,6 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron/white,
/area/station/medical/medbay)
"riZ" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 4;
id = "chemisttop";
name = "Pharmacy Shutters"
},
/obj/machinery/smartfridge/chemistry/preloaded,
/turf/open/floor/iron/white,
/area/station/medical/pharmacy)
"rjd" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
Expand Down Expand Up @@ -119144,7 +119146,7 @@ uiP
vkg
wlS
vQj
ntU
enj
cJX
fhr
kTd
Expand Down Expand Up @@ -136921,8 +136923,8 @@ uNY
squ
pEU
cwh
riZ
pTz
gfK
mUh
cwh
cwh
udd
Expand Down
Loading

0 comments on commit 73698bf

Please sign in to comment.