Merge remote-tracking branch 'upstream/master' into inf-dorms-locking

_maps/RandomRuins/LavaRuins/bluemoon/lavaland_surface_syndicate_base1_bluemoon.dmm

@@ -235,7 +235,7 @@
 /obj/structure/window/reinforced/survival_pod,
 /obj/structure/flora/junglebush/large,
 /turf/open/floor/grass/grass0,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "bh" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/lavaland/unpowered/deepspaceone/main)
@@ -260,7 +260,7 @@
 	pixel_y = 16
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "bm" = (
 /obj/structure/closet/secure_closet{
 	icon_state = "qm";
@@ -362,7 +362,7 @@
 	level = 1
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "bR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -404,7 +404,7 @@
 	light_color = "#c1caff"
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "ca" = (
 /obj/machinery/door/airlock/external{
 	req_access_txt = "150"
@@ -464,14 +464,14 @@
 	dir = 1
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "co" = (
 /obj/machinery/door/airlock{
 	name = "Unisex Restrooms";
 	req_access_txt = "150"
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "cp" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/reagent_containers/blood/random,
@@ -565,7 +565,7 @@
 	pixel_x = 28
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/cargo)
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
 "cD" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/yellow{
@@ -606,7 +606,7 @@
 	pixel_y = 28
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "cZ" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -1963,7 +1963,7 @@
 	level = 1
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "mD" = (
 /obj/machinery/door/poddoor{
 	id = "interdynecargo"
@@ -2393,7 +2393,7 @@
 	level = 1
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "pK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 8
@@ -2481,7 +2481,7 @@
 /obj/item/soap/syndie,
 /obj/machinery/light/small,
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "qz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
@@ -3017,7 +3017,7 @@
 	dir = 8
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "vt" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
@@ -3622,7 +3622,7 @@
 	dir = 4
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "zt" = (
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 1
@@ -3894,7 +3894,7 @@
 	pixel_y = 16
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "AW" = (
 /obj/structure/window/reinforced/survival_pod{
 	dir = 8
@@ -5189,6 +5189,9 @@
 /obj/item/storage/box/masks,
 /turf/open/floor/iron/white,
 /area/ruin/lavaland/unpowered/deepspaceone/medbay)
+"Jk" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "Jm" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -6114,7 +6117,7 @@
 /area/ruin/lavaland/unpowered/deepspaceone/testlab)
 "PM" = (
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "PS" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
@@ -7577,7 +7580,7 @@
 	},
 /obj/item/seeds/gatfruit,
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "YB" = (
 /obj/structure/chair,
 /turf/open/floor/iron/dark,
@@ -7733,7 +7736,7 @@
 	req_access_txt = "150"
 	},
 /turf/open/indestructible/hoteltile,
-/area/ruin/lavaland/unpowered/deepspaceone/main)
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
 "Zn" = (
 /obj/machinery/atmospherics/components/unary/portables_connector{
 	dir = 4
@@ -9631,12 +9634,12 @@ bh
 Jt
 aj
 Jt
-bh
-bh
-bh
-bh
-bh
-bh
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
 xP
 St
 Pt
@@ -9693,12 +9696,12 @@ MO
 ds
 Uv
 SU
-bh
+Jk
 AV
 qt
-bh
+Jk
 cW
-bh
+Jk
 Tz
 Ci
 TX
@@ -9755,7 +9758,7 @@ mG
 mz
 WG
 rQ
-bh
+Jk
 AV
 PM
 Zj
@@ -9817,12 +9820,12 @@ hA
 hA
 BP
 bh
-bh
-bh
-bh
-bh
+Jk
+Jk
+Jk
+Jk
 vm
-bh
+Jk
 Nj
 St
 Pt
@@ -9880,11 +9883,11 @@ bh
 HM
 bh
 Jg
-bh
+Jk
 Yz
 co
 zr
-bh
+Jk
 Nj
 St
 Pt
@@ -9942,11 +9945,11 @@ Jr
 GY
 WM
 bh
-bh
-bh
-bh
-bh
-bh
+Jk
+Jk
+Jk
+Jk
+Jk
 Nj
 St
 Pt