Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] SerenityStation patches #5174

Merged
merged 2 commits into from
Nov 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions _maps/map_files/SerenityStation/SerenityStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27070,7 +27070,6 @@
/turf/open/floor/iron,
/area/station/maintenance/department/crew_quarters/dorms)
"hKw" = (
/obj/machinery/pdapainter/engineering,
/obj/structure/cable,
/obj/machinery/requests_console/directional/north{
department = "Head of Security's Desk";
Expand All @@ -27079,6 +27078,7 @@
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/machinery/pdapainter/security,
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/hos)
"hKJ" = (
Expand Down Expand Up @@ -32272,7 +32272,6 @@
/obj/machinery/door/airlock/mining{
name = "Drone Bay"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/machinery/door/firedoor,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand All @@ -32283,6 +32282,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/cargo/drone_bay)
"jjl" = (
Expand Down Expand Up @@ -36000,6 +36000,13 @@
},
/turf/open/floor/iron,
/area/station/hallway/primary/central/fore)
"klt" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/brown/filled/corner{
dir = 8
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
"klu" = (
/obj/effect/turf_decal/trimline/green/corner{
dir = 4
Expand Down Expand Up @@ -38714,7 +38721,6 @@
/obj/machinery/door/airlock/mining/glass{
name = "Cargo Breakroom"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
Expand All @@ -38724,6 +38730,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"lct" = (
Expand Down Expand Up @@ -52525,12 +52532,6 @@
},
/turf/open/floor/iron,
/area/station/security/prison/visit)
"plo" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
},
/turf/closed/wall,
/area/station/cargo/sorting)
"plp" = (
/turf/open/floor/plating,
/area/station/maintenance/department/eva/abandoned)
Expand Down Expand Up @@ -65648,14 +65649,14 @@
/obj/machinery/door/airlock/mining{
name = "Mining Dock"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/mining,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"tfP" = (
Expand Down Expand Up @@ -77345,10 +77346,10 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/trimline/brown/filled/corner{
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/cargo/sorting)
"wuG" = (
Expand Down Expand Up @@ -81758,9 +81759,6 @@
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/starboard/aft)
"xNO" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 8
},
/obj/machinery/camera/directional/south{
c_tag = "Supply - Customs Office";
network = list("ss13","prison")
Expand All @@ -81770,6 +81768,9 @@
name = "Markus's bed"
},
/mob/living/basic/pet/dog/markus,
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 10
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
"xNU" = (
Expand Down Expand Up @@ -173690,7 +173691,7 @@ hAc
aHS
gII
xNO
plo
mbf
mbf
mbf
mbf
Expand Down Expand Up @@ -173946,7 +173947,7 @@ oWv
hul
hul
rpL
hul
klt
wuA
tDh
vMb
Expand Down
Loading