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.

Sign up for GitHub

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

Fix xenobiology disposals on Box, Delta, and Meta #2425

Merged
merged 13 commits into from
Aug 2, 2024
Merged

Fix xenobiology disposals on Box, Delta, and Meta #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5a6f866
Fix xenobiology disposals on Box, Delta, and Meta.
Absolucy Jun 26, 2024
9c92eb9
Made some whoopsies on Meta, fix those
Absolucy Jun 26, 2024
81aa86f
guh? guh.
Absolucy Jun 26, 2024
a3639d6
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jun 27, 2024
7e508af
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 1, 2024
f22facd
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 1, 2024
39e39ae
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 14, 2024
9d96194
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 14, 2024
a930b30
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 21, 2024
ca421d3
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 21, 2024
ff4c966
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 24, 2024
4e57450
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 26, 2024
d1d08f9
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jul 31, 2024
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
55 changes: 29 additions & 26 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18144,20 +18144,6 @@
/obj/item/crowbar/red,
/turf/open/floor/iron/dark,
/area/station/command/teleporter)
"gdF" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
/obj/structure/liquid_barrier,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"gea" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -34541,6 +34527,23 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"lyj" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/science/xenobio,
/obj/structure/liquid_barrier,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"lyp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
Expand Down Expand Up @@ -48993,6 +48996,16 @@
},
/turf/open/floor/wood,
/area/station/command/heads_quarters/captain)
"qqH" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/bot,
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"qqJ" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -56029,16 +56042,6 @@
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/wood,
/area/station/service/library/lounge)
"sLA" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/bot,
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"sLG" = (
/obj/structure/cable,
/turf/open/floor/carpet,
Expand Down Expand Up @@ -100468,7 +100471,7 @@ yaX
yaX
gJK
vTX
sLA
qqH
oER
gfF
tLo
Expand Down Expand Up @@ -116928,7 +116931,7 @@ cDv
cDv
cDv
cDv
gdF
lyj
cDv
cDv
nBS
Expand Down
29 changes: 16 additions & 13 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
},
/turf/closed/wall/r_wall,
/area/station/maintenance/solars/port/fore)
"aah" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"aak" = (
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
Expand Down Expand Up @@ -20233,13 +20240,6 @@
/obj/effect/spawner/random/trash/moisture_trap,
/turf/open/floor/iron,
/area/station/maintenance/department/chapel)
"eOW" = (
/obj/effect/turf_decal/bot,
/obj/machinery/vending/hydroseeds{
slogan_delay = 700
},
/turf/open/floor/iron/dark,
/area/station/security/prison/garden)
"ePa" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -62773,10 +62773,6 @@
},
/turf/open/floor/iron,
/area/station/security/brig)
"oXX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science/xenobiology)
"oYe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -70019,6 +70015,13 @@
"qIH" = (
/turf/closed/wall/r_wall,
/area/station/security/execution/transfer)
"qII" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/science/xenobiology)
"qIK" = (
/obj/effect/landmark/start/hangover,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -120466,7 +120469,7 @@ siU
kPO
wqB
gAw
oXX
qII
wYU
uhb
uhb
Expand Down Expand Up @@ -153774,7 +153777,7 @@ qYo
uHd
aaa
bCV
eOW
aah
vIf
nEv
tsP
Expand Down
Loading
Loading