diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm
new file mode 100644
index 00000000..2c06f622
--- /dev/null
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_duohermit.dmm
@@ -0,0 +1,66 @@
+"a" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors)
+"b" = (/obj/effect/decal/cleanable/blood/drip,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"c" = (/turf/closed/wall/mineral/iron,/area/ruin/powered)
+"d" = (/obj/item/circuitboard/machine/circuit_imprinter,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"e" = (/obj/item/clothing/mask/breath,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"f" = (/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"g" = (/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"h" = (/obj/item/shovel,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"i" = (/obj/item/reagent_containers/glass/bucket,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"j" = (/obj/structure/sink/puddle,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"k" = (/obj/machinery/hydroponics/soil,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"l" = (/obj/item/storage/toolbox/emergency,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"m" = (/obj/structure/glowshroom/single,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"n" = (/obj/structure/rack,/obj/item/seeds/reishi,/obj/item/seeds/plump,/obj/item/seeds/plump,/obj/item/seeds/tower,/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom,/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"o" = (/turf/open/floor/plating,/area/ruin/powered)
+"p" = (/obj/structure/rack,/obj/item/storage/bag/plants/portaseeder,/obj/item/storage/bag/ore,/obj/item/storage/firstaid/regular,/obj/item/clothing/mask/breath,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"q" = (/obj/structure/glowshroom/single,/turf/open/floor/plating,/area/ruin/powered)
+"r" = (/obj/structure/rack,/obj/item/tank/internals/oxygen,/obj/item/pickaxe/emergency,/obj/item/tank/internals/oxygen,/obj/item/pickaxe/emergency,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"s" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"t" = (/turf/closed/wall/mineral/titanium/survival/pod,/area/ruin/powered)
+"u" = (/obj/structure/bed/pod,/obj/item/bedsheet/black,/turf/open/floor/plating,/area/ruin/powered)
+"v" = (/obj/structure/fans,/turf/open/floor/pod/dark,/area/ruin/powered)
+"w" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod/dark,/area/ruin/powered)
+"x" = (/obj/effect/mob_spawn/human/duohermit,/turf/open/floor/pod/dark,/area/ruin/powered)
+"y" = (/turf/open/floor/pod/dark,/area/ruin/powered)
+"z" = (/obj/machinery/light/small{dir = 4},/obj/structure/tubes,/turf/open/floor/plating,/area/ruin/powered)
+"A" = (/obj/structure/table,/obj/item/clothing/head/welding,/obj/item/hatchet,/obj/item/kitchen/knife/combat/survival,/turf/open/floor/plating,/area/ruin/powered)
+"C" = (/obj/structure/tubes,/obj/item/crowbar,/obj/effect/decal/cleanable/blood/drip,/turf/open/floor/pod/dark,/area/ruin/powered)
+"D" = (/obj/effect/decal/cleanable/blood/footprints{dir = 1; icon_state = "blood1"},/obj/machinery/door/airlock/survival_pod/glass,/obj/structure/fans/tiny,/turf/open/floor/pod/dark,/area/ruin/powered)
+"E" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"F" = (/obj/machinery/computer{desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; dir = 8; name = "Broken Computer"},/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"G" = (/obj/item/clothing/suit/space/orange,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"H" = (/obj/item/storage/toolbox/mechanical,/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"I" = (/obj/item/circuitboard/machine/autolathe,/obj/item/stock_parts/matter_bin,/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"J" = (/obj/item/stock_parts/manipulator,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"K" = (/obj/structure/mirror{pixel_x = 28},/turf/open/floor/plating,/area/ruin/powered)
+"L" = (/obj/item/clothing/head/helmet/space/orange,/turf/open/floor/plating/asteroid{name = "dirt"},/area/ruin/powered)
+"M" = (/obj/structure/girder,/turf/open/floor/plating{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
+"N" = (/obj/effect/spawner/structure/window/shuttle,/turf/open/floor/plating{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
+"O" = (/obj/machinery/door/airlock/titanium{name = "Escape Pod Airlock"},/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"Q" = (/turf/open/floor/mineral/titanium/blue,/area/ruin/powered)
+"T" = (/obj/item/stock_parts/matter_bin,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"U" = (/obj/item/stock_parts/matter_bin,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"V" = (/turf/closed/wall/mineral/titanium/interior,/area/ruin/powered)
+"W" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 8},/turf/closed/wall/mineral/titanium/interior,/area/ruin/powered)
+"Y" = (/obj/item/mining_scanner,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"Z" = (/obj/item/circuitboard/machine/protolathe/department/science,/obj/item/circuitboard/computer/rdconsole,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+
+(1,1,1) = {"
+aaaaaaaccccaaaaa
+aaaacccfkkkcaaaa
+aaacdffgeGhkcaaa
+aacffffgijmkcaaa
+aacJfYffLilkcaaa
+aaccfffffgncaaaa
+aaacffZfffpcaaaa
+aaacTfoqofrcaaaa
+saactttooucaaaaa
+saaatvwooKcaaaaa
+sssatxyztAcaaaaa
+sssstxyCtcWVVaaa
+ssssttDttaWEQMaa
+ssssssssssOEFNaa
+sssUssbsssWHIVaa
+sssssssssbWVVaaa
+"}
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index bf4f0dbf..dfad8faf 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -228,6 +228,8 @@
/obj/item/stack/rods/fifty,
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
+/obj/item/circuitboard/computer/solar_control,
+/obj/item/electronics/tracker,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/deepstorage/storage)
"aL" = (
@@ -3065,10 +3067,11 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage)
"gR" = (
-/obj/structure/grille,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/structure/cable/yellow,
+/obj/machinery/power/rtg/advanced,
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gT" = (
diff --git a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm
index 7f55d69b..c81d252f 100644
--- a/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm
+++ b/_maps/RandomRuins/StationRuins/Box/Engine/engine_tesla.dmm
@@ -683,7 +683,7 @@
/turf/open/floor/plating/airless,
/area/engine/engineering)
"LB" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -763,10 +763,6 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"Og" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/engine/engineering)
"Ox" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -1413,7 +1409,7 @@ Aw
JC
WI
rj
-Og
+rj
rm
tl
ht
@@ -1441,7 +1437,7 @@ wt
tE
rj
rj
-Og
+rj
rm
ZS
Xk
@@ -1469,7 +1465,7 @@ ZK
zZ
ZK
fH
-Og
+rj
rm
ea
hR
@@ -1497,7 +1493,7 @@ Ox
nR
Zb
lY
-Og
+rj
rm
yq
rm
@@ -1553,7 +1549,7 @@ nW
Mn
WQ
lY
-Og
+rj
rm
ZS
rm
@@ -1581,7 +1577,7 @@ No
tT
No
LV
-Og
+rj
rm
DF
hR
@@ -1609,7 +1605,7 @@ wt
tE
rj
rj
-Og
+rj
rm
ZS
Xk
@@ -1637,7 +1633,7 @@ Aw
JC
WI
rj
-Og
+rj
rm
Ce
ht
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 525c8fcf..b2a34cad 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -2285,14 +2285,6 @@
"fh" = (
/turf/closed/wall/rust,
/area/awaymission/snowdin/post/gateway)
-"fi" = (
-/obj/structure/barricade/wooden/crude,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/awaymission/snowdin/post/messhall)
"fj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -2405,8 +2397,8 @@
/area/awaymission/snowdin/post/dorm)
"fw" = (
/obj/machinery/sleeper{
- icon_state = "sleeper";
- dir = 4
+ dir = 4;
+ icon_state = "sleeper"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -2551,7 +2543,6 @@
"fK" = (
/obj/structure/table/reinforced,
/obj/item/trash/raisins,
-/obj/structure/barricade/wooden/crude,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -2587,6 +2578,9 @@
"fP" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
+/obj/item/seeds/apple,
+/obj/item/seeds/glowshroom,
+/obj/item/seeds/plump,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
@@ -6275,9 +6269,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/plasteel{
- icon_state = "yellow"
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
"np" = (
/obj/structure/cable/yellow{
@@ -6521,9 +6513,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/plasteel{
- icon_state = "yellow"
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
"nR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -6749,9 +6739,9 @@
"oo" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
+ piping_layer = 3;
pixel_x = 5;
- pixel_y = 5;
- piping_layer = 3
+ pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -6759,9 +6749,9 @@
"op" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4;
+ piping_layer = 3;
pixel_x = 5;
- pixel_y = 5;
- piping_layer = 3
+ pixel_y = 5
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
@@ -7151,9 +7141,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/turf/open/floor/plasteel{
- icon_state = "redcorner"
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/secpost)
"pn" = (
/turf/open/floor/plating,
@@ -7791,9 +7779,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/turf/open/floor/plasteel{
- icon_state = "yellow"
- },
+/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/engineering)
"qS" = (
/obj/machinery/button/door{
@@ -9765,10 +9751,10 @@
/area/awaymission/snowdin/post/broken_shuttle)
"wc" = (
/obj/machinery/computer{
- name = "Shuttle Transist Console";
desc = "A console meant for calling and sending a transit ferry. It seems iced-over and non-functional.";
dir = 1;
- icon_screen = null
+ icon_screen = null;
+ name = "Shuttle Transist Console"
},
/turf/open/floor/mineral/titanium/blue,
/area/awaymission/snowdin/post/broken_shuttle)
@@ -9857,9 +9843,9 @@
"wm" = (
/obj/machinery/porta_turret/centcom_shuttle/weak{
desc = "A turret built with substandard parts and run down further with age.";
- icon_state = "syndie_off";
dir = 9;
- faction = list("pirate")
+ faction = list("pirate");
+ icon_state = "syndie_off"
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
@@ -9984,8 +9970,8 @@
/area/awaymission/snowdin/outside)
"wC" = (
/obj/vehicle/ridden/atv{
- icon_state = "atv";
- dir = 4
+ dir = 4;
+ icon_state = "atv"
},
/obj/effect/light_emitter{
name = "outdoor light";
@@ -10722,10 +10708,10 @@
/area/awaymission/snowdin/cave)
"yu" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- name = "toxin out";
dir = 8;
+ frequency = 1442;
id_tag = "snowdin_toxins_mine_1";
- frequency = 1442
+ name = "toxin out"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
@@ -11097,8 +11083,8 @@
/area/awaymission/snowdin/post/minipost)
"zq" = (
/obj/vehicle/ridden/atv{
- icon_state = "atv";
- dir = 8
+ dir = 8;
+ icon_state = "atv"
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/minipost)
@@ -12349,8 +12335,8 @@
/area/awaymission/snowdin/cave)
"CP" = (
/obj/structure/shuttle/engine/heater{
- icon_state = "heater";
- dir = 4
+ dir = 4;
+ icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -12884,8 +12870,8 @@
/area/awaymission/snowdin/cave)
"DU" = (
/obj/structure/shuttle/engine/heater{
- icon_state = "heater";
- dir = 4
+ dir = 4;
+ icon_state = "heater"
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -13324,8 +13310,8 @@
/area/awaymission/snowdin/cave)
"EN" = (
/obj/machinery/sleeper/syndie{
- icon_state = "sleeper_s";
- dir = 1
+ dir = 1;
+ icon_state = "sleeper_s"
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
@@ -13337,8 +13323,8 @@
"EP" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/sleeper/syndie{
- icon_state = "sleeper_s";
- dir = 1
+ dir = 1;
+ icon_state = "sleeper_s"
},
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/cave)
@@ -14559,8 +14545,8 @@
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
- icon_state = "ripley";
- dir = 1
+ dir = 1;
+ icon_state = "ripley"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mech_bay_recharge_floor,
@@ -14620,8 +14606,8 @@
/area/awaymission/snowdin/post/mining_main)
"Ix" = (
/obj/vehicle/ridden/atv{
- icon_state = "atv";
- dir = 1
+ dir = 1;
+ icon_state = "atv"
},
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
@@ -28210,7 +28196,7 @@ aC
aC
dP
es
-fi
+ex
fK
gB
hq
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 0fcdb63e..c040ef21 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -194,12 +194,21 @@
allow_duplicates = FALSE
cost = 10
+/datum/map_template/ruin/lavaland/duohermit
+ name = "Makeshift Big Shelter"
+ id = "duohermitcave"
+ description = "A place of shelter for a couple of stranded hermits, scraping by to live another day."
+ suffix = "lavaland_surface_duohermit.dmm"
+ allow_duplicates = FALSE
+ cost = 5
+
/datum/map_template/ruin/lavaland/hermit
name = "Makeshift Shelter"
id = "hermitcave"
description = "A place of shelter for a lone hermit, scraping by to live another day."
suffix = "lavaland_surface_hermit.dmm"
allow_duplicates = FALSE
+ never_spawn_with = list(/datum/map_template/ruin/lavaland/duohermit)
cost = 5
/datum/map_template/ruin/lavaland/swarmer_boss
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 8b517021..07b113e0 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -249,6 +249,54 @@
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
return ..()
+//Duo malfunctioning cryostasis sleepers: Spawns in big makeshift shelters in lavaland.
+/obj/effect/mob_spawn/human/duohermit
+ name = "malfunctioning cryostasis sleeper"
+ desc = "A humming sleeper with a silhouetted occupant inside. Its stasis function is broken and it's likely being used as a bed."
+ mob_name = "a stranded hermit"
+ job_description = "Lavaland Hermit"
+ icon = 'icons/obj/lavaland/spawners.dmi'
+ icon_state = "cryostasis_sleeper"
+ roundstart = FALSE
+ death = FALSE
+ random = TRUE
+ mob_species = /datum/species/human
+ flavour_text = "You and another have been stranded in this planet for quite some time now. Each day you barely scrape by, and between the terrible \
+ conditions of your makeshift shelter, the hostile creatures, and the ash drakes swooping down from the cloudless skies, all you can wish for is the feel of soft grass between your toes and \
+ the fresh air of Earth. These thoughts are dispelled by yet another recollection of how you and your friend got here... "
+ assignedrole = "Hermit"
+ mirrorcanloadappearance = TRUE
+
+/obj/effect/mob_spawn/human/duohermit/Initialize(mapload)
+ . = ..()
+ var/arrpee = rand(1,3)
+ switch(arrpee)
+ if(1)
+ flavour_text += "you were an intern at a rather odd deep space facility. You weren't quite sure how things worked or what they were doing there, but it was your first day on the \
+ job. A day that was abruptly interrupted by gunfire and alarms. Luckily enough, your handy crowbar skills managed to get you to an escape pod before it was too late."
+ outfit.uniform = /obj/item/clothing/under/assistantformal
+ outfit.shoes = /obj/item/clothing/shoes/sneakers/black
+ outfit.back = /obj/item/storage/backpack
+ if(2)
+ flavour_text += "you were a volunteer test subject for a state of the art deep space facility. You didn't care much about who you were working with, but in the end, the paycheck \
+ was really, really good. To this day, you're not quite sure which sort of prototype implants were used on you, as you seem to remember little but the headache that struck you once \
+ the escape pod finally hit the ground and your seatbelt failed to keep you buckled."
+ outfit.uniform = /obj/item/clothing/under/rank/scientist
+ outfit.suit = /obj/item/clothing/suit/toggle/labcoat
+ outfit.shoes = /obj/item/clothing/shoes/sneakers/black
+ outfit.back = /obj/item/storage/backpack
+ if(3)
+ flavour_text += "you were a doctor at a state of the art deep space facility. For who exactly you were conducting research for, not even you are quite sure. Only that the paycheck \
+ at the end of the month was good enough. In the end, when said facility was attacked by Nanotransen, you and another were the only ones to have made it out alive. Or so it seemed."
+ outfit.uniform = /obj/item/clothing/under/rank/medical
+ outfit.suit = /obj/item/clothing/suit/toggle/labcoat
+ outfit.back = /obj/item/storage/backpack/medic
+ outfit.shoes = /obj/item/clothing/shoes/sneakers/black
+
+/obj/effect/mob_spawn/human/duohermit/Destroy()
+ new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
+ return ..()
+
//Broken rejuvenation pod: Spawns in animal hospitals in lavaland. Ghosts become disoriented interns and are advised to search for help.
/obj/effect/mob_spawn/human/doctor/alive/lavaland
name = "broken rejuvenation pod"