Skip to content

Commit

Permalink
fix more shower rooms (#1613)
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixRuin authored Jan 16, 2025
1 parent fce01c7 commit 407a63a
Show file tree
Hide file tree
Showing 8 changed files with 154 additions and 129 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,7 @@
/obj/structure/window/reinforced/survival_pod,
/obj/structure/flora/junglebush/large,
/turf/open/floor/grass/grass0,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"bh" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/lavaland/unpowered/deepspaceone/main)
Expand All @@ -263,10 +260,7 @@
pixel_y = 16
},
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"bm" = (
/obj/structure/closet/secure_closet{
icon_state = "qm";
Expand Down Expand Up @@ -368,10 +362,7 @@
level = 1
},
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"bR" = (
/obj/structure/disposalpipe/segment{
dir = 6
Expand Down Expand Up @@ -413,10 +404,7 @@
light_color = "#c1caff"
},
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"ca" = (
/obj/machinery/door/airlock/external{
req_access_txt = "150"
Expand Down Expand Up @@ -476,10 +464,7 @@
dir = 1
},
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"co" = (
/obj/machinery/door/airlock{
name = "Unisex Restrooms";
Expand Down Expand Up @@ -580,10 +565,7 @@
pixel_x = 28
},
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/cargo{
name = "DS-1 'Dune' | Comm Shower";
icon_state = "shower"
})
/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
"cD" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
Expand Down
56 changes: 33 additions & 23 deletions _maps/RandomRuins/SpaceRuins/BlueMoon/defcon2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
},
/obj/machinery/door/window/brigdoor/westright,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"ar" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -1217,7 +1217,7 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/cult,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"fp" = (
/obj/machinery/airalarm/directional/north,
/obj/structure/closet,
Expand Down Expand Up @@ -1717,7 +1717,7 @@
"iq" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"ir" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
Expand Down Expand Up @@ -1877,6 +1877,10 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
/area/ruin/space/has_grav/bluemoon/port_tarkon/mining)
"jr" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/cult,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"jv" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/button/door{
Expand Down Expand Up @@ -2334,7 +2338,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/door/window/brigdoor/southright,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"lR" = (
/obj/machinery/door/firedoor/solid,
/obj/machinery/door/airlock/public/glass{
Expand Down Expand Up @@ -3879,7 +3883,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/vomit/old,
/turf/open/floor/plasteel/cult,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"ut" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/tile/blue/anticorner{
Expand All @@ -3889,6 +3893,9 @@
/obj/item/lighter/gold,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bluemoon/port_tarkon/comms)
"uu" = (
/turf/closed/wall/mineral/cult/artificer,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"uv" = (
/turf/closed/wall,
/area/ruin/space/has_grav/bluemoon/port_tarkon)
Expand All @@ -3913,7 +3920,7 @@
pixel_y = 8
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"uD" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
Expand Down Expand Up @@ -4124,7 +4131,7 @@
/obj/machinery/light/small/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"vZ" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
Expand Down Expand Up @@ -5071,7 +5078,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/loot_pile/maint,
/turf/open/floor/plasteel/cult,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"Ch" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
Expand Down Expand Up @@ -5923,6 +5930,9 @@
},
/turf/open/floor/engine/n2o,
/area/ruin/space/has_grav/bluemoon/port_tarkon/atmos)
"GE" = (
/turf/closed/wall,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"GF" = (
/obj/structure/bed,
/obj/effect/turf_decal/tile/blue/anticorner{
Expand Down Expand Up @@ -6782,7 +6792,7 @@
dir = 4
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"KW" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/obj/effect/decal/cleanable/dirt/dust,
Expand Down Expand Up @@ -7050,7 +7060,7 @@
},
/obj/machinery/door/firedoor/solid,
/turf/open/floor/iron,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"MD" = (
/obj/machinery/atmospherics/miner/toxins,
/turf/open/floor/engine/plasma,
Expand Down Expand Up @@ -8077,7 +8087,7 @@
dir = 4
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"SM" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
Expand Down Expand Up @@ -8846,7 +8856,7 @@
},
/obj/effect/mob_spawn/human/corpse/cargo_tech,
/turf/open/floor/plasteel/cult,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"XG" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
Expand Down Expand Up @@ -9023,7 +9033,7 @@
/obj/structure/mirror/directional/west,
/obj/structure/sink/directional/east,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"Zf" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
Expand Down Expand Up @@ -11120,9 +11130,9 @@ Qs
NU
hA
WU
Ki
GE
vR
GV
jr
fm
iq
iq
Expand Down Expand Up @@ -11193,10 +11203,10 @@ Ge
CA
xE
xr
Ki
GE
MC
ZZ
GV
uu
jr
uo
Cf
Iw
Expand Down Expand Up @@ -11268,8 +11278,8 @@ GM
Jk
ro
MB
Ki
ZZ
GE
uu
XE
aq
Iw
Expand Down Expand Up @@ -11342,9 +11352,9 @@ xU
xU
AT
IE
ZZ
ZZ
Iw
uu
uu
GE
Iw
Iw
Iw
Expand Down
Loading

0 comments on commit 407a63a

Please sign in to comment.