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

Jump to bottom

Fixes missing vent and scrubber in security checkpoint near brig on delta station #26089

Merged
merged 10 commits into from
Aug 7, 2024
Merged

Fixes missing vent and scrubber in security checkpoint near brig on delta station #26089

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89512b0
Update deltastation.dmm
Fluffyzack21 Jun 29, 2024
f4aab15
Merge remote-tracking branch 'upstream/master' into vent
Fluffyzack21 Jul 1, 2024
7e79c4e
Merge remote-tracking branch 'upstream/master' into vent
Fluffyzack21 Jul 9, 2024
0b4ca5f
Merge remote-tracking branch 'upstream/master' into vent
Fluffyzack21 Jul 13, 2024
4d1f9eb
Merge remote-tracking branch 'upstream/master' into vent
Fluffyzack21 Jul 22, 2024
1c91e4d
Update deltastation.dmm
Fluffyzack21 Jul 22, 2024
b004aa5
damn pipe
Fluffyzack21 Jul 23, 2024
2431e2e
Merge remote-tracking branch 'origin/master' into vent
Fluffyzack21 Jul 30, 2024
1075f5f
Merge remote-tracking branch 'upstream/master' into vent
Fluffyzack21 Aug 5, 2024
7d6357c
removes a random airvent
Fluffyzack21 Aug 5, 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
62 changes: 50 additions & 12 deletions _maps/map_files/stations/deltastation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20887,6 +20887,9 @@
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
Expand Down Expand Up @@ -22187,13 +22190,15 @@
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
"bpl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
Expand Down Expand Up @@ -22897,6 +22902,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
Expand Down Expand Up @@ -25309,6 +25317,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"bxQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
Expand Down Expand Up @@ -30816,13 +30825,6 @@
"bLt" = (
/turf/simulated/floor/carpet,
/area/station/security/detective)
"bLu" = (
/obj/machinery/computer/med_data{
dir = 8
},
/obj/machinery/requests_console/directional/east,
/turf/simulated/floor/carpet,
/area/station/security/detective)
"bLv" = (
/obj/structure/disposalpipe/segment{
dir = 4
Expand Down Expand Up @@ -32360,6 +32362,7 @@
"bPs" = (
/obj/structure/chair/office/dark,
/obj/effect/landmark/start/security_officer,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
Expand Down Expand Up @@ -48157,6 +48160,16 @@
icon_state = "neutralfull"
},
/area/station/public/fitness)
"cGV" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
},
/area/station/hallway/primary/starboard/east)
"cGW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -63272,6 +63285,13 @@
icon_state = "cult"
},
/area/station/service/chapel/office)
"dUf" = (
/obj/machinery/computer/med_data{
dir = 8
},
/obj/machinery/requests_console/directional/east,
/turf/simulated/floor/carpet,
/area/station/security/detective)
"dUi" = (
/obj/item/kirbyplants,
/obj/structure/cable{
Expand Down Expand Up @@ -86698,6 +86718,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/security/checkpoint)
"qZq" = (
Expand Down Expand Up @@ -92767,6 +92790,7 @@
dir = 1;
name = "Security Reception"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
Expand Down Expand Up @@ -99496,6 +99520,20 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/reception)
"ybX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/hallway/primary/starboard/east)
"ycH" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass,
Expand Down Expand Up @@ -148444,7 +148482,7 @@ aaa
bLn
bHP
dMA
bLu
dUf
bNu
nXf
bLn
Expand Down Expand Up @@ -149219,8 +149257,8 @@ bLx
bxQ
bPs
ueR
rOn
bVg
cGV
ybX
caz
bYM
caK
Expand Down