diff --git a/_maps/RandomRuins/LavaRuins/bluemoon/lavaland_surface_syndicate_base1_bluemoon.dmm b/_maps/RandomRuins/LavaRuins/bluemoon/lavaland_surface_syndicate_base1_bluemoon.dmm
index e86d69ce6499..ce053fdbeef7 100644
--- a/_maps/RandomRuins/LavaRuins/bluemoon/lavaland_surface_syndicate_base1_bluemoon.dmm
+++ b/_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
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon2.dmm
index 440724df763e..7707fb23352e 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon2.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon2.dmm
@@ -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,
@@ -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,
@@ -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,
@@ -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{
@@ -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{
@@ -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{
@@ -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)
@@ -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,
@@ -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,
@@ -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,
@@ -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{
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -11120,9 +11130,9 @@ Qs
NU
hA
WU
-Ki
+GE
vR
-GV
+jr
fm
iq
iq
@@ -11193,10 +11203,10 @@ Ge
CA
xE
xr
-Ki
+GE
MC
-ZZ
-GV
+uu
+jr
uo
Cf
Iw
@@ -11268,8 +11278,8 @@ GM
Jk
ro
MB
-Ki
-ZZ
+GE
+uu
XE
aq
Iw
@@ -11342,9 +11352,9 @@ xU
xU
AT
IE
-ZZ
-ZZ
-Iw
+uu
+uu
+GE
Iw
Iw
Iw
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon3.dmm
index ca1c2436a237..726f453f40d7 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon3.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon3.dmm
@@ -55,7 +55,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)
"ah" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/blue/half,
@@ -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/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/tile/brown/half,
@@ -1547,7 +1547,7 @@
/area/ruin/space/has_grav/bluemoon/port_tarkon/mining)
"iq" = (
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"iv" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/open/space/basic,
@@ -1584,7 +1584,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)
"iC" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/firealarm/directional/east,
@@ -3747,7 +3747,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/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/tracks,
@@ -3991,7 +3991,7 @@
"vR" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"vT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
@@ -5800,6 +5800,9 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/bluemoon/port_tarkon/mining)
+"HM" = (
+/turf/closed/wall,
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"HQ" = (
/obj/machinery/door/airlock/research{
req_access = list("tarkoff")
@@ -6420,7 +6423,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/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/gibs/body,
@@ -6686,7 +6689,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,
@@ -7205,7 +7208,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/loot_pile/maint,
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"Qo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/blue,
@@ -7654,7 +7657,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" = (
/turf/open/floor/plating/asteroid,
/area/ruin/space/has_grav/bluemoon/port_tarkon/atmos)
@@ -7741,7 +7744,7 @@
"Ti" = (
/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)
"Tk" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
@@ -8051,7 +8054,7 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/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)
"Vj" = (
/obj/effect/mob_spawn/human/tarkon/engi,
/obj/effect/decal/cleanable/dirt/dust,
@@ -8427,7 +8430,7 @@
/obj/effect/decal/cleanable/vomit/old,
/obj/machinery/door/window/brigdoor/westleft,
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"XH" = (
/obj/effect/turf_decal/tile/purple/fourcorners,
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
@@ -10738,7 +10741,7 @@ Qs
AN
hA
WU
-Ki
+HM
vR
iq
Ti
@@ -10811,9 +10814,9 @@ ro
CA
dT
MB
-Ki
+HM
MC
-Ki
+HM
Vi
Ti
Qn
@@ -10886,8 +10889,8 @@ GM
kb
ro
MB
-Ki
-Ki
+HM
+HM
XE
aq
Iw
@@ -10960,9 +10963,9 @@ px
px
on
IE
-Ki
-Ki
-Iw
+HM
+HM
+HM
Iw
Iw
Iw
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon4.dmm
index f1376ecd0dd6..7abc330e1451 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon4.dmm
@@ -117,7 +117,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/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -1430,7 +1430,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)
"iu" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -2098,7 +2098,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/loot_pile/maint,
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"lW" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -3226,7 +3226,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)
"tt" = (
/obj/structure/fence{
dir = 4
@@ -3407,7 +3407,7 @@
},
/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)
"uD" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -3612,7 +3612,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)
"wa" = (
/obj/effect/mapping_helpers/network_builder/power_cable/auto,
/obj/machinery/power/terminal{
@@ -4028,6 +4028,9 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark/airless,
/area/ruin/space/has_grav/bluemoon/port_tarkon/developement)
+"yJ" = (
+/turf/closed/wall,
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"yO" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/glass,
@@ -5844,7 +5847,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,
@@ -6054,7 +6057,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/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
@@ -6404,7 +6407,7 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/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)
"Pp" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron,
@@ -6952,7 +6955,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/glass,
/obj/effect/decal/cleanable/dirt/dust,
@@ -7728,7 +7731,7 @@
/obj/effect/decal/cleanable/vomit/old,
/obj/machinery/door/window/brigdoor/westleft,
/turf/open/floor/iron/white,
-/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,
@@ -7904,7 +7907,7 @@
},
/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)
"Zi" = (
/obj/machinery/door/window/brigdoor/southleft{
req_access = list("tarkoff")
@@ -9987,7 +9990,7 @@ Qs
pR
hA
WU
-Ki
+yJ
vR
iq
iq
@@ -10060,9 +10063,9 @@ ro
CA
dT
MB
-Ki
+yJ
MC
-Ki
+yJ
Pl
iq
lV
@@ -10135,8 +10138,8 @@ GM
Uz
ro
MB
-Ki
-Ki
+yJ
+yJ
XE
aq
Iw
@@ -10209,9 +10212,9 @@ xU
xU
AT
IE
-Ki
-Ki
-Iw
+yJ
+yJ
+yJ
Iw
Iw
Iw
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon5.dmm
index f313d6da1a02..1e5b57bff8a6 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon5.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/defcon5.dmm
@@ -29,7 +29,7 @@
pixel_x = -28
},
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"ah" = (
/obj/effect/turf_decal/tile/blue/half,
/obj/effect/decal/cleanable/dirt/dust,
@@ -82,7 +82,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)
"as" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -1450,7 +1450,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)
"iu" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
@@ -3141,7 +3141,7 @@
req_access = list("tarkoff")
},
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"sc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/spawner/lootdrop/grille_or_trash,
@@ -3495,7 +3495,7 @@
},
/obj/effect/spawner/lootdrop/cigars_cases,
/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,
@@ -3730,7 +3730,7 @@
/obj/effect/decal/cleanable/confetti,
/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,
@@ -3992,7 +3992,7 @@
/obj/effect/spawner/lootdrop/grille_or_trash,
/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)
"xY" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4;
@@ -6294,7 +6294,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{
piping_layer = 1
@@ -6533,7 +6533,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,
@@ -7572,7 +7572,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/confetti,
/obj/effect/decal/cleanable/dirt/dust,
@@ -7897,7 +7897,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/loot_pile/maint,
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"Ur" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3,
/obj/effect/turf_decal/tile/brown,
@@ -8333,6 +8333,9 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bluemoon/port_tarkon/developement)
+"WR" = (
+/turf/closed/wall,
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"WU" = (
/turf/closed/wall,
/area/ruin/space/has_grav/bluemoon/port_tarkon/porthall)
@@ -8419,7 +8422,7 @@
req_access = list("tarkoff")
},
/turf/open/floor/iron/white,
-/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,
@@ -8688,7 +8691,7 @@
pixel_x = -28
},
/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall)
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
"Za" = (
/obj/effect/turf_decal/tile/purple/half{
dir = 8
@@ -10828,7 +10831,7 @@ Qs
AN
hA
WU
-Ki
+WR
vR
iq
iq
@@ -10901,9 +10904,9 @@ ro
CA
ep
Kg
-Ki
+WR
MC
-Ki
+WR
xW
iq
Up
@@ -10976,8 +10979,8 @@ Oo
Uz
ro
MB
-Ki
-Ki
+WR
+WR
XE
aq
Iw
@@ -11050,9 +11053,9 @@ xU
XS
on
IE
-Ki
-Ki
-Iw
+WR
+WR
+WR
hs
Iw
Iw
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm
index 84c82421d272..f4e132b63157 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm
@@ -112,7 +112,7 @@
pixel_y = -8
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"az" = (
/obj/effect/mob_spawn/human/corpse/damaged,
/obj/effect/decal/cleanable/blood,
@@ -617,7 +617,7 @@
pixel_y = 28
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"dd" = (
/obj/structure/filingcabinet,
/obj/machinery/door/window{
@@ -768,7 +768,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"dW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 8
@@ -946,7 +946,7 @@
pixel_x = 26
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"fl" = (
/obj/structure/chair/stool/bar/directional/south,
/obj/effect/turf_decal/tile/brown/opposingcorners,
@@ -1723,7 +1723,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"jn" = (
/obj/effect/turf_decal/stripes{
dir = 1;
@@ -3367,7 +3367,7 @@
dir = 10
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"qa" = (
/turf/open/floor/wood/wood_large,
/area/ruin/space/has_grav/inteq_forgotten_ship)
@@ -3760,7 +3760,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/inteq_forgotten_bridge)
"sf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon{
dir = 8;
id_tag = "forgotten_outpost_tox_out";
name = "toxin out"
@@ -3905,7 +3905,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"sx" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/inteq_forgotten_inspection)
@@ -3949,7 +3949,7 @@
dir = 10
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"sD" = (
/obj/effect/turf_decal/tile/brown/opposingcorners,
/obj/structure/cable/yellow{
@@ -4089,6 +4089,9 @@
},
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/inteq_forgotten_ship)
+"tS" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"tV" = (
/obj/structure/table/reinforced,
/obj/machinery/chem_dispenser/drinks/beer,
@@ -5049,7 +5052,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"yB" = (
/obj/machinery/door/poddoor/incinerator_syndicatelava_main,
/turf/open/floor/engine/vacuum,
@@ -6209,7 +6212,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Eo" = (
/obj/machinery/processor,
/obj/effect/turf_decal/stripes/red/line{
@@ -6300,6 +6303,9 @@
/obj/effect/spawner/structure/window/plastitanium,
/turf/open/floor/plasteel/damturf/platdmg1,
/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+"EU" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Fb" = (
/obj/machinery/light,
/turf/open/floor/iron/dark,
@@ -6344,7 +6350,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Fk" = (
/obj/machinery/door/window{
dir = 1;
@@ -6764,7 +6770,7 @@
name = "Bathroom"
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"HA" = (
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
@@ -7201,7 +7207,7 @@
/obj/machinery/pool/drain,
/obj/structure/curtain,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"JX" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7553,7 +7559,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Ly" = (
/obj/machinery/computer/camera_advanced{
dir = 8
@@ -8171,7 +8177,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Of" = (
/obj/effect/decal/cleanable/glass,
/obj/item/trash/semki,
@@ -8438,7 +8444,7 @@
/area/ruin/space/has_grav/inteq_forgotten_rnd)
"Ql" = (
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Qo" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -9066,7 +9072,7 @@
pixel_y = 2
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"TL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -10165,7 +10171,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Zk" = (
/obj/machinery/door/airlock/grunge{
name = "Vault";
@@ -11798,10 +11804,10 @@ Pl
Yp
kw
kw
-kw
-kw
-kw
-kw
+tS
+tS
+tS
+tS
WP
sz
sz
@@ -11873,10 +11879,10 @@ Pl
Pl
Pl
dT
-kw
+tS
Em
yA
-kw
+tS
sz
sz
sz
@@ -11948,10 +11954,10 @@ pq
Nz
Rj
wx
-kw
+tS
dc
Ql
-kw
+tS
sz
sz
sz
@@ -12023,10 +12029,10 @@ bk
kw
kw
kw
-kw
-kw
+tS
+tS
Hy
-kw
+tS
kw
sz
sz
@@ -12625,10 +12631,10 @@ kw
kw
Rf
Pl
-kw
+tS
Hy
-kw
-kw
+tS
+tS
sz
Vp
Vp
@@ -12700,10 +12706,10 @@ kw
uB
xE
xE
-kw
+tS
Fj
TJ
-kw
+tS
sz
XD
XD
@@ -12775,10 +12781,10 @@ Rz
qi
AG
Ml
-kw
+tS
dU
ay
-kw
+tS
sz
Jb
kn
@@ -12850,10 +12856,10 @@ kw
sG
Pl
Tc
-kw
-kw
-kw
-kw
+tS
+tS
+tS
+tS
Jb
Jb
be
@@ -14860,10 +14866,10 @@ OA
nm
nm
sx
-gb
+EU
JW
sw
-gb
+EU
rF
xv
gb
@@ -14935,10 +14941,10 @@ sx
sx
GE
sx
-gb
+EU
Zj
Od
-gb
+EU
YU
db
oL
@@ -15010,7 +15016,7 @@ ye
ye
lO
sz
-gb
+EU
sC
pX
jf
@@ -15085,10 +15091,10 @@ sz
sz
sz
sz
-gb
+EU
Lp
fk
-gb
+EU
Dl
cl
EA
@@ -15160,10 +15166,10 @@ sz
sz
sz
sz
-gb
-gb
-gb
-gb
+EU
+EU
+EU
+EU
Ii
rQ
ch
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm
index 526ef3018246..63c0a3cf2bc1 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm
@@ -108,7 +108,7 @@
pixel_y = -8
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"aD" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal/twenty,
@@ -222,7 +222,7 @@
/area/ruin/space/has_grav/inteq_forgotten_vault)
"aQ" = (
/obj/machinery/atmospherics/miner/toxins,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"aR" = (
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
@@ -561,7 +561,7 @@
pixel_y = 28
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"dd" = (
/obj/structure/filingcabinet,
/obj/machinery/door/window{
@@ -694,7 +694,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"dW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 8
@@ -872,7 +872,7 @@
pixel_x = 26
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"fl" = (
/obj/structure/chair/stool/bar/directional/south,
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
@@ -1539,7 +1539,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"jn" = (
/obj/effect/turf_decal/stripes{
dir = 1;
@@ -2840,7 +2840,7 @@
dir = 10
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"qa" = (
/turf/open/floor/wood/wood_large,
/area/ruin/space/has_grav/inteq_forgotten_ship)
@@ -3209,12 +3209,12 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/inteq_forgotten_bridge)
"sf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon{
dir = 8;
id_tag = "forgotten_outpost_tox_out";
name = "toxin out"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"sg" = (
/obj/structure/table/glass,
@@ -3333,7 +3333,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"sx" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/inteq_forgotten_inspection)
@@ -3357,7 +3357,7 @@
dir = 6
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"sD" = (
/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
/obj/structure/cable/yellow{
@@ -3806,6 +3806,9 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/inteq_forgotten_bridge)
+"wt" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"wu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -3878,7 +3881,7 @@
dir = 4;
volume_rate = 200
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"wX" = (
/obj/effect/decal/cleanable/dirt,
@@ -4258,7 +4261,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"yB" = (
/obj/machinery/door/poddoor/incinerator_syndicatelava_main,
/turf/open/floor/engine/vacuum,
@@ -4693,6 +4696,9 @@
},
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/inteq_forgotten_ship)
+"Bc" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Be" = (
/obj/machinery/computer/rdconsole/core{
req_access = null
@@ -5256,7 +5262,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Eo" = (
/obj/machinery/processor,
/obj/effect/turf_decal/stripes/red/line{
@@ -5382,7 +5388,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Fk" = (
/obj/machinery/door/window{
dir = 1;
@@ -5760,7 +5766,7 @@
name = "Bathroom"
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"HA" = (
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
@@ -5866,7 +5872,7 @@
id_tag = "forgotten_outpost_o2_out";
name = "oxygen out"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"If" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -6174,7 +6180,7 @@
/obj/machinery/pool/drain,
/obj/structure/curtain,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"JX" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6257,7 +6263,7 @@
id_tag = "forgotten_outpost_n2_out";
name = "nitrogen out"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"Ky" = (
/obj/effect/decal/cleanable/robot_debris/limb,
@@ -6354,7 +6360,7 @@
frequency = 1442;
id_tag = "syndie_lavaland_o2_sensor"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"KR" = (
/obj/machinery/computer/med_data/syndie{
@@ -6463,7 +6469,7 @@
dir = 8
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Ly" = (
/obj/machinery/computer/camera_advanced{
dir = 8
@@ -6714,7 +6720,7 @@
/area/ruin/space/has_grav/inteq_forgotten_outpost)
"MI" = (
/obj/machinery/atmospherics/miner/nitrogen,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"MJ" = (
/obj/effect/turf_decal/tile/dark_blue/anticorner,
@@ -7023,7 +7029,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Oh" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/inteq_forgotten_bar)
@@ -7266,7 +7272,7 @@
/area/ruin/space/has_grav/inteq_forgotten_rnd)
"Ql" = (
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"Qo" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -7830,7 +7836,7 @@
pixel_y = 2
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/inteq_forgotten_outpost)
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
"TL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -8258,7 +8264,7 @@
/area/ruin/space/has_grav/inteq_forgotten_rnd)
"Wc" = (
/obj/machinery/atmospherics/miner/oxygen,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"Wl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -8279,7 +8285,7 @@
frequency = 1442;
id_tag = "syndie_lavaland_n2_sensor"
},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/inteq_forgotten_atmos)
"Wt" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{
@@ -8835,7 +8841,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/inteq_forgotten_permabrig)
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
"Zk" = (
/obj/machinery/door/airlock/grunge{
name = "Vault";
@@ -10466,10 +10472,10 @@ Pl
Yp
kw
kw
-kw
-kw
-kw
-kw
+wt
+wt
+wt
+wt
WP
sz
sz
@@ -10541,10 +10547,10 @@ Pl
Pl
Pl
dT
-kw
+wt
Em
yA
-kw
+wt
sz
sz
sz
@@ -10616,10 +10622,10 @@ pq
Nz
Rj
wx
-kw
+wt
dc
Ql
-kw
+wt
sz
sz
sz
@@ -10691,10 +10697,10 @@ bk
kw
kw
kw
-kw
-kw
+wt
+wt
Hy
-kw
+wt
kw
sz
sz
@@ -11293,10 +11299,10 @@ kw
kw
Rf
Pl
-kw
+wt
Hy
-kw
-kw
+wt
+wt
lO
lO
ye
@@ -11368,10 +11374,10 @@ kw
uB
xE
xE
-kw
+wt
Fj
TJ
-kw
+wt
lO
lO
lO
@@ -11443,10 +11449,10 @@ Rz
qi
AG
Ml
-kw
+wt
dU
ay
-kw
+wt
lO
lO
lO
@@ -11518,10 +11524,10 @@ kw
sG
Pl
Tc
-kw
-kw
-kw
-kw
+wt
+wt
+wt
+wt
lO
lO
lO
@@ -13528,10 +13534,10 @@ OA
nm
nm
sx
-gb
+Bc
JW
sw
-gb
+Bc
rF
xv
gb
@@ -13603,10 +13609,10 @@ sx
sx
GE
sx
-gb
+Bc
Zj
Od
-gb
+Bc
io
db
oL
@@ -13678,7 +13684,7 @@ ye
ye
lO
sz
-gb
+Bc
sC
pX
jf
@@ -13753,10 +13759,10 @@ sz
sz
sz
sz
-gb
+Bc
Lp
fk
-gb
+Bc
Dl
cl
EA
@@ -13828,10 +13834,10 @@ sz
sz
sz
sz
-gb
-gb
-gb
-gb
+Bc
+Bc
+Bc
+Bc
Ii
rQ
ch
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm
index 977fbea46e00..afcd7cd2d548 100644
--- a/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm
+++ b/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm
@@ -457,7 +457,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"bw" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/diner)
@@ -1135,7 +1135,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"dS" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/portable_atmospherics/scrubber,
@@ -4055,7 +4055,7 @@
dir = 8
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"qo" = (
/obj/structure/rack/shelf,
/obj/effect/turf_decal/trimline/dark_red/filled/line{
@@ -4279,7 +4279,7 @@
level = 1
},
/turf/open/floor/iron/dark/textured_large,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"rb" = (
/obj/effect/turf_decal/trimline/dark_red/filled/line{
dir = 8
@@ -4392,7 +4392,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"rx" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -4745,7 +4745,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"tk" = (
/obj/effect/turf_decal/trimline/yellow/line,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
@@ -5339,7 +5339,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"vK" = (
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
@@ -6681,7 +6681,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"Cm" = (
/obj/effect/mob_spawn/human/ds2/syndicate_command/corporateliaison,
/turf/open/floor/carpet/blackred,
@@ -6843,7 +6843,7 @@
dir = 9
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"Dt" = (
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -7404,7 +7404,7 @@
},
/turf/open/floor/plasteel/showroomfloor/shower,
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"Fx" = (
/obj/machinery/hydroponics/constructable,
/obj/machinery/door/window/survival_pod{
@@ -7484,7 +7484,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"FJ" = (
/obj/effect/turf_decal/siding/dark{
dir = 10
@@ -8180,7 +8180,7 @@
/area/ruin/space/has_grav/bluemoon/deepspacetwo/bridge/cl)
"IQ" = (
/turf/closed/wall/r_wall/syndicate/nodiagonal,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"IV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/iron/dark,
@@ -9931,7 +9931,7 @@
req_access = list(151)
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"Qo" = (
/obj/effect/turf_decal/siding/dark{
dir = 1
@@ -11840,7 +11840,7 @@
dir = 4
},
/turf/open/floor/iron/white/small,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"Xf" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -12205,6 +12205,9 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bluemoon/deepspacetwo/halls)
+"YF" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal,
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
"YG" = (
/obj/effect/mob_spawn/human/ds2/syndicate_command/admiral,
/turf/open/floor/carpet/red,
@@ -12220,7 +12223,7 @@
dir = 4
},
/turf/open/floor/iron/dark/textured_large,
-/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness)
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
"YI" = (
/obj/effect/turf_decal/stripes/red/corner{
dir = 8
@@ -12787,11 +12790,11 @@ pX
kF
kF
Wv
-kF
-kF
+YF
+YF
ra
-kF
-kF
+YF
+YF
hC
Lw
OT
@@ -12842,11 +12845,11 @@ xZ
kF
av
sh
-kF
+YF
Ds
Xb
bu
-kF
+YF
kF
SF
kF
@@ -12897,11 +12900,11 @@ TH
kF
Ue
wc
-kF
+YF
Qi
qn
vF
-kF
+YF
aa
Fb
BN
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index 94fd1664b5d0..fbce715d7ab6 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -969,7 +969,7 @@
pixel_x = -26
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"dF" = (
/obj/effect/turf_decal/siding/red{
dir = 1
@@ -1057,7 +1057,7 @@
},
/obj/item/soap/syndie,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"eI" = (
/obj/effect/turf_decal/trimline/dark_red/corner{
dir = 1
@@ -1361,7 +1361,7 @@
pixel_y = 18
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"pr" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -1391,6 +1391,9 @@
},
/turf/open/floor/iron/dark/textured,
/area/ruin/space/has_grav/bluemoon/listeningstation)
+"qg" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"qk" = (
/obj/structure/closet/crate/engineering/electrical,
/turf/open/floor/mineral/plastitanium,
@@ -1687,7 +1690,7 @@
/area/ruin/space/has_grav/bluemoon/listeningstation)
"xP" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"yg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -2033,7 +2036,7 @@
"HW" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"HX" = (
/obj/structure/table,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -2363,7 +2366,7 @@
req_access_txt = "150"
},
/turf/open/floor/iron,
-/area/ruin/space/has_grav/bluemoon/listeningstation)
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
"PW" = (
/obj/machinery/status_display{
pixel_x = -32
@@ -3413,10 +3416,10 @@ bw
aJ
ag
ag
-ag
-ag
-ag
-ag
+qg
+qg
+qg
+qg
ab
ab
ab
@@ -3451,10 +3454,10 @@ cl
yg
ik
Wi
-ag
+qg
po
di
-ag
+qg
ab
ab
ab
@@ -3492,7 +3495,7 @@ Ea
PB
xP
HW
-ag
+qg
ab
ab
ab
@@ -3527,10 +3530,10 @@ XY
ik
ik
YZ
-ag
+qg
ey
xP
-ag
+qg
ab
ab
ab
@@ -3565,10 +3568,10 @@ Ce
Nz
Gw
ZY
-ag
-ag
-ag
-ag
+qg
+qg
+qg
+qg
ag
ab
ab
diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit1.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit1.dmm
index 6ca75b0202ed..f7894f1b5a78 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehermit1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehermit1.dmm
@@ -748,7 +748,8 @@
/area/ruin/powered)
"Hp" = (
/mob/living/simple_animal/hostile/asteroid/goliath{
- health = 20
+ health = 20;
+ wander = 0
},
/turf/open/floor/plating/asteroid/airless,
/area/survivalpod/nonpowered)
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 8dbb4713175d..ad0663841237 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -272,14 +272,16 @@
/turf/closed/wall,
/area/security/prison/upper)
"acI" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/obj/machinery/recharge_station,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"acK" = (
@@ -2808,20 +2810,19 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"anO" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
+/obj/machinery/light{
+ dir = 4
},
-/obj/machinery/computer/med_data{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/machinery/requests_console{
- department = "Chief Medical Officer's Desk";
- name = "Chief Medical Officer RC";
- pixel_y = -1;
- pixel_x = -32
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
},
-/turf/open/floor/plasteel/white,
-/area/command/heads_quarters/cmo)
+/turf/open/floor/plasteel,
+/area/security/checkpoint/medical)
"anQ" = (
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
@@ -8065,6 +8066,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"aJI" = (
@@ -10305,10 +10309,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
"aUf" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/manifold4w/supply,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"aUj" = (
@@ -11353,15 +11357,17 @@
dir = 9
},
/obj/structure/table/reinforced,
-/obj/item/roller{
- pixel_y = 6;
- pixel_x = -4
+/obj/structure/disposalpipe/segment,
+/obj/item/stack/medical/gauze{
+ pixel_y = 6
},
-/obj/item/roller{
- pixel_y = 10;
- pixel_x = -4
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ pixel_y = -1;
+ pixel_x = 10
+ },
+/obj/item/reagent_containers/syringe{
+ pixel_y = -1
},
-/obj/structure/disposalpipe/segment,
/turf/open/floor/iron/dark,
/area/medical/paramedic)
"aYY" = (
@@ -11664,8 +11670,12 @@
/area/command/heads_quarters/captain)
"bak" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/reagent_dispensers/peppertank{
+ pixel_x = 30
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
@@ -13829,6 +13839,8 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bht" = (
@@ -14246,6 +14258,7 @@
/area/cargo/storage)
"biu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"biv" = (
@@ -14258,6 +14271,13 @@
/turf/open/floor/plasteel,
/area/cargo/office)
"biw" = (
+/obj/item/radio/intercom{
+ pixel_x = 25
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bix" = (
@@ -14265,27 +14285,14 @@
dir = 8
},
/obj/effect/landmark/start/depsec/medical,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"biy" = (
-/obj/machinery/computer/secure_data{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 8
},
-/obj/item/radio/intercom{
- pixel_x = 25
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/checkpoint/medical)
+/turf/closed/wall,
+/area/command/heads_quarters/cmo)
"biA" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -14805,16 +14812,7 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bjX" = (
-/obj/structure/table,
-/obj/machinery/recharger{
- pixel_y = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bjZ" = (
@@ -18309,9 +18307,16 @@
/turf/open/floor/plasteel/dark,
/area/security/office)
"bvm" = (
-/obj/machinery/holopad,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/filingcabinet,
+/turf/open/floor/plasteel,
+/area/security/checkpoint/medical)
"bvx" = (
/turf/closed/wall/r_wall,
/area/science)
@@ -18920,10 +18925,13 @@
/area/cargo/miningdock)
"bxB" = (
/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/item/pen{
+ pixel_y = 5;
+ pixel_x = -5
},
-/obj/item/pen,
/obj/structure/table,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -18934,6 +18942,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/book/manual/splurt_space_law{
+ pixel_x = 7;
+ pixel_y = 2
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"bxC" = (
@@ -19539,6 +19551,25 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"bze" = (
+/obj/machinery/power/apc{
+ areastring = "/area/security/checkpoint/medical";
+ dir = 8;
+ name = "Medbay Security APC";
+ pixel_x = -25
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/closet/secure_closet/security/med,
+/turf/open/floor/plasteel,
+/area/security/checkpoint/medical)
"bzs" = (
/turf/closed/wall,
/area/maintenance/aft)
@@ -19791,13 +19822,9 @@
/turf/open/floor/plasteel,
/area/cargo/miningdock)
"bAd" = (
-/obj/item/screwdriver{
- pixel_y = 10
- },
/obj/machinery/light{
dir = 4
},
-/obj/item/radio/off,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -20504,10 +20531,6 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/science)
"bBZ" = (
-/obj/item/screwdriver{
- pixel_y = 10
- },
-/obj/item/radio/off,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -20517,10 +20540,13 @@
"bCb" = (
/obj/structure/table,
/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+ pixel_x = -5;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_y = 4;
+ pixel_x = -5
},
-/obj/item/pen,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -20528,6 +20554,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/book/manual/splurt_space_law{
+ pixel_x = 7;
+ pixel_y = 3
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/science)
"bCc" = (
@@ -24493,9 +24523,6 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bQe" = (
-/obj/item/screwdriver{
- pixel_y = 10
- },
/obj/machinery/button/door{
desc = "A remote control-switch for the engineering security doors.";
id = "Engineering";
@@ -24507,7 +24534,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/radio/off,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light_switch{
pixel_x = -27;
@@ -25511,10 +25537,13 @@
"bTG" = (
/obj/structure/table,
/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = 6;
+ pixel_y = 5
},
-/obj/item/pen,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 30
},
@@ -25528,6 +25557,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/book/manual/splurt_space_law{
+ pixel_x = -7;
+ pixel_y = 3
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"bTJ" = (
@@ -27248,6 +27281,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel,
/area/engineering/break_room)
"bZh" = (
@@ -27497,6 +27531,22 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/light_switch{
+ pixel_x = 28
+ },
+/obj/structure/rack/shelf,
+/obj/item/roller{
+ pixel_y = -2;
+ pixel_x = -2
+ },
+/obj/item/roller{
+ pixel_y = -2;
+ pixel_x = 4
+ },
+/obj/item/storage/firstaid/regular{
+ pixel_x = -1;
+ pixel_y = 5
+ },
/turf/open/floor/iron/dark,
/area/medical/paramedic)
"bZP" = (
@@ -31735,6 +31785,7 @@
/turf/open/floor/wood,
/area/service/lawoffice)
"cmk" = (
+/obj/structure/disposalpipe/segment,
/obj/structure/chair/stool{
pixel_y = 8
},
@@ -37358,10 +37409,13 @@
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cVT" = (
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cWh" = (
@@ -37665,9 +37719,7 @@
"ddF" = (
/obj/machinery/light/directional/east,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
+/obj/machinery/recharge_station,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"ddG" = (
@@ -38336,6 +38388,9 @@
},
/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"dwU" = (
@@ -38403,15 +38458,10 @@
dir = 8
},
/obj/structure/table/glass,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 5
- },
-/obj/item/pen,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/item/toy/figure/cmo{
- pixel_y = 9;
- pixel_x = 8
+/obj/machinery/fax{
+ fax_name = "Chief Medical Officer's Office";
+ name = "Chief Medical Officer's Fax Machine"
},
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
@@ -39532,13 +39582,13 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"dZJ" = (
-/obj/effect/turf_decal/trimline/yellow/filled/corner{
- dir = 4
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"eaI" = (
@@ -40020,6 +40070,7 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/factory)
"eoX" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -40037,8 +40088,6 @@
},
/obj/effect/mapping_helpers/airlock/access/any/medical/general,
/obj/effect/mapping_helpers/airlock/unres,
-/obj/effect/landmark/navigate_destination,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"epc" = (
@@ -40232,10 +40281,12 @@
/turf/open/floor/plasteel,
/area/commons/fitness)
"euE" = (
-/obj/machinery/firealarm/directional/north,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"evB" = (
@@ -40483,11 +40534,9 @@
/area/maintenance/starboard/aft)
"eDH" = (
/obj/machinery/button/door{
- id = "secdorm2";
+ id = "secdorm1";
name = "Cabin Bolt Control";
- normaldoorcontrol = 1;
- pixel_y = -25;
- specialfunctions = 4
+ pixel_y = -25
},
/turf/open/floor/plasteel/dark,
/area/security/office)
@@ -40616,6 +40665,15 @@
},
/turf/open/floor/wood,
/area/service/lawoffice)
+"eIz" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/computer/med_data{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/command/heads_quarters/cmo)
"eIC" = (
/obj/machinery/hydroponics/soil,
/obj/item/radio/intercom{
@@ -41681,16 +41739,16 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"flj" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/light_switch{
+ pixel_x = 28
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
@@ -42285,9 +42343,6 @@
/area/commons/dorms)
"fyN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
/obj/machinery/vending/medical{
pixel_x = -2
},
@@ -42776,8 +42831,8 @@
/obj/structure/closet{
name = "janitorial supplies"
},
-/obj/item/storage/box/bodybags,
/obj/item/reagent_containers/spray/cleaner,
+/obj/item/storage/box/bodybags,
/turf/open/floor/iron/dark,
/area/medical/morgue)
"fOI" = (
@@ -43060,6 +43115,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/turf_decal/trimline/blue/filled/line,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"fXD" = (
@@ -44099,6 +44155,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/command/heads_quarters/cmo)
"gyW" = (
@@ -44170,9 +44229,7 @@
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 1
},
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
+/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"gBo" = (
@@ -44837,9 +44894,6 @@
/area/cargo/office)
"gQF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"gQN" = (
@@ -45208,12 +45262,16 @@
/turf/open/floor/plasteel/white/corner,
/area/hallway/primary/starboard)
"hcR" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/sign/poster/official/medical_green_cross{
+ pixel_y = 32
+ },
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"hcT" = (
@@ -45577,18 +45635,6 @@
dir = 10
},
/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp{
- pixel_x = -6;
- pixel_y = 10
- },
-/obj/item/storage/firstaid/regular{
- pixel_x = -3;
- pixel_y = 1
- },
-/obj/item/reagent_containers/glass/bottle/epinephrine{
- pixel_y = -1;
- pixel_x = 10
- },
/obj/machinery/power/apc{
areastring = "/area/medical/paramedic";
name = "Paramedic dispatch APC";
@@ -45598,6 +45644,12 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
+/obj/item/flashlight/lamp{
+ pixel_x = -6;
+ pixel_y = 10
+ },
+/obj/item/folder/white,
+/obj/item/pen,
/turf/open/floor/iron/dark,
/area/medical/paramedic)
"hpL" = (
@@ -46305,19 +46357,17 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
"hKW" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/machinery/light{
- dir = 4
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/structure/bed/dogbed/runtime,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27;
+ pixel_y = 1
},
-/turf/open/floor/plasteel,
-/area/security/checkpoint/medical)
+/mob/living/simple_animal/pet/cat/Runtime,
+/turf/open/floor/plasteel/white,
+/area/command/heads_quarters/cmo)
"hLn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -47575,19 +47625,15 @@
/turf/open/floor/wood,
/area/command/bridge)
"iCd" = (
-/obj/structure/filingcabinet,
-/obj/machinery/newscaster{
- pixel_y = 32
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/security/checkpoint/medical)
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"iCl" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -48075,9 +48121,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/structure/cable{
icon_state = "2-4"
},
@@ -48340,6 +48383,28 @@
},
/turf/open/floor/plasteel,
/area/service/bar)
+"iYv" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+ id_tag = "MedbayFoyer";
+ name = "Medbay"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/medical/general,
+/obj/effect/mapping_helpers/airlock/unres,
+/obj/effect/landmark/navigate_destination,
+/turf/open/floor/plasteel,
+/area/medical/medbay/central)
"iYX" = (
/obj/machinery/airalarm{
pixel_y = 22
@@ -49018,6 +49083,12 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/shuttle,
/area/command/heads_quarters/cmo)
"joB" = (
@@ -49981,12 +50052,19 @@
/turf/open/floor/plasteel,
/area/cargo/storage)
"jNg" = (
-/obj/structure/chair/office/light{
- dir = 4
- },
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
+/obj/structure/table/glass,
+/obj/item/paper_bin{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/obj/item/pen,
+/obj/item/toy/figure/cmo{
+ pixel_y = 9;
+ pixel_x = 8
+ },
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
"jNj" = (
@@ -50290,7 +50368,6 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"jYp" = (
-/obj/structure/table/glass,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
@@ -50298,10 +50375,6 @@
dir = 4
},
/obj/machinery/airalarm/directional/north,
-/obj/machinery/fax{
- fax_name = "Chief Medical Officer's Office";
- name = "Chief Medical Officer's Fax Machine"
- },
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
@@ -50388,6 +50461,12 @@
id = "cmoprivacy";
name = "CMO Office"
},
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating,
/area/command/heads_quarters/cmo)
"kai" = (
@@ -51921,19 +52000,13 @@
/turf/open/floor/plasteel/white,
/area/medical/surgery)
"kPu" = (
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27;
- pixel_y = 1
- },
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
-/obj/machinery/computer/card/minor/cmo{
- dir = 4;
- layer = 3;
- pixel_y = 9
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/chair/office/light{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
"kPG" = (
@@ -52542,26 +52615,9 @@
/turf/open/floor/wood/wood_large,
/area/service/chapel/office)
"liI" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- id_tag = "MedbayFoyer";
- name = "Medbay"
- },
-/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/obj/effect/mapping_helpers/airlock/unres,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/medical/medbay/central)
+/turf/closed/wall,
+/area/security/checkpoint/medical)
"liJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52907,6 +52963,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
"lvO" = (
@@ -54460,15 +54517,15 @@
codes_txt = "delivery;dir=4";
location = "Medbay"
},
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 8
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/effect/turf_decal/trimline/yellow/filled/warning{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"mmX" = (
@@ -54505,9 +54562,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"moe" = (
@@ -54810,10 +54864,10 @@
dir = 4
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "2-8"
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-8"
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -55224,16 +55278,15 @@
/turf/open/floor/plasteel/shuttle,
/area/maintenance/port/aft)
"mFJ" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ color = "#DE3A3A"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"mFM" = (
@@ -55701,13 +55754,12 @@
/turf/open/floor/carpet/orange,
/area/medical/psychology)
"mUE" = (
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/tile/blue/opposingcorners{
- dir = 8
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 4
},
-/obj/item/kirbyplants/random,
+/obj/machinery/light/directional/east,
/turf/open/floor/plasteel/white,
-/area/command/heads_quarters/cmo)
+/area/medical/medbay/central)
"mUH" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -55951,16 +56003,14 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"nbI" = (
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
- dir = 4
+ dir = 8
},
/obj/effect/turf_decal/tile/blue{
- dir = 1
+ dir = 4
},
-/obj/machinery/light/directional/north,
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/command/heads_quarters/cmo)
"nbT" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -56038,7 +56088,7 @@
/obj/item/bedsheet/red,
/obj/structure/bed,
/obj/machinery/button/door{
- id = "secdormone";
+ id = "secdormtwo";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
@@ -56617,7 +56667,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/mob/living/simple_animal/parrot/Polly,
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"nxu" = (
@@ -57097,9 +57146,6 @@
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
@@ -57161,12 +57207,15 @@
/area/space/nearstation)
"nKi" = (
/obj/structure/table,
-/obj/item/book/manual/splurt_space_law,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/radio/off,
+/obj/item/screwdriver{
+ pixel_y = 10
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"nKs" = (
@@ -57183,6 +57232,17 @@
},
/turf/open/floor/plasteel/dark,
/area/security/prison/cells)
+"nLt" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/machinery/computer/card/minor/cmo{
+ dir = 4;
+ layer = 3;
+ pixel_y = 14
+ },
+/turf/open/floor/plasteel/white,
+/area/command/heads_quarters/cmo)
"nLw" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -57728,12 +57788,11 @@
},
/area/medical/medbay/zone2)
"obG" = (
-/obj/structure/lattice,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Incinerator Output Pump"
},
-/turf/open/space,
-/area/space/nearstation)
+/turf/open/floor/plating/airless,
+/area/maintenance/disposal/incinerator)
"oce" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -58876,30 +58935,16 @@
/turf/open/floor/plasteel/cafeteria,
/area/security/prison/upper)
"oJa" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 9
- },
-/obj/item/pen,
-/obj/machinery/button/door{
- desc = "A remote control switch for the medbay foyer.";
- id = "MedbayFoyer";
- name = "Medbay Doors Control";
- normaldoorcontrol = 1;
- pixel_y = 26;
- req_access_txt = "5"
+/obj/machinery/newscaster{
+ pixel_y = 32
},
-/obj/item/book/manual/splurt_space_law,
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
+/obj/machinery/computer/security/mining,
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"oJl" = (
@@ -60290,13 +60335,13 @@
/obj/effect/turf_decal/trimline/blue/filled/warning{
dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/mob/living/simple_animal/bot/cleanbot{
name = "Scrubs, MD";
on = 0
},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"pCB" = (
@@ -60505,6 +60550,9 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"pJr" = (
@@ -60861,6 +60909,16 @@
},
/turf/open/floor/carpet/royalblack,
/area/service/library)
+"pSP" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "secdorm1"
+ },
+/turf/open/floor/plating,
+/area/security/office)
"pTa" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -61390,7 +61448,7 @@
dir = 10
},
/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
+ dir = 6
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -61729,6 +61787,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"qtX" = (
@@ -62752,7 +62813,6 @@
/turf/open/floor/plasteel/dark,
/area/security/prison/cells)
"qXG" = (
-/obj/item/book/manual/splurt_space_law,
/obj/structure/table,
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -62760,6 +62820,10 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/item/radio/off,
+/obj/item/screwdriver{
+ pixel_y = 10
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"qXJ" = (
@@ -63186,23 +63250,23 @@
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"rjX" = (
-/obj/machinery/light_switch{
- pixel_x = 28
- },
-/obj/item/screwdriver{
- pixel_y = 10
- },
-/obj/item/radio/off,
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
- dir = 4
+ dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/closet/secure_closet/security/med,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 8
+/obj/structure/table,
+/obj/machinery/recharger{
+ pixel_y = 4;
+ pixel_x = 6
+ },
+/obj/item/radio/off{
+ pixel_y = 8;
+ pixel_x = -7
+ },
+/obj/item/screwdriver{
+ pixel_y = -5
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
@@ -63247,16 +63311,9 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"rlF" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Security Office";
- req_access_txt = "63"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/white,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/security/checkpoint/medical)
"rmz" = (
/obj/effect/turf_decal/tile/blue,
@@ -63385,13 +63442,13 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/factory)
"rrr" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
/obj/effect/landmark/start/paramedic,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"rrH" = (
@@ -63547,9 +63604,16 @@
/turf/open/floor/plating,
/area/security/brig)
"ruF" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
+/obj/machinery/door/airlock/security/glass{
+ id_tag = "outerbrig";
+ name = "Security Office";
+ req_access_txt = "63"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white,
/area/security/checkpoint/medical)
"rvv" = (
/obj/machinery/status_display/ai{
@@ -63571,16 +63635,12 @@
},
/area/maintenance/port/fore)
"rww" = (
-/obj/structure/sign/poster/official/medical_green_cross{
- pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/machinery/light/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"rwA" = (
@@ -63892,6 +63952,9 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"rEN" = (
@@ -64642,8 +64705,11 @@
/area/medical/virology)
"rXK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -64895,6 +64961,22 @@
},
/turf/open/floor/plasteel,
/area/security/range)
+"shO" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "secdorm1"
+ },
+/turf/open/floor/plating,
+/area/security/office)
"shR" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -65486,15 +65568,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"syN" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
},
-/obj/effect/turf_decal/trimline/blue/filled/line{
+/obj/machinery/light/directional/west,
+/obj/item/kirbyplants/random,
+/obj/machinery/firealarm/directional/south{
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/area/command/heads_quarters/cmo)
"syY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/mineral/wood,
@@ -65688,7 +65771,6 @@
/area/commons/fitness)
"sFg" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -65721,12 +65803,12 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"sHy" = (
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 1
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
+/obj/effect/turf_decal/trimline/blue/filled/warning{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"sHO" = (
@@ -66098,6 +66180,16 @@
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/command/heads_quarters/ntr)
+"sTk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
"sTA" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -66493,13 +66585,13 @@
/obj/machinery/requests_console{
department = "Chief Medical Officer's Desk";
name = "Chief Medical Officer RC";
- pixel_y = 32
+ pixel_y = 32;
+ announcementConsole = 1
},
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
-/obj/structure/bed/dogbed/runtime,
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
"tdx" = (
@@ -67456,6 +67548,16 @@
"tHe" = (
/turf/closed/wall/r_wall,
/area/maintenance/prison/aft)
+"tHo" = (
+/obj/effect/turf_decal/tile/blue/opposingcorners{
+ dir = 8
+ },
+/obj/structure/chair/office/light,
+/obj/machinery/keycard_auth{
+ pixel_y = 25
+ },
+/turf/open/floor/plasteel/white,
+/area/command/heads_quarters/cmo)
"tHy" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -67657,12 +67759,24 @@
/turf/open/floor/plasteel,
/area/security/processing)
"tMN" = (
-/obj/structure/reagent_dispensers/peppertank{
- pixel_x = 30
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
- dir = 4
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/obj/item/pen{
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/book/manual/splurt_space_law{
+ pixel_x = -7;
+ pixel_y = 3
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
@@ -68114,6 +68228,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/effect/turf_decal/trimline/blue/filled/corner,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"uaV" = (
@@ -68257,6 +68372,9 @@
name = "CMO Office"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plating,
/area/command/heads_quarters/cmo)
"ugG" = (
@@ -68632,6 +68750,14 @@
dir = 1
},
/area/science)
+"urM" = (
+/obj/machinery/button/door{
+ id = "secdorm2";
+ name = "Cabin Shutters";
+ pixel_y = -25
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/office)
"usE" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/rack,
@@ -68771,12 +68897,26 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"uvV" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/button/door{
+ desc = "A remote control switch for the medbay foyer.";
+ id = "MedbayFoyer";
+ name = "Medbay Doors Control";
+ normaldoorcontrol = 1;
+ pixel_y = 26;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/computer/secure_data,
+/turf/open/floor/plasteel,
+/area/security/checkpoint/medical)
"uvZ" = (
/obj/structure/mineral_door/wood,
/turf/open/floor/wood,
@@ -69026,13 +69166,13 @@
/turf/open/floor/spooktime/cobble/roadmid,
/area/service/park)
"uEG" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/trimline/blue/filled/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"uEK" = (
@@ -69688,11 +69828,14 @@
/area/service/chapel/main)
"uXn" = (
/obj/structure/table,
-/obj/item/book/manual/splurt_space_law,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/item/radio/off,
+/obj/item/screwdriver{
+ pixel_y = 10
+ },
/turf/open/floor/plasteel,
/area/security/checkpoint/science)
"uXt" = (
@@ -69838,6 +69981,16 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/service/bar)
+"veL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "secdorm1"
+ },
+/turf/open/floor/plating,
+/area/security/office)
"vfS" = (
/turf/open/floor/carpet,
/area/commons/cryopod)
@@ -70716,8 +70869,8 @@
/area/command/bridge)
"vFm" = (
/obj/effect/turf_decal/trimline/blue/filled/warning,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
+/obj/effect/turf_decal/trimline/blue/filled/corner{
+ dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -71961,7 +72114,7 @@
},
/obj/effect/turf_decal/trimline/blue/filled/warning,
/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
+ dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
@@ -72139,10 +72292,6 @@
/turf/open/floor/carpet/royalblack,
/area/command/bridge)
"woh" = (
-/obj/structure/chair/office/light{
- dir = 8
- },
-/obj/effect/landmark/start/chief_medical_officer,
/obj/machinery/button/door{
id = "cmoprivacy";
name = "CMO Shutter Control";
@@ -72156,6 +72305,7 @@
/obj/machinery/light_switch{
pixel_x = 28
},
+/obj/machinery/suit_storage_unit/cmo,
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/cmo)
"won" = (
@@ -72180,8 +72330,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"woL" = (
-/obj/machinery/suit_storage_unit/cmo,
-/obj/machinery/light/directional/west,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 8
},
@@ -73129,22 +73277,10 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
"wWk" = (
-/obj/machinery/power/apc{
- areastring = "/area/security/checkpoint/medical";
- dir = 8;
- name = "Medbay Security APC";
- pixel_x = -25
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"wWo" = (
@@ -105423,7 +105559,7 @@ aaa
aaa
aaa
aaa
-orP
+veL
bvj
kHv
adR
@@ -105680,7 +105816,7 @@ aaa
aaa
aaa
aaf
-joD
+shO
gnA
gnA
uNQ
@@ -105937,7 +106073,7 @@ aaa
aaa
aaa
aaa
-jke
+pSP
eDH
adR
adR
@@ -106452,7 +106588,7 @@ aaa
aaa
aaa
orP
-eDH
+urM
adR
adR
kfC
@@ -111661,7 +111797,7 @@ biu
olT
bDQ
oQV
-sqv
+iYv
rXK
aqk
xms
@@ -111913,11 +112049,11 @@ aYV
bdp
bet
wng
-pju
-bhh
-bvm
-bhh
-sMd
+cVT
+tCt
+tCt
+mUE
+wpD
eoX
sHy
uWN
@@ -112169,12 +112305,12 @@ aJC
aYV
bdp
bet
-bof
-nbI
-cVT
-uvV
-tCt
-wpD
+bfK
+bhi
+bhi
+bhi
+bfK
+bfK
liI
hcR
bqQ
@@ -112427,12 +112563,12 @@ bcs
bdp
bev
bfK
+uvV
+tMN
+rjX
+bze
+bvm
bhi
-bhi
-bhi
-bfK
-bfK
-bfK
rww
bqQ
oAQ
@@ -112943,7 +113079,7 @@ chp
bfK
bhj
biw
-biw
+anO
bak
flj
rlF
@@ -113198,13 +113334,13 @@ aYV
bdp
chp
bfK
-iCd
-biy
-hKW
-tMN
-rjX
-bhi
-iho
+bfK
+bfK
+bfK
+bfK
+llb
+bfK
+sTk
akR
hcD
bof
@@ -113454,13 +113590,13 @@ aQg
rQK
vad
mvt
-bfK
-bfK
-bfK
-bfK
-bfK
-llb
-bfK
+bBN
+eIz
+nLt
+hKW
+syN
+biy
+iCd
euE
vXl
uDf
@@ -113712,12 +113848,12 @@ aYV
bdp
chp
bBN
-kKT
-anO
+tHo
+oRS
kPu
woL
gyS
-syN
+gcv
iho
vXl
hrI
@@ -114227,7 +114363,7 @@ bdp
nLD
bBN
jYp
-oRS
+nbI
sSZ
fwc
kae
@@ -114483,7 +114619,7 @@ aYV
bdp
jcd
bBN
-mUE
+kKT
woh
iMw
dyh
@@ -116331,7 +116467,7 @@ bAw
bFr
ceJ
ccM
-ccM
+cmk
cng
bzs
bzs
@@ -116588,7 +116724,7 @@ ciH
bHd
bzs
bAw
-cmk
+bAw
cnf
bzs
aaf
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index c951b4320a92..28af182d50bf 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -90655,8 +90655,8 @@
/obj/item/kirbyplants/random,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light_switch{
- pixel_x = 22;
- pixel_y = -10
+ pixel_x = 25;
+ pixel_y = -2
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -117882,12 +117882,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue,
-/obj/item/wallframe/light_fixture/small{
- pixel_y = -15
- },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
/area/medical/paramedic)
"uhb" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index f768f7799ae9..fa50623713c2 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -9136,7 +9136,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/beacon,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/explab)
"aqr" = (
@@ -11523,11 +11523,14 @@
dir = 8
},
/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -4;
- pixel_y = 4
+/obj/item/storage/box/beakers{
+ pixel_y = 10;
+ pixel_x = 8
+ },
+/obj/item/stack/cable_coil{
+ pixel_x = 1;
+ pixel_y = 2
},
-/obj/item/pen,
/obj/machinery/requests_console{
department = "Science";
departmentType = 2;
@@ -11535,9 +11538,6 @@
pixel_y = 30;
receive_ore_updates = 1
},
-/obj/machinery/light{
- dir = 1
- },
/turf/open/floor/plasteel/dark,
/area/science/explab)
"auf" = (
@@ -11559,6 +11559,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/science/explab)
"aug" = (
@@ -13931,23 +13934,16 @@
/turf/closed/wall/r_wall,
/area/science/explab)
"ayx" = (
-/obj/machinery/computer/rdconsole/experiment{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
/turf/open/floor/plasteel/dark,
/area/science/explab)
"ayy" = (
@@ -15540,6 +15536,10 @@
pixel_y = 4
},
/obj/item/stock_parts/cell/high,
+/obj/item/book/manual/wiki/experimentor{
+ pixel_x = -12;
+ pixel_y = -6
+ },
/turf/open/floor/plasteel/dark,
/area/science/explab)
"aBa" = (
@@ -18023,6 +18023,7 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
+/obj/item/beacon,
/turf/open/floor/engine,
/area/science/explab)
"aFt" = (
@@ -21718,20 +21719,18 @@
/turf/closed/wall/r_wall,
/area/engineering/main)
"aLO" = (
+/obj/effect/turf_decal/tile/purple{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple,
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/poddoor/preopen{
- id = "telelab";
- name = "Test Chamber Blast Door"
- },
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/door/airlock/research/glass{
- name = "Experimentor Lab";
- req_one_access_txt = "7;29"
+/obj/machinery/computer/rdconsole/experiment{
+ dir = 4
},
-/turf/open/floor/engine,
+/turf/open/floor/plasteel/showroomfloor,
/area/science/explab)
"aLP" = (
/obj/effect/turf_decal/tile/purple{
@@ -29001,6 +29000,14 @@
"aWV" = (
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
+/obj/effect/turf_decal/box/corners{
+ dir = 8
+ },
+/obj/machinery/button/door{
+ id = "telelab";
+ name = "Test Chamber Toggle";
+ pixel_y = 25
+ },
/turf/open/floor/engine,
/area/science/explab)
"aWW" = (
@@ -29055,9 +29062,11 @@
},
/area/maintenance/central)
"aXb" = (
-/obj/effect/landmark/blobstart,
-/obj/effect/landmark/xeno_spawn,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 4
+ },
+/obj/effect/landmark/blobstart,
/turf/open/floor/engine,
/area/science/explab)
"aXc" = (
@@ -29190,7 +29199,6 @@
/area/science/lab)
"aXo" = (
/obj/machinery/rnd/experimentor,
-/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/explab)
"aXp" = (
@@ -29536,6 +29544,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 5
},
+/obj/effect/turf_decal/box/corners,
/turf/open/floor/engine,
/area/science/explab)
"aXT" = (
@@ -29550,15 +29559,31 @@
},
/area/maintenance/central/secondary)
"aXU" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -4;
+ pixel_y = 4
+ },
/obj/machinery/button/door{
id = "telelab";
name = "Test Chamber Toggle";
- pixel_y = 25
+ pixel_x = 9;
+ pixel_y = 5
},
-/obj/effect/turf_decal/box/corners{
- dir = 8
+/obj/item/pen,
+/obj/item/pen{
+ pixel_x = -2;
+ pixel_y = -2
},
-/turf/open/floor/engine,
+/obj/item/folder{
+ pixel_x = 11;
+ pixel_y = -8
+ },
+/turf/open/floor/plasteel/dark,
/area/science/explab)
"aXV" = (
/obj/structure/sink{
@@ -29686,18 +29711,21 @@
},
/area/science/robotics/mechbay)
"aYj" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
-/obj/machinery/door/poddoor/preopen{
- id = "telelab";
- name = "Test Chamber Blast Door"
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
/area/science/explab)
"aYk" = (
/obj/machinery/door/firedoor,
@@ -30218,9 +30246,9 @@
/obj/effect/turf_decal/bot,
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/ai_monitored/turret_protected/ai_upload";
- dir = 1;
name = "Upload APC";
- pixel_y = 23
+ pixel_x = 0;
+ pixel_y = -24
},
/obj/structure/cable,
/turf/open/floor/engine,
@@ -32761,26 +32789,22 @@
/turf/open/floor/plasteel/dark,
/area/science/mixing/chamber)
"bdb" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
-/turf/open/floor/engine,
-/area/science/explab)
-"bdc" = (
-/obj/structure/table,
-/obj/item/storage/box/beakers{
- pixel_y = 5
- },
-/obj/item/stack/cable_coil,
-/obj/machinery/button/door{
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/preopen{
id = "telelab";
- name = "Test Chamber Toggle";
- pixel_x = -24
+ name = "Test Chamber Blast Door"
},
+/turf/open/floor/plating,
+/area/science/explab)
+"bdc" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/closet/bombcloset,
/turf/open/floor/plasteel/dark,
/area/science/explab)
"bdd" = (
@@ -32800,6 +32824,7 @@
name = "science camera";
network = list("ss13","rd")
},
+/obj/effect/landmark/xeno_spawn,
/turf/open/floor/engine,
/area/science/explab)
"bdf" = (
@@ -33119,6 +33144,10 @@
/obj/effect/turf_decal/box/corners{
dir = 1
},
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
/turf/open/floor/engine,
/area/science/explab)
"bdB" = (
@@ -33336,29 +33365,29 @@
},
/area/maintenance/starboard)
"bdR" = (
-/obj/structure/table,
-/obj/item/folder{
- pixel_x = -6
- },
-/obj/item/book/manual/wiki/experimentor,
-/obj/item/pen,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
+/obj/structure/closet/l3closet/scientist,
/turf/open/floor/plasteel/dark,
/area/science/explab)
"bdS" = (
-/obj/effect/turf_decal/box/corners,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
+/obj/machinery/door/poddoor/preopen{
+ id = "telelab";
+ name = "Test Chamber Blast Door"
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/machinery/door/airlock/research/glass{
+ name = "Experimentor Lab";
+ req_one_access_txt = "7;29"
},
/turf/open/floor/engine,
/area/science/explab)
@@ -122169,7 +122198,7 @@ aWY
aFs
aqq
bdA
-bah
+aZS
aXg
aAT
aAC
@@ -122937,10 +122966,10 @@ alB
aeT
agg
aWY
-aXU
+aXc
bdb
bdS
-bah
+aZS
aZC
bad
aBr
@@ -123194,7 +123223,7 @@ alB
aqa
aga
aWY
-aXc
+aXU
aLO
aYj
bah
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index db92697ada19..6c63a4e0ae4f 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -28001,13 +28001,12 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"ckC" = (
-/obj/structure/lattice,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Incinerator Output Pump"
},
/obj/structure/disposalpipe/segment,
-/turf/open/space,
-/area/space/nearstation)
+/turf/open/floor/plating/airless,
+/area/maintenance/disposal/incinerator)
"ckD" = (
/obj/machinery/light/small{
dir = 8
@@ -55128,16 +55127,32 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"gZf" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
-/obj/item/toy/figure/qm,
+/obj/structure/table,
+/obj/item/cartridge/quartermaster{
+ pixel_x = 11;
+ pixel_y = 14
+ },
+/obj/item/clipboard{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/gps{
+ gpstag = "QM0";
+ pixel_x = -4;
+ pixel_y = -1
+ },
+/obj/item/cartridge/quartermaster{
+ pixel_x = 11;
+ pixel_y = 10
+ },
+/obj/item/cartridge/quartermaster{
+ pixel_x = 11;
+ pixel_y = 6
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"gZo" = (
@@ -56464,12 +56479,12 @@
/area/service/chapel/main)
"hDb" = (
/obj/effect/landmark/start/quartermaster,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
/obj/structure/chair/office/dark{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"hDz" = (
@@ -56896,8 +56911,6 @@
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/restrooms)
"hMN" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/holopad/secure,
/turf/open/floor/plasteel,
/area/cargo/qm)
"hMQ" = (
@@ -59796,6 +59809,10 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
+/obj/machinery/holopad/secure{
+ pixel_x = 16;
+ pixel_y = -16
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"jit" = (
@@ -65915,14 +65932,19 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"lYW" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = 5;
+ pixel_y = 7
+ },
+/obj/item/toy/figure/qm{
+ pixel_x = -8;
+ pixel_y = 4
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"lYZ" = (
@@ -66246,19 +66268,14 @@
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/restrooms)
"mgb" = (
-/obj/structure/table,
-/obj/item/folder/yellow,
-/obj/item/pen{
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/pen/red,
/obj/machinery/requests_console{
department = "Cargo Bay";
departmentType = 2;
pixel_x = 32
},
-/obj/item/stamp/qm,
+/obj/machinery/computer/card/minor/qm{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"mgh" = (
@@ -67331,8 +67348,16 @@
/obj/machinery/status_display/supply{
pixel_x = 32
},
-/obj/machinery/computer/card/minor/qm{
- dir = 8
+/obj/structure/table,
+/obj/item/folder/yellow,
+/obj/item/stamp/qm{
+ pixel_x = -8;
+ pixel_y = -4
+ },
+/obj/item/pen/red,
+/obj/item/pen{
+ pixel_x = 4;
+ pixel_y = 4
},
/turf/open/floor/plasteel,
/area/cargo/qm)
@@ -81798,19 +81823,6 @@
/turf/closed/wall,
/area/command/bridge)
"tmr" = (
-/obj/structure/table,
-/obj/item/cartridge/quartermaster{
- pixel_x = -4;
- pixel_y = 7
- },
-/obj/item/cartridge/quartermaster{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/item/cartridge/quartermaster,
-/obj/item/gps{
- gpstag = "QM0"
- },
/obj/effect/turf_decal/tile/brown{
dir = 1
},
@@ -81820,7 +81832,10 @@
/obj/machinery/keycard_auth{
pixel_y = 23
},
-/obj/item/clipboard,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"tmB" = (
@@ -83423,6 +83438,9 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/plasteel,
/area/cargo/qm)
"tXR" = (
diff --git a/_maps/map_files/Mining/Lavaland_novaya.dmm b/_maps/map_files/Mining/Lavaland_novaya.dmm
index d60c7cb2ae9f..de9990dea293 100644
--- a/_maps/map_files/Mining/Lavaland_novaya.dmm
+++ b/_maps/map_files/Mining/Lavaland_novaya.dmm
@@ -1040,10 +1040,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"bbm" = (
@@ -1385,10 +1387,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"bqt" = (
@@ -1542,10 +1546,12 @@
"bwq" = (
/obj/item/stack/cable_coil/cut/yellow,
/obj/item/stack/rods,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mine/storage)
"bwu" = (
@@ -1730,7 +1736,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/blue,
/area/mine/living_quarters)
"bCt" = (
@@ -1959,7 +1967,9 @@
/area/mine/living_quarters)
"bOE" = (
/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/purple,
/area/mine/living_quarters)
"bPW" = (
@@ -2161,7 +2171,9 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -2309,10 +2321,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/checker,
/area/mine/living_quarters)
"cfK" = (
@@ -3012,7 +3026,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -3038,10 +3054,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/production)
"cUw" = (
@@ -3089,7 +3107,9 @@
/area/ruin/lavaland/unpowered/deepspaceone/dormitories)
"cWb" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"cWi" = (
@@ -3185,10 +3205,12 @@
req_access_txt = "47"
},
/obj/structure/barricade/wooden/crude,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/storage)
"cZi" = (
@@ -3772,10 +3794,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"dCm" = (
@@ -3789,10 +3813,12 @@
icon_state = "4-8"
},
/obj/item/stack/rods,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mine/storage)
"dCW" = (
@@ -4007,10 +4033,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mine/storage)
"dNb" = (
@@ -4398,7 +4426,9 @@
/area/ruin/lavaland/unpowered/deepspaceone/medbay)
"ehA" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -4618,7 +4648,9 @@
/area/lavaland/necropolis)
"ewQ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/eva)
"exN" = (
@@ -4977,7 +5009,9 @@
name = "EVA Atrium"
},
/obj/structure/barricade/wooden/crude,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -5002,7 +5036,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"eRu" = (
@@ -5665,10 +5701,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"fBA" = (
@@ -5933,10 +5971,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"fPq" = (
@@ -6042,7 +6082,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -6736,6 +6778,12 @@
},
/turf/open/floor/plating,
/area/mine/production)
+"gDA" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/mine/laborcamp)
"gFp" = (
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -7297,10 +7345,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"hko" = (
@@ -7730,7 +7780,9 @@
/turf/open/floor/wood,
/area/ruin/lavaland/unpowered/deepspaceone/cargo)
"hFc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -7764,10 +7816,12 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"hHf" = (
@@ -7990,7 +8044,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -8119,10 +8175,12 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"hXt" = (
@@ -8276,7 +8334,9 @@
"iif" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"iiJ" = (
@@ -9966,10 +10026,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"jSD" = (
@@ -10203,7 +10265,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"kgt" = (
@@ -11259,10 +11323,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"lar" = (
@@ -11649,10 +11715,12 @@
/obj/structure/sign/poster/official/cleanliness{
pixel_y = 32
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp)
"lro" = (
@@ -11701,11 +11769,13 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/barricade/wooden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/stairs/medium{
dir = 4
},
@@ -12035,7 +12105,9 @@
/area/mine/storage)
"lFN" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/mine/storage)
@@ -12759,7 +12831,9 @@
/area/mine/storage)
"mmJ" = (
/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/blue,
/area/mine/living_quarters)
"mmN" = (
@@ -13269,10 +13343,12 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp/security)
"mKg" = (
@@ -13507,7 +13583,9 @@
/area/mine/living_quarters)
"mSO" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/storage)
"mSQ" = (
@@ -13675,7 +13753,9 @@
/area/ruin/lavaland/unpowered)
"mZL" = (
/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
@@ -14128,10 +14208,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/production)
"nuF" = (
@@ -14158,7 +14240,9 @@
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/necropolis)
"nvH" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/eva)
"nvN" = (
@@ -14852,10 +14936,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"obc" = (
@@ -14990,7 +15076,9 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -15334,10 +15422,12 @@
req_access_txt = "2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp/security)
"oAU" = (
@@ -15361,6 +15451,13 @@
},
/turf/open/floor/plasteel,
/area/ruin/lavaland/unpowered/deepspaceone/engineering)
+"oBr" = (
+/obj/structure/spider/stickyweb,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/turf/open/floor/carpet/royalblue,
+/area/mine/storage)
"oBu" = (
/obj/structure/chair/office/light{
dir = 8
@@ -16881,10 +16978,12 @@
/turf/open/floor/plasteel/dark,
/area/mine/storage)
"qhq" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"qhz" = (
@@ -17072,7 +17171,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"qnJ" = (
@@ -17205,10 +17306,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp/security)
"qwa" = (
@@ -17342,7 +17445,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"qBo" = (
@@ -17361,10 +17466,12 @@
dir = 1;
network = list("labor")
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"qDm" = (
@@ -18138,10 +18245,12 @@
name = "Chemistry Lab";
req_access_txt = "47,54,29"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mine/storage)
"rkT" = (
@@ -18515,7 +18624,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/mine/living_quarters)
"rDx" = (
@@ -18640,17 +18751,21 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"rMK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/red,
/area/mine/living_quarters)
"rMV" = (
@@ -18884,10 +18999,12 @@
/area/mine/xenoarch_area_a)
"rXy" = (
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp)
"rXL" = (
@@ -18937,10 +19054,12 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"rZj" = (
@@ -19049,7 +19168,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/purple,
/area/mine/living_quarters)
"siF" = (
@@ -19109,6 +19230,18 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/mine/xenoarch_area_c)
+"skL" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/mine/storage)
"slg" = (
/obj/structure/stone_tile/block{
dir = 4
@@ -19751,7 +19884,9 @@
/area/ruin/lavaland/unpowered/deepspaceone/testlab)
"sUC" = (
/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -20348,10 +20483,12 @@
name = "Chemistry Lab";
req_access_txt = "47,54,29"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mine/storage)
"tBS" = (
@@ -21249,7 +21386,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"urU" = (
@@ -21691,10 +21830,12 @@
/turf/open/indestructible/hoteltile,
/area/ruin/lavaland/unpowered/deepspaceone/main)
"uSs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/laborcamp)
"uSR" = (
@@ -21734,7 +21875,9 @@
/turf/open/floor/plasteel,
/area/mine/storage)
"uUa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -22480,7 +22623,9 @@
/area/mine/living_quarters)
"vID" = (
/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/carpet/red,
/area/mine/living_quarters)
"vIK" = (
@@ -22509,7 +22654,9 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/lavaland/unpowered/ash_walkers)
"vKw" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
@@ -23840,10 +23987,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/mine/living_quarters)
"wXi" = (
@@ -24566,7 +24715,9 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"xCk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/mine/eva)
"xCA" = (
@@ -51390,7 +51541,7 @@ tpN
qhq
xjP
hBv
-wJF
+gDA
jQa
dSf
lbk
@@ -51647,7 +51798,7 @@ oBO
dMM
kPS
kgt
-wJF
+gDA
jUL
hBv
sjG
@@ -67051,7 +67202,7 @@ gIl
gIl
hqv
rmn
-bpF
+skL
oIo
mKn
uiT
@@ -68856,7 +69007,7 @@ hmc
gfP
xeB
wos
-ikU
+oBr
fHL
wSy
mWh
diff --git a/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm b/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm
index f081b8367486..00ce27947b85 100644
--- a/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm
+++ b/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm
@@ -8339,13 +8339,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/hallway/primary/fore)
-"ate" = (
-/obj/effect/landmark/xeno_spawn,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/carpet/black,
-/area/commons/dorms)
"atf" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -33512,7 +33505,6 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bHq" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -33522,6 +33514,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/structure/disposalpipe/junction,
/turf/open/floor/plating,
/area/maintenance/aft)
"bHr" = (
@@ -35545,8 +35538,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/aft)
"bMf" = (
@@ -60849,12 +60842,12 @@
/turf/open/floor/plasteel/kitchen_coldroom,
/area/commons/dorms)
"puV" = (
-/obj/structure/chair/sofa/corp/right{
- dir = 1
- },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/chair/sofa/corp/left{
+ dir = 1
+ },
/turf/open/floor/mineral/plastitanium/red,
/area/maintenance/bar)
"pvJ" = (
@@ -89445,7 +89438,7 @@ bCq
mqZ
rVy
cNW
-rgW
+aCr
bcU
dfL
aXL
@@ -89702,7 +89695,7 @@ bCq
mqZ
fLN
fxa
-aCr
+rgW
bcU
dfL
aLt
@@ -90736,7 +90729,7 @@ fxa
puV
rVy
fxa
-sAH
+oKh
bLv
bUs
bLv
@@ -90987,13 +90980,13 @@ bCq
mqZ
usO
xJa
-oKh
+sAH
usO
mpI
-oKh
+sAH
usO
izv
-oKh
+sAH
bCq
bUs
bCq
@@ -97602,7 +97595,7 @@ aod
aqe
ctq
apY
-ate
+ath
ctq
apY
ath
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index dd8da4045eda..7aed68e19de6 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -3448,7 +3448,7 @@
/area/security/prison)
"ajD" = (
/turf/closed/wall/r_wall,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"ajE" = (
/turf/closed/wall/r_wall,
/area/security/execution/transfer)
@@ -3724,7 +3724,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"aks" = (
/obj/structure/window/reinforced{
dir = 4
@@ -3738,7 +3738,7 @@
/obj/effect/turf_decal/tile/blue,
/obj/structure/closet/secure_closet/medical2,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"aku" = (
/obj/machinery/airalarm{
pixel_y = 22
@@ -3751,7 +3751,7 @@
},
/obj/machinery/computer/crew,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"akx" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4021,13 +4021,13 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"alk" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 6
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"all" = (
/obj/machinery/door/window/westleft{
dir = 4;
@@ -4041,7 +4041,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"aln" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -4242,7 +4242,7 @@
},
/obj/effect/landmark/start/brigdoc,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"alV" = (
/obj/machinery/door/window/westleft{
base_state = "right";
@@ -4261,7 +4261,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"alW" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -45641,7 +45641,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cjl" = (
/obj/structure/chair/wood/normal,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -46820,7 +46820,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cnQ" = (
/obj/machinery/door/window/southleft{
name = "Operating room";
@@ -46835,7 +46835,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cnV" = (
/turf/closed/wall/r_wall,
/area/command/heads_quarters/hos)
@@ -47674,7 +47674,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cqU" = (
/obj/structure/window/reinforced{
dir = 4
@@ -48996,7 +48996,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cwk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -49006,7 +49006,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cwl" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -49042,7 +49042,7 @@
},
/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cwo" = (
/obj/machinery/light/small{
dir = 1
@@ -49065,7 +49065,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cwr" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
@@ -49199,7 +49199,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cxh" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "datboidetective";
@@ -49264,7 +49264,7 @@
"cxL" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cxM" = (
/obj/structure/window/reinforced/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -49309,7 +49309,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"cyz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -50399,7 +50399,7 @@
req_access_txt = "71"
},
/turf/open/floor/plating,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"deJ" = (
/turf/open/floor/plasteel/yellowsiding/corner,
/area/hallway/secondary/entry)
@@ -50850,7 +50850,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"dFJ" = (
/turf/open/floor/engine,
/area/engineering/supermatter)
@@ -50865,7 +50865,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"dHo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -51042,7 +51042,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"dVI" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -51092,7 +51092,7 @@
/obj/effect/turf_decal/tile/blue,
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"dYe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -52464,7 +52464,7 @@
pixel_y = 2
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"fWv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
@@ -53855,7 +53855,7 @@
/obj/machinery/suit_storage_unit/cmo,
/obj/machinery/light,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"hOz" = (
/obj/item/weldingtool,
/turf/open/floor/plating,
@@ -54723,7 +54723,7 @@
/obj/item/clothing/suit/armor/vest/alt,
/obj/item/defibrillator,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"iZO" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -54826,7 +54826,7 @@
/obj/item/clothing/suit/armor/brigdoc,
/obj/item/defibrillator,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"jhk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -56576,7 +56576,7 @@
icon_state = "plant-10"
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"lNW" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -58803,7 +58803,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"oEG" = (
/obj/structure/mirror{
icon_state = "mirror_broke";
@@ -59857,7 +59857,7 @@
dir = 9
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"pVD" = (
/obj/machinery/light/small{
dir = 1
@@ -60448,7 +60448,7 @@
},
/obj/machinery/light,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"qOE" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -60515,7 +60515,7 @@
"qSj" = (
/obj/machinery/vending/wallmed,
/turf/closed/wall/r_wall,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"qTV" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -60705,7 +60705,7 @@
light_color = "#cee5d2"
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"rbe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -61002,7 +61002,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"rxa" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -61547,12 +61547,10 @@
dir = 1
},
/obj/effect/turf_decal/tile/blue,
-/obj/machinery/power/apc/auto_name/south{
- name = "Brig Infirmary"
- },
/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/south,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"slJ" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -62240,7 +62238,7 @@
/area/engineering/main)
"tmm" = (
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"tmE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
@@ -62409,7 +62407,7 @@
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"tyL" = (
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 2;
@@ -63462,7 +63460,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"vay" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -64536,7 +64534,7 @@
},
/obj/machinery/vending/brigdoc_vendomat,
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"wta" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -65170,7 +65168,7 @@
dir = 10
},
/turf/open/floor/plasteel/white,
-/area/security/processing/cremation)
+/area/security/brig/brig_medical)
"xgh" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
index a60cbb7c8f25..04e1346b9432 100644
--- a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
+++ b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
@@ -8304,13 +8304,6 @@
},
/turf/open/floor/mineral/plastitanium,
/area/hallway/primary/fore)
-"ate" = (
-/obj/effect/landmark/xeno_spawn,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/carpet/black,
-/area/commons/dorms)
"atf" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -33405,7 +33398,6 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bHq" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -33415,6 +33407,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/structure/disposalpipe/junction,
/turf/open/floor/plating,
/area/maintenance/aft)
"bHr" = (
@@ -35424,8 +35417,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/junction,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/aft)
"bMf" = (
@@ -97656,7 +97649,7 @@ aod
aqe
ctq
apY
-ate
+ath
ctq
apY
ath
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 48833557720c..38c6be181029 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -10939,12 +10939,6 @@
},
/turf/open/floor/plasteel/bluespace,
/area/centcom)
-"clt" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree4"
- },
-/turf/open/floor/grass/grass0,
-/area/centcom/holding)
"clL" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -10961,12 +10955,6 @@
/obj/structure/fans/tiny/invisible,
/turf/open/indestructible/hoteltile,
/area/centcom/holding)
-"clV" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree3"
- },
-/turf/open/floor/grass/grass0,
-/area/centcom/holding)
"cmn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -13115,7 +13103,7 @@
/area/centcom/control)
"eqf" = (
/obj/machinery/door/airlock/centcom{
- name = "Medical Bay";
+ name = "VIP cell 1";
req_access_txt = "154"
},
/turf/open/floor/plasteel/dark/side{
@@ -14444,12 +14432,6 @@
/obj/item/immortality_talisman,
/turf/open/floor/plasteel/bluespace,
/area/centcom)
-"fvP" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree6"
- },
-/turf/open/floor/grass/grass0,
-/area/centcom/holding)
"fvW" = (
/obj/effect/turf_decal/tile/dark_blue/half,
/obj/effect/turf_decal/delivery,
@@ -14598,9 +14580,7 @@
/area/tdome/arena_source)
"fAu" = (
/obj/structure/flora/ausbushes/lavendergrass,
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree6"
- },
+/obj/structure/flora/tree/jungle/small,
/obj/structure/flora/rock/jungle,
/obj/structure/flora/junglebush,
/turf/open/floor/grass/grass2,
@@ -18263,7 +18243,7 @@
/area/syndicate_mothership/control)
"iNE" = (
/obj/machinery/door/airlock/centcom{
- name = "Medical Bay";
+ name = "VIP cell 3";
req_access_txt = "154"
},
/turf/open/floor/plating,
@@ -26965,9 +26945,7 @@
/turf/open/floor/grass/grass0,
/area/centcom/holding)
"qLP" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree5"
- },
+/obj/structure/flora/tree/jungle/small,
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/rock/jungle,
/turf/open/floor/grass,
@@ -27490,7 +27468,7 @@
dir = 8
},
/obj/machinery/door/airlock/centcom{
- name = "Medical Bay";
+ name = "VIP cells";
req_access_txt = "154"
},
/turf/open/floor/plasteel,
@@ -30756,9 +30734,7 @@
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"ukF" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree3"
- },
+/obj/structure/flora/tree/jungle/small,
/obj/structure/flora/bush,
/turf/open/floor/grass/grass2,
/area/centcom/control)
@@ -31855,12 +31831,6 @@
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
-"vgJ" = (
-/obj/structure/flora/tree/jungle/small{
- icon_state = "tree5"
- },
-/turf/open/floor/grass/grass0,
-/area/centcom/holding)
"vgW" = (
/obj/structure/bed/double,
/turf/open/floor/carpet,
@@ -48161,8 +48131,8 @@ fON
fON
fON
fON
-clt
-clt
+pbN
+pbN
fON
fON
fON
@@ -49216,7 +49186,7 @@ ncJ
ncJ
ncJ
ncJ
-fvP
+pbN
ncJ
ncJ
ncJ
@@ -51278,7 +51248,7 @@ cwD
ncJ
ncJ
ncJ
-clV
+pbN
fON
fON
fON
@@ -55632,7 +55602,7 @@ fON
fON
fON
fON
-vgJ
+pbN
fON
fON
fON
@@ -57433,8 +57403,8 @@ aFe
uTC
aFe
aFe
-clt
-clt
+pbN
+pbN
fON
fON
fON
@@ -57952,7 +57922,7 @@ fON
fON
fON
fON
-clt
+pbN
hmY
hmY
hmY
@@ -58720,7 +58690,7 @@ oOC
fON
fON
fON
-clt
+pbN
fON
fON
fON
diff --git a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm
index f6af4bc3738c..19a632535ad7 100644
--- a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm
+++ b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm
@@ -16290,10 +16290,6 @@
icon_state = "wood_tile"
},
/area/maintenance/space_hut/cabin)
-"faj" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/openspace,
-/area/space/nearstation)
"fam" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/wood,
@@ -64721,10 +64717,6 @@
},
/turf/open/floor/circuit,
/area/science/nanite)
-"usD" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/openspace,
-/area/maintenance/department/science/upper)
"usO" = (
/obj/structure/chair/comfy,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -230900,7 +230892,7 @@ bAb
djY
djY
djY
-faj
+qbe
qbe
qbe
rOv
@@ -240918,7 +240910,7 @@ ylx
kWS
oxE
dFe
-usD
+pVM
pVM
pVM
pVM
diff --git a/code/__DEFINES/layers_planes.dm b/code/__DEFINES/layers_planes.dm
index 54f83ac4f9d8..40bedbd3de12 100644
--- a/code/__DEFINES/layers_planes.dm
+++ b/code/__DEFINES/layers_planes.dm
@@ -261,5 +261,8 @@
// Admin popup layer
#define ADMIN_POPUP_LAYER 1
+///Plane master controller keys
+#define PLANE_MASTERS_GAME "plane_masters_game"
+
///Layer for screentips
#define SCREENTIP_LAYER 40
diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm
index c0193241b0c0..2534b1bc7eed 100644
--- a/code/__DEFINES/lighting.dm
+++ b/code/__DEFINES/lighting.dm
@@ -188,7 +188,6 @@ do { \
#define CINEMATIC_LAYER -1
///Plane master controller keys
-#define PLANE_MASTERS_GAME "plane_masters_game"
#define PLANE_MASTERS_COLORBLIND "plane_masters_colorblind"
#define PLANE_CRITICAL_FUCKO_PARALLAX (PLANE_CRITICAL_DISPLAY|PLANE_CRITICAL_NO_EMPTY_RELAY)
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 5f5de24b22d1..71f9e4874c66 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -58,7 +58,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/list/inv_slots[SLOTS_AMT] // /atom/movable/screen/inventory objects, ordered by their slot ID.
var/list/hand_slots // /atom/movable/screen/inventory/hand objects, assoc list of "[held_index]" = object
var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
-
+ ///Assoc list of controller groups, associated with key string group name with value of the plane master controller ref
+ var/list/atom/movable/plane_master_controller/plane_master_controllers = list()
///UI for screentips that appear when you mouse over things
var/atom/movable/screen/screentip/screentip_text
@@ -116,6 +117,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/special/see_through_darkness)
+ for(var/mytype in subtypesof(/atom/movable/plane_master_controller))
+ var/atom/movable/plane_master_controller/controller_instance = new mytype(src)
+ plane_master_controllers[controller_instance.name] = controller_instance
+
screentip_text = new(null, src)
static_inventory += screentip_text
@@ -163,6 +168,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
combo_display = null
QDEL_LIST_ASSOC_VAL(plane_masters)
+ QDEL_LIST_ASSOC_VAL(plane_master_controllers)
QDEL_LIST(screenoverlays)
mymob = null
diff --git a/code/_onclick/hud/plane_master_controller.dm b/code/_onclick/hud/plane_master_controller.dm
new file mode 100644
index 000000000000..e27bd3bc5551
--- /dev/null
+++ b/code/_onclick/hud/plane_master_controller.dm
@@ -0,0 +1,87 @@
+///Atom that manages and controls multiple planes. It's an atom so we can hook into add_filter etc. Multiple controllers can control one plane.
+/atom/movable/plane_master_controller
+ ///List of planes in this controllers control. Initially this is a normal list, but becomes an assoc list of plane numbers as strings | plane instance
+ var/list/controlled_planes = list()
+ ///hud that owns this controller
+ var/datum/hud/owner_hud
+
+///Ensures that all the planes are correctly in the controlled_planes list.
+/atom/movable/plane_master_controller/New(hud)
+ . = ..()
+ owner_hud = hud
+ var/assoc_controlled_planes = list()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/instance = owner_hud.plane_masters["[i]"]
+ if(!instance) //If we looked for a hud that isn't instanced, just keep going
+ stack_trace("[i] isn't a valid plane master layer for [owner_hud.type], are you sure it exists in the first place?")
+ continue
+ assoc_controlled_planes["[i]"] = instance
+ controlled_planes = assoc_controlled_planes
+
+// From BeeStation
+/atom/movable/plane_master_controller/Destroy()
+ if(owner_hud)
+ owner_hud.plane_master_controllers -= src
+ controlled_planes.Cut()
+ return ..()
+
+///Full override so we can just use filterrific
+/atom/movable/plane_master_controller/add_filter(name, priority, list/params)
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.add_filter(name, priority, params)
+
+///Full override so we can just use filterrific
+/atom/movable/plane_master_controller/remove_filter(name_or_names)
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.remove_filter(name_or_names)
+
+/atom/movable/plane_master_controller/update_filters()
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.update_filters()
+
+///Gets all filters for this controllers plane masters
+/atom/movable/plane_master_controller/proc/get_filters(name)
+ . = list()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ . += pm_iterator.get_filter(name)
+
+///Transitions all filters owned by this plane master controller
+/atom/movable/plane_master_controller/transition_filter(name, time, list/new_params, easing, loop)
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.transition_filter(name, time, new_params, easing, loop)
+
+///Full override so we can just use filterrific
+/atom/movable/plane_master_controller/add_atom_colour(coloration, colour_priority)
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.add_atom_colour(coloration, colour_priority)
+
+
+///Removes an instance of colour_type from the atom's atom_colours list
+/atom/movable/plane_master_controller/remove_atom_colour(colour_priority, coloration)
+ . = ..()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.remove_atom_colour(colour_priority, coloration)
+
+
+///Resets the atom's color to null, and then sets it to the highest priority colour available
+/atom/movable/plane_master_controller/update_atom_colour()
+ for(var/i in controlled_planes)
+ var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i]
+ pm_iterator.update_atom_colour()
+
+
+/atom/movable/plane_master_controller/game
+ name = PLANE_MASTERS_GAME
+ controlled_planes = list(FLOOR_PLANE, GAME_PLANE, WALL_PLANE, ABOVE_WALL_PLANE, LIGHTING_PLANE, EMISSIVE_PLANE)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index ae25e4dc37f7..60e53490ced7 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -199,6 +199,7 @@ SUBSYSTEM_DEF(ticker)
// BLUEMOON ADD START - воут за карту и перезагрузка сервера, если прошлый раунд окончился крашем
if(mapvote_restarter_in_progress)
return
+ #ifndef LOWMEMORYMODE
if(!SSpersistence.CheckGracefulEnding())
SetTimeLeft(-1)
start_immediately = FALSE
@@ -207,6 +208,7 @@ SUBSYSTEM_DEF(ticker)
SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type)
to_chat(world, span_boldwarning("Активировано голосование за смену карты из-за неудачного завершения прошлого раунда. После его окончания сервер будет перезапущен."))
return
+ #endif
// BLUEMOON ADD END
//lobby stats for statpanels
@@ -225,8 +227,13 @@ SUBSYSTEM_DEF(ticker)
var/forcemode = CONFIG_GET(string/force_gamemode)
if(forcemode)
force_gamemode(forcemode)
+ #ifndef LOWMEMORYMODE
if(!forcemode || (GLOB.master_mode == "dynamic" && CONFIG_GET(flag/dynamic_voting)))
send_gamemode_vote()
+ #else
+ modevoted = TRUE
+ SEND_SOUND(world, sound('sound/announcer/tonelow.ogg')) // Чтобы не придумывать колесо пусть будет тут
+ #endif
//countdown
if(timeLeft < 0)
return
diff --git a/code/datums/components/fantasy/prefixes.dm b/code/datums/components/fantasy/prefixes.dm
index 3dd965b185cd..d06b66239f14 100644
--- a/code/datums/components/fantasy/prefixes.dm
+++ b/code/datums/components/fantasy/prefixes.dm
@@ -38,6 +38,8 @@
else
return "[pick(badPrefixes)] [newName]"
+/* BLUEMOON DELETE Оставь надежду, всяк сюда входящий, каким-то неимоверным образом уводить сам объект как элемент в _AddElement(list/arguments)
+//времени попыток решить данную околесицу 4 часа
/datum/fantasy_affix/tactical
placement = AFFIX_PREFIX
alignment = AFFIX_GOOD
@@ -50,6 +52,7 @@
comp.appliedElements += list(dat)
return "tactical [newName]"
+*/
/datum/fantasy_affix/pyromantic
placement = AFFIX_PREFIX
alignment = AFFIX_GOOD
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
index 7d733f8b8694..0e8bc88e2f13 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/twohanded.dm
@@ -210,14 +210,21 @@
// Update icons
parent_item.update_icon()
- if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent)
+ if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent_item) // Bluemoon Edit-Fix || if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent)
user.update_inv_back()
- else
- user.update_inv_hands()
+
+ // Bluemoon Addition - Start || Доп. проверка
+ if(user.get_item_by_slot(ITEM_SLOT_BELT) == parent_item)
+ user.update_inv_belt()
+ // Bluemoon Addition - End
+
+ user.update_inv_hands() // Bluemoon Edit-Fix || Вынес, чтобы обновляло всегда.
// if the item requires two handed drop the item on unwield
- if(require_twohands)
- user.dropItemToGround(parent, force=TRUE)
+ /* // Bluemoon Removed - Start // Нахуя оно надо? Автор, ты еблан? Это буквально руин на ровном месте, который иначе никак не используется.
+ // if(require_twohands)
+ // user.dropItemToGround(parent, force=TRUE)
+ */ // Bluemoon Removed - End
// Show message if requested
if(show_message)
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index efa3beddb4ff..acac28fd26d0 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -24,6 +24,7 @@
this["short_desc"] = ""
this["flavor_text"] = ""
this["important_warning"] = ""
+ this["category"] = ""
this["refs"] = list()
for(var/spawner_obj in GLOB.mob_spawners[spawner])
this["refs"] += "[REF(spawner_obj)]"
@@ -33,6 +34,7 @@
this["short_desc"] = MS.short_desc
this["flavor_text"] = MS.flavour_text
this["important_info"] = MS.important_info
+ this["category"] = MS.category
this["can_load_appearance"] = MS.can_load_appearance
else
var/obj/O = spawner_obj
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index bb05fc28f84e..9099ed07ecba 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -71,9 +71,23 @@
/area/ruin/lavaland/unpowered/deepspaceone/main
name = "DS-1 'Dune' | Primary Hallway"
+ sub_areas = list(/area/ruin/lavaland/unpowered/deepspaceone/main/shower)
+
+/area/ruin/lavaland/unpowered/deepspaceone/main/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "DS-1 'Dune' | Shower Room"
+ valid_to_shower = TRUE
/area/ruin/lavaland/unpowered/deepspaceone/cargo
name = "DS-1 'Dune' | Cargo Bay"
+ sub_areas = list(/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower)
+
+/area/ruin/lavaland/unpowered/deepspaceone/cargo/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "DS-1 'Dune' | Comm Shower Room"
+ valid_to_shower = TRUE
/area/ruin/lavaland/unpowered/deepspaceone/chemistry
name = "DS-1 'Dune' | Chemistry"
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index cdc7b7df2a53..3bd4810f4684 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -72,6 +72,12 @@
/area/ruin/space/has_grav/bluemoon/hotel/guestroom
name = "Hotel Guest Room"
icon_state = "Sleep"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/hotel/guestroom/shower)
+
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom/shower
+ name = "Hotel Guest Shower"
+ icon_state = "shower"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/bluemoon/hotel/guestroom/room_1
name = "Hotel Guest Room 1"
@@ -98,6 +104,12 @@
/area/ruin/space/has_grav/bluemoon/hotel/pool
name = "Hotel Pool Room"
icon_state = "fitness"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/hotel/pool/shower)
+
+/area/ruin/space/has_grav/bluemoon/hotel/pool/shower
+ name = "Hotel Pool Shower"
+ icon_state = "shower"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/bluemoon/hotel/bar
name = "Hotel Bar"
@@ -557,6 +569,13 @@
/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall
name = "P-T Central Hallway"
icon_state = "hallC"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower)
+
+/area/ruin/space/has_grav/bluemoon/port_tarkon/centerhall/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "P-T Shower Room"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/bluemoon/port_tarkon/secoff
name = "P-T Security Office"
@@ -648,6 +667,13 @@
/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison
name = "DS-2 'Blessed' | Long-Term Brig"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower)
+
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/security/prison/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "DS-2 'Blessed' | Brig Shower Room"
+ valid_to_shower = TRUE
//Service
/area/ruin/space/has_grav/bluemoon/deepspacetwo/service
@@ -661,6 +687,13 @@
/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness
name = "DS-2 'Blessed' | Fitness Room"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower)
+
+/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms/fitness/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "DS-2 'Blessed' | Shower Room"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/bluemoon/deepspacetwo/service/lounge
name = "DS-2 'Blessed' | Lounge"
@@ -769,6 +802,13 @@
/area/ruin/space/has_grav/bluemoon/listeningstation
name = "Listening Post"
icon_state = "yellow"
+ sub_areas = list(/area/ruin/space/has_grav/bluemoon/listeningstation/shower)
+
+/area/ruin/space/has_grav/bluemoon/listeningstation/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "Listening Post Shower"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/powered/ancient_shuttle
name = "Ancient Shuttle"
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index d233d08118ce..72ab226df620 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -896,59 +896,55 @@ BLUEMOON REMOVAL END*/
else if(HAS_TRAIT(P, TRAIT_ROBOTIC_ORGANISM)) // никаких роботов-вампиров из далекого космоса
candidates -= P
-//////////////////////////////////////////////
+// ////////////////////////////////////////////
// //
// SLAVERS OF SYNDICATE //
// //
-//////////////////////////////////////////////
+// ////////////////////////////////////////////
-// /datum/dynamic_ruleset/roundstart/slavers
-// name = "Slavers"
-// antag_flag = ROLE_SLAVER
-// antag_datum = /datum/antagonist/slaver
-// var/datum/antagonist/antag_leader_datum = /datum/antagonist/slaver/leader
-// minimum_required_age = 0
-// restricted_roles = list("Head of Security","Bridge Officer", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted
-// required_candidates = 4
-// weight = 3
-// cost = 20
-// requirements = list(101,101,101,101,101,101,60,40,30,10)
-// required_round_type = list(ROUNDTYPE_DYNAMIC_LIGHT)
-// flags = LONE_RULESET
-// antag_cap = list("denominator" = 18, "offset" = 1)
-// var/datum/team/slavers/slavers_team
+/datum/dynamic_ruleset/roundstart/slavers
+ name = "Slavers"
+ antag_flag = ROLE_SLAVER
+ antag_datum = /datum/antagonist/slaver
+ var/datum/antagonist/antag_leader_datum = /datum/antagonist/slaver/leader
+ minimum_required_age = 0
+ restricted_roles = list("Head of Security","Bridge Officer", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted
+ required_candidates = 4
+ weight = 3
+ cost = 20
+ requirements = list(101,101,101,101,101,101,60,40,30,10)
+ required_round_type = list(ROUNDTYPE_DYNAMIC_LIGHT)
+ flags = LONE_RULESET
+ antag_cap = list("denominator" = 18, "offset" = 1)
+ var/datum/team/slavers/slavers_team
-// /datum/dynamic_ruleset/roundstart/slavers/ready(population, forced = FALSE)
-// required_candidates = get_antag_cap(population)
-// . = ..()
+/datum/dynamic_ruleset/roundstart/slavers/ready(population, forced = FALSE)
+ required_candidates = get_antag_cap(population)
+ . = ..()
-// /datum/dynamic_ruleset/roundstart/slavers/pre_execute(population)
-// . = ..()
-// // If ready() did its job, candidates should have 5 or more members in it
-// var/operatives = get_antag_cap(population)
-// for(var/operatives_number = 1 to operatives)
-// // BLUEMOON ADD START - если нет кандидатов и не выданы все роли, иначе выдаст рантайм
-// if(candidates.len <= 0)
-// message_admins("Рулсет [name] не был активирован по причине отсутствия кандидатов.")
-// break
-// // BLUEMOON ADD END
-// var/mob/M = pick_n_take(candidates)
-// assigned += M.mind
-// M.mind.assigned_role = "Slaver"
-// M.mind.special_role = "Slaver"
-// return TRUE
+/datum/dynamic_ruleset/roundstart/slavers/pre_execute(population)
+ . = ..()
+ var/operatives = get_antag_cap(population)
+ for(var/operatives_number = 1 to operatives)
+ if(!candidates.len) // Проверяем наличие кандидатов
+ message_admins("Ruleset [name] failed to activate due to lack of candidates.")
+ return FALSE // Возвращаем FALSE если нет кандидатов
+ var/mob/M = pick_n_take(candidates)
+ assigned += M.mind
+ M.mind.assigned_role = "Slaver"
+ M.mind.special_role = "Slaver"
+ return TRUE
-// /datum/dynamic_ruleset/roundstart/slavers/execute()
-// var/leader = TRUE
-// for(var/datum/mind/M in assigned)
-// if (leader)
-// leader = FALSE
-// var/datum/antagonist/slaver/leader/slavers_op = M.add_antag_datum(antag_leader_datum)
-// slavers_team = slavers_op.slaver_team
-// else
-// var/datum/antagonist/slaver/new_op = new antag_datum()
-// M.add_antag_datum(new_op)
-// return TRUE
+/datum/dynamic_ruleset/roundstart/slavers/execute()
+ var/leader = TRUE
+ for(var/datum/mind/M in assigned)
+ if (leader)
+ leader = FALSE
+ M.add_antag_datum(antag_leader_datum)
+ else
+ var/datum/antagonist/slaver/slavers_op = new antag_datum()
+ M.add_antag_datum(slavers_op)
+ return TRUE
//////////////////////////////////////////////
// //
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index 59e9a9252000..47fbe0526910 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
else if(message_type == "ARRIVALS_BROKEN")
message = "The arrivals shuttle has been damaged. Docking for repairs..."
- if(channels.len == 0)
+ if(!length(channels))
radio.talk_into(src, message, null)
else
for(var/channel in channels)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 5f3032cfeaf4..449253556a81 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -274,12 +274,14 @@
/obj/machinery/autolathe/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
- if(busy)
- balloon_alert(user, "Занято!")
- return STOP_ATTACK_PROC_CHAIN
+ if(user.a_intent == INTENT_DISARM)
+ if(busy)
+ balloon_alert(user, "Занято!")
+ return STOP_ATTACK_PROC_CHAIN
- if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", I))
- return STOP_ATTACK_PROC_CHAIN
+ if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", I))
+ return STOP_ATTACK_PROC_CHAIN
+ return ..()
/obj/machinery/autolathe/crowbar_act(mob/living/user, obj/item/I)
. = ..()
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0c90df9c2821..23777b68c6b7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -173,9 +173,6 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
- //the outline filter on hover
- var/outline_filter
-
/* Our block parry data. Should be set in init, or something if you are using it.
* This won't be accessed without ITEM_CAN_BLOCK or ITEM_CAN_PARRY so do not set it unless you have to to save memory.
* If you decide it's a good idea to leave this unset while turning the flags on, you will runtime. Enjoy.
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 315afad044b0..afb425a60e63 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -98,6 +98,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
return ..(freq, level)
return FALSE
+/obj/item/radio/headset/MouseDrop(mob/over, src_location, over_location)
+ var/mob/headset_user = usr
+ if((headset_user == over) && headset_user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return attack_self(headset_user)
+ return ..()
+
/obj/item/radio/headset/syndicate //disguised to look like a normal headset for stealth ops
/obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 35f768d8724a..9281763bb44c 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -943,6 +943,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
var/throwforce_off // Damage when off
var/weight_class_on // What is the new size class when turned on
+/* BLUEMOON DELETE добавить когда спрайт от него найдётся ;P
/obj/item/melee/baseball_bat/Initialize(mapload)
. = ..()
if(prob(1))
@@ -950,6 +951,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
desc = "You've got red on you."
icon_state = "baseball_bat_brit"
item_state = "baseball_bat_brit"
+*/
/obj/item/melee/baseball_bat/chaplain
name = "blessed baseball bat"
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 921ebe897af0..07bce2ae6dbc 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -43,6 +43,7 @@
Your goal is to cultivate and spread life wherever it will go while waiting for contact from your creators. \
Estimated time of last contact: Deployment, 5000 millennia ago."
assignedrole = "Lifebringer"
+ category = "offstation"
/obj/effect/mob_spawn/human/seed_vault/Destroy()
new/obj/structure/fluff/empty_terrarium(get_turf(src))
@@ -126,6 +127,7 @@
assignedrole = "Ash Walker"
var/datum/team/ashwalkers/team
var/obj/structure/ash_walker_eggshell/eggshell
+ category = "offstation"
/obj/effect/mob_spawn/human/ash_walker/Destroy()
eggshell = null
@@ -233,6 +235,7 @@
путешествовать по звездам с одним единственным заявлением: \ 'Да, делай что хочешь.'\ Хотя вы связаны с тем, кто вас создал, в вашем обществе принято повторять эти же слова новорожденным \
големам, чтобы ни один голем никогда не был вынужден служить снова."
important_info = "Вы не антагонист."
+ category = "offstation"
/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
if(species) //spawners list uses object name to register so this goes before ..()
@@ -322,6 +325,7 @@
can_load_appearance = TRUE
loadout_enabled = TRUE
antagonist_type = /datum/antagonist/ghost_role/hermit
+ category = "offstation"
/obj/effect/mob_spawn/human/hermit/Initialize(mapload)
. = ..()
@@ -376,6 +380,7 @@
important_info = "Вы не антагонист."
assignedrole = "Translocated Vet"
can_load_appearance = TRUE
+ category = "offstation"
/obj/effect/mob_spawn/human/doctor/alive/lavaland/Destroy()
var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
@@ -442,6 +447,7 @@
can_load_appearance = TRUE
loadout_enabled = TRUE
antagonist_type = /datum/antagonist/ghost_role/space_hotel
+ category = "offstation"
/datum/outfit/hotelstaff
name = "Hotel Staff"
@@ -546,6 +552,7 @@
outfit = /datum/outfit/syndicate_empty
assignedrole = "Space Syndicate" //I know this is really dumb, but Syndicate operative is nuke ops
can_load_appearance = TRUE
+ category = "syndicate"
/obj/effect/mob_spawn/human/solfed
name = "Solar Federation Marine"
@@ -557,6 +564,7 @@
assignedrole = "Solar Federation Operative"
can_load_appearance = TRUE
loadout_enabled = TRUE
+ category = "sol"
/obj/effect/mob_spawn/human/solfed/demoman
name = "Solar Federation Support"
@@ -694,6 +702,7 @@
job_description = "Oldstation Crew"
assignedrole = "Ancient Crew"
can_load_appearance = TRUE
+ category = "offstation"
/obj/effect/mob_spawn/human/oldsec/Destroy()
new/obj/structure/showcase/machinery/oldpod/used(drop_location())
@@ -774,6 +783,7 @@
assignedrole = "Space Pirate"
var/rank = "Mate"
can_load_appearance = FALSE
+ category = "midround"
/obj/effect/mob_spawn/human/pirate/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
. = ..()
@@ -1039,6 +1049,7 @@
give_cooler_to_mob_if_synth = TRUE
antagonist_type = /datum/antagonist/ghost_role/tarkov
+ category = "offstation"
/datum/outfit/tarkoff
name = "Default Port Tarkov Outfit"
@@ -1215,6 +1226,7 @@
can_load_appearance = TRUE
loadout_enabled = TRUE
antagonist_type = /datum/antagonist/ghost_role/centcom_intern
+ category = "offstation"
/datum/outfit/centcom_syndicate
name = "Special Ops Syndicate Intern"
@@ -1270,6 +1282,7 @@
can_load_appearance = TRUE
loadout_enabled = TRUE
antagonist_type = /datum/antagonist/ghost_role/centcom_intern
+ category = "offstation"
/datum/outfit/centcom_nanotrasen
name = "Special Ops Nanotrasen Intern"
@@ -1324,6 +1337,7 @@
computer_area = /area/ruin/space/has_grav/bluemoon/deepspacetwo/service/dorms
antagonist_type = /datum/antagonist/ghost_role/ds2
make_bank_account = TRUE // BLUEMOON ADD
+ category = "syndicate"
/obj/effect/mob_spawn/human/ds2/prisoner
name = "Syndicate Prisoner"
diff --git a/code/modules/admin/view_variables/debug_variable_appearance.dm b/code/modules/admin/view_variables/debug_variable_appearance.dm
index 8bc9979a7d10..31d387efb333 100644
--- a/code/modules/admin/view_variables/debug_variable_appearance.dm
+++ b/code/modules/admin/view_variables/debug_variable_appearance.dm
@@ -63,6 +63,13 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))
return FALSE
if(var_name == "realized_underlays")
return FALSE
+
+#if (MIN_COMPILER_VERSION >= 515 && MIN_COMPILER_BUILD >= 1643)
+#warn X/Y/Z and contents are now fully unviewable on our supported versions, remove the below check
+#endif
+
+// lummy removed these from the the MA/image type
+#if (DM_VERSION <= 515 && DM_BUILD < 1643)
// Filtering out the stuff I know we don't care about
if(var_name == "x")
return FALSE
@@ -70,12 +77,15 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))
return FALSE
if(var_name == "z")
return FALSE
- // Could make an argument for these but I think they will just confuse people, so yeeet
- if(var_name == "contents")
+ #ifndef SPACEMAN_DMM // Spaceman doesn't believe in contents on appearances, sorry lads
+ if(var_name == NAMEOF(src, contents))
return FALSE
- if(var_name == "loc")
+ #endif
+ if(var_name == NAMEOF(src, loc))
return FALSE
- if(var_name == "vis_contents")
+#endif
+ // Could make an argument for this but I think they will just confuse people, so yeeet
+ if(var_name == NAMEOF(src, vis_contents))
return FALSE
return ..()
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index cdd612eefd4f..503718f80680 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -29,6 +29,7 @@
2. Ensure that this location is fit for invasion at a later date; do not perform actions that would render it dangerous or inhospitable.
3. Biological resources will be harvested at a later date; do not harm them.
"}
+ category = "midround"
/obj/effect/mob_spawn/swarmer/Initialize(mapload)
. = ..()
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index a9f1c850cbe9..c0dc7168318a 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -36,6 +36,7 @@
var/can_load_appearance = FALSE
var/make_bank_account = FALSE // BLUEMOON ADD
var/starting_money = 0 // BLUEMOON ADD работает только при make_bank_account = TRUE
+ var/category = "misc" // BLUEMOON ADD - категоризация для отображения по спискам
///override this to add special spawn conditions to a ghost role
/obj/effect/mob_spawn/proc/allow_spawn(mob/user, silent = FALSE)
@@ -533,6 +534,7 @@
flavour_text = "Вы посетитель пляжа и вы уже не помните, сколько вы здесь пробыли! Какое же это приятное место."
assignedrole = "Beach Bum"
can_load_appearance = TRUE
+ category = "offstation"
/obj/effect/mob_spawn/human/beach/alive/lifeguard
flavour_text = "Вы - пляжный спасатель! Присматривай за посетителями пляжа, чтобы никто не утонул, не был съеден акулами и так далее."
@@ -542,6 +544,7 @@
job_description = "Beach Biodome Lifeguard"
uniform = /obj/item/clothing/under/shorts/red
can_load_appearance = TRUE
+ category = "offstation"
/datum/outfit/beachbum
name = "Beach Bum"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index ed1d40713303..4c4a2a43519a 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -199,6 +199,9 @@
fitted = FEMALE_UNIFORM_TOP
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+/obj/item/clothing/under/rank/security/detective/grey/skirt/no_armor // Donat stuff - famas098
+ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 0)
+
/*
* Head of Security
*/
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index f9505811b58c..e2889b42a04e 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -39,6 +39,13 @@
stat_allowed = SOFT_CRIT
emote_cooldown = 2 SECONDS
+/datum/emote/sound/human/carbon/moan/run_emote(mob/user, params)
+ if(user.gender == FEMALE || (user.gender == PLURAL && isfeminine(user)))
+ sound = pick(GLOB.lewd_moans_female)
+ else
+ sound = pick(GLOB.lewd_moans_male)
+ . = ..()
+
/datum/emote/sound/human/carbon/roll
key = "roll"
key_third_person = "rolls"
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index bfad3339f160..7fd8bb5317f3 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -182,10 +182,7 @@
else if(eye_blurry) //blurry eyes heal slowly
eye_blurry = max(eye_blurry-1, 0)
if(client)
- if(!eye_blurry)
- remove_eyeblur()
- else
- update_eyeblur()
+ update_eye_blur()
/mob/living/proc/update_damage_hud()
return
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 791afbf52ca2..97ea2557b2d8 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -486,14 +486,14 @@
if(src && reagents)
reagents.add_reagent(/datum/reagent/toxin/heparin, 5)
return FALSE
- if(GLOB.cult_narsie && GLOB.cult_narsie.souls_needed[src])
- GLOB.cult_narsie.souls_needed -= src
- GLOB.cult_narsie.souls += 1
- if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
- GLOB.cult_narsie.resolved = TRUE
- sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_MASS_CONVERSION), 120)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270)
+ // if(GLOB.cult_narsie && GLOB.cult_narsie.souls_needed[src])
+ // GLOB.cult_narsie.souls_needed -= src
+ // GLOB.cult_narsie.souls += 1
+ // if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
+ // GLOB.cult_narsie.resolved = TRUE
+ // sound_to_playing_players('sound/machines/alarm.ogg')
+ // addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_MASS_CONVERSION), 120)
+ // addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270)
if(client)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE)
else
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6851b4ff0a97..4852dc081cf0 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -394,7 +394,7 @@
"Raptor V-4 (alt)" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "traumaraptor-b"), // SPLURT Addon (ChompS Port)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_medical"), // SPLURT Addon (Fallout 13)
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_med-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
- "Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-medical"), // Danaiyka request
+ "Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-medical"), // Danaiyka request
"DrakeTrauma" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "draketraumabox"), //DarkSer request by Gardelin0
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_medical"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanmed")
@@ -584,10 +584,11 @@
moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
dogborg = TRUE
if("Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-medical"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-medical"
- sleeper_overlay = "medraptor_sleeper"
+ cyborg_base_icon = "mechoid-medical"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-medical"
+ has_snowflake_deadsprite = "mechoid-medical-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
+ sleeper_overlay = "medraptorsleeper"
if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
cyborg_base_icon = "smolraptor_med"
cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi'
@@ -642,7 +643,8 @@
/obj/item/stack/sheet/rglass/cyborg,
/obj/item/stack/rods/cyborg,
/obj/item/stack/tile/plasteel/cyborg,
- /obj/item/stack/cable_coil/cyborg)
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/cyborg_inducer)
emag_modules = list(/obj/item/borg/stun)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/engineer,
@@ -693,7 +695,7 @@
"Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeeengi"), // SPLURT Addon
"Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixengi-b"), // SPLURT Addon (ChompS Port)
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "engiraptor-b"), // SPLURT Addon (ChompS Port)
- "Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-engineer"), // Danaiyka request
+ "Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-engineer"), // Danaiyka request
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_eng-b"), // BubberStation Port; Made by @aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_engineer"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahaneng")
@@ -880,9 +882,10 @@
sleeper_overlay = "engiraptor-sleeper"
dogborg = TRUE
if("Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-engineer"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-engineer"
+ cyborg_base_icon = "mechoid-engineer"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-engineer"
+ has_snowflake_deadsprite = "mechoid-engineer-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
sleeper_overlay = "engiraptor-sleeper"
if("SmollRaptor") // BubberStation Port; Made by @aKromatopzia (GitHub)
cyborg_base_icon = "smolraptor_eng"
@@ -964,7 +967,7 @@
"Sentry Bot" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "sentrybot"), // SPLURT Addon (Fallout 13)
"Securitron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "securitron"), // SPLURT Addon (Fallout 13)
"FMeka Syndie" = image(icon = 'modular_bluemoon/Gardelin0/icons/mob/tallrobot.dmi', icon_state = "fmekasyndi"), // Lyoll Request (Skyrat Port) & Добавлен дополнительно в СБ-борги по запросу SmiLeY
- "Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-security"), // Danaiyka request
+ "Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-security"), // Danaiyka request
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanpeace")
)
var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark")
@@ -1148,11 +1151,11 @@
cyborg_icon_override = 'modular_bluemoon/Gardelin0/icons/mob/tallrobot.dmi'
hasrest = TRUE
if("Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-security"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-security"
+ cyborg_base_icon = "mechoid-security"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-security"
+ has_snowflake_deadsprite = "mechoid-security-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
sleeper_overlay = "secraptor-sleeper"
- dogborg = TRUE
if("Dullahan")
cyborg_base_icon = "dullahanpeace"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
@@ -1511,8 +1514,8 @@
"(Service) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_service"), // SPLURT Addon (Fallout 13)
"(Janitor) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_janitor"), // SPLURT Addon (Fallout 13)
"(Pleasure) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_pleasure"), // SPLURT Addon (Fallout 13)
- "(Service) Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-civi"), // Danaiyka request
- "(Janitor) Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-janitor") // Danaiyka request
+ "(Service) Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-civi"), // Danaiyka request
+ "(Janitor) Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-janitor") // Danaiyka request
)
var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark",
"(Janitor) Scrubpuppy" = "scrubpup")
@@ -1831,17 +1834,17 @@
cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
hat_offset = 3
if("(Service) Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-civi"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-civi"
+ cyborg_base_icon = "mechoid-civi"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-civi"
+ has_snowflake_deadsprite = "mechoid-civi-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
sleeper_overlay = "serviraptor-sleeper"
- dogborg = TRUE
if("(Janitor) Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-janitor"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-janitor"
+ cyborg_base_icon = "mechoid-janitor"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-janitor"
+ has_snowflake_deadsprite = "mechoid-janitor-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
sleeper_overlay = "janiraptor-sleeper"
- dogborg = TRUE
if("(Service) Dullahan")
cyborg_base_icon = "dullahanserv"
cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi'
@@ -1924,7 +1927,7 @@
"K4T (alt)" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "k4tmine_alt1"), // SPLURT Addon
"Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixmine-b"), // SPLURT Adoon (ChompS Port)
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "mineraptor-b"), // SPLURT Adoon (ChompS Port)
- "Mechoid" = image(icon = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi', icon_state = "wide-mechoid-mining"), // Danaiyka request
+ "Mechoid" = image(icon = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi', icon_state = "mechoid-mining"), // Danaiyka request
"SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_min-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_miner"), // SPLURT Addon (Fallout 13)
"Dullahan" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "dullahanmine")
@@ -2083,9 +2086,10 @@
sleeper_overlay = "mineraptor-sleeper"
dogborg = TRUE
if("Mechoid") //Danaiyka request
- cyborg_base_icon = "wide-mechoid-mining"
- cyborg_icon_override = 'modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi'
- special_light_key = "wide-mechoid-mining"
+ cyborg_base_icon = "mechoid-mining"
+ cyborg_icon_override = 'modular_bluemoon/KiJoking/icons/mob/mechoid.dmi'
+ special_light_key = "mechoid-mining"
+ has_snowflake_deadsprite = "mechoid-mining-wreck" // Bez etogo ne bydet texturki smerti. Ne znayu pochemy tak.
sleeper_overlay = "mineraptor-sleeper"
if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub)
cyborg_base_icon = "smolraptor_min"
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 3f0d88ab8196..10b8111d9daa 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -243,7 +243,7 @@
/mob/living/simple_animal/bot/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
. = ..()
- if(. && prob(10))
+ if(. && amount > 0 && prob(10))
new oil_spill_type(loc)
/mob/living/simple_animal/bot/updatehealth()
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index da1919443a97..6b47d016e5ee 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -66,42 +66,28 @@
/mob/proc/blur_eyes(amount)
if(amount>0)
eye_blurry = max(amount, eye_blurry)
- update_eyeblur()
+ update_eye_blur()
/**
* Adjust the current blurriness of the mobs vision by amount
*/
/mob/proc/adjust_blurriness(amount)
eye_blurry = max(eye_blurry+amount, 0)
- update_eyeblur()
+ update_eye_blur()
///Set the mobs blurriness of vision to an amount
/mob/proc/set_blurriness(amount)
eye_blurry = max(amount, 0)
- update_eyeblur()
+ update_eye_blur()
-/mob/proc/update_eyeblur()
- remove_eyeblur()
- if(eye_blurry)
- add_eyeblur()
-
-/mob/proc/add_eyeblur()
- if(!client)
+/mob/proc/update_eye_blur()
+ if(!hud_used)
return
- var/list/screens = list(hud_used.plane_masters["[GAME_PLANE]"], hud_used.plane_masters["[FLOOR_PLANE]"],
- hud_used.plane_masters["[WALL_PLANE]"], hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
- for(var/A in screens)
- var/atom/movable/screen/plane_master/P = A
- P.add_filter("blurry_eyes", 2, EYE_BLUR(clamp(eye_blurry*0.1,0.6,3)))
-
-/mob/proc/remove_eyeblur()
- if(!client)
- return
- var/list/screens = list(hud_used.plane_masters["[GAME_PLANE]"], hud_used.plane_masters["[FLOOR_PLANE]"],
- hud_used.plane_masters["[WALL_PLANE]"], hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
- for(var/A in screens)
- var/atom/movable/screen/plane_master/P = A
- P.remove_filter("blurry_eyes")
+ var/atom/movable/plane_master_controller/game_plane_master_controller = hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ if(eye_blurry)
+ game_plane_master_controller.add_filter("eye_blur", 1, gauss_blur_filter(clamp(eye_blurry * 0.1, 0.6, 3)))
+ else
+ game_plane_master_controller.remove_filter("eye_blur")
///Adjust the drugginess of a mob
/mob/proc/adjust_drugginess(amount)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index f61b52512eb5..6eadfb9da365 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -66,7 +66,7 @@
for(var/mob/living/player in GLOB.player_list)
if(player.stat != DEAD && player.loc && is_station_level(player.loc.z) && !iscultist(player) && !isanimal(player))
souls_needed[player] = TRUE
- soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
+ soul_goal = round(1 + LAZYLEN(souls_needed) * 0.25)
INVOKE_ASYNC(src, PROC_REF(begin_the_end))
/obj/singularity/narsie/large/cult/proc/begin_the_end()
@@ -84,7 +84,11 @@
priority_announce("Датчики более не фиксируют обозначенного пространственного разлома. Решения ЦК отозваны. Тем не менее, рекомендуется произвести немедленную эвакуацию персонала.","Центральное Командование, Отдел Работы с Реальностью")
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_FAILURE_NARSIE_KILLED), 2 SECONDS)
return
- if(resolved == FALSE)
+ if(souls >= soul_goal && !resolved)
+ resolved = TRUE
+ sound_to_playing_players('sound/machines/alarm.ogg')
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_MASS_CONVERSION), 10 SECONDS)
+ else if(!resolved)
resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_NUKE), 10 SECONDS)
@@ -100,13 +104,13 @@
switch(ending_type)
if(CULT_FAILURE_NARSIE_KILLED)
- Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
+ Cinematic(CINEMATIC_CULT_FA,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
if(CULT_VICTORY_MASS_CONVERSION)
Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
if(CULT_VICTORY_NUKE)
- Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
+ Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 51db0691d304..8d7979372bc5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -52,7 +52,7 @@
C.adjust_integration_blood(round(reac_volume, 0.1))
// we don't care about bloodtype here, we're just refilling the mob
- if(reac_volume >= 10 && istype(L) && method != INJECT)
+ if(reac_volume >= 10 && istype(L) && (method != INJECT && method != INGEST))
L.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
/datum/reagent/blood/on_mob_life(mob/living/carbon/C) //Because lethals are preferred over stamina. damnifino.
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index c5a808c1c7c5..b8b6d82bffd4 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -789,26 +789,22 @@
value = REAGENT_VALUE_VERY_RARE
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
- return ..() // until fixed - the rotations never stop
-/*
if(M.hud_used)
if(current_cycle >= 20 && current_cycle%20 == 0)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"],
- M.hud_used.plane_masters["[LIGHTING_PLANE]"], M.hud_used.plane_masters["[WALL_PLANE]"],
- M.hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+
var/rotation = min(round(current_cycle/20), 89) // By this point the player is probably puking and quitting anyway
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
animate(transform = matrix(-rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
return ..()
/datum/reagent/toxin/rotatium/on_mob_end_metabolize(mob/living/M)
- if(M && M.hud_used)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
+ if(M?.hud_used)
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(), time = 5, easing = QUAD_EASING)
..()
-*/
/datum/reagent/toxin/skewium
name = "Skewium"
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index bf55344639b5..816ae40b5f8d 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -31,6 +31,10 @@ Note: Must be placed within 3 tiles of the R&D Console
linked_console.linked_destroy = null
..()
+/obj/machinery/rnd/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/I)
+ if(user.a_intent == INTENT_DISARM)
+ return ..()
+
/obj/machinery/rnd/destructive_analyzer/Insert_Item(obj/item/O, mob/user)
if(user.a_intent != INTENT_HARM)
. = 1
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index a915292a03b6..29d34eb35bda 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -133,6 +133,7 @@
assignedrole = "Lavaland Syndicate"
can_load_appearance = TRUE
loadout_enabled = TRUE
+ category = "syndicate"
/obj/effect/mob_spawn/human/lavaland_syndicate/special(mob/living/new_spawn)
. = ..()
diff --git a/code/modules/vehicles/mecha/combat/phazon.dm b/code/modules/vehicles/mecha/combat/phazon.dm
index 481a05715998..88e452d58688 100644
--- a/code/modules/vehicles/mecha/combat/phazon.dm
+++ b/code/modules/vehicles/mecha/combat/phazon.dm
@@ -5,7 +5,7 @@
movedelay = 2
dir_in = 2 //Facing South.
normal_step_energy_drain = 3
- max_integrity = 200
+ max_integrity = 100
deflect_chance = 30
armor = list(MELEE = 10, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 20, BIO = 0, RAD = 50, FIRE = 100, ACID = 100)
max_temperature = 25000
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index d36e8e1b0e7d..804a51abad8e 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 5877513420e5..1bde8ab4850a 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/modular__juicy/icons/obj/items/food/martian.dmi b/modular__juicy/icons/obj/items/food/martian.dmi
index 62ba625f9906..fe556010e23f 100644
Binary files a/modular__juicy/icons/obj/items/food/martian.dmi and b/modular__juicy/icons/obj/items/food/martian.dmi differ
diff --git a/modular_bluemoon/Fink/code/items/summon_chalk.dm b/modular_bluemoon/Fink/code/items/summon_chalk.dm
index ab082317d382..ad694611ea43 100644
--- a/modular_bluemoon/Fink/code/items/summon_chalk.dm
+++ b/modular_bluemoon/Fink/code/items/summon_chalk.dm
@@ -49,17 +49,20 @@
for(var/mob/living/carbon/human/H in GLOB.carbon_list)
if(!HAS_TRAIT(H, TRAIT_LEWD_SUMMON) || HAS_TRAIT(H, TRAIT_LEWD_SUMMONED))
continue
-
+ if(!H.client)
+ continue
applicants += H
var/species = "[H.dna.species]"
- if(H.dna.custom_species)
+ if(H.dna && H.dna.custom_species)
species = "[H.dna.custom_species]"
var/player_info
- if(H.client.prefs.summon_nickname)
+ if(H.client.prefs && H.client.prefs.summon_nickname)
player_info += "[H.client.prefs.summon_nickname], "
player_info += "[H.gender] [species]"
applicants_result[initial(player_info)] = player_info
+ if(!applicants_result.len)
+ to_chat(M, span_userdanger("Nobody to summon!"))
var/target_info = input("Please, select a person to summon!", "Select", null, null) as null|anything in applicants_result
if(!target_info)
return
diff --git a/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm b/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm
index 8eec161360e8..4d5c433e8c68 100644
--- a/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm
+++ b/modular_bluemoon/Gardelin0/code/antagonists/ghost_spawner.dm
@@ -18,6 +18,7 @@
roundstart = FALSE
random = FALSE
uses = 1
+ category = "special"
/obj/effect/mob_spawn/qareen/wendigo //not grief antag u little shits
name = "Woman Wendigo - The Horny Creature"
@@ -51,7 +52,6 @@
short_desc = "Вы таинственное нечто и абсолютно идеальный организм, который питается возбуждением своих жертв!"
desc = "Генокрад."
icon = 'icons/obj/machines/sleeper.dmi'
-
icon_state = "sleeper_clockwork"
mob_name = "Changeling"
flavour_text = "Вы Генокрад."
@@ -62,6 +62,7 @@
loadout_enabled = TRUE
use_outfit_name = TRUE
outfit = /datum/outfit/job/stowaway/syndicate
+ category = "special"
/obj/effect/mob_spawn/human/changeling_extended/attack_ghost(mob/user, latejoinercalling)
if(GLOB.master_mode == "Extended")
diff --git a/modular_bluemoon/KiJoking/README.txt b/modular_bluemoon/KiJoking/README.txt
new file mode 100644
index 000000000000..cd18749860eb
--- /dev/null
+++ b/modular_bluemoon/KiJoking/README.txt
@@ -0,0 +1 @@
+UBLIDKI ZASTAVILI MENYA DELAT PAPKY.
diff --git a/modular_bluemoon/KiJoking/code/clothing/suit.dm b/modular_bluemoon/KiJoking/code/clothing/suit.dm
new file mode 100644
index 000000000000..d2eb8c5392b6
--- /dev/null
+++ b/modular_bluemoon/KiJoking/code/clothing/suit.dm
@@ -0,0 +1,8 @@
+/obj/item/clothing/under/rank/civilian/gift_ribbon
+ name = "Gift ribbon"
+ desc = "You know how to use it, right? You know... right?"
+ icon = 'modular_bluemoon/KiJoking/icons/clothing/obj/gift_ribbon.dmi'
+ mob_overlay_icon = 'modular_bluemoon/KiJoking/icons/clothing/mob/gift_ribbon.dmi'
+ mutantrace_variation = STYLE_DIGITIGRADE | STYLE_NO_ANTHRO_ICON
+ icon_state = "gift_ribbon"
+ item_state = "gift_ribbon"
diff --git a/modular_bluemoon/KiJoking/code/loadout/suit.dm b/modular_bluemoon/KiJoking/code/loadout/suit.dm
new file mode 100644
index 000000000000..8afa278c3960
--- /dev/null
+++ b/modular_bluemoon/KiJoking/code/loadout/suit.dm
@@ -0,0 +1,4 @@
+/datum/gear/uniform/gift_ribbon
+ name = "Gift ribbon"
+ path = /obj/item/clothing/under/rank/civilian/gift_ribbon
+ subcategory = LOADOUT_SUBCATEGORY_UNIFORM_GENERAL
diff --git a/modular_bluemoon/KiJoking/code/modules/mob/living/emotes.dm b/modular_bluemoon/KiJoking/code/modules/mob/living/emotes.dm
new file mode 100644
index 000000000000..e9a558addb4d
--- /dev/null
+++ b/modular_bluemoon/KiJoking/code/modules/mob/living/emotes.dm
@@ -0,0 +1,35 @@
+/datum/emote/sound/human/catscream1
+ key = "catscream1"
+ key_third_person = "catscreams1"
+ message = "Screams!"
+ sound = 'modular_bluemoon/KiJoking/sound/voice/catscream1.ogg'
+ emote_cooldown = 1 SECONDS // I love felinid
+ emote_pitch_variance = FALSE
+
+/datum/emote/sound/human/catscream2
+ key = "catscream2"
+ key_third_person = "catscreams2"
+ message = "Screams!"
+ sound = 'modular_bluemoon/KiJoking/sound/voice/catscream2.ogg'
+ emote_cooldown = 1 SECONDS
+ emote_pitch_variance = FALSE
+
+/datum/emote/sound/human/catscream3
+ key = "catscream3"
+ key_third_person = "catscreams3"
+ message = "Screams!"
+ sound = 'modular_bluemoon/KiJoking/sound/voice/catscream3.ogg'
+ emote_cooldown = 1 SECONDS
+ emote_pitch_variance = FALSE
+
+/datum/emote/sound/human/catscream
+ key = "catscream"
+ key_third_person = "catscreams"
+ message = "Screams!"
+ sound = 'modular_bluemoon/KiJoking/sound/voice/catscream1.ogg'
+ emote_cooldown = 1 SECONDS
+ emote_pitch_variance = FALSE
+
+/datum/emote/sound/human/catscream/run_emote(mob/user, params)
+ sound = pick('modular_bluemoon/KiJoking/sound/voice/catscream1.ogg', 'modular_bluemoon/KiJoking/sound/voice/catscream2.ogg')
+ . = ..()
diff --git a/modular_bluemoon/KiJoking/icons/clothing/mob/gift_ribbon.dmi b/modular_bluemoon/KiJoking/icons/clothing/mob/gift_ribbon.dmi
new file mode 100644
index 000000000000..00fe8c25a3fd
Binary files /dev/null and b/modular_bluemoon/KiJoking/icons/clothing/mob/gift_ribbon.dmi differ
diff --git a/modular_bluemoon/KiJoking/icons/clothing/obj/gift_ribbon.dmi b/modular_bluemoon/KiJoking/icons/clothing/obj/gift_ribbon.dmi
new file mode 100644
index 000000000000..88e95d7258b0
Binary files /dev/null and b/modular_bluemoon/KiJoking/icons/clothing/obj/gift_ribbon.dmi differ
diff --git a/modular_bluemoon/KiJoking/icons/mob/mechoid.dmi b/modular_bluemoon/KiJoking/icons/mob/mechoid.dmi
new file mode 100644
index 000000000000..ea273f861956
Binary files /dev/null and b/modular_bluemoon/KiJoking/icons/mob/mechoid.dmi differ
diff --git a/modular_bluemoon/KiJoking/sound/voice/catscream1.ogg b/modular_bluemoon/KiJoking/sound/voice/catscream1.ogg
new file mode 100644
index 000000000000..30d142c5bcdf
Binary files /dev/null and b/modular_bluemoon/KiJoking/sound/voice/catscream1.ogg differ
diff --git a/modular_bluemoon/KiJoking/sound/voice/catscream2.ogg b/modular_bluemoon/KiJoking/sound/voice/catscream2.ogg
new file mode 100644
index 000000000000..2a9f41018917
Binary files /dev/null and b/modular_bluemoon/KiJoking/sound/voice/catscream2.ogg differ
diff --git a/modular_bluemoon/KiJoking/sound/voice/catscream3.ogg b/modular_bluemoon/KiJoking/sound/voice/catscream3.ogg
new file mode 100644
index 000000000000..ba00eec223c6
Binary files /dev/null and b/modular_bluemoon/KiJoking/sound/voice/catscream3.ogg differ
diff --git a/modular_bluemoon/Ren/Code/FTU/FTU.dm b/modular_bluemoon/Ren/Code/FTU/FTU.dm
index 0120cce15705..5c3b706ae6db 100644
--- a/modular_bluemoon/Ren/Code/FTU/FTU.dm
+++ b/modular_bluemoon/Ren/Code/FTU/FTU.dm
@@ -18,6 +18,7 @@
important_info = "Вам запрещено использовать товар или присваивать товар корабля себе. Не нападайте и не грабьте станцию, вы здесь для ведения торговли. Если на вас совершили нападение или украли товар, то вы можете применить силу в ответ."
assignedrole = "FTU worker"
antagonist_type = /datum/antagonist/ghost_role/traders
+ category = "midround"
/obj/effect/mob_spawn/human/ftu_crew/qm
name = "Trade ship QM"
diff --git a/modular_bluemoon/Ren/Code/misc.dm b/modular_bluemoon/Ren/Code/misc.dm
index 5244f476b677..fa2424f08064 100644
--- a/modular_bluemoon/Ren/Code/misc.dm
+++ b/modular_bluemoon/Ren/Code/misc.dm
@@ -343,7 +343,8 @@
/obj/item/stack/rods/cyborg,
/obj/item/stack/tile/plasteel/cyborg,
/obj/item/screwdriver/power/inteq,
- /obj/item/stack/cable_coil/cyborg)
+ /obj/item/stack/cable_coil/cyborg,
+ /obj/item/cyborg_inducer)
emag_modules = list(/obj/item/borg/stun)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/engineer,
diff --git a/modular_bluemoon/SmiLeY/inteq_ghostrole/forgottenship.dm b/modular_bluemoon/SmiLeY/inteq_ghostrole/forgottenship.dm
index 5c104bc4cf79..010acce22a57 100644
--- a/modular_bluemoon/SmiLeY/inteq_ghostrole/forgottenship.dm
+++ b/modular_bluemoon/SmiLeY/inteq_ghostrole/forgottenship.dm
@@ -347,6 +347,13 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
name = "InteQ Forgotten Outpost"
icon_state = "inteq-ship"
ambientsounds = list('sound/ambience/ambigen4.ogg', 'sound/ambience/signal.ogg')
+ sub_areas = list(/area/ruin/space/has_grav/inteq_forgotten_outpost/shower)
+
+/area/ruin/space/has_grav/inteq_forgotten_outpost/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "InteQ Forgotten Outpost Shower"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/inteq_forgotten_cargopod
name = "InteQ Forgotten Cargo pod"
@@ -386,6 +393,13 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
name = "InteQ Forgotten Permanent Brig"
icon_state = "inteq-ship"
ambientsounds = list('sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg')
+ sub_areas = list(/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower)
+
+/area/ruin/space/has_grav/inteq_forgotten_permabrig/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "InteQ Forgotten Permanent Brig Shower"
+ valid_to_shower = TRUE
/area/ruin/space/has_grav/inteq_forgotten_inspection
name = "InteQ Forgotten Inspection room"
diff --git a/modular_bluemoon/code/game/objects/items/fleshlight.dm b/modular_bluemoon/code/game/objects/items/fleshlight.dm
index a73b315b5dc2..6d7aa47f2795 100644
--- a/modular_bluemoon/code/game/objects/items/fleshlight.dm
+++ b/modular_bluemoon/code/game/objects/items/fleshlight.dm
@@ -1,3 +1,6 @@
+/mob/living/carbon/human
+ var/fleshlight_nickname //Используется для анонимизации персонажа
+
/obj/item/portallight/examine(mob/user)
. = ..()
. += "Возможен более точный контроль ситуации. (Ctrl+Click для кастомного эмоута)"
@@ -61,6 +64,18 @@
return FALSE
var/list/show_to = list()
+ if(!H_user.fleshlight_nickname)
+ var/new_fleshlight_nickname = stripped_input(user, "Задайте своё прозвище, его можно задать только 1 раз (Если не выбрать, будет задано случайное):", "Character Preference", null, MAX_NAME_LEN)
+ if(new_fleshlight_nickname)
+ new_fleshlight_nickname = reject_bad_name(new_fleshlight_nickname, allow_numbers = TRUE)
+ if(new_fleshlight_nickname)
+ H_user.fleshlight_nickname = new_fleshlight_nickname
+ if(!H_user.fleshlight_nickname)
+ H_user.fleshlight_nickname = pick("Aqua", "Azure", "Black", "Blue", "Coral", "Crimson","Cyan", "Red", "Violet", "Gray",\
+ "White", "Yellow", "Indigo", "Ivory", "Lime", "Orchid", "Olive", "Silver", "Teal", "Turquoise")
+ H_user.fleshlight_nickname += " " + pick("Adara", "Aeon", "Aerilon", "Agora", "Berea", "Cascor", "Cogito", "Eadu", "Eldar", "Farrfin",\
+ "Gaia", "Glacia", "Gorta", "Gree", "Hala", "Heian", "Hillys", "Ingo", "Ivax", "Nix")
+
if(istype(choosen_flesh, /obj/item/portallight))
var/obj/item/portallight/PF = choosen_flesh
if(PF.portalunderwear && ishuman(PF.portalunderwear.loc))
@@ -94,7 +109,7 @@
return FALSE
user.log_message("[message] (FLESHLIGH)", LOG_SUBTLER)
- message = "[user] [user.say_emphasis(message)]"
+ message = "[H_user.fleshlight_nickname] [user.say_emphasis(message)]"
for(var/mob/living/L in range(user, 1))
show_to |= L
diff --git a/modular_bluemoon/code/game/objects/items/inducer.dm b/modular_bluemoon/code/game/objects/items/inducer.dm
new file mode 100644
index 000000000000..96eb2a71819d
--- /dev/null
+++ b/modular_bluemoon/code/game/objects/items/inducer.dm
@@ -0,0 +1,113 @@
+/obj/item/cyborg_inducer //Слишком много проков не будут совпадать с родительскими проками
+ name = "inducer"
+ desc = "A tool for inductively charging internal power cells."
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "inducer-engi"
+ item_state = "inducer-engi"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ force = 7
+ w_class = WEIGHT_CLASS_SMALL
+ slot_flags = ITEM_SLOT_BELT
+ item_flags = SURGICAL_TOOL
+ var/powertransfer = 1000
+ var/obj/item/stock_parts/cell/cell
+ var/recharging = FALSE
+ var/gun_charger = FALSE
+ var/mob/living/silicon/robot/owner
+ var/min_remaining_charge = 0.2 // 20%
+
+/obj/item/cyborg_inducer/Initialize(mapload)
+ ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
+ if(issilicon(src.loc.loc)) // Индуцер спавнится в модуле, в модуле внутри борга
+ owner = src.loc.loc
+ . = ..()
+
+/obj/item/cyborg_inducer/examine(mob/living/M)
+ . = ..()
+ cell = get_cell()
+ if(cell)
+ . += "Its display shows: [DisplayEnergy(cell.charge)]."
+ else
+ . += "Its display is dark."
+
+/obj/item/cyborg_inducer/attack_obj(obj/O, mob/living/carbon/user)
+ if(user.a_intent == INTENT_HARM) return ..()
+ if(cantbeused(user)) return
+ if(recharge(O, user)) return
+ return ..()
+
+/obj/item/cyborg_inducer/attackby(obj/item/W, mob/user)
+ if(cantbeused(user)) return
+ if(recharge(W, user)) return
+ return ..()
+
+/obj/item/cyborg_inducer/attack(mob/M, mob/user)
+ if(user.a_intent == INTENT_HARM) return ..()
+ if(cantbeused(user)) return
+ if(recharge(M, user)) return
+ return ..()
+
+/obj/item/cyborg_inducer/proc/induce(obj/item/stock_parts/cell/target, coefficient)
+ cell = get_cell()
+ var/totransfer = min(cell.charge, (powertransfer * coefficient), cell.maxcharge * 0.2) //Тратим максимум до 20% заряда
+ var/transferred = target.give(totransfer)
+ cell.use(transferred)
+ cell.update_icon()
+ target.update_icon()
+
+/obj/item/cyborg_inducer/get_cell()
+ return owner.cell
+
+/obj/item/cyborg_inducer/proc/cantbeused(mob/user)
+ cell = get_cell()
+ if(!cell)
+ to_chat(user, "Unit doesn't have a power cell installed!")
+ return TRUE
+
+ if(!cell.charge)
+ to_chat(user, "Unit's battery is dead!")
+ return TRUE
+ return FALSE
+
+/obj/item/cyborg_inducer/proc/recharge(atom/movable/A, mob/user)
+ if(!isturf(A) && user.loc == A)
+ return FALSE
+ if(A.get_cell() == get_cell()) //запрещаем пытаться заряжать самого себя
+ to_chat(user, "Error: Power loop detected!")
+ playsound(owner, "modular_splurt/sound/misc/bonk.ogg", 50, 1)
+ return FALSE
+ if(recharging)
+ return TRUE
+
+ recharging = TRUE
+ cell = get_cell()
+ var/obj/item/stock_parts/cell/C = A.get_cell()
+ var/obj/O
+ var/coefficient = 1
+ if(istype(A, /obj/item/gun/energy) && gun_charger != TRUE)
+ to_chat(user,"Error unable to interface with device")
+ return FALSE
+ if(istype(A, /obj))
+ O = A
+ if(C)
+ var/done_any = FALSE
+ if(C.charge >= C.maxcharge)
+ to_chat(user, "[A] is fully charged!")
+ recharging = FALSE
+ return TRUE
+ user.visible_message("[user] starts recharging [A] with [src].","You start recharging [A] with [src].")
+ while(C.charge < C.maxcharge)
+ if(do_after(user, 10, target = user) && cell.charge && (cell.maxcharge * min_remaining_charge < cell.charge))
+ done_any = TRUE
+ induce(C, coefficient)
+ do_sparks(1, FALSE, A)
+ if(O)
+ O.update_icon()
+ else
+ break
+ if(done_any) // Only show a message if we succeeded at least once
+ user.visible_message("[user] recharged [A]!","You recharged [A]!")
+ recharging = FALSE
+ return TRUE
+ recharging = FALSE
diff --git a/modular_bluemoon/code/modules/lewd_russian_revlover/lewd_russian_revolver.dm b/modular_bluemoon/code/modules/lewd_russian_revlover/lewd_russian_revolver.dm
index 845d5c4f94ef..aca191023cbb 100644
--- a/modular_bluemoon/code/modules/lewd_russian_revlover/lewd_russian_revolver.dm
+++ b/modular_bluemoon/code/modules/lewd_russian_revlover/lewd_russian_revolver.dm
@@ -1,6 +1,23 @@
+/obj/item/ammo_box/magazine/internal/cylinder/rus357/lewd
+ name = "\improper Lewd Russian revolver cylinder"
+ ammo_type = /obj/item/ammo_casing/a357/lewd
+ caliber = list("lewd357")
+
+/obj/item/ammo_casing/a357/lewd
+ name = "Lewd .357 bullet casing"
+ desc = "A lewd .357 bullet casing."
+ caliber = "lewd357"
+ projectile_type = /obj/item/projectile/bullet/a357/lewd
+
+/obj/item/projectile/bullet/a357/lewd
+ name = "Lewd .357 bullet"
+ damage = 0
+ wound_bonus = 0
+
/obj/item/gun/ballistic/revolver/russian/lewd
name = "\improper Lewd russian revolver"
desc = "A Russian-made revolver for cumming games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull. Prepare for the embarrasment."
+ mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357/lewd
/obj/item/gun/ballistic/revolver/russian/lewd/afterattack(atom/target, mob/living/user, flag, params)
. = ..(null, user, flag, params)
@@ -30,6 +47,7 @@
var/obj/item/ammo_casing/AC = chambered
if(AC.fire_casing(user, user))
playsound(user, fire_sound, 50, 1)
+ H.moan()
H.cum()
chambered = null
user.visible_message("How about this. Rather than waste my time trying to salvage this nonsense, we just make [user.name] cum? Yeah. Fuck it. Said the coder, extremely confused.")
diff --git a/modular_bluemoon/fluffs/code/donator.dm b/modular_bluemoon/fluffs/code/donator.dm
index 9e43631f7fbf..551588cacabb 100644
--- a/modular_bluemoon/fluffs/code/donator.dm
+++ b/modular_bluemoon/fluffs/code/donator.dm
@@ -1111,3 +1111,10 @@
path = /obj/item/clothing/neck/SMART_fabric_boatcloak
ckeywhitelist = list("kijoking")
subcategory = LOADOUT_SUBCATEGORIES_DON02
+
+/datum/gear/donator/bm/famas098_NoirSuitskirt
+ name = "Noir suitskirt"
+ slot = ITEM_SLOT_ICLOTHING
+ path = /obj/item/clothing/under/rank/security/detective/grey/skirt/no_armor
+ ckeywhitelist = list("famas098")
+ subcategory = LOADOUT_SUBCATEGORIES_DON02
diff --git a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm
index 0dd45784866a..2c659a6791a4 100644
--- a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm
+++ b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/raiders.dm
@@ -91,6 +91,7 @@
short_desc = "You are an InteQ raider."
flavour_text = "Капитан станции отказался платить в ответ на требование наёмников InteQ. Атакуйте её: похищайте ресурсы, берите заложников. Избегайте ненужных жертв. Не забывайте следить за своим корабль."
assignedrole = "InteQ Raider"
+ category = "midround"
/obj/effect/mob_spawn/human/raider/vanguard
outfit = /datum/outfit/inteq_raider/vanguard
diff --git a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm
index b2bbbb47fe9b..3e5908d30303 100644
--- a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm
+++ b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers.dm
@@ -93,6 +93,7 @@
short_desc = "You are a Vox Scavenger."
flavour_text = "Самое время поживиться чем-то полезным на просторах космической станции. Не начинайте конфликтов первыми и избегайте их: ваша философия не допускает напрасной потери жизней с обеих сторон. Кроме того, никто из воксов не должен оказаться за бортом."
assignedrole = "Vox Scavenger"
+ category = "midround"
/obj/effect/mob_spawn/human/vox_scavenger/special(mob/living/new_spawn)
new_spawn.fully_replace_character_name(new_spawn.real_name,generate_scavenger_name())
diff --git a/modular_bluemoon/krashly/code/game/objects/items/weaponry.dm b/modular_bluemoon/krashly/code/game/objects/items/weaponry.dm
index 48c9215bb62e..3b65e737064d 100644
--- a/modular_bluemoon/krashly/code/game/objects/items/weaponry.dm
+++ b/modular_bluemoon/krashly/code/game/objects/items/weaponry.dm
@@ -150,6 +150,21 @@
block_chance = 30
sharpness = SHARP_EDGED
hitsound = 'sound/weapons/bladeslice.ogg'
+ base_pixel_x = -16
+
+/obj/item/nullrod/hadar_red/ComponentInitialize() // Попросили чтобы занимал обе руки.
+ . = ..()
+ AddComponent(/datum/component/two_handed, require_twohands = TRUE)
+
+/obj/item/nullrod/hadar_red/add_blood_overlay() // Меч слишком большой для старой иконки крови на предметах, моя новая иконка фиксит красную половину меча.
+ if(!blood_DNA.len)
+ return
+ if(initial(icon) && initial(icon_state))
+ blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1)
+ blood_splatter_icon.Blend("#fff", ICON_ADD)
+ blood_splatter_icon.Blend(icon('modular_bluemoon/krashly/icons/obj/weapons/tall.dmi', "item_blood"), ICON_MULTIPLY)
+ blood_splatter_icon.Blend(blood_DNA_to_color(), ICON_MULTIPLY)
+ add_overlay(blood_splatter_icon)
/obj/item/nullrod/hadar_red/blue_one
name = "Fatebreather"
diff --git a/modular_bluemoon/krashly/icons/obj/weapons/tall.dmi b/modular_bluemoon/krashly/icons/obj/weapons/tall.dmi
index d44d36d405fa..0658274af8fb 100644
Binary files a/modular_bluemoon/krashly/icons/obj/weapons/tall.dmi and b/modular_bluemoon/krashly/icons/obj/weapons/tall.dmi differ
diff --git a/modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi b/modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi
deleted file mode 100644
index 654ed91bee19..000000000000
Binary files a/modular_bluemoon/leesuro/icons/mob/widerobot_mechoid.dmi and /dev/null differ
diff --git a/modular_bluemoon/modules/characters_accessories/code/hair_head.dm b/modular_bluemoon/modules/characters_accessories/code/hair_head.dm
new file mode 100644
index 000000000000..e74e171987b1
--- /dev/null
+++ b/modular_bluemoon/modules/characters_accessories/code/hair_head.dm
@@ -0,0 +1,5 @@
+//Добавил спрайт для вульпы
+/datum/sprite_accessory/hair/spikytail2
+ icon = 'modular_bluemoon/modules/characters_accessories/icons/hair.dmi'
+ name = "Ponytail (Spiky) ALT"
+ icon_state = "hair_spikyponytail_alt"
diff --git a/modular_bluemoon/modules/characters_accessories/icons/hair.dmi b/modular_bluemoon/modules/characters_accessories/icons/hair.dmi
new file mode 100644
index 000000000000..89c9fc498a70
Binary files /dev/null and b/modular_bluemoon/modules/characters_accessories/icons/hair.dmi differ
diff --git a/modular_bluemoon/oni3288/code/pipebomb.dm b/modular_bluemoon/oni3288/code/pipebomb.dm
index dfe8f0765ddd..9278ac0e608b 100644
--- a/modular_bluemoon/oni3288/code/pipebomb.dm
+++ b/modular_bluemoon/oni3288/code/pipebomb.dm
@@ -310,7 +310,8 @@
/obj/item/pipe/quaternary = 1,
)
time = 6 SECONDS
- category = CAT_OTHER
+ category = CAT_WEAPONRY
+ subcategory = CAT_OTHER
/obj/item/pipe/welder_act(mob/living/user, obj/item/welder)
. = ..()
diff --git a/modular_bluemoon/phoenix404/modules/vending/autodrobe.dm b/modular_bluemoon/phoenix404/modules/vending/autodrobe.dm
index 1f13dd032eb5..1a9fd4a13a6f 100644
--- a/modular_bluemoon/phoenix404/modules/vending/autodrobe.dm
+++ b/modular_bluemoon/phoenix404/modules/vending/autodrobe.dm
@@ -219,6 +219,7 @@ GLOBAL_LIST_INIT(autodrobe_other_items, list(
/obj/item/clothing/underwear/briefs/garland_panties = 5,
/obj/item/clothing/underwear/shirt/garland_bra = 5,
/obj/item/clothing/suit/garland_suit = 5,
+ /obj/item/clothing/under/rank/civilian/gift_ribbon = 5,
))
GLOBAL_LIST_INIT(autodrobe_premium_items, list(
diff --git a/modular_bluemoon/phoenix404/modules/vending/megaseed.dm b/modular_bluemoon/phoenix404/modules/vending/megaseed.dm
index 53c4f50170d3..495026f3d756 100644
--- a/modular_bluemoon/phoenix404/modules/vending/megaseed.dm
+++ b/modular_bluemoon/phoenix404/modules/vending/megaseed.dm
@@ -13,6 +13,7 @@
/obj/item/seeds/apple = 3, // Apple
/obj/item/seeds/banana = 3, // Banana
/obj/item/seeds/cherry = 3, // Cherry
+ /obj/item/seeds/berry = 3, // Berry
/obj/item/seeds/cocoapod = 3, // Cocoa Pod
/obj/item/seeds/coconut = 3, // Coconut
/obj/item/seeds/grape = 3, // Grape
diff --git a/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
index 0efa9108a6e3..75eeb19e8c79 100644
--- a/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -53,7 +53,8 @@
/obj/item/borg/lollipop,
/obj/item/holosign_creator/cyborg,
/obj/item/stamp/chameleon,
- /obj/item/borg_shapeshifter
+ /obj/item/borg_shapeshifter,
+ /obj/item/cyborg_inducer
)
ratvar_modules = list(
diff --git a/modular_sand/code/modules/pixel_shift/pixel_shift.dm b/modular_sand/code/modules/pixel_shift/pixel_shift.dm
index 7cecab9e8d6e..5b22423c0686 100644
--- a/modular_sand/code/modules/pixel_shift/pixel_shift.dm
+++ b/modular_sand/code/modules/pixel_shift/pixel_shift.dm
@@ -59,26 +59,26 @@
if(CHECK_BITFIELD(direction, NORTH))
if(pixel_y <= PIXEL_SHIFT_MAXIMUM + base_pixel_y)
pixel_y++
- if(client?.prefs.view_pixelshift) //SPLURT Edit
- client?.pixel_y++
+ if(client && client.prefs.view_pixelshift && client.pixel_y <= PIXEL_SHIFT_MAXIMUM) //SPLURT Edit
+ client.pixel_y++
is_shifted = TRUE
if(CHECK_BITFIELD(direction, EAST))
if(pixel_x <= PIXEL_SHIFT_MAXIMUM + base_pixel_x)
pixel_x++
- if(client?.prefs.view_pixelshift) //SPLURT Edit
- client?.pixel_x++
+ if(client && client.prefs.view_pixelshift && client.pixel_x <= PIXEL_SHIFT_MAXIMUM) //SPLURT Edit
+ client.pixel_x++
is_shifted = TRUE
if(CHECK_BITFIELD(direction, SOUTH))
if(pixel_y >= -PIXEL_SHIFT_MAXIMUM + base_pixel_y)
pixel_y--
- if(client?.prefs.view_pixelshift) //SPLURT Edit
- client?.pixel_y--
+ if(client && client.prefs.view_pixelshift && client.pixel_y >= -PIXEL_SHIFT_MAXIMUM) //SPLURT Edit
+ client.pixel_y--
is_shifted = TRUE
if(CHECK_BITFIELD(direction, WEST))
if(pixel_x >= -PIXEL_SHIFT_MAXIMUM + base_pixel_x)
pixel_x--
- if(client?.prefs.view_pixelshift) //SPLURT Edit
- client?.pixel_x--
+ if(client && client.prefs.view_pixelshift && client.pixel_x >= -PIXEL_SHIFT_MAXIMUM) //SPLURT Edit
+ client.pixel_x--
is_shifted = TRUE
// Yes, I know this sets it to true for everything if more than one is matched.
diff --git a/modular_sand/code/modules/research/designs/tool_designs.dm b/modular_sand/code/modules/research/designs/tool_designs.dm
index 82f72cc67ae5..ec47f9a7c27f 100644
--- a/modular_sand/code/modules/research/designs/tool_designs.dm
+++ b/modular_sand/code/modules/research/designs/tool_designs.dm
@@ -1,5 +1,5 @@
/datum/design/bsrpd
- name = "Bluespace Rapid Pipe Dispenser"
+ name = "Bluespace Rapid Pipe Dispenser (BSRPD)"
desc = "A tool that can construct and deconstruct pipes on the fly."
id = "bsrpd"
build_type = PROTOLATHE
diff --git a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelbluemoon.dmm b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelbluemoon.dmm
index 6f399407ace9..2aa8aa15965e 100644
--- a/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelbluemoon.dmm
+++ b/modular_splurt/_maps/RandomRuins/SpaceRuins/spacehotelbluemoon.dmm
@@ -53,7 +53,11 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"al" = (
/obj/machinery/light{
dir = 4
@@ -239,7 +243,11 @@
"bO" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"bQ" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -303,7 +311,11 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"cg" = (
/obj/item/toy/plush/catgirl/fermis,
/obj/structure/dresser,
@@ -361,7 +373,11 @@
pixel_y = 24
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"cA" = (
/obj/structure/mirror{
pixel_y = -32
@@ -466,7 +482,11 @@
dir = 4
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"de" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -838,7 +858,11 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"fd" = (
/obj/structure/chair/sofa/corp/right{
dir = 4
@@ -975,7 +999,11 @@
pixel_y = 19
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"fT" = (
/obj/structure/table/wood/fancy/royalblack,
/turf/open/floor/plasteel/dark,
@@ -995,7 +1023,11 @@
dir = 9
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"gi" = (
/obj/structure/chair/sofa/corp/corner{
dir = 1
@@ -1014,7 +1046,11 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"gr" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1069,7 +1105,11 @@
pixel_y = 24
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"hd" = (
/obj/machinery/light/small{
dir = 4
@@ -1337,7 +1377,11 @@
},
/obj/item/soap,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"iw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 8
@@ -1741,7 +1785,11 @@
dir = 6
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"ln" = (
/obj/structure/toilet/secret/low_loot{
dir = 4
@@ -1750,7 +1798,11 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"lq" = (
/obj/machinery/ore_silo,
/turf/open/floor/engine,
@@ -1953,7 +2005,11 @@
pixel_y = 10
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"ms" = (
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/bluemoon/hotel/pool)
@@ -2182,7 +2238,11 @@
/area/ruin/space/has_grav/bluemoon/hotel/workroom)
"nV" = (
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"nZ" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -2301,7 +2361,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"oQ" = (
/obj/item/trash/candy,
/obj/effect/decal/cleanable/cobweb{
@@ -2595,7 +2659,11 @@
dir = 5
},
/turf/open/pool,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"qu" = (
/obj/structure/table,
/obj/item/kitchen/rollingpin,
@@ -2730,7 +2798,11 @@
dir = 8
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"rD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
@@ -2860,7 +2932,11 @@
dir = 8
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"ss" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 2
@@ -2945,7 +3021,11 @@
dir = 5
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"sU" = (
/turf/open/floor/plating,
/area/ruin/space/has_grav/bluemoon/hotel)
@@ -2955,7 +3035,11 @@
},
/obj/structure/pool/ladder,
/turf/open/pool,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"sX" = (
/obj/machinery/button/door{
id = "a6";
@@ -3020,7 +3104,11 @@
/obj/structure/closet/athletic_mixed,
/obj/item/clothing/under/misc/bathrobe,
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"tA" = (
/obj/structure/table,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
@@ -3117,7 +3205,11 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"ud" = (
/obj/machinery/light,
/turf/open/floor/wood/wood_tiled,
@@ -3168,7 +3260,11 @@
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"un" = (
/obj/machinery/vending/clothing{
onstation = 0
@@ -3193,7 +3289,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"uy" = (
/obj/structure/grille,
/obj/structure/grille,
@@ -3665,7 +3765,11 @@
dir = 4
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"xi" = (
/obj/structure/table/wood,
/obj/item/quantum_keycard{
@@ -3835,7 +3939,11 @@
dir = 8
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"yb" = (
/obj/structure/chair/sofa/corp/left{
dir = 1
@@ -3939,7 +4047,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"yR" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -4133,7 +4245,11 @@
"Ac" = (
/obj/structure/sauna_oven,
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"Ad" = (
/obj/machinery/mass_driver{
dir = 4;
@@ -4215,14 +4331,22 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Az" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"AB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -4242,7 +4366,11 @@
pixel_y = 32
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"AN" = (
/obj/structure/table/wood/fancy/royalblack,
/obj/effect/turf_decal/siding/dark{
@@ -4311,7 +4439,11 @@
dir = 8
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"BB" = (
/obj/structure/chair/sofa/corp/right{
dir = 4
@@ -4354,7 +4486,11 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Cc" = (
/obj/machinery/smartfridge,
/turf/open/floor/plasteel/cafeteria,
@@ -4418,7 +4554,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Cy" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 4
@@ -4858,7 +4998,11 @@
pixel_x = 24
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Fu" = (
/obj/machinery/conveyor{
dir = 4;
@@ -4891,7 +5035,11 @@
pixel_y = 24
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"FN" = (
/obj/structure/table/wood/fancy/royalblack,
/obj/effect/turf_decal/siding/dark{
@@ -4948,7 +5096,11 @@
/obj/item/soap,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Gp" = (
/obj/structure/table/plasmaglass,
/turf/open/floor/carpet/purple,
@@ -5024,7 +5176,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"GJ" = (
/obj/structure/closet/wardrobe/pjs,
/turf/open/floor/plasteel/showroomfloor,
@@ -5181,7 +5337,11 @@
/area/ruin/space/has_grav/bluemoon/hotel/pool)
"HF" = (
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"HI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
@@ -5238,7 +5398,11 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Ii" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 6
@@ -5275,7 +5439,11 @@
dir = 10
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Iy" = (
/obj/structure/table,
/obj/item/clothing/under/misc/bathrobe,
@@ -5380,7 +5548,11 @@
"Jo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Jr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -5589,7 +5761,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"La" = (
/obj/machinery/light{
dir = 4
@@ -5758,7 +5934,11 @@
/obj/structure/table,
/obj/structure/bedsheetbin/towel,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"Mk" = (
/obj/structure/mirror{
pixel_x = 28
@@ -5860,14 +6040,22 @@
/area/ruin/space/has_grav/bluemoon/hotel/dock)
"MF" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"MG" = (
/obj/structure/window{
dir = 1;
icon_state = "window"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"MJ" = (
/obj/machinery/light{
dir = 1;
@@ -6148,7 +6336,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"OE" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 8
@@ -6169,7 +6361,11 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"OJ" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -6248,6 +6444,13 @@
},
/turf/open/pool,
/area/ruin/space/has_grav/bluemoon/hotel/pool)
+"Pe" = (
+/turf/closed/wall,
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Pf" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/obj/machinery/light{
@@ -6380,7 +6583,11 @@
pixel_y = 7
},
/turf/open/floor/wood/wood_tiled,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"PI" = (
/obj/structure/table/wood/fancy/cyan,
/turf/open/floor/carpet/cyan,
@@ -6519,7 +6726,11 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"Qu" = (
/obj/machinery/light{
dir = 1
@@ -6555,7 +6766,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"QA" = (
/obj/structure/table/wood/fancy/royalblack,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -6763,7 +6978,11 @@
/area/ruin/space/has_grav/bluemoon/hotel/bar)
"Ry" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"RA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 10
@@ -6846,7 +7065,11 @@
dir = 10
},
/turf/open/pool,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"RY" = (
/obj/machinery/conveyor/inverted{
dir = 10;
@@ -6885,7 +7108,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Sl" = (
/obj/structure/table/glass,
/turf/open/floor/glass/reinforced,
@@ -6925,7 +7152,11 @@
dir = 6
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Sy" = (
/obj/machinery/button/door{
id = "a9";
@@ -6992,7 +7223,11 @@
dir = 6
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"SL" = (
/obj/machinery/door/airlock{
id_tag = "a7";
@@ -7070,7 +7305,11 @@
icon_state = "2-4"
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"To" = (
/obj/effect/turf_decal/tile/red/half{
dir = 4
@@ -7097,7 +7336,11 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
-/area/ruin/space/has_grav/bluemoon/hotel/pool)
+/area/ruin/space/has_grav/bluemoon/hotel/pool{
+ valid_to_shower = 1;
+ name = "Hotel Pool Shower";
+ icon_state = "shower"
+ })
"Tx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
@@ -7114,7 +7357,11 @@
pixel_y = 17
},
/turf/open/pool,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"TD" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/chair/sofa/corp/right{
@@ -7279,7 +7526,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"UM" = (
/obj/structure/table/wood,
/obj/structure/bedsheetbin/towel,
@@ -7300,7 +7551,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"UY" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -7507,7 +7762,11 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Wr" = (
/obj/structure/chair/sofa/corp/corner{
dir = 1
@@ -7628,7 +7887,11 @@
},
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"Xb" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 4
@@ -7717,7 +7980,11 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"XT" = (
/obj/structure/chair/comfy/brown{
color = "#596479"
@@ -7989,7 +8256,11 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/bluemoon/hotel/guestroom)
+/area/ruin/space/has_grav/bluemoon/hotel/guestroom{
+ valid_to_shower = 1;
+ name = "Hotel Guest Shower";
+ icon_state = "shower"
+ })
"ZN" = (
/obj/structure/table/wood,
/obj/item/storage/box/stockparts/basic,
@@ -9238,7 +9509,7 @@ eE
eE
vh
fa
-vh
+Pe
vh
vh
vh
diff --git a/modular_splurt/_maps/away_mission/AGRComplexClock.dmm b/modular_splurt/_maps/away_mission/AGRComplexClock.dmm
index dcf0ae0aa062..fda88581e05b 100644
--- a/modular_splurt/_maps/away_mission/AGRComplexClock.dmm
+++ b/modular_splurt/_maps/away_mission/AGRComplexClock.dmm
@@ -410,7 +410,7 @@
},
/obj/item/soap/homemade,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"apf" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -742,7 +742,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"aHk" = (
/obj/structure/lattice/catwalk,
/turf/open/floor/plating,
@@ -1065,10 +1065,6 @@
/obj/item/wallframe/camera,
/turf/open/floor/wood,
/area/awaymission/complex/command)
-"aUU" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
"aVn" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -1675,7 +1671,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"bxa" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel,
@@ -1693,7 +1689,7 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"byu" = (
/obj/machinery/light/small,
/obj/effect/turf_decal/siding/brown{
@@ -2114,7 +2110,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"bZb" = (
/obj/effect/turf_decal/delivery,
/obj/structure/railing{
@@ -2377,7 +2373,7 @@
/obj/structure/bedsheetbin/towel,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"clp" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate/engineering/electrical,
@@ -3497,12 +3493,6 @@
"dhO" = (
/turf/open/floor/festive/stairs/stairssouth,
/area/awaymission/complex/janitorial)
-"dib" = (
-/obj/structure/toilet/secret/high_loot{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
"din" = (
/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt/dust,
@@ -4175,7 +4165,7 @@
/obj/machinery/space_heater,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"dPB" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -4401,13 +4391,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
-"dWU" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/research)
"dWW" = (
/obj/machinery/door/poddoor/shutters{
name = "lockdown shutters";
@@ -4424,17 +4407,10 @@
},
/turf/closed/wall,
/area/awaymission/complex/janitorial)
-"dXo" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/structure/curtain,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
"dXu" = (
/obj/machinery/light,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"dXA" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -5117,14 +5093,14 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"eyP" = (
/obj/structure/sink{
pixel_y = 30
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"ezB" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/wood,
@@ -5382,7 +5358,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/turf/open/floor/clockwork,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"eHb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -6243,7 +6219,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"fuB" = (
/obj/machinery/vending/cola,
/obj/effect/decal/cleanable/dirt/dust,
@@ -6449,7 +6425,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
+/area/awaymission/complex/shower)
"fDT" = (
/obj/structure/railing{
dir = 8
@@ -6698,6 +6674,9 @@
dir = 1
},
/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel,
/area/awaymission/complex/logistics)
"fMa" = (
@@ -6836,13 +6815,6 @@
},
/turf/open/floor/plating/snowed/smoothed/warmer,
/area/awaymission/complex/exterior)
-"fTe" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
"fTF" = (
/obj/machinery/airalarm,
/turf/closed/wall,
@@ -7347,13 +7319,6 @@
},
/turf/open/floor/wood,
/area/awaymission/complex/engineering)
-"goP" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 8;
- pixel_x = 6
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
"goU" = (
/obj/machinery/power/apc/auto_name/west,
/obj/structure/cable{
@@ -7474,7 +7439,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"gxe" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
@@ -7738,7 +7703,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"gHJ" = (
/obj/structure/railing,
/obj/effect/turf_decal/tile/yellow,
@@ -8036,7 +8001,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/clockwork,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"gUJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -8046,9 +8011,8 @@
/turf/open/floor/plasteel,
/area/awaymission/complex/janitorial)
"gVg" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
+/turf/closed/wall/ice,
+/area/awaymission/complex/shower)
"gVm" = (
/obj/machinery/atmospherics/miner/oxygen,
/turf/open/floor/plating,
@@ -8490,7 +8454,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"hpa" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -8558,6 +8522,9 @@
"hqo" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate/large,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/awaymission/complex/logistics)
"hqV" = (
@@ -9023,14 +8990,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
-"hMh" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/hydroponics)
"hMj" = (
/obj/structure/table,
/obj/item/newspaper,
@@ -9448,7 +9407,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"icr" = (
/obj/structure/table,
/obj/item/camera/detective,
@@ -9569,7 +9528,7 @@
"iis" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"iiT" = (
/obj/structure/flora/tree/dead,
/turf/open/floor/plating/asteroid/snow/complex,
@@ -9871,7 +9830,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"izP" = (
/obj/machinery/light{
dir = 8
@@ -10577,12 +10536,10 @@
/turf/open/floor/plating/asteroid/snow/complex,
/area/awaymission/complex/exterior)
"jgk" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/logistics)
+/obj/structure/table/reinforced/brass,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/clockwork,
+/area/awaymission/complex/shower)
"jgt" = (
/obj/effect/turf_decal/siding/brown{
dir = 9
@@ -10634,13 +10591,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
/area/awaymission/complex/dorms)
-"jjr" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -11
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
"jjw" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red{
@@ -11090,7 +11040,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"jDF" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light{
@@ -11133,7 +11083,7 @@
pixel_x = -11
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"jEs" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -11328,7 +11278,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"jMA" = (
/turf/open/floor/wood{
icon_state = "wood-broken7"
@@ -12031,7 +11981,7 @@
"kos" = (
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"koy" = (
/obj/item/chair/wood,
/turf/open/floor/wood,
@@ -12209,6 +12159,12 @@
},
/turf/open/floor/clockwork,
/area/awaymission/complex/engineering)
+"kwd" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"kwe" = (
/obj/structure/flora/ausbushes/brflowers,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -12688,8 +12644,10 @@
/turf/open/floor/plating,
/area/awaymission/complex/mainfacility)
"kTE" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/obj/machinery/door/airlock/mining,
+/obj/machinery/poweredfans,
+/turf/open/floor/plating,
+/area/awaymission/complex/shower)
"kTI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sink{
@@ -13021,17 +12979,11 @@
},
/turf/open/floor/wood,
/area/awaymission/complex/miningcamp)
-"llJ" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 4
- },
-/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
"lmc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"lnf" = (
/turf/closed/wall/rust,
/area/awaymission/complex/dorms)
@@ -13441,7 +13393,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"lJk" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass/fairy/pink,
@@ -13493,6 +13445,18 @@
/obj/effect/turf_decal/tile/purple,
/turf/open/floor/plasteel,
/area/awaymission/complex/medical)
+"lLx" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"lLK" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -14169,7 +14133,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"mwq" = (
/turf/closed/indestructible/rock/snow,
/area/awaymission/complex/research)
@@ -14307,7 +14271,7 @@
pixel_x = 28
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"mCK" = (
/turf/open/floor/plasteel/dark,
/area/awaymission/complex/minerhouse)
@@ -14622,14 +14586,14 @@
},
/obj/structure/curtain,
/turf/open/floor/plating,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"mMt" = (
/obj/machinery/shower{
pixel_y = 17
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"mMN" = (
/obj/machinery/door/airlock/security/glass,
/turf/open/floor/plating,
@@ -14665,7 +14629,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"mOv" = (
/obj/machinery/modular_computer/console/preset/civilian{
dir = 8
@@ -14775,7 +14739,7 @@
},
/obj/structure/destructible/clockwork/trap/steam_vent,
/turf/open/floor/clockwork,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"mTR" = (
/obj/structure/table,
/obj/item/clothing/head/welding{
@@ -14896,6 +14860,12 @@
},
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
+"mXx" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"mYr" = (
/obj/item/ammo_casing/a762,
/turf/open/floor/plasteel{
@@ -15075,7 +15045,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"ngz" = (
/turf/closed/wall/rust,
/area/awaymission/complex/hydroponics)
@@ -15370,7 +15340,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"nsG" = (
/obj/structure/destructible/clockwork/trap/trigger/pressure_sensor,
/obj/structure/destructible/clockwork/trap/brass_skewer,
@@ -15817,7 +15787,7 @@
"nNi" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
+/area/awaymission/complex/shower)
"nNT" = (
/obj/item/wallframe/picture,
/turf/closed/wall/ice,
@@ -16226,7 +16196,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"oiQ" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/plating,
@@ -16834,7 +16804,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"oJZ" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/turf_decal/weather/snow/corner{
@@ -17472,7 +17442,7 @@
},
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"psW" = (
/obj/machinery/light,
/turf/open/floor/clockwork,
@@ -17605,7 +17575,7 @@
pixel_x = -11
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
+/area/awaymission/complex/shower)
"pwU" = (
/obj/structure/railing{
dir = 8
@@ -18083,7 +18053,7 @@
"pPy" = (
/mob/living/simple_animal/hostile/russian/remnant,
/turf/open/floor/clockwork,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"pPB" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -18207,7 +18177,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"pUZ" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
@@ -18399,7 +18369,7 @@
"qen" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"qev" = (
/obj/structure/guncase/shotgun,
/obj/effect/decal/cleanable/dirt/dust,
@@ -18689,7 +18659,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"qtE" = (
/obj/structure/table/reinforced/brass,
/obj/effect/decal/cleanable/dirt/dust,
@@ -18882,7 +18852,7 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"qCM" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/drip,
@@ -18906,7 +18876,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"qDo" = (
/obj/effect/turf_decal/siding/brown,
/turf/open/floor/carpet,
@@ -19082,7 +19052,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"qJV" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -19267,7 +19237,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"qUe" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -19640,7 +19610,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"rkz" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/damturf/broken7,
@@ -20593,13 +20563,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
-"rQN" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
"rRn" = (
/turf/closed/wall/ice,
/area/awaymission/complex/prison)
@@ -20982,7 +20945,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"sgH" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light{
@@ -21470,13 +21433,6 @@
floor_variance = 0
},
/area/awaymission/complex/janitorial)
-"sCC" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/structure/curtain,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
"sCM" = (
/obj/item/trash/can,
/turf/open/floor/plating/asteroid/snow/complex,
@@ -21857,14 +21813,6 @@
},
/turf/open/floor/plasteel/white,
/area/awaymission/complex/facilityresearch)
-"sUu" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 13;
- pixel_y = 7
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
"sUX" = (
/obj/item/clockwork/component/vanguard_cogwheel/onyx_prism,
/turf/open/floor/clockwork,
@@ -22073,8 +22021,8 @@
/turf/open/floor/plasteel/white,
/area/awaymission/complex/medical)
"tfP" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/turf/closed/wall,
+/area/awaymission/complex/shower)
"tgP" = (
/turf/open/floor/carpet,
/area/awaymission/complex/janitorial)
@@ -22142,7 +22090,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"tjA" = (
/obj/structure/chair{
dir = 1
@@ -22219,7 +22167,7 @@
/area/awaymission/complex/research)
"tmw" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"tmx" = (
/obj/structure/fence,
/obj/structure/cable{
@@ -22431,7 +22379,7 @@
/obj/structure/window/reinforced/tinted,
/obj/item/soap,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"tyo" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/cooking_oil,
@@ -22508,7 +22456,7 @@
},
/obj/effect/decal/cleanable/ash/large,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"tAm" = (
/obj/structure/bed,
/turf/open/floor/plasteel,
@@ -22625,7 +22573,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"tHi" = (
/obj/machinery/photocopier,
/turf/open/floor/plasteel,
@@ -22740,7 +22688,7 @@
pixel_y = 7
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"tKT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -22928,7 +22876,7 @@
/obj/structure/curtain,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"tPN" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/asteroid/snow/complex{
@@ -23178,7 +23126,7 @@
/area/awaymission/complex/engineering)
"ubg" = (
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"ubR" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/plasteel/damturf/scorched,
@@ -23535,7 +23483,7 @@
dir = 1
},
/turf/open/floor/clockwork,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"uqC" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red,
@@ -23880,7 +23828,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"uHQ" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -24922,7 +24870,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"vxJ" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -25639,7 +25587,7 @@
pixel_y = 30
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"wds" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -25822,7 +25770,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"wnc" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -26040,12 +25988,9 @@
/turf/open/floor/plating,
/area/awaymission/complex/thewall)
"wyb" = (
-/obj/machinery/light/small{
- brightness = 3;
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/awaymission/complex/shower)
"wyD" = (
/turf/closed/wall/clockwork,
/area/awaymission/complex/prison)
@@ -26287,13 +26232,6 @@
/obj/item/circuitboard/computer/cloning/prototype,
/turf/open/floor/plating,
/area/awaymission/complex/medical)
-"wKH" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/command)
"wKJ" = (
/obj/structure/mecha_wreckage/phazon,
/turf/open/floor/plating/snowed/complex,
@@ -26397,7 +26335,7 @@
pixel_x = 6
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"wPn" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating,
@@ -26573,7 +26511,7 @@
/obj/structure/curtain,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"xbw" = (
/obj/structure/closet/crate/engineering,
/obj/structure/railing{
@@ -26634,17 +26572,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/complex/research)
-"xdH" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 13;
- pixel_y = 7
- },
-/obj/structure/mirror{
- pixel_x = 28
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
"xdN" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -26740,7 +26667,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"xhM" = (
/obj/structure/table,
/obj/item/storage/box/bodybags,
@@ -26816,7 +26743,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"xkO" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -26922,9 +26849,6 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/complex/hydroponics)
-"xpq" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
"xqd" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27180,7 +27104,7 @@
},
/obj/item/soap/deluxe,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"xBI" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small{
@@ -27553,7 +27477,7 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"xTW" = (
/obj/machinery/light{
dir = 1
@@ -28823,11 +28747,11 @@ sFr
sFr
sFr
sFr
-tcn
-tcn
-tcn
-tcn
-tcn
+tfP
+tfP
+tfP
+tfP
+tfP
sFr
sFr
sFr
@@ -29080,11 +29004,11 @@ sFr
sFr
sFr
sFr
-tcn
+tfP
hoT
-aUU
+iis
nfZ
-tcn
+tfP
sFr
sFr
sFr
@@ -29337,11 +29261,11 @@ sFr
sFr
sFr
sFr
-jRV
+gVg
gwT
-aUU
+iis
mOl
-jRV
+gVg
sFr
sFr
sFr
@@ -29594,11 +29518,11 @@ sFr
sFr
gIA
gIA
-jRV
+gVg
mMt
tmw
xbo
-jRV
+gVg
gIA
sFr
sFr
@@ -29851,11 +29775,11 @@ gIA
iwF
gIA
gIA
-jRV
+gVg
mMt
tmw
-dXo
-jRV
+gHy
+gVg
gIA
gIA
gIA
@@ -30108,11 +30032,11 @@ gIA
gIA
gIA
sQR
-jRV
-jRV
+gVg
+gVg
dXu
-jRV
-jRV
+gVg
+gVg
gIA
gIA
whP
@@ -30365,11 +30289,11 @@ lvw
lvw
gIA
gIA
-jRV
+gVg
jMe
tmw
xTw
-jRV
+gVg
gIA
ssH
gIA
@@ -30622,11 +30546,11 @@ cvC
hjJ
gIA
gIA
-jRV
+gVg
eyP
tmw
xTw
-jRV
+gVg
gIA
gIA
gIA
@@ -30879,11 +30803,11 @@ aRw
vKB
gIA
gIA
-jRV
+gVg
dPv
tmw
xTw
-jRV
+gVg
gIA
gIA
gIA
@@ -31136,11 +31060,11 @@ aRw
lHj
gIA
wVH
-jRV
-jRV
-euK
-jRV
-jRV
+gVg
+gVg
+kTE
+gVg
+gVg
gIA
gIA
gIA
@@ -35380,7 +35304,7 @@ ngz
ngz
sEb
ngz
-hMh
+qTC
tGZ
hFQ
sFr
@@ -49270,7 +49194,7 @@ dgV
skA
uVT
eyI
-qwY
+iis
viZ
qwY
gMH
@@ -51336,10 +51260,10 @@ qKJ
jJE
dWB
ner
-fTe
+sgr
rmT
-wKH
-jjr
+nsb
+pwH
hSI
lwD
cVw
@@ -51595,7 +51519,7 @@ uxh
hRK
xCU
rmT
-dib
+mvF
qen
hSI
eBg
@@ -54420,7 +54344,7 @@ rmT
rmT
xBt
rku
-rQN
+oik
hSI
pbz
hjy
@@ -54676,7 +54600,7 @@ iTJ
pTn
hSI
cln
-tfP
+tmw
aHj
kyi
aGV
@@ -57506,8 +57430,8 @@ gZt
gZt
tLY
nIn
-jgk
-llJ
+nsb
+qCA
nIn
exV
hTE
@@ -57776,7 +57700,7 @@ gXp
gGl
tUw
kVK
-xdH
+mCv
vxv
kVK
qEx
@@ -58008,12 +57932,12 @@ dgV
skA
uTV
kRH
-gCn
-nyD
-nyD
-nyD
-nyD
-nyD
+lLx
+mXx
+mXx
+mXx
+mXx
+kwd
nyD
nyD
nyD
@@ -62231,7 +62155,7 @@ gnT
icb
oXP
eGk
-tYh
+jgk
oXP
icb
xYX
@@ -67693,8 +67617,8 @@ buI
buI
buI
vOn
-gVg
-sCC
+iis
+gHy
hYg
sFr
sFr
@@ -80661,7 +80585,7 @@ fcb
fcb
fcb
jEn
-wyb
+rku
qOF
nPW
hHX
@@ -85790,7 +85714,7 @@ tym
psb
psb
iis
-gKd
+wyb
pHa
kve
kve
@@ -86043,10 +85967,10 @@ iDa
jPd
fcb
icj
-kTE
-kTE
-kTE
-kTE
+tmw
+tmw
+tmw
+tmw
qCP
pHa
uoO
@@ -86300,10 +86224,10 @@ iDa
gIA
fcb
mMo
-fcb
+gVg
izJ
-fcb
-sUu
+gVg
+tKQ
pUK
pHa
rID
@@ -89963,7 +89887,7 @@ wmI
wmI
dum
pwH
-dWU
+sgr
dum
dum
dum
@@ -90219,8 +90143,8 @@ wmI
wmI
wmI
dum
-xpq
-goP
+tmw
+wOW
dum
sfF
uwS
diff --git a/modular_splurt/_maps/away_mission/AGRComplexCult.dmm b/modular_splurt/_maps/away_mission/AGRComplexCult.dmm
index c216c94d4f7c..ae3ad7c2a56e 100644
--- a/modular_splurt/_maps/away_mission/AGRComplexCult.dmm
+++ b/modular_splurt/_maps/away_mission/AGRComplexCult.dmm
@@ -422,7 +422,7 @@
},
/obj/item/soap/homemade,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"apf" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -753,7 +753,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"aHk" = (
/obj/structure/lattice/catwalk,
/turf/open/floor/plating,
@@ -1076,7 +1076,7 @@
"aUU" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"aVn" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -1623,7 +1623,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"bxa" = (
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plasteel,
@@ -1640,7 +1640,7 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"byu" = (
/obj/machinery/light/small,
/obj/effect/turf_decal/siding/brown{
@@ -1677,7 +1677,7 @@
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/glass,
/turf/open/floor/plasteel/cult,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"bAl" = (
/obj/structure/table/wood,
/obj/machinery/computer/med_data/laptop,
@@ -2065,7 +2065,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"bZb" = (
/obj/effect/turf_decal/delivery,
/obj/structure/railing{
@@ -2332,7 +2332,7 @@
/obj/structure/bedsheetbin/towel,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"clp" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate/engineering/electrical,
@@ -3446,7 +3446,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"din" = (
/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt/dust,
@@ -3967,6 +3967,12 @@
},
/turf/open/floor/plasteel/dark,
/area/awaymission/complex/facilityresearch)
+"dCR" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"dDv" = (
/obj/structure/grille/broken,
/obj/item/shard,
@@ -4148,7 +4154,7 @@
/obj/machinery/space_heater,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"dQb" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 5
@@ -4373,7 +4379,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/research)
+/area/awaymission/complex/shower)
"dWW" = (
/obj/machinery/door/poddoor/shutters{
name = "lockdown shutters";
@@ -4396,11 +4402,11 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"dXu" = (
/obj/machinery/light,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"dXA" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -5112,14 +5118,14 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"eyP" = (
/obj/structure/sink{
pixel_y = 30
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"ezB" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/wood,
@@ -6199,7 +6205,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"fuB" = (
/obj/machinery/vending/cola,
/obj/effect/decal/cleanable/dirt/dust,
@@ -6420,7 +6426,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
+/area/awaymission/complex/shower)
"fDT" = (
/obj/structure/railing{
dir = 8
@@ -6668,6 +6674,9 @@
dir = 1
},
/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plasteel,
/area/awaymission/complex/logistics)
"fMa" = (
@@ -6783,12 +6792,10 @@
/turf/open/floor/plating/snowed/smoothed/warmer,
/area/awaymission/complex/exterior)
"fTe" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/obj/structure/table/wood/fancy/blackred,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/cult,
+/area/awaymission/complex/shower)
"fTF" = (
/obj/machinery/airalarm,
/turf/closed/wall,
@@ -7281,13 +7288,6 @@
},
/turf/open/floor/wood,
/area/awaymission/complex/engineering)
-"goP" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 8;
- pixel_x = 6
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
"goU" = (
/obj/machinery/power/apc/auto_name/west,
/obj/structure/cable{
@@ -7419,7 +7419,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"gxe" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
@@ -7670,13 +7670,6 @@
},
/turf/open/floor/plasteel/white,
/area/awaymission/complex/medical)
-"gHy" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/structure/curtain,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
"gHJ" = (
/obj/structure/railing,
/obj/effect/turf_decal/tile/yellow,
@@ -7964,7 +7957,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/cult,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"gUJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -7973,10 +7966,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel,
/area/awaymission/complex/janitorial)
-"gVg" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
"gVm" = (
/obj/machinery/atmospherics/miner/oxygen,
/turf/open/floor/plating,
@@ -8423,7 +8412,7 @@
/obj/structure/table,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"hpa" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -8491,6 +8480,9 @@
"hqo" = (
/obj/effect/turf_decal/delivery,
/obj/structure/closet/crate/large,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/awaymission/complex/logistics)
"hqV" = (
@@ -8854,6 +8846,18 @@
/obj/item/chair,
/turf/open/floor/plasteel,
/area/awaymission/complex/mainfacility)
+"hHa" = (
+/obj/structure/chair{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"hHm" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 10
@@ -8981,7 +8985,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"hMj" = (
/obj/structure/table,
/obj/item/newspaper,
@@ -9406,7 +9410,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"icr" = (
/obj/structure/table,
/obj/item/camera/detective,
@@ -9531,10 +9535,6 @@
/mob/living/simple_animal/pet/fox,
/turf/open/floor/plating/asteroid/snow/complex,
/area/awaymission/complex/exterior)
-"iis" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
"iiT" = (
/obj/structure/flora/tree/dead,
/turf/open/floor/plating/asteroid/snow/complex,
@@ -9827,7 +9827,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"izP" = (
/obj/machinery/light{
dir = 8
@@ -10536,12 +10536,8 @@
/turf/open/floor/plating/asteroid/snow/complex,
/area/awaymission/complex/exterior)
"jgk" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/logistics)
+/turf/closed/wall,
+/area/awaymission/complex/shower)
"jgt" = (
/obj/effect/turf_decal/siding/brown{
dir = 9
@@ -10611,7 +10607,7 @@
pixel_x = -11
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"jjw" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red{
@@ -11059,7 +11055,7 @@
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"jDI" = (
/obj/structure/closet,
/obj/item/mining_voucher,
@@ -11095,7 +11091,7 @@
pixel_x = -11
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"jEs" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -11297,7 +11293,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"jMA" = (
/turf/open/floor/wood{
icon_state = "wood-broken7"
@@ -12012,7 +12008,7 @@
"kos" = (
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"koy" = (
/obj/item/chair/wood,
/turf/open/floor/wood,
@@ -12642,8 +12638,8 @@
/turf/open/floor/plating,
/area/awaymission/complex/mainfacility)
"kTE" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/turf/closed/wall/ice,
+/area/awaymission/complex/shower)
"kTI" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sink{
@@ -12996,12 +12992,12 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
+/area/awaymission/complex/shower)
"lmc" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"lnf" = (
/turf/closed/wall/rust,
/area/awaymission/complex/dorms)
@@ -13407,7 +13403,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"lJk" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass/fairy/pink,
@@ -14135,11 +14131,9 @@
},
/area/awaymission/complex/security)
"mvF" = (
-/obj/structure/toilet/secret/high_loot{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/awaymission/complex/shower)
"mvS" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
@@ -14304,16 +14298,10 @@
/turf/open/floor/plating,
/area/awaymission/complex/research)
"mCv" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 13;
- pixel_y = 7
- },
-/obj/structure/mirror{
- pixel_x = 28
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/obj/machinery/door/airlock/mining,
+/obj/machinery/poweredfans,
+/turf/open/floor/plating,
+/area/awaymission/complex/shower)
"mCK" = (
/turf/open/floor/plasteel/dark,
/area/awaymission/complex/minerhouse)
@@ -14617,14 +14605,14 @@
},
/obj/structure/curtain,
/turf/open/floor/plating,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"mMt" = (
/obj/machinery/shower{
pixel_y = 17
},
/obj/structure/curtain,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"mMN" = (
/obj/machinery/door/airlock/security/glass,
/turf/open/floor/plating,
@@ -14660,7 +14648,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"mOu" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
@@ -14774,7 +14762,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/cult,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"mTR" = (
/obj/structure/table,
/obj/item/clothing/head/welding{
@@ -15095,7 +15083,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"ngz" = (
/turf/closed/wall/rust,
/area/awaymission/complex/hydroponics)
@@ -15378,13 +15366,6 @@
/obj/structure/bonfire,
/turf/open/floor/plating/dirt/jungle,
/area/awaymission/complex/exterior)
-"nsb" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/medical)
"nsG" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plasteel/cult,
@@ -15844,7 +15825,7 @@
"nNi" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/logistics)
+/area/awaymission/complex/shower)
"nNT" = (
/obj/item/wallframe/picture,
/turf/closed/wall/ice,
@@ -16249,7 +16230,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"oiQ" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/plating,
@@ -16873,7 +16854,7 @@
dir = 1
},
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"oJZ" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/effect/turf_decal/weather/snow/corner{
@@ -17524,7 +17505,7 @@
},
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"ptx" = (
/obj/structure/flora/stump,
/turf/open/floor/plating/asteroid/snow/complex,
@@ -17638,13 +17619,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
-"pwH" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -11
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
"pwU" = (
/obj/structure/railing{
dir = 8
@@ -18096,7 +18070,7 @@
"pPy" = (
/mob/living/simple_animal/hostile/russian/remnant,
/turf/open/floor/plasteel/cult,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"pPB" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -18204,7 +18178,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"pUZ" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
@@ -18425,7 +18399,7 @@
"qen" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"qev" = (
/obj/structure/guncase/shotgun,
/obj/effect/decal/cleanable/dirt/dust,
@@ -18639,6 +18613,12 @@
/obj/structure/table,
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
+"qoG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/awaymission/complex/logistics)
"qoV" = (
/obj/machinery/door/airlock/medical/glass,
/turf/open/floor/plating,
@@ -18715,7 +18695,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"qtE" = (
/obj/structure/table/wood/fancy/blackred,
/obj/effect/decal/cleanable/dirt/dust,
@@ -18890,12 +18870,6 @@
/obj/item/trash/semki,
/turf/open/floor/plating,
/area/awaymission/complex/cultcabin)
-"qCA" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 4
- },
-/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
"qCH" = (
/obj/effect/turf_decal/tile/purple{
dir = 4
@@ -18930,7 +18904,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"qDo" = (
/obj/effect/turf_decal/siding/brown,
/turf/open/floor/carpet,
@@ -19104,7 +19078,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"qJV" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -19285,14 +19259,6 @@
floor_variance = 0
},
/area/awaymission/complex/exterior)
-"qTC" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- pixel_y = 17
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/facilityresearch)
"qUe" = (
/obj/effect/turf_decal/tile/green{
dir = 1
@@ -19676,13 +19642,6 @@
},
/turf/open/floor/plating/asteroid/snow/complex,
/area/awaymission/complex/exterior)
-"rku" = (
-/obj/machinery/light/small{
- brightness = 3;
- dir = 8
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
"rkw" = (
/obj/machinery/light,
/obj/effect/turf_decal/trimline/brown/filled/line,
@@ -20675,13 +20634,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel,
/area/awaymission/complex/engineering)
-"rQN" = (
-/obj/structure/toilet/secret/high_loot{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
"rRn" = (
/turf/closed/wall/ice,
/area/awaymission/complex/prison)
@@ -21038,13 +20990,6 @@
},
/turf/open/floor/plating/asteroid/snow/complex,
/area/awaymission/complex/exterior)
-"sgr" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
- dir = 1
- },
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/janitorial)
"sgH" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light{
@@ -21551,13 +21496,6 @@
floor_variance = 0
},
/area/awaymission/complex/janitorial)
-"sCC" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/structure/curtain,
-/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/prison)
"sCM" = (
/obj/item/trash/can,
/turf/open/floor/plating/asteroid/snow/complex,
@@ -21982,7 +21920,7 @@
pixel_y = 7
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"sUX" = (
/obj/item/stack/sheet/runed_metal,
/turf/open/floor/plasteel/cult,
@@ -22185,7 +22123,7 @@
/area/awaymission/complex/medical)
"tfP" = (
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"tgP" = (
/turf/open/floor/carpet,
/area/awaymission/complex/janitorial)
@@ -22253,7 +22191,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"tjA" = (
/obj/structure/chair{
dir = 1
@@ -22328,9 +22266,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel,
/area/awaymission/complex/research)
-"tmw" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
"tmK" = (
/obj/machinery/hydroponics/constructable,
/turf/open/floor/plating,
@@ -22516,7 +22451,7 @@
/obj/structure/window/reinforced/tinted,
/obj/item/soap,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"tyo" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/reagent_dispensers/cooking_oil,
@@ -22593,7 +22528,7 @@
},
/obj/effect/decal/cleanable/ash/large,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"tAm" = (
/obj/structure/bed,
/turf/open/floor/plasteel,
@@ -22699,7 +22634,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/hydroponics)
+/area/awaymission/complex/shower)
"tHi" = (
/obj/machinery/photocopier,
/turf/open/floor/plasteel,
@@ -22797,14 +22732,6 @@
floor_variance = 0
},
/area/awaymission/complex/cultfacility)
-"tKQ" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 13;
- pixel_y = 7
- },
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
"tKT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -22977,7 +22904,7 @@
/obj/structure/curtain,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/dorms)
+/area/awaymission/complex/shower)
"tPN" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plating/asteroid/snow/complex{
@@ -23254,7 +23181,7 @@
/area/awaymission/complex/engineering)
"ubg" = (
/turf/open/floor/plasteel/freezer,
-/area/awaymission/complex/janitorial)
+/area/awaymission/complex/shower)
"ubR" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/floor/plasteel/damturf/scorched,
@@ -23597,7 +23524,7 @@
dir = 1
},
/turf/open/floor/plasteel/cult,
-/area/awaymission/complex/cultfacility)
+/area/awaymission/complex/shower)
"uqC" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red,
@@ -23914,7 +23841,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"uHQ" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -24949,7 +24876,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"vxJ" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -25669,7 +25596,7 @@
pixel_y = 30
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"wds" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -25852,7 +25779,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/prison)
+/area/awaymission/complex/shower)
"wnc" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 9
@@ -26068,7 +25995,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/engineering)
+/area/awaymission/complex/shower)
"wyD" = (
/turf/closed/wall/mineral/cult,
/area/awaymission/complex/prison)
@@ -26328,7 +26255,7 @@
pixel_y = 17
},
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"wKJ" = (
/obj/structure/mecha_wreckage/phazon,
/turf/open/floor/plating/snowed/complex,
@@ -26420,7 +26347,7 @@
pixel_x = 6
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/security)
+/area/awaymission/complex/shower)
"wPn" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating,
@@ -26603,7 +26530,7 @@
/obj/structure/curtain,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"xbw" = (
/obj/structure/closet/crate/engineering,
/obj/structure/railing{
@@ -26685,7 +26612,7 @@
pixel_x = 28
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/medical)
+/area/awaymission/complex/shower)
"xdN" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -26781,7 +26708,7 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/woodcabin)
+/area/awaymission/complex/shower)
"xhM" = (
/obj/structure/table,
/obj/item/storage/box/bodybags,
@@ -26857,7 +26784,7 @@
dir = 1
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/facilityresearch)
+/area/awaymission/complex/shower)
"xkO" = (
/obj/effect/turf_decal/siding/yellow{
dir = 1
@@ -26956,9 +26883,6 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/awaymission/complex/hydroponics)
-"xpq" = (
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/research)
"xqd" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27209,7 +27133,7 @@
},
/obj/item/soap/deluxe,
/turf/open/floor/plasteel/showroomfloor/shower,
-/area/awaymission/complex/command)
+/area/awaymission/complex/shower)
"xBI" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small{
@@ -27565,7 +27489,7 @@
dir = 4
},
/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/complex/miningcamp)
+/area/awaymission/complex/shower)
"xTW" = (
/obj/machinery/light{
dir = 1
@@ -28860,11 +28784,11 @@ sFr
sFr
sFr
sFr
-tcn
-tcn
-tcn
-tcn
-tcn
+jgk
+jgk
+jgk
+jgk
+jgk
sFr
sFr
sFr
@@ -29117,11 +29041,11 @@ sFr
sFr
sFr
sFr
-tcn
+jgk
hoT
aUU
nfZ
-tcn
+jgk
sFr
sFr
sFr
@@ -29374,11 +29298,11 @@ sFr
sFr
sFr
sFr
-jRV
+kTE
gwT
aUU
mOl
-jRV
+kTE
sFr
sFr
sFr
@@ -29631,11 +29555,11 @@ sFr
sFr
gIA
gIA
-jRV
+kTE
mMt
-tmw
+tfP
xbo
-jRV
+kTE
gIA
sFr
sFr
@@ -29888,11 +29812,11 @@ gIA
iwF
gIA
gIA
-jRV
+kTE
mMt
-tmw
+tfP
dXo
-jRV
+kTE
gIA
gIA
gIA
@@ -30145,11 +30069,11 @@ gIA
gIA
gIA
sQR
-jRV
-jRV
+kTE
+kTE
dXu
-jRV
-jRV
+kTE
+kTE
gIA
gIA
whP
@@ -30402,11 +30326,11 @@ lvw
lvw
gIA
gIA
-jRV
+kTE
jMe
-tmw
+tfP
xTw
-jRV
+kTE
gIA
ssH
gIA
@@ -30659,11 +30583,11 @@ cvC
hjJ
gIA
gIA
-jRV
+kTE
eyP
-tmw
+tfP
xTw
-jRV
+kTE
gIA
gIA
gIA
@@ -30916,11 +30840,11 @@ aRw
vKB
gIA
gIA
-jRV
+kTE
dPv
-tmw
+tfP
xTw
-jRV
+kTE
gIA
gIA
gIA
@@ -31173,11 +31097,11 @@ aRw
lHj
gIA
rCL
-jRV
-jRV
-euK
-jRV
-jRV
+kTE
+kTE
+mCv
+kTE
+kTE
gIA
gIA
gIA
@@ -33367,7 +33291,7 @@ sFr
sFr
pQF
ubg
-qCA
+llJ
fWs
fWs
fWs
@@ -33624,7 +33548,7 @@ sFr
sFr
pQF
oJX
-sgr
+dWU
fWs
sFr
sFr
@@ -49049,7 +48973,7 @@ mVw
dgV
skA
uVT
-gHy
+dXo
tPu
qKJ
oUS
@@ -49307,7 +49231,7 @@ dgV
skA
uVT
eyI
-qwY
+aUU
viZ
qwY
gMH
@@ -49563,7 +49487,7 @@ mVw
dgV
eBD
uVT
-gHy
+dXo
jDv
qKJ
ePn
@@ -51373,7 +51297,7 @@ qKJ
jJE
dWB
ner
-fTe
+dWU
rmT
wKH
jjr
@@ -54456,8 +54380,8 @@ rmT
rmT
rmT
xBt
-rku
-rQN
+wyb
+oik
hSI
pbz
hjy
@@ -54729,7 +54653,7 @@ xeV
jZT
vHx
xms
-qTC
+hMh
byc
rfU
wrM
@@ -54987,7 +54911,7 @@ uvO
wWS
xms
xku
-mCv
+xdH
rfU
wrM
eTH
@@ -57543,7 +57467,7 @@ gZt
gZt
tLY
nIn
-jgk
+wKH
llJ
nIn
exV
@@ -57556,7 +57480,7 @@ gnu
cbG
xEE
kVK
-nsb
+wKH
oik
kVK
pfq
@@ -58045,12 +57969,12 @@ dgV
skA
uTV
kRH
-gCn
-nyD
-nyD
-nyD
-nyD
-nyD
+hHa
+qoG
+qoG
+qoG
+qoG
+dCR
nyD
nyD
nyD
@@ -62268,7 +62192,7 @@ gnT
icb
oXP
bAg
-tYh
+fTe
oXP
icb
xYX
@@ -67730,8 +67654,8 @@ buI
buI
buI
vOn
-gVg
-sCC
+aUU
+dXo
hYg
sFr
sFr
@@ -80954,7 +80878,7 @@ rrx
ewD
ewD
pHa
-mvF
+dib
lIS
xuQ
rHl
@@ -82384,7 +82308,7 @@ mcw
fng
gcy
wOW
-tKQ
+sUu
iGx
ssH
gIA
@@ -85826,8 +85750,8 @@ psb
tym
psb
psb
-iis
-gKd
+aUU
+mvF
pHa
kve
kve
@@ -86080,10 +86004,10 @@ iDa
jPd
fcb
icj
-kTE
-kTE
-kTE
-kTE
+tfP
+tfP
+tfP
+tfP
qCP
pHa
uoO
@@ -86337,9 +86261,9 @@ iDa
gIA
fcb
mMo
-fcb
+kTE
izJ
-fcb
+kTE
sUu
pUK
pHa
@@ -89999,7 +89923,7 @@ wmI
wmI
wmI
dum
-pwH
+jjr
dWU
dum
dum
@@ -90256,8 +90180,8 @@ wmI
wmI
wmI
dum
-xpq
-goP
+eyI
+wOW
dum
sfF
uwS
diff --git a/modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm b/modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm
index 41669bdbd1b2..c0e6ea1f50f6 100644
--- a/modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm
+++ b/modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm
@@ -6,9 +6,15 @@
category = CAT_CLOTHING
/datum/crafting_recipe/tailbag_xl
- name = "XL Tailbag"
+ name = "XL Tailbag (using empty Tailbag)"
result = /obj/item/storage/wallet/tailbag/xtralg
reqs = list(/obj/item/storage/wallet/tailbag = 1,
/obj/item/stack/sheet/leather = 2)
time = 30
category = CAT_CLOTHING
+
+/datum/crafting_recipe/tailbag_xl/check_requirements(mob/user, list/collected_requirements)
+ for(var/obj/item/storage/wallet/tailbag/TB in collected_requirements[/obj/item/storage/wallet/tailbag])
+ if(TB.contents.len)
+ return FALSE
+ return TRUE
diff --git a/modular_splurt/code/datums/traits/positive_quirks/bloodfledge.dm b/modular_splurt/code/datums/traits/positive_quirks/bloodfledge.dm
index 85b88a5e786f..5597fd5079f0 100644
--- a/modular_splurt/code/datums/traits/positive_quirks/bloodfledge.dm
+++ b/modular_splurt/code/datums/traits/positive_quirks/bloodfledge.dm
@@ -137,8 +137,10 @@
// Remove quirk ability action datums
var/datum/action/cooldown/bloodfledge/bite/act_bite = locate() in quirk_mob.actions
var/datum/action/cooldown/bloodfledge/revive/act_revive = locate() in quirk_mob.actions
- act_bite.Remove(quirk_mob)
- act_revive.Remove(quirk_mob)
+ if(act_bite)
+ act_bite.Remove(quirk_mob)
+ if(act_revive)
+ act_revive.Remove(quirk_mob)
// Remove quirk language
quirk_mob.remove_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER)
diff --git a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
index a46f70162663..4e908f8d75df 100644
--- a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
+++ b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
@@ -49,6 +49,7 @@
random = TRUE
can_load_appearance = TRUE
loadout_enabled = FALSE
+ category = "offstation"
/obj/effect/mob_spawn/human/ash_walkers_slave/special_post_appearance(mob/living/new_spawn)
. = ..()
@@ -81,6 +82,7 @@
Only you know how you got to this planetoid, whether this place in which you woke up was one of your shelters, or you just stumbled upon it."
can_load_appearance = TRUE
antagonist_type = /datum/antagonist/ghost_role/hermit
+ category = "offstation"
/obj/effect/mob_spawn/human/wandering_hermit/Destroy()
var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
@@ -196,6 +198,7 @@
assignedrole = ROLE_GHOSTROLE_INTEQ
antagonist_type = /datum/antagonist/ghost_role/inteq
loadout_enabled = TRUE
+ category = "inteq"
/datum/outfit/inteqspace/inteq_crew/post_equip(mob/living/carbon/human/H)
H.faction |= ROLE_INTEQ
@@ -224,7 +227,8 @@
. = ..()
if(GLOB.master_mode == "Extended")
important_info = "Запрещено пытаться сбежать и сопротивляться без веских причин как серьёзная угроза жизни от сотрудников Космической Полиции и Солнечной. Побег только с разрешения администрации."
-
+ category = "sol"
+
/obj/effect/mob_spawn/human/inteqspace/captain
name = "InteQ Ship Captain"
short_desc = "Вы - Лидер Авангарда ИнтеКью на старом корабле, застрявшем во враждебном космосе."
diff --git a/modular_splurt/code/modules/awaymissions/mission_code/AGRComplex.dm b/modular_splurt/code/modules/awaymissions/mission_code/AGRComplex.dm
index 725257232c28..9553b5bb7620 100644
--- a/modular_splurt/code/modules/awaymissions/mission_code/AGRComplex.dm
+++ b/modular_splurt/code/modules/awaymissions/mission_code/AGRComplex.dm
@@ -65,6 +65,12 @@
/area/awaymission/complex/mainfacility
name = "Primary Complex"
icon_state = "awaycontent12"
+ sub_areas = list(/area/awaymission/complex/shower)
+
+/area/awaymission/complex/shower
+ icon = 'icons/turf/areas.dmi'
+ icon_state = "shower"
+ name = "Shower"
/area/awaymission/complex/logistics
name = "Logistics Department"
diff --git a/modular_splurt/code/modules/client/loadout/glasses.dm b/modular_splurt/code/modules/client/loadout/glasses.dm
index 2e807ad57aa4..a658f63cff47 100644
--- a/modular_splurt/code/modules/client/loadout/glasses.dm
+++ b/modular_splurt/code/modules/client/loadout/glasses.dm
@@ -50,12 +50,12 @@
/datum/gear/glasses/security/sunglasses/holo
name = "Holo Secuirity HUD Glasses"
path = /obj/item/clothing/glasses/hud/security/sunglasses/holo
- restricted_roles = list("Peacekeeper", "Security Officer", "Warden", "Head of Security")
+ restricted_roles = list("Peacekeeper", "Security Officer", "Warden", "Head of Security", "NanoTrasen Representative", "Captain", "Blueshield") // Add by KiJoking
/datum/gear/glasses/security/sunglasses/holo/prescription
name = "Prescription Holo Secuirity HUD Glasses"
path = /obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription
- restricted_roles = list("Peacekeeper", "Security Officer", "Warden", "Head of Security")
+ restricted_roles = list("Peacekeeper", "Security Officer", "Warden", "Head of Security", "NanoTrasen Representative", "Captain", "Blueshield") // Add by KiJoking
//NON-RESTRICTED
diff --git a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm
index 0052fae3c646..170603584840 100644
--- a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm
+++ b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm
@@ -80,7 +80,7 @@
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/suit.dmi'
icon_state = "baroness"
item_state = "baroness"
- body_parts_covered = CHEST|GROIN|LEGS|FEET
+ body_parts_covered = CHEST|GROIN|LEGS
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
flags_inv = HIDESHOES|HIDEUNDERWEAR
diff --git a/modular_splurt/icons/obj/drinks.dmi b/modular_splurt/icons/obj/drinks.dmi
index 0863b0878d49..be9a06e9ae74 100644
Binary files a/modular_splurt/icons/obj/drinks.dmi and b/modular_splurt/icons/obj/drinks.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index f4657ba3a193..8d36aa16ff5f 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -405,6 +405,7 @@
#include "code\_onclick\hud\new_player.dm"
#include "code\_onclick\hud\picture_in_picture.dm"
#include "code\_onclick\hud\plane_master.dm"
+#include "code\_onclick\hud\plane_master_controller.dm"
#include "code\_onclick\hud\radial.dm"
#include "code\_onclick\hud\radial_persistent.dm"
#include "code\_onclick\hud\revenanthud.dm"
@@ -4265,6 +4266,7 @@
#include "modular_bluemoon\code\game\objects\anti_singulo.dm"
#include "modular_bluemoon\code\game\objects\effects\decals\cleanable\misc.dm"
#include "modular_bluemoon\code\game\objects\items\fleshlight.dm"
+#include "modular_bluemoon\code\game\objects\items\inducer.dm"
#include "modular_bluemoon\code\game\objects\items\pinpointer.dm"
#include "modular_bluemoon\code\game\objects\items\plushes.dm"
#include "modular_bluemoon\code\game\objects\items\devices\multitool.dm"
@@ -4456,6 +4458,9 @@
#include "modular_bluemoon\icons\code\under.dm"
#include "modular_bluemoon\jobs_species_blacklist\jobs_species_blacklist.dm"
#include "modular_bluemoon\jukebox\jukebox_function.dm"
+#include "modular_bluemoon\KiJoking\code\clothing\suit.dm"
+#include "modular_bluemoon\KiJoking\code\loadout\suit.dm"
+#include "modular_bluemoon\KiJoking\code\modules\mob\living\emotes.dm"
#include "modular_bluemoon\kovac_shitcode\code\body_markings.dm"
#include "modular_bluemoon\kovac_shitcode\code\coffee_update.dm"
#include "modular_bluemoon\kovac_shitcode\code\lambda_code.dm"
diff --git a/tgui/packages/tgui/interfaces/SpawnersMenu.js b/tgui/packages/tgui/interfaces/SpawnersMenu.js
index 667cd44d9e0e..8ff89d64af77 100644
--- a/tgui/packages/tgui/interfaces/SpawnersMenu.js
+++ b/tgui/packages/tgui/interfaces/SpawnersMenu.js
@@ -1,67 +1,222 @@
-import { useBackend } from '../backend';
-import { Box, Button, Icon, Section, Tooltip } from '../components';
+import { useBackend, useSharedState } from '../backend';
+import { Box, Button, Icon, Section, Tooltip, Tabs } from '../components';
import { Window } from '../layouts';
export const SpawnersMenu = (props, context) => {
- const { act, data } = useBackend(context);
- const spawners = data.spawners || [];
return (
-
+
-
- {spawners.map(spawner => (
-
-
-
-
-
- ))}
-
+
);
};
+
+export const SpawnerContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [tab, setTab] = useSharedState(context, 'tab', 'misc');
+ const spawners = data.spawners || [];
+ const misc = spawners.filter((spawner) => spawner.category === 'misc');
+ const syndicate = spawners.filter((spawner) => spawner.category === 'syndicate');
+ const inteq = spawners.filter((spawner) => spawner.category === 'inteq');
+ const sol = spawners.filter((spawner) => spawner.category === 'sol');
+ const midround = spawners.filter((spawner) => spawner.category === 'midround');
+ const special = spawners.filter((spawner) => spawner.category === 'special');
+ const offstation = spawners.filter((spawner) => spawner.category === 'offstation');
+
+ return (
+
+
+
+ {misc.length > 0 && (
+ setTab('misc')}>
+ Misc ({misc.length})
+
+ )}
+ {syndicate.length > 0 && (
+ setTab('syndicate')}>
+ Syndicate ({syndicate.length})
+
+ )}
+ {inteq.length > 0 && (
+ setTab('inteq')}>
+ InteQ ({inteq.length})
+
+ )}
+ {sol.length > 0 && (
+ setTab('sol')}>
+ Solar Gov. ({sol.length})
+
+ )}
+ {midround.length > 0 && (
+ setTab('midround')}>
+ Mid-Round ({midround.length})
+
+ )}
+ {special.length > 0 && (
+ setTab('special')}>
+ Special ({special.length})
+
+ )}
+ {offstation.length > 0 && (
+ setTab('offstation')}>
+ Off-Station ({offstation.length})
+
+ )}
+
+
+ {tab === 'misc' && }
+ {tab === 'syndicate' && }
+ {tab === 'inteq' && }
+ {tab === 'sol' && }
+ {tab === 'midround' && }
+ {tab === 'special' && }
+ {tab === 'offstation' && }
+
+ );
+};
+
+export const RolelistItem = (props, context) => {
+ const spawner = props.spawner || {};
+ const { act } = useBackend(context);
+
+ return (
+
+
+
+
+
+ );
+};
+
+export const RolelistMisc = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistSyndicate = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistInteq = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistSol = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistMidround = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistSpecial = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};
+
+export const RolelistOffstation = ({ spawners, context }) => {
+ return (
+
+ {spawners.map((spawner) => (
+
+ ))}
+
+ );
+};