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

air alarms and more minor valor tweaks #3452

Merged
merged 9 commits into from
Oct 4, 2024
Merged

air alarms and more minor valor tweaks #3452

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e94a36
adds scrubbers+airalarms+firelocks
Jedi-Toothpaste Sep 27, 2024
01c4a6b
Update inteq_valor.dmm
Jedi-Toothpaste Sep 27, 2024
e212f14
Update inteq_valor.dmm
Jedi-Toothpaste Sep 27, 2024
5ead1ae
fixes the duped pipe- oops
Jedi-Toothpaste Sep 27, 2024
fe9513e
adds a medical webbing to hc locker
Jedi-Toothpaste Sep 27, 2024
29de5a8
Merge branch 'master' into final-valor-passover
Jedi-Toothpaste Sep 28, 2024
a47f5bc
Merge branch 'master' into final-valor-passover
Jedi-Toothpaste Sep 28, 2024
81a4cc4
fixes some broken wiring
Jedi-Toothpaste Oct 1, 2024
930d37a
Merge branch 'master' into final-valor-passover
Jedi-Toothpaste Oct 1, 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
19 changes: 15 additions & 4 deletions _maps/shuttles/inteq/inteq_valor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "2-8"
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/cargo)
"bR" = (
Expand Down Expand Up @@ -1707,6 +1710,9 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/central)
"pt" = (
Expand Down Expand Up @@ -1971,6 +1977,9 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"rX" = (
Expand Down Expand Up @@ -2272,10 +2281,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -20
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"tZ" = (
Expand Down Expand Up @@ -4281,6 +4286,12 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Nh" = (
Expand Down
Loading