diff --git a/_maps/RandomRuins/LavaRuins/lavaland_battle_site.dmm b/_maps/RandomRuins/LavaRuins/lavaland_battle_site.dmm index ea41e728846..d1da6074b99 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_battle_site.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_battle_site.dmm @@ -10,7 +10,7 @@ desc = "A crown that was fit for a king, looks like it didn't get them very far."; name = "dented crown" }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "g" = ( /obj/structure/water_source/puddle, @@ -19,18 +19,18 @@ "h" = ( /obj/effect/mob_spawn/corpse/human/skeleton, /obj/item/shield/buckler, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "j" = ( /turf/template_noop, /area/template_noop) "m" = ( /obj/effect/decal/cleanable/shreds, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "n" = ( /obj/structure/stone_tile/block/burnt, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "o" = ( /obj/structure/stone_tile/burnt{ @@ -41,39 +41,39 @@ }, /obj/effect/decal/cleanable/blood/drip, /mob/living/basic/mining/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "p" = ( /obj/item/stack/rods{ pixel_x = 10 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "q" = ( /obj/structure/flora/rock, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "s" = ( /mob/living/basic/mining/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "t" = ( /obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "u" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "x" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "D" = ( /obj/structure/statue/bone/rib{ name = "colossal tailbone" }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "F" = ( /obj/effect/decal/cleanable/blood/drip, @@ -81,33 +81,33 @@ dir = 1 }, /obj/structure/statue/bone/rib, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "G" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "H" = ( /obj/structure/firepit, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "I" = ( /obj/structure/closet/crate/wooden, /obj/item/stack/sheet/animalhide/goliath_hide, /obj/item/flashlight/flare/torch, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "J" = ( /obj/structure/flora/ash/cap_shroom, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "K" = ( /obj/structure/closet/crate/wooden, /obj/item/stack/sheet/sinew, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "M" = ( /obj/structure/statue/bone/skull, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "O" = ( /obj/structure/statue/bone/rib{ @@ -116,18 +116,18 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "P" = ( /obj/effect/mob_spawn/corpse/human/skeleton, /obj/item/shovel/spade, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "S" = ( /obj/structure/chair/wood/wings{ color = "#ffff00" }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "T" = ( /obj/effect/mob_spawn/corpse/human/skeleton, @@ -135,14 +135,14 @@ pixel_x = 13; pixel_y = 12 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "U" = ( /obj/structure/statue/bone/rib, /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "V" = ( /obj/effect/mob_spawn/corpse/human/skeleton, @@ -150,14 +150,14 @@ pixel_x = -1; pixel_y = -7 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "X" = ( /obj/structure/stone_tile/burnt, /obj/structure/stone_tile/burnt{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Y" = ( /obj/effect/mob_spawn/corpse/human/skeleton, @@ -165,7 +165,7 @@ pixel_y = -12; pixel_x = 2 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 22ffa00cf48..494d435575e 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -260,7 +260,7 @@ /area/ruin/powered/beach) "gX" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer4, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "hj" = ( /obj/structure/flora/tree/palm, @@ -630,7 +630,7 @@ /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) "wL" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "wY" = ( /turf/open/floor/pod/light, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 8b4dd1bc5d0..41e568324dc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -441,7 +441,7 @@ name = "stealth banana peel" }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "jw" = ( /obj/structure/disposalpipe/segment{ @@ -533,6 +533,11 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) +"qO" = ( +/obj/machinery/light/directional/west, +/obj/effect/mapping_helpers/no_lava, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, +/area/ruin/powered/clownplanet) "rP" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -563,6 +568,10 @@ "ye" = ( /turf/open/lava/smooth, /area/ruin/powered/clownplanet) +"Am" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, +/area/lavaland/surface/outdoors/explored) "BO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -615,6 +624,11 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/indestructible/permalube, /area/ruin/powered/clownplanet) +"Ig" = ( +/obj/machinery/light/directional/east, +/obj/effect/mapping_helpers/no_lava, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, +/area/ruin/powered/clownplanet) "JU" = ( /obj/item/bikehorn, /obj/structure/disposalpipe/segment{ @@ -739,11 +753,11 @@ aa aa aa aa -QT -QT -QT -QT -QT +Am +Am +Am +Am +Am aa aa aa @@ -772,11 +786,11 @@ cc cc cc cc -Or -QT +Ig +Am gX -QT -QT +Am +Am gX Or cc @@ -1724,11 +1738,11 @@ cc cc cc cc -Zg -QT +qO +Am gX -QT -QT +Am +Am gX Zg cc @@ -1759,11 +1773,11 @@ aa aa aa aa -QT -QT -QT -QT -QT +Am +Am +Am +Am +Am aa aa aa diff --git a/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm b/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm index 7b06697eede..6956c444f01 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_strong_rock.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/template_noop) "b" = ( /turf/closed/mineral/strong, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 469eff6ff5c..3d57df9235b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -405,7 +405,7 @@ "bx" = ( /obj/structure/stone_tile/slab/cracked, /obj/effect/decal/cleanable/blood, -/turf/open/indestructible/boss, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "by" = ( /obj/structure/closet/crate, @@ -471,14 +471,14 @@ "bJ" = ( /obj/effect/mapping_helpers/no_lava, /mob/living/basic/mining/gutlunch/milk, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "cp" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/railing/wooden_fence{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "cF" = ( /obj/structure/stone_tile/block{ @@ -609,12 +609,12 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "eu" = ( /obj/structure/stone_tile, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "eC" = ( /obj/structure/stone_tile/block{ @@ -622,7 +622,7 @@ }, /obj/item/pickaxe, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "eG" = ( /obj/structure/closet/crate/radiation, @@ -635,27 +635,27 @@ /obj/item/flashlight/flare/torch, /obj/item/flashlight/flare/torch, /obj/item/flashlight/flare/torch, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "fM" = ( /obj/effect/mapping_helpers/no_lava, /mob/living/basic/mining/gutlunch/warrior, /obj/item/flashlight/lantern, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "gi" = ( /obj/structure/table/optable, /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "hF" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "id" = ( /obj/structure/stone_tile{ @@ -664,7 +664,7 @@ /obj/structure/stone_tile/cracked, /obj/effect/decal/cleanable/blood, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ie" = ( /obj/machinery/hydroponics/soil, @@ -683,7 +683,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "iW" = ( /obj/structure/stone_tile/block, @@ -691,14 +691,14 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "kX" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 }, /obj/item/flashlight/flare/torch, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "mm" = ( /obj/structure/stone_tile, @@ -713,22 +713,22 @@ }, /obj/effect/decal/cleanable/blood, /obj/item/crusher_trophy/retool_kit/ashenskull, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "mo" = ( /obj/structure/stone_tile/block, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "mp" = ( /obj/structure/stone_tile/surrounding/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "mB" = ( /obj/structure/stone_tile/surrounding/cracked{ dir = 1 }, /obj/item/flashlight/lantern, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "mL" = ( /obj/effect/mob_spawn/corpse/human/damaged, @@ -736,7 +736,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "nB" = ( /obj/effect/decal/cleanable/blood, @@ -748,14 +748,14 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "oI" = ( /obj/structure/stone_tile{ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "pT" = ( /obj/structure/stone_tile/surrounding_tile/cracked, @@ -767,7 +767,7 @@ }, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "qm" = ( /obj/effect/mapping_helpers/no_lava, @@ -777,25 +777,25 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "qn" = ( /obj/item/storage/box/rxglasses, /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "qw" = ( /obj/structure/stone_tile/slab, /obj/effect/decal/cleanable/blood, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "qH" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/railing/wooden_fence, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "qV" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -807,7 +807,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "qZ" = ( /obj/structure/stone_tile/block{ @@ -817,7 +817,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "rs" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ @@ -830,18 +830,18 @@ /obj/structure/stone_tile/center, /obj/item/hatchet/wooden, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ry" = ( /obj/structure/stone_tile/block, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "rZ" = ( /obj/structure/stone_tile/slab/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "sd" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -856,24 +856,24 @@ /obj/structure/stone_tile/center, /obj/effect/decal/cleanable/blood, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "sz" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ty" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "tY" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ua" = ( /obj/structure/stone_tile{ @@ -884,7 +884,7 @@ }, /obj/item/spear, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "uv" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -894,11 +894,11 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "vk" = ( /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "vw" = ( /obj/structure/stone_tile/cracked{ @@ -908,7 +908,7 @@ /obj/item/flashlight/flare/torch, /obj/item/flashlight/flare/torch, /obj/item/flashlight/flare/torch, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "wB" = ( /obj/structure/stone_tile/block, @@ -919,7 +919,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "wQ" = ( /obj/structure/stone_tile/cracked{ @@ -928,12 +928,12 @@ /obj/structure/stone_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "xd" = ( /obj/structure/stone_tile/block/cracked, /obj/item/storage/toolbox/syndicate, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "xo" = ( /obj/structure/stone_tile/cracked{ @@ -944,7 +944,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "xH" = ( /obj/item/spear, @@ -952,7 +952,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "zD" = ( /obj/item/stack/sheet/mineral/wood, @@ -960,7 +960,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "zR" = ( /obj/structure/stone_tile/surrounding_tile, @@ -972,14 +972,14 @@ }, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Aj" = ( /obj/structure/stone_tile/cracked{ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "AV" = ( /obj/item/pickaxe, @@ -987,7 +987,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Bc" = ( /obj/item/shovel, @@ -995,7 +995,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Bl" = ( /obj/structure/stone_tile/surrounding_tile, @@ -1007,20 +1007,20 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Bq" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Cg" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "Dx" = ( /obj/effect/decal/cleanable/blood, @@ -1031,7 +1031,7 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Dz" = ( /obj/effect/mapping_helpers/no_lava, @@ -1039,7 +1039,7 @@ dir = 8 }, /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Ee" = ( /obj/structure/stone_tile/block/cracked, @@ -1050,14 +1050,14 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Fa" = ( /obj/structure/stone_tile/block{ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Fg" = ( /obj/structure/stone_tile, @@ -1068,19 +1068,19 @@ dir = 1 }, /obj/item/spear, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "Fp" = ( /obj/structure/stone_tile/slab, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "FJ" = ( /obj/structure/stone_tile{ dir = 1 }, /obj/item/weldingtool/experimental, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "Go" = ( /obj/structure/stone_tile/cracked{ @@ -1090,11 +1090,11 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Gv" = ( /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Gx" = ( /obj/structure/stone_tile/block/cracked, @@ -1110,7 +1110,7 @@ /obj/item/seeds/tower, /obj/item/seeds/bamboo, /obj/item/seeds/bamboo, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "GW" = ( /obj/structure/stone_tile/cracked{ @@ -1124,14 +1124,14 @@ /obj/item/pickaxe, /obj/item/pickaxe, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "HU" = ( /obj/structure/stone_tile/block{ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Ic" = ( /obj/machinery/hydroponics/soil, @@ -1144,7 +1144,7 @@ }, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Ie" = ( /obj/structure/stone_tile/cracked{ @@ -1157,31 +1157,31 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "If" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, /obj/item/malf_upgrade, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "Iy" = ( /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, /obj/item/flashlight/flare/torch, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "IS" = ( /obj/structure/stone_tile/block, /obj/item/spear, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "JD" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/ore_container/food_trough/gutlunch_trough, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Kt" = ( /obj/structure/water_source/puddle{ @@ -1195,18 +1195,18 @@ /obj/effect/mapping_helpers/no_lava, /obj/structure/table/wood, /obj/item/reagent_containers/cup/bucket/wooden, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "KR" = ( /obj/structure/stone_tile/block/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Lb" = ( /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "LH" = ( /obj/structure/stone_tile, @@ -1214,7 +1214,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "LN" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -1226,7 +1226,7 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "MD" = ( /obj/structure/stone_tile/block/cracked{ @@ -1236,13 +1236,13 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "MY" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "Nv" = ( /obj/structure/stone_tile/block/cracked, @@ -1250,42 +1250,42 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "NV" = ( /obj/structure/stone_tile{ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Oe" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/stone_tile{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "OY" = ( /obj/structure/stone_tile/surrounding_tile/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Pk" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/railing/corner/end/wooden_fence, /obj/structure/railing/corner/end/flip/wooden_fence, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "PA" = ( /obj/effect/mapping_helpers/no_lava, /mob/living/basic/mining/gutlunch/warrior, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "PK" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "RE" = ( /obj/structure/stone_tile/block/cracked{ @@ -1293,14 +1293,14 @@ }, /obj/structure/stone_tile/block, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "RH" = ( /obj/structure/stone_tile{ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Sf" = ( /obj/structure/stone_tile/block/cracked{ @@ -1308,7 +1308,7 @@ }, /obj/item/reagent_containers/cup/bucket/wooden, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Sq" = ( /obj/structure/stone_tile/cracked{ @@ -1318,7 +1318,7 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Th" = ( /obj/structure/stone_tile/block/cracked{ @@ -1329,13 +1329,13 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Tl" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/table/wood, /obj/item/flashlight/lantern, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Tr" = ( /obj/machinery/hydroponics/soil, @@ -1343,12 +1343,12 @@ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "TC" = ( /obj/effect/mapping_helpers/no_lava, /obj/item/flashlight/lantern, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "TO" = ( /obj/structure/stone_tile{ @@ -1360,7 +1360,7 @@ /obj/item/reagent_containers/blood/lizard, /obj/item/reagent_containers/blood/lizard, /obj/item/stack/sheet/cloth/ten, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "TY" = ( /obj/structure/stone_tile/surrounding_tile{ @@ -1374,12 +1374,12 @@ dir = 4 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Uh" = ( /obj/effect/mapping_helpers/no_lava, /obj/structure/stone_tile/block, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "UI" = ( /obj/structure/stone_tile/block{ @@ -1387,12 +1387,12 @@ }, /obj/machinery/iv_drip, /obj/item/reagent_containers/cup/glass/waterbottle/large, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ash_walkers) "UL" = ( /obj/structure/stone_tile/cracked, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Wh" = ( /obj/structure/stone_tile/block, @@ -1400,26 +1400,26 @@ dir = 1 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Xp" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "YO" = ( /obj/structure/bonfire/dense, /obj/structure/stone_tile/center, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Zr" = ( /obj/structure/stone_tile/surrounding_tile/cracked, /obj/structure/ore_box, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 3c228756225..56263c3b814 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -302,7 +302,7 @@ /area/ruin/powered/snow_biodome) "tb" = ( /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "tl" = ( /turf/open/floor/pod/light, @@ -422,10 +422,10 @@ "Qa" = ( /obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "QI" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors/explored) "QK" = ( /obj/structure/table, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm index e2783c55253..aacebb24ac0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm @@ -3,60 +3,60 @@ /turf/template_noop, /area/template_noop) "c" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "d" = ( /obj/structure/stone_tile/block{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "e" = ( /obj/structure/stone_tile{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "f" = ( /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "g" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "h" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "i" = ( /obj/structure/stone_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "j" = ( /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "k" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "l" = ( /obj/structure/stone_tile, /obj/structure/stone_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "m" = ( /obj/structure/stone_tile/cracked{ @@ -65,23 +65,23 @@ /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "n" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "o" = ( /obj/structure/stone_tile/block, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "p" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "q" = ( /obj/structure/stone_tile{ @@ -96,7 +96,7 @@ /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "s" = ( /obj/structure/stone_tile/block, @@ -117,7 +117,7 @@ dir = 4 }, /obj/structure/stone_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "w" = ( /obj/structure/stone_tile, @@ -133,11 +133,11 @@ /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "y" = ( /obj/structure/stone_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "I" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm index bf6ea418d22..034e7d297ce 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk2.dmm @@ -6,66 +6,66 @@ /obj/structure/stone_tile/surrounding_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "d" = ( /obj/structure/stone_tile/block{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "e" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "f" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "g" = ( /obj/structure/stone_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "h" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "i" = ( /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "j" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "k" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "l" = ( /obj/structure/stone_tile/surrounding_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "m" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "n" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "q" = ( /obj/structure/stone_tile{ @@ -74,7 +74,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "r" = ( /obj/structure/stone_tile/surrounding/burnt, @@ -87,37 +87,37 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "v" = ( /obj/structure/stone_tile/block/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "w" = ( /obj/structure/stone_tile/block, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "x" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "y" = ( /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "z" = ( /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "A" = ( /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "C" = ( /obj/structure/stone_tile/block{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm index 1a6e34e94c7..bdac7f9bada 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_blooddrunk3.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "c" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "d" = ( /obj/structure/stone_tile/block{ @@ -12,7 +12,7 @@ /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "e" = ( /obj/structure/stone_tile/block{ @@ -21,7 +21,7 @@ /obj/structure/stone_tile/block/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "f" = ( /obj/structure/stone_tile/block{ @@ -30,19 +30,19 @@ /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "g" = ( /obj/structure/stone_tile{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "h" = ( /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "i" = ( /obj/structure/stone_tile{ @@ -52,7 +52,7 @@ dir = 1 }, /obj/structure/stone_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "j" = ( /obj/structure/stone_tile, @@ -62,7 +62,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "k" = ( /obj/structure/stone_tile/cracked, @@ -72,7 +72,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "l" = ( /obj/structure/stone_tile{ @@ -82,7 +82,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "m" = ( /obj/structure/stone_tile{ @@ -92,13 +92,13 @@ dir = 8 }, /obj/structure/stone_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "o" = ( /obj/structure/stone_tile/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "p" = ( /obj/structure/stone_tile{ @@ -108,7 +108,7 @@ dir = 8 }, /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "q" = ( /obj/structure/stone_tile{ @@ -118,7 +118,7 @@ /obj/structure/stone_tile{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "r" = ( /obj/structure/stone_tile{ @@ -128,21 +128,21 @@ dir = 8 }, /obj/structure/stone_tile, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "s" = ( /obj/structure/stone_tile/surrounding_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "t" = ( /obj/structure/stone_tile/block/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "u" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "z" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm index 790ba098850..660d01dedff 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "b" = ( /obj/machinery/door/airlock/titanium{ @@ -44,11 +44,11 @@ /area/ruin/powered) "h" = ( /obj/effect/decal/cleanable/rubble, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "i" = ( /obj/effect/mob_spawn/corpse/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "j" = ( /obj/structure/chair/comfy/shuttle{ @@ -96,17 +96,17 @@ /area/ruin/powered) "t" = ( /obj/structure/flora/tree/stump, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "u" = ( /obj/structure/bonfire/prelit, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "v" = ( /obj/effect/decal/cleanable/rubble, /obj/item/stack/sheet/mineral/titanium, /obj/item/stack/sheet/mineral/titanium, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "w" = ( /obj/effect/decal/cleanable/glass/titanium, @@ -133,18 +133,18 @@ /area/lavaland/surface/outdoors) "B" = ( /mob/living/basic/mining/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "D" = ( /obj/item/gun/energy/recharge/kinetic_accelerator, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "E" = ( /turf/open/misc/ashplanet/wateryrock/lavaland_atmos, /area/lavaland/surface/outdoors) "F" = ( /obj/effect/mob_spawn/corpse/human/cargo_tech, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "G" = ( /turf/template_noop, @@ -193,7 +193,7 @@ /area/ruin/unpowered) "P" = ( /obj/effect/mob_spawn/corpse/human/miner, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Q" = ( /turf/closed/wall/mineral/titanium/nodiagonal, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index 952bc14a031..2198bf7542f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -15,11 +15,11 @@ /area/ruin/unpowered/cultaltar) "e" = ( /obj/effect/decal/remains/human, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/cultaltar) "f" = ( /obj/structure/destructible/cult/pylon, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/cultaltar) "g" = ( /obj/effect/decal/cleanable/blood/old, @@ -35,7 +35,7 @@ }, /area/ruin/unpowered/cultaltar) "j" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/template_noop) "k" = ( /obj/effect/decal/remains/human, @@ -85,7 +85,7 @@ }, /area/ruin/unpowered/cultaltar) "s" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/cultaltar) "z" = ( /turf/open/floor/engine/cult{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index f5fc610f0af..35dc96ed6e5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -3,15 +3,15 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "c" = ( /obj/structure/fluff/clockwork/alloy_shards/small, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "d" = ( /obj/structure/girder/bronze, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "e" = ( /obj/item/stack/sheet/bronze, @@ -22,14 +22,14 @@ /area/template_noop) "g" = ( /obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "h" = ( /turf/open/floor/bronze/filled/lavaland, /area/ruin/unpowered/ratvar) "i" = ( /obj/structure/grille/broken, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "j" = ( /turf/closed/wall/mineral/bronze, @@ -43,15 +43,15 @@ /area/ruin/unpowered/ratvar) "m" = ( /obj/structure/fluff/clockwork/alloy_shards/medium, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "n" = ( /obj/structure/fluff/clockwork/blind_eye, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "o" = ( /obj/structure/fluff/clockwork/alloy_shards/large, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "p" = ( /obj/structure/fluff/clockwork/alloy_shards/medium, @@ -59,7 +59,7 @@ /area/ruin/unpowered/ratvar) "r" = ( /obj/structure/lattice, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "s" = ( /obj/structure/fluff/clockwork/alloy_shards/large, @@ -67,7 +67,7 @@ /area/ruin/unpowered/ratvar) "t" = ( /obj/item/stack/sheet/bronze, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "u" = ( /obj/structure/grille, @@ -76,7 +76,7 @@ "v" = ( /obj/structure/fluff/clockwork/alloy_shards/medium, /obj/structure/lattice, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "w" = ( /obj/structure/grille/broken, @@ -109,11 +109,11 @@ /area/ruin/unpowered/ratvar) "D" = ( /obj/structure/grille, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "E" = ( /obj/structure/fluff/clockwork/clockgolem_remains, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "F" = ( /obj/structure/dead_ratvar, @@ -121,21 +121,21 @@ /area/ruin/unpowered/ratvar) "G" = ( /obj/item/stack/sheet/bronze/thirty, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "I" = ( /obj/structure/fluff/clockwork/alloy_shards/large, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/template_noop) "J" = ( /obj/structure/fluff/clockwork/alloy_shards/small, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/template_noop) "K" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, /area/ruin/unpowered/ratvar) "L" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/template_noop) (1,1,1) = {" @@ -458,7 +458,7 @@ l l l b -p +m s r h diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index b296990ae3c..157211daadb 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -155,7 +155,7 @@ "iE" = ( /obj/structure/barricade/wooden/crude, /obj/item/paper/fluff/ruins/elephant_graveyard, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/elephant_graveyard) "iR" = ( /obj/structure/statue/bone/skull/half{ @@ -165,7 +165,7 @@ /area/ruin/unpowered/elephant_graveyard) "jx" = ( /obj/machinery/power/shuttle_engine/propulsion, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/floor/plating/lavaland_atmos, /area/ruin/powered/graveyard_shuttle) "jK" = ( /obj/effect/decal/cleanable/blood/tracks{ @@ -376,7 +376,7 @@ /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "Bu" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/elephant_graveyard) "Cn" = ( /obj/structure/flora/rock/style_random, @@ -388,7 +388,7 @@ /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "Cu" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface) "Di" = ( /obj/item/organ/lungs, @@ -435,7 +435,7 @@ /area/ruin/unpowered/elephant_graveyard) "Iy" = ( /obj/item/paper/fluff/ruins/elephant_graveyard, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface) "Iz" = ( /obj/structure/table, @@ -519,7 +519,7 @@ /area/ruin/unpowered/elephant_graveyard) "NO" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered/elephant_graveyard) "Oa" = ( /obj/effect/decal/cleanable/generic, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm index 81cef3facd9..6a55278a1a4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elite_tumor.dmm @@ -4,10 +4,10 @@ /area/template_noop) "b" = ( /obj/structure/elite_tumor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index fa4e286ff22..b03596f03f7 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "b" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, @@ -66,7 +66,7 @@ /area/ruin/unpowered) "A" = ( /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm index 790879899db..7e195ebcae8 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gas.dmm @@ -17,9 +17,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/lavaland_atmos{ - baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface - }, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/thelizardsgas_lavaland) "bT" = ( /obj/structure/window/reinforced/spawner/directional/west, @@ -125,7 +123,7 @@ /area/lavaland/surface/outdoors) "fF" = ( /obj/machinery/portable_atmospherics/canister, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "fH" = ( /obj/machinery/duct, @@ -254,7 +252,7 @@ /area/ruin/thelizardsgas_lavaland) "lI" = ( /obj/effect/spawner/random/structure/billboard/roadsigns, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "mn" = ( /obj/structure/sign/poster/official/plasma_effects/directional/east, @@ -351,7 +349,7 @@ /area/ruin/thelizardsgas_lavaland) "oD" = ( /obj/effect/spawner/random/trash/crushed_can, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "pp" = ( /obj/machinery/light/directional/south, @@ -418,7 +416,7 @@ /obj/machinery/portable_atmospherics/canister/plasma{ filled = 0.05 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "sY" = ( /obj/structure/table/reinforced, @@ -603,7 +601,7 @@ }, /area/ruin/thelizardsgas_lavaland) "Ao" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Bf" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -685,9 +683,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/lavaland_atmos{ - baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface - }, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/thelizardsgas_lavaland) "CR" = ( /obj/structure/cable, @@ -766,9 +762,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/lavaland_atmos{ - baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface - }, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/thelizardsgas_lavaland) "Gg" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -780,7 +774,7 @@ /area/ruin/thelizardsgas_lavaland) "Gu" = ( /obj/effect/spawner/random/structure/billboard/lizardsgas, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Gv" = ( /obj/machinery/duct, @@ -793,7 +787,7 @@ /area/ruin/thelizardsgas_lavaland) "GK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Hz" = ( /obj/structure/cable, @@ -808,7 +802,7 @@ /area/ruin/thelizardsgas_lavaland) "HB" = ( /obj/effect/spawner/random/trash/cigbutt, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "HI" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -904,7 +898,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Kc" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -1059,9 +1053,7 @@ }, /obj/structure/cable, /obj/effect/turf_decal/stripes/end, -/turf/open/floor/plating/lavaland_atmos{ - baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface - }, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/thelizardsgas_lavaland) "SL" = ( /obj/structure/cable, @@ -1129,7 +1121,7 @@ "UZ" = ( /obj/structure/sign/warning/fire/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/hidden, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "VD" = ( /obj/machinery/duct, @@ -1179,7 +1171,7 @@ /obj/machinery/atmospherics/components/unary/passive_vent/layer4{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Yx" = ( /obj/structure/cable, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index beb889fe411..96f20dae29d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -108,7 +108,7 @@ /obj/structure/stone_tile/surrounding_tile/burnt{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ie" = ( /obj/item/veilrender/vealrender, @@ -130,7 +130,7 @@ /obj/structure/stone_tile/surrounding_tile/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "jM" = ( /turf/closed/indestructible/necropolis, @@ -182,7 +182,7 @@ /obj/structure/stone_tile/surrounding/cracked{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "nT" = ( /turf/closed/indestructible/riveted/boss, @@ -315,7 +315,7 @@ /area/lavaland/surface/outdoors) "DH" = ( /obj/structure/headpike/bone, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "DY" = ( /obj/structure/stone_tile/center/burnt, @@ -391,7 +391,7 @@ /obj/structure/stone_tile/block/burnt{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "MH" = ( /turf/open/lava/smooth/lava_land_surface, @@ -400,7 +400,7 @@ /obj/structure/stone_tile/block/burnt{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Ol" = ( /obj/effect/decal/cleanable/blood/footprints{ @@ -518,7 +518,7 @@ /turf/open/indestructible/necropolis, /area/ruin/powered/gluttony) "Zu" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Zx" = ( /obj/structure/stone_tile/surrounding/cracked, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm index d3116c6b557..8a539ef8854 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "b" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index ed31df13e20..b642034f2d6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -10,10 +10,10 @@ /area/ruin/powered) "e" = ( /obj/item/clothing/suit/space/orange, -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "f" = ( -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "g" = ( /turf/open/misc/asteroid{ @@ -57,7 +57,7 @@ /obj/item/seeds/plump, /obj/item/food/grown/mushroom/glowshroom, /obj/item/seeds/tower, -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "n" = ( /obj/machinery/hydroponics/soil, @@ -71,7 +71,7 @@ /obj/item/storage/bag/plants/portaseeder, /obj/item/storage/bag/ore, /obj/item/storage/medkit/regular, -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "q" = ( /obj/structure/glowshroom/single, @@ -81,10 +81,10 @@ /obj/structure/rack, /obj/item/pickaxe/emergency, /obj/item/tank/internals/oxygen, -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "s" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "t" = ( /turf/closed/wall/mineral/titanium/survival/pod, @@ -174,7 +174,7 @@ /area/ruin/powered) "M" = ( /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/misc/asteroid/basalt, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered) "P" = ( /turf/template_noop, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm index 241b2b608f2..d6b15a15993 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "b" = ( /obj/structure/bonfire/prelit, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( /turf/open/floor/wood/lavaland, @@ -13,12 +13,12 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "e" = ( /obj/structure/flora/ash/fireblossom, /mob/living/basic/mining/mook/worker/tribal_chief, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "f" = ( /obj/structure/chair/wood{ @@ -50,7 +50,7 @@ /area/lavaland/surface/outdoors) "l" = ( /obj/structure/flora/ash/fireblossom, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "m" = ( /obj/item/flashlight/lantern{ @@ -61,15 +61,15 @@ "n" = ( /obj/structure/flora/ash/fireblossom, /mob/living/basic/mining/mook/worker, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "o" = ( /obj/structure/railing/corner, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "p" = ( /obj/structure/ore_container/material_stand, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "q" = ( /obj/item/fishing_rod, @@ -81,27 +81,27 @@ /area/lavaland/surface/outdoors) "s" = ( /obj/effect/landmark/mook_village, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "t" = ( /obj/structure/chair/pew/left, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "u" = ( /obj/structure/railing, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "v" = ( /obj/structure/railing/corner{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "w" = ( /obj/structure/railing{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "x" = ( /obj/structure/table/wood/shuttle_bar, @@ -114,11 +114,11 @@ /area/lavaland/surface/outdoors) "z" = ( /mob/living/basic/mining/mook/worker/bard, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "A" = ( /obj/structure/chair/pew/right, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "E" = ( /obj/structure/flora/grass/jungle/b, @@ -126,7 +126,7 @@ /area/lavaland/surface/outdoors) "F" = ( /obj/structure/chair/pew, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "G" = ( /obj/structure/bed/pod, @@ -137,23 +137,23 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "I" = ( /mob/living/basic/mining/mook, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "J" = ( /obj/structure/railing{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "M" = ( /obj/structure/chair/pew/right{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "O" = ( /obj/structure/table/wood/shuttle_bar, @@ -163,39 +163,39 @@ /area/lavaland/surface/outdoors) "P" = ( /mob/living/basic/mining/mook/worker, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Q" = ( /obj/structure/flora/tree/jungle/style_5, /turf/open/misc/grass/jungle/lavaland, /area/lavaland/surface/outdoors) -"S" = ( -/obj/item/flashlight/lantern{ - start_on = 1 - }, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) "V" = ( /obj/structure/chair/pew{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "W" = ( /obj/structure/flora/tree/jungle/style_3, /turf/open/misc/grass/jungle/lavaland, /area/lavaland/surface/outdoors) +"X" = ( +/obj/item/flashlight/lantern{ + start_on = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, +/area/lavaland/surface/outdoors) "Y" = ( /obj/structure/chair/pew/left{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Z" = ( /obj/structure/railing/corner{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" @@ -228,7 +228,7 @@ a a a l -S +X a a a @@ -294,14 +294,14 @@ g c c a -S +X a a a a P a -S +X F a a @@ -493,7 +493,7 @@ h h h z -S +X l a a @@ -606,7 +606,7 @@ a a l a -S +X h m c diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ore_vent.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ore_vent.dmm index 6379b7f084b..1cdb5a564ab 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ore_vent.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ore_vent.dmm @@ -3,11 +3,11 @@ /turf/template_noop, /area/template_noop) "l" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "L" = ( /obj/structure/ore_vent/random, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm index 4cbf3478bc2..80e4d6811ea 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm @@ -9,7 +9,7 @@ /turf/open/floor/iron/dark/smooth_edge, /area/ruin/powered/lavaland_phone_booth) "e" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered/lavaland_phone_booth) "k" = ( /obj/machinery/vending/snack/green{ @@ -32,7 +32,7 @@ "v" = ( /obj/structure/lattice, /obj/structure/billboard/Phone_booth, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered/lavaland_phone_booth) "z" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62,7 +62,7 @@ /area/ruin/powered/lavaland_phone_booth) "V" = ( /obj/structure/lattice, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/powered/lavaland_phone_booth) "W" = ( /obj/machinery/vending/cigarette{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index b48b6f58928..ebdcfb4850d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -3,11 +3,11 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ac" = ( /obj/structure/lattice, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ad" = ( /turf/closed/wall, @@ -153,7 +153,7 @@ /area/ruin/unpowered) "hQ" = ( /obj/effect/decal/cleanable/blood/old, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "is" = ( /obj/effect/mapping_helpers/burnt_floor, @@ -496,7 +496,7 @@ "Fg" = ( /mob/living/basic/mining/goliath, /obj/effect/decal/cleanable/blood/old, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "FF" = ( /obj/effect/turf_decal/tile/yellow/diagonal_edge, @@ -516,7 +516,7 @@ /area/ruin/unpowered) "Jt" = ( /obj/item/stack/sheet/iron, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "KA" = ( /obj/structure/table/wood, @@ -609,7 +609,7 @@ "RP" = ( /obj/item/clothing/under/shorts/blue, /obj/effect/decal/cleanable/blood/old, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "RV" = ( /obj/structure/girder, @@ -631,7 +631,7 @@ /area/ruin/unpowered) "Sz" = ( /obj/structure/flora/ash/fireblossom, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "SQ" = ( /obj/item/clothing/shoes/sneakers/orange, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm index 6ed4b294d41..7178948a9af 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pride.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( /turf/open/lava/smooth/lava_land_surface, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm index b9ccb545ca0..ce4c3ed6a03 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_puzzle.dmm @@ -4,10 +4,10 @@ /area/template_noop) "b" = ( /obj/effect/sliding_puzzle/lavaland, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm index 5685415aec3..a1d6abf8f9d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm @@ -6,17 +6,17 @@ /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "d" = ( /obj/vehicle/sealed/mecha/ripley/mining, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "e" = ( /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/under/rank/cargo/miner/lavaland, /obj/effect/decal/remains/human, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 69c7d47d006..a2e8876b3ed 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -3,7 +3,7 @@ /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ab" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "ac" = ( /turf/closed/wall/r_wall, @@ -491,7 +491,7 @@ /area/ruin/powered/seedvault) "bx" = ( /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "by" = ( /obj/structure/disposalpipe/segment{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm index 43f6ad0af5c..7a8c7bfacdc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bl" = ( /obj/item/stack/sheet/iron/five, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "bw" = ( /obj/effect/decal/cleanable/glass, @@ -12,7 +12,7 @@ "cB" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/rubble, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "dI" = ( /obj/machinery/door/airlock/public/glass{ @@ -27,20 +27,20 @@ /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/rubble, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "en" = ( /obj/effect/mob_spawn/corpse/human/charredskeleton, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "eQ" = ( /obj/item/shard/titanium, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "fy" = ( /obj/structure/door_assembly/door_assembly_shuttle, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "fz" = ( /obj/effect/mapping_helpers/broken_floor, @@ -64,16 +64,16 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "iU" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "ky" = ( /obj/structure/chair/comfy/shuttle, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "ld" = ( /obj/item/stack/sheet/mineral/titanium/fifty{ @@ -103,7 +103,7 @@ /area/ruin/unpowered) "py" = ( /obj/effect/decal/cleanable/ash, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "rn" = ( /turf/open/lava/smooth/lava_land_surface, @@ -111,26 +111,26 @@ "rr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "rE" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "se" = ( /obj/structure/table, /obj/effect/decal/cleanable/ash, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "sE" = ( /obj/item/shard/titanium, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "tp" = ( /obj/item/stack/sheet/iron, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "tx" = ( /obj/machinery/light/small/directional/east, @@ -148,7 +148,7 @@ /area/ruin/unpowered) "uH" = ( /obj/effect/spawner/random/structure/crate, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "vf" = ( /obj/effect/mapping_helpers/broken_floor, @@ -158,7 +158,7 @@ /area/ruin/unpowered) "xz" = ( /obj/machinery/computer, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "yZ" = ( /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, @@ -166,11 +166,11 @@ "zk" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Bb" = ( /obj/effect/mapping_helpers/broken_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "BT" = ( /obj/effect/mob_spawn/corpse/human/charredskeleton, @@ -180,7 +180,7 @@ /area/ruin/unpowered) "Cg" = ( /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "CX" = ( /obj/item/stack/sheet/mineral/titanium, @@ -191,19 +191,19 @@ /area/ruin/unpowered) "Dq" = ( /obj/effect/mapping_helpers/burnt_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Dy" = ( /obj/item/shard/titanium, /obj/machinery/light/small/directional/east, /obj/effect/mapping_helpers/broken_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "DL" = ( /obj/item/stack/sheet/mineral/titanium/fifty{ amount = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "DZ" = ( /obj/effect/mapping_helpers/burnt_floor, @@ -214,7 +214,7 @@ "Ee" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/item/stack/sheet/iron, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Er" = ( /obj/effect/decal/cleanable/dirt, @@ -224,7 +224,7 @@ }, /area/ruin/unpowered) "Fq" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface) "FI" = ( /obj/machinery/power/shuttle_engine/heater, @@ -255,48 +255,48 @@ /area/ruin/unpowered) "GF" = ( /obj/structure/window/reinforced/shuttle/unanchored, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "GS" = ( /obj/item/stack/sheet/iron/five, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Hy" = ( /obj/machinery/computer/communications{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "HM" = ( /obj/item/stack/sheet/mineral/titanium, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "JD" = ( /mob/living/basic/mining/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "JN" = ( /obj/item/shard/titanium, /obj/item/stack/sheet/mineral/titanium, /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "KN" = ( /obj/structure/spawner/lavaland/legion, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Lz" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "LQ" = ( /mob/living/basic/mining/goldgrub, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Ma" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "NI" = ( /obj/structure/chair/comfy/shuttle{ @@ -310,7 +310,7 @@ "NS" = ( /obj/item/stack/sheet/iron, /obj/effect/mapping_helpers/broken_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Om" = ( /obj/effect/mapping_helpers/broken_floor, @@ -330,7 +330,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Pa" = ( /obj/structure/table, @@ -338,7 +338,7 @@ pixel_x = 2; pixel_y = 3 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Qq" = ( /obj/effect/mapping_helpers/broken_floor, @@ -350,7 +350,7 @@ "Rm" = ( /obj/item/shard/titanium, /obj/effect/mapping_helpers/broken_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "St" = ( /obj/structure/window/reinforced/shuttle, @@ -369,11 +369,11 @@ "Tt" = ( /obj/item/stack/sheet/iron, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "TF" = ( /obj/effect/decal/cleanable/rubble, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "TQ" = ( /obj/item/stack/sheet/iron, @@ -385,7 +385,7 @@ "Vs" = ( /obj/item/stack/sheet/mineral/titanium, /obj/effect/mapping_helpers/broken_floor, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "VN" = ( /obj/effect/mapping_helpers/burnt_floor, @@ -396,7 +396,7 @@ "XT" = ( /obj/item/stack/sheet/mineral/titanium, /obj/effect/decal/cleanable/glass, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "XU" = ( /obj/item/stack/sheet/mineral/titanium/fifty{ @@ -414,7 +414,7 @@ /area/ruin/unpowered) "Zo" = ( /obj/effect/mob_spawn/corpse/human/legioninfested, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/unpowered) "Zq" = ( /obj/effect/mapping_helpers/burnt_floor, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm index 4894dbce32b..9e01f5f0063 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( /obj/effect/turf_decal/mining, @@ -40,7 +40,7 @@ /area/ruin/powered) "j" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "k" = ( /obj/machinery/sleeper/survival_pod, @@ -60,12 +60,12 @@ /area/ruin/powered) "n" = ( /obj/effect/decal/cleanable/blood, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "o" = ( /obj/effect/decal/cleanable/blood, /obj/effect/mob_spawn/corpse/goliath, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "p" = ( /obj/structure/table/survival_pod, @@ -92,7 +92,7 @@ /area/ruin/powered) "s" = ( /obj/effect/decal/cleanable/blood/footprints, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "t" = ( /obj/effect/decal/cleanable/blood/footprints{ @@ -106,14 +106,14 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/drip, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "v" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 8 }, /obj/effect/decal/cleanable/blood/footprints, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "w" = ( /obj/effect/turf_decal/mining/survival{ @@ -126,7 +126,7 @@ /obj/effect/decal/cleanable/blood/footprints{ dir = 1 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "y" = ( /obj/effect/turf_decal/mining/survival{ @@ -138,12 +138,12 @@ /obj/effect/decal/cleanable/blood/footprints{ dir = 8 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "A" = ( /obj/effect/decal/cleanable/blood/footprints, /obj/effect/decal/cleanable/blood/drip, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 29e0bd76c93..dd1151ee4fa 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1898,7 +1898,7 @@ /area/ruin/syndicate_lava_base/testlab) "pa" = ( /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "pe" = ( /obj/effect/decal/cleanable/dirt, @@ -2068,7 +2068,7 @@ dir = 1 }, /obj/structure/disposalpipe/trunk, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/ruin/syndicate_lava_base/virology) "rC" = ( /obj/machinery/door/firedoor, @@ -2111,7 +2111,7 @@ /turf/open/floor/engine/co2, /area/ruin/syndicate_lava_base/engineering) "si" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "sl" = ( /obj/effect/decal/cleanable/dirt, @@ -4268,7 +4268,7 @@ key = "mistake" }, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "Wv" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index 374be84f53a..d01dc346b2b 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( /turf/closed/wall/mineral/abductor, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm index ce935f889af..6496cdcb2b5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm @@ -53,7 +53,7 @@ /obj/structure/stone_tile/cracked{ pixel_x = 16 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "u" = ( /obj/structure/flora/ash/stem_shroom, @@ -61,7 +61,7 @@ /area/lavaland/surface/outdoors) "v" = ( /obj/effect/mob_spawn/corpse/watcher/crushed, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "y" = ( /obj/structure/stone_tile/block/cracked{ @@ -88,7 +88,7 @@ /area/lavaland/surface/outdoors) "E" = ( /obj/structure/stone_tile/cracked, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "I" = ( /turf/template_noop, @@ -97,11 +97,11 @@ /obj/structure/stone_tile/slab/cracked{ dir = 4 }, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "M" = ( /obj/structure/flora/ash/fireblossom, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "R" = ( /turf/closed/indestructible/riveted/boss/wasteland, @@ -112,7 +112,7 @@ /turf/open/misc/asteroid/basalt/wasteland, /area/lavaland/surface/outdoors) "W" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm index 7084fceb8fe..dd770bb660a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm @@ -3,7 +3,7 @@ /turf/closed/mineral/volcanic/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "b" = ( -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "c" = ( /turf/template_noop, @@ -283,7 +283,7 @@ "F" = ( /obj/structure/stone_tile/slab, /obj/effect/mapping_helpers/no_lava, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "G" = ( /turf/closed/indestructible/riveted/boss/see_through, @@ -306,11 +306,11 @@ /area/lavaland/surface/outdoors) "J" = ( /obj/structure/fluff/divine/convertaltar, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) "K" = ( /mob/living/basic/dark_wizard, -/turf/open/misc/asteroid/basalt/lava_land_surface, +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace, /area/lavaland/surface/outdoors) (1,1,1) = {" diff --git a/code/__DEFINES/botany.dm b/code/__DEFINES/botany.dm index 8afca99300b..2a9fc2021c9 100644 --- a/code/__DEFINES/botany.dm +++ b/code/__DEFINES/botany.dm @@ -56,6 +56,8 @@ /// -- Flags for seeds. -- /// Allows a plant to wild mutate (mutate on haravest) at a certain instability. #define MUTATE_EARLY (1<<0) +/// Prevents seeds from being planted in hydroponics or soil +#define NO_PLANTING (1<<1) /// -- Flags for traits. -- /// Caps the plant's yield at 5 instead of 10. diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index a319559c548..bdc6be75782 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -129,21 +129,23 @@ DEFINE_BITFIELD(smoothing_junction, list( #define SMOOTH_GROUP_CARPET_SIMPLE_NEON_PINK_NODOTS S_TURF(51) //![turf/open/floor/carpet/neon/simple/pink/nodots] #define SMOOTH_GROUP_BAMBOO_FLOOR S_TURF(52) //![/turf/open/floor/bamboo] #define SMOOTH_GROUP_FLOOR_WATER_LAVALAND S_TURF(53) //![/turf/open/water/lavaland_atmos/basalt] +#define SMOOTH_GROUP_FLOOR_SIDERITE S_TURF(54) ///turf/open/misc/grass +#define SMOOTH_GROUP_FLOOR_SHALE S_TURF(55) ///turf/open/misc/grass -#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(54) ///turf/closed -#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(55) ///turf/closed/wall/material -#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(56) ///turf/closed/wall/r_wall/plastitanium/syndicate, /turf/closed/indestructible/syndicate -#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(57) ///turf/closed/indestructible/hotelwall -#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(58) ///turf/closed/mineral, /turf/closed/indestructible -#define SMOOTH_GROUP_RED_ROCK_WALLS S_TURF(59) ///turf/closed/mineral/asteroid, /turf/closed/mineral/random/stationside/asteroid -#define SMOOTH_GROUP_SHALE_WALLS S_TURF(60) ///turf/closed/mineral/random/volcanic/shale -#define SMOOTH_GROUP_BOSS_WALLS S_TURF(61) ///turf/closed/indestructible/riveted/boss -#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(62) ///turf/closed/wall/mineral/titanium/survival -#define SMOOTH_GROUP_TURF_OPEN_CLIFF S_TURF(63) ///turf/open/cliff -#define SMOOTH_GROUP_HIEROPHANT S_TURF(64) ///turf/closed/indestructible/riveted/hierophant -#define SMOOTH_GROUP_PLASTINUM_WALLS S_TURF(65) ///turf/closed/indestructible/riveted/plastinum +#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(56) ///turf/closed +#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(57) ///turf/closed/wall/material +#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(58) ///turf/closed/wall/r_wall/plastitanium/syndicate, /turf/closed/indestructible/syndicate +#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(59) ///turf/closed/indestructible/hotelwall +#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(60) ///turf/closed/mineral, /turf/closed/indestructible +#define SMOOTH_GROUP_RED_ROCK_WALLS S_TURF(61) ///turf/closed/mineral/asteroid, /turf/closed/mineral/random/stationside/asteroid +#define SMOOTH_GROUP_SHALE_WALLS S_TURF(62) ///turf/closed/mineral/random/volcanic/shale +#define SMOOTH_GROUP_BOSS_WALLS S_TURF(63) ///turf/closed/indestructible/riveted/boss +#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(64) ///turf/closed/wall/mineral/titanium/survival +#define SMOOTH_GROUP_TURF_OPEN_CLIFF S_TURF(65) ///turf/open/cliff +#define SMOOTH_GROUP_HIEROPHANT S_TURF(66) ///turf/closed/indestructible/riveted/hierophant +#define SMOOTH_GROUP_PLASTINUM_WALLS S_TURF(67) ///turf/closed/indestructible/riveted/plastinum -#define MAX_S_TURF 65 //Always match this value with the one above it. +#define MAX_S_TURF 67 //Always match this value with the one above it. #define S_OBJ(num) ("-" + #num + ",") /* /obj included */ diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index 8d78ce25c47..097e8740aff 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -41,6 +41,8 @@ /// of biome-related operations. Is populated through /// `generate_terrain_with_biomes()`. var/list/generated_turfs_per_biome = list() + /// Same as generated_turfs_per_biome, but additionally indexed by area + var/list/generated_turfs_per_area_biome = list() /// 2D list of all biomes based on heat and humidity combos. Associative by /// `BIOME_X_HEAT` and then by `BIOME_X_HUMIDITY` (i.e. /// `possible_biomes[BIOME_LOW_HEAT][BIOME_LOWMEDIUM_HUMIDITY]`). @@ -65,14 +67,16 @@ var/shared_seed = TRUE /// Stamp size for DBP noise, aka frequency var/biome_stamp_size = 75 + /// Stored noise maps per z level if we use a shared seed + var/static_biome_maps = list() - ///Base chance of spawning a mob + /// Base chance of spawning a mob var/mob_spawn_chance = 6 - ///Base chance of spawning flora + /// Base chance of spawning flora var/flora_spawn_chance = 2 - ///Base chance of spawning features + /// Base chance of spawning features var/feature_spawn_chance = 0.25 - ///Unique ID for this spawner + /// Unique ID for this spawner var/string_gen /// Radius around features within which we avoid spawning other features @@ -196,6 +200,14 @@ heat_gen[BIOME_HIGH_HEAT] = rustg_dbp_generate("[heat_seed]", "60", "[biome_stamp_size]", "[world.maxx]", "[high_heat_threshold]", "1.1") heat_gen[BIOME_MEDIUM_HEAT] = rustg_dbp_generate("[heat_seed]", "60", "[biome_stamp_size]", "[world.maxx]", "[medium_heat_threshold]", "[high_heat_threshold]") + if (shared_seed) + static_biome_maps["[turfs[1].z]"] = list( + BIOME_HIGH_HUMIDITY = humidity_gen[BIOME_HIGH_HUMIDITY], + BIOME_MEDIUM_HUMIDITY = humidity_gen[BIOME_MEDIUM_HUMIDITY], + BIOME_HIGH_HEAT = heat_gen[BIOME_HIGH_HEAT], + BIOME_MEDIUM_HEAT = heat_gen[BIOME_MEDIUM_HEAT], + ) + var/list/to_generate = list() for(var/turf/gen_turf as anything in turfs) //Go through all the turfs and generate them var/closed = string_gen[world.maxx * (gen_turf.y - 1) + gen_turf.x] != "0" @@ -222,12 +234,40 @@ for(var/biome in to_generate) var/datum/biome/generating_biome = SSmapping.biomes[biome] var/list/turf/generated_turfs = generating_biome.generate_turfs_for_terrain(to_generate[biome]) - generated_turfs_per_biome[biome] = generated_turfs + generated_turfs_per_biome[biome] = (generated_turfs_per_biome[biome] || list()) + generated_turfs + var/list/area_list = generated_turfs_per_area_biome[biome] + if (!area_list) + area_list = list() + generated_turfs_per_area_biome[biome] = area_list + area_list[generate_in] = generated_turfs var/message = "[name] terrain generation finished in [(REALTIMEOFDAY - start_time)/10]s!" to_chat(world, span_boldannounce("[message]"), MESSAGE_TYPE_DEBUG) log_world(message) +/// Returns a biome datum that the turf was initialized with, or would be if it is present on our Z level and we use a consistent shared seed +/// Not consistent between calls by itself due to using RNG in perlin zoom, needs a static coordinate-based formula +/datum/map_generator/cave_generator/proc/get_biome_for_turf(turf/target) + for (var/biome in generated_turfs_per_biome) + var/list/generated_turfs = generated_turfs_per_biome[biome] + if (generated_turfs[target]) + return biome + + var/list/biome_map = static_biome_maps["[target.z]"] + if (!shared_seed || !biome_map) + return null + + var/drift_x = clamp((target.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)), 1, world.maxx) + var/drift_y = clamp((target.y + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)), 2, world.maxy) + var/coordinate = world.maxx * (drift_y - 1) + drift_x + + var/humidity_level = text2num(biome_map[BIOME_HIGH_HUMIDITY][coordinate]) ? \ + BIOME_HIGH_HUMIDITY : text2num(biome_map[BIOME_MEDIUM_HUMIDITY][coordinate]) ? BIOME_MEDIUM_HUMIDITY : BIOME_LOW_HUMIDITY + var/heat_level = text2num(biome_map[BIOME_HIGH_HEAT][coordinate]) ? \ + BIOME_HIGH_HEAT : text2num(biome_map[BIOME_MEDIUM_HEAT][coordinate]) ? BIOME_MEDIUM_HEAT : BIOME_LOW_HEAT + + return possible_biomes[heat_level][humidity_level] + /datum/map_generator/cave_generator/populate_terrain(list/turfs, area/generate_in) if (biome_population && length(possible_biomes)) return populate_terrain_with_biomes(turfs, generate_in) @@ -354,9 +394,10 @@ log_world(message) return - for(var/biome in generated_turfs_per_biome) + for(var/biome in generated_turfs_per_area_biome) var/datum/biome/generating_biome = SSmapping.biomes[biome] - generating_biome.populate_turfs(generated_turfs_per_biome[biome], flora_allowed, features_allowed, fauna_allowed) + var/list/areas_list = generated_turfs_per_area_biome[biome] + generating_biome.populate_turfs(areas_list[generate_in], flora_allowed, features_allowed, fauna_allowed) CHECK_TICK diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index e464c62dc33..40c25b51c28 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -20,50 +20,12 @@ ), ) - biome_population = FALSE - high_heat_threshold = 0.15 high_humidity_threshold = 0.15 biome_stamp_size = 60 - - weighted_mob_spawn_list = list( - SPAWN_MEGAFAUNA = 2, - /obj/effect/spawner/random/lavaland_mob/goliath = 50, - /obj/effect/spawner/random/lavaland_mob/legion = 30, - /obj/effect/spawner/random/lavaland_mob/watcher = 40, - /mob/living/basic/mining/bileworm = 20, - /mob/living/basic/mining/brimdemon = 20, - /mob/living/basic/mining/lobstrosity/lava = 20, - /obj/effect/spawner/random/lavaland_mob/raptor = 15, - /mob/living/basic/mining/goldgrub = 15, - /obj/structure/spawner/lavaland = 2, - /obj/structure/spawner/lavaland/goliath = 3, - /obj/structure/spawner/lavaland/legion = 3, - ) - - weighted_flora_spawn_list = list( - /obj/structure/flora/ash/cacti = 1, - /obj/structure/flora/ash/cap_shroom = 2, - /obj/structure/flora/ash/fireblossom = 2, - /obj/structure/flora/ash/leaf_shroom = 2, - /obj/structure/flora/ash/seraka = 2, - /obj/structure/flora/ash/stem_shroom = 2, - /obj/structure/flora/ash/tall_shroom = 2, - ) - - ///Note that this spawn list is also in the icemoon generator - weighted_feature_spawn_list = list( - /obj/structure/geyser/hollowwater = 8, - /obj/structure/geyser/plasma_oxide = 8, - /obj/structure/geyser/protozine = 8, - /obj/structure/geyser/random = 2, - /obj/structure/geyser/wittel = 8, - /obj/structure/geyser/chiral_buffer = 8, - /obj/structure/ore_vent/boss = 1, - ) - smoothing_iterations = 50 /datum/map_generator/cave_generator/lavaland/ruin_version + biome_population = FALSE weighted_open_turf_types = list(/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins = 1) weighted_closed_turf_types = list(/turf/closed/mineral/volcanic/lava_land_surface/do_not_chasm = 1) diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm index d671f50e1f8..8dc588680a8 100644 --- a/code/datums/mapgen/biomes/_biome.dm +++ b/code/datums/mapgen/biomes/_biome.dm @@ -1,3 +1,8 @@ +#define CAVE_SPAWN_MOB "mob" +#define CAVE_SPAWN_FEATURE "feature" +#define CAVE_SPAWN_TENDRIL "tendril" +#define CAVE_SPAWN_MEGAFAUNA "megafauna" + ///This datum handles the transitioning from a turf to a specific biome, and handles spawning decorative structures and mobs. /datum/biome /// Type of turf this biome creates for open turfs @@ -19,7 +24,15 @@ /// Weighted list of type paths of fauna that can be spawned when the /// turf spawns fauna. var/list/fauna_types = list() - + /// Weighted list of megafauna that can spawn from SPAWN_MEGAFAUNA fauna entry + /// Defaults to GLOB.megafauna_spawn_list + var/list/megafauna_types = null + /// Radius around features within which we avoid spawning other features + var/feature_exclusion_radius = 7 + /// Radius around mobs which we avoid spawning other mobs + var/mob_exclusion_radius = 12 + /// Radius around megafauna within which we avoid spawning tendrils + var/megafauna_exclusion_radius = 7 /datum/biome/New() . = ..() @@ -32,6 +45,8 @@ if(length(feature_types)) feature_types = expand_weights(feature_types) + if(isnull(megafauna_types)) + megafauna_types = GLOB.megafauna_spawn_list ///This proc handles the creation of a turf of a specific biome type /datum/biome/proc/generate_turf(turf/gen_turf, closed) @@ -107,57 +122,93 @@ if(!has_flora && !has_features && !has_fauna) return + // Assoc list of spawned categories to + // Static as to be shared between all biomes + var/static/list/spawn_data + if (isnull(spawn_data)) + spawn_data = list( + CAVE_SPAWN_FEATURE = list(), + CAVE_SPAWN_TENDRIL = list(), + CAVE_SPAWN_MOB = list(), + CAVE_SPAWN_MEGAFAUNA = list(), + ) + for(var/turf/target_turf as anything in target_turfs) - // We do the CHECK_TICK here because there's a bunch of continue calls - // in this. + // Only put stuff on open turfs we generated, so closed walls and rivers and stuff are skipped + if(!istype(target_turf, open_turf_type)) + continue + CHECK_TICK + if (!(target_turf.turf_flags & TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES)) + if (flora_allowed && prob(flora_density)) + var/flora_type = pick(flora_types) + new flora_type(target_turf) + continue - if(istype(target_turf, closed_turf_type)) + if (features_allowed && prob(feature_density)) + var/can_spawn = TRUE + for(var/turf/spawn_turf as anything in spawn_data[CAVE_SPAWN_FEATURE]) + if (get_dist(spawn_turf, target_turf) <= feature_exclusion_radius) + can_spawn = FALSE + break + + if (can_spawn) + var/picked_feature = pick(feature_types) + new picked_feature(target_turf) + spawn_data[CAVE_SPAWN_FEATURE] += target_turf + continue + + if (!fauna_allowed || !prob(fauna_density)) continue - if(has_flora && prob(flora_density)) - var/obj/structure/flora = pick(flora_types) - new flora(target_turf) - continue + var/picked_mob = pick(fauna_types) + var/is_megafauna = FALSE + if (picked_mob == SPAWN_MEGAFAUNA) + picked_mob = pick_weight(megafauna_types) + is_megafauna = TRUE - if(has_features && prob(feature_density)) - var/can_spawn = TRUE - - var/atom/picked_feature = pick(feature_types) - - var/list/features_in_range = range(7, target_turf) - for(var/obj/structure/existing_feature in features_in_range) - if(istype(existing_feature, picked_feature)) + var/can_spawn = TRUE + if(ispath(picked_mob, /obj/structure/spawner/lavaland)) + // Prevents tendrils spawning in each other's collapse range + for(var/turf/spawn_turf as anything in spawn_data[CAVE_SPAWN_TENDRIL]) + if (get_dist(spawn_turf, target_turf) <= 2) can_spawn = FALSE break - if(can_spawn) - new picked_feature(target_turf) - continue - - if(has_fauna && prob(fauna_density)) - var/mob/picked_mob = pick(fauna_types) - - // prevents tendrils spawning in each other's collapse range - if(ispath(picked_mob, /obj/structure/spawner/lavaland)) - var/blocked = FALSE - for(var/obj/structure/spawner/lavaland/spawn_blocker in range(2, target_turf)) - blocked = TRUE + // Also avoid spawning them next to megafauna + for(var/turf/spawn_turf as anything in spawn_data[CAVE_SPAWN_MEGAFAUNA]) + if (get_dist(spawn_turf, target_turf) <= megafauna_exclusion_radius) + can_spawn = FALSE + break + else if (is_megafauna) + // Megafauna can spawn wherever it wants as long as its not next to another mega + for(var/turf/spawn_turf as anything in spawn_data[CAVE_SPAWN_MEGAFAUNA]) + if (get_dist(spawn_turf, target_turf) <= megafauna_exclusion_radius) + can_spawn = FALSE + break + else + for(var/turf/spawn_turf as anything in spawn_data[CAVE_SPAWN_MOB]) + if (get_dist(spawn_turf, target_turf) <= mob_exclusion_radius) + can_spawn = FALSE break - if(blocked) - continue + if (!can_spawn) + continue - // if the random is not a tendril (hopefully meaning it is a mob), avoid spawning if there's another one within 12 tiles - else - var/list/things_in_range = range(12, target_turf) - var/blocked = FALSE - for(var/mob/living/mob_blocker in things_in_range) - if(ismining(mob_blocker)) - blocked = TRUE - break + if (ispath(picked_mob, /obj/structure/spawner/lavaland)) + spawn_data[CAVE_SPAWN_TENDRIL] += target_turf + else + if (is_megafauna) + spawn_data[CAVE_SPAWN_MEGAFAUNA] += target_turf + spawn_data[CAVE_SPAWN_MOB] += target_turf - if(blocked) - continue + new picked_mob(target_turf) - new picked_mob(target_turf) + // There can be only one Bubblegum, so don't waste spawns on it + if(ispath(picked_mob, /mob/living/simple_animal/hostile/megafauna/bubblegum)) + megafauna_types.Remove(picked_mob) + +#undef CAVE_SPAWN_MOB +#undef CAVE_SPAWN_FEATURE +#undef CAVE_SPAWN_TENDRIL +#undef CAVE_SPAWN_MEGAFAUNA diff --git a/code/datums/mapgen/biomes/lavaland.dm b/code/datums/mapgen/biomes/lavaland.dm index 9ebcd2d73eb..48f76491f1d 100644 --- a/code/datums/mapgen/biomes/lavaland.dm +++ b/code/datums/mapgen/biomes/lavaland.dm @@ -2,11 +2,114 @@ open_turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface closed_turf_type = /turf/closed/mineral/volcanic + /datum/biome/lavaland/basalt closed_turf_type = /turf/closed/mineral/random/volcanic + fauna_density = 6 + flora_density = 2.5 + feature_density = 0.25 + + // Legions and goliaths, but fewer watchers and no demons + fauna_types = list( + SPAWN_MEGAFAUNA = 2, + /obj/effect/spawner/random/lavaland_mob/goliath = 50, + /obj/effect/spawner/random/lavaland_mob/legion = 40, + /obj/effect/spawner/random/lavaland_mob/watcher = 20, + /mob/living/basic/mining/bileworm = 10, + /mob/living/basic/mining/lobstrosity/lava = 20, + /obj/effect/spawner/random/lavaland_mob/raptor = 15, + /mob/living/basic/mining/goldgrub = 15, + /obj/structure/spawner/lavaland = 1, + /obj/structure/spawner/lavaland/goliath = 3, + /obj/structure/spawner/lavaland/legion = 3, + ) + + flora_types = list( + /obj/structure/flora/ash/cap_shroom = 3, + /obj/structure/flora/ash/fireblossom = 1, + /obj/structure/flora/ash/stem_shroom = 1, + /obj/structure/flora/rock/style_random = 1, + /obj/structure/flora/rock/pile/style_random = 3, + /obj/structure/flora/rock/volcano = 1, + ) + + feature_types = list( + /obj/structure/geyser/plasma_oxide = 8, + /obj/structure/geyser/protozine = 8, + /obj/structure/geyser/wittel = 8, + /obj/structure/geyser/random = 3, + /obj/structure/ore_vent/boss = 1, + ) + /datum/biome/lavaland/shale + open_turf_type = /turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface closed_turf_type = /turf/closed/mineral/random/volcanic/shale + flora_density = 5 + + // Higher chance of lobstrocities, goldgrubs and brimdemons, but no bileworms + fauna_types = list( + SPAWN_MEGAFAUNA = 2, + /obj/effect/spawner/random/lavaland_mob/goliath = 40, + /obj/effect/spawner/random/lavaland_mob/legion = 20, + /obj/effect/spawner/random/lavaland_mob/watcher = 30, + /mob/living/basic/mining/brimdemon = 40, + /mob/living/basic/mining/lobstrosity/lava = 40, + /obj/effect/spawner/random/lavaland_mob/raptor = 15, + /mob/living/basic/mining/goldgrub = 35, + /obj/structure/spawner/lavaland = 2, + /obj/structure/spawner/lavaland/goliath = 3, + /obj/structure/spawner/lavaland/legion = 3, + ) + + flora_types = list( + /obj/structure/flora/ash/fireblossom = 2, + /obj/structure/flora/ash/leaf_shroom = 2, + /obj/structure/flora/ash/seraka = 2, + /obj/structure/flora/ash/glowgrowth = 2, + /obj/structure/flora/rock/pile/shale/style_random = 5, + ) + + feature_types = list( + /obj/structure/geyser/hollowwater = 12, + /obj/structure/geyser/plasma_oxide = 12, + /obj/structure/geyser/random = 3, + /obj/structure/ore_vent/boss = 1, + ) /datum/biome/lavaland/red_rock + open_turf_type = /turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface closed_turf_type = /turf/closed/mineral/random/volcanic/red_rock + flora_density = 4 + + // Bileworms, raptors and watchers, but few goliaths + fauna_types = list( + SPAWN_MEGAFAUNA = 2, + /obj/effect/spawner/random/lavaland_mob/goliath = 20, + /obj/effect/spawner/random/lavaland_mob/legion = 25, + /obj/effect/spawner/random/lavaland_mob/watcher = 55, + /mob/living/basic/mining/bileworm = 35, + /mob/living/basic/mining/brimdemon = 15, + /mob/living/basic/mining/lobstrosity/lava = 25, + /obj/effect/spawner/random/lavaland_mob/raptor = 20, + /mob/living/basic/mining/goldgrub = 15, + /obj/structure/spawner/lavaland = 2, + /obj/structure/spawner/lavaland/goliath = 1, + /obj/structure/spawner/lavaland/legion = 3, + ) + + flora_types = list( + /obj/structure/flora/ash/cacti = 2, + /obj/structure/flora/ash/cap_shroom = 1, + /obj/structure/flora/ash/tall_shroom = 2, + /obj/structure/flora/ash/stem_shroom = 2, + /obj/structure/flora/rock/pile/siderite/style_random = 4, + /obj/structure/flora/rock/siderite_growth = 1, + ) + + feature_types = list( + /obj/structure/geyser/protozine = 12, + /obj/structure/geyser/chiral_buffer = 12, + /obj/structure/geyser/random = 3, + /obj/structure/ore_vent/boss = 1, + ) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 974425c94ca..4882007ddbb 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -1059,9 +1059,82 @@ /obj/structure/flora/rock/pile/style_random/Initialize(mapload) . = ..() - icon_state = "lavarocks[rand(1, 3)]" + icon_state = "lavarocks[pick(3;1,3;2,1;3)]" update_appearance() +/obj/structure/flora/rock/pile/siderite + icon_state = "lavarocks_siderite1" + +/obj/structure/flora/rock/pile/siderite/get_potential_products() + return list(/obj/item/stack/ore/glass/siderite = 1) + +/obj/structure/flora/rock/pile/siderite/style_2 + icon_state = "lavarocks_siderite2" + +/obj/structure/flora/rock/pile/siderite/style_3 + icon_state = "lavarocks_siderite3" + +/obj/structure/flora/rock/pile/siderite/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks_siderite[pick(3;1,3;2,1;3)]" + update_appearance() + +/obj/structure/flora/rock/pile/shale + icon_state = "lavarocks_shale1" + +/obj/structure/flora/rock/pile/shale/style_2 + icon_state = "lavarocks_shale2" + +/obj/structure/flora/rock/pile/shale/style_3 + icon_state = "lavarocks_shale3" + +/obj/structure/flora/rock/pile/shale/style_random/Initialize(mapload) + . = ..() + icon_state = "lavarocks_shale[pick(3;1,3;2,1;3)]" + update_appearance() + +/obj/structure/flora/rock/siderite_growth + name = "siderite growth" + desc = "A natural stalagmite formed of siderite, with thin pointy strands of dirty metal sticking out of the top." + icon_state = "siderite_growth1" + base_icon_state = "siderite_growth" + icon = 'icons/obj/mining_zones/terrain.dmi' + harvest_message_med = "You finish mining the growth." + +/obj/structure/flora/rock/siderite_growth/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state][pick(3;1,3;2,1;3)]" + update_appearance() + AddComponent(/datum/component/seethrough, SEE_THROUGH_MAP_DEFAULT) + +/obj/structure/flora/rock/siderite_growth/get_potential_products() + return list(/obj/item/stack/ore/glass/siderite = 1) + +/obj/structure/flora/rock/volcano + name = "volcanic pore" + desc = "A miniature volcano-like rock formed of the lava slowly pouring from it." + icon_state = "volcano_1" + base_icon_state = "volcano" + harvest_message_med = "You finish mining the pore buildup." + light_range = 3 + light_power = 2.5 + light_color = LIGHT_COLOR_LAVA + +/obj/structure/flora/rock/volcano/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state]_[rand(1, 5)]" + update_appearance() + +/obj/structure/flora/rock/volcano/update_overlays() + . = ..() + . += emissive_appearance(icon, "[icon_state]_e", src, alpha = 200) + +/obj/structure/flora/rock/volcano/after_harvest(user) + var/turf/open/our_turf = loc + if (istype(our_turf)) + our_turf.ChangeTurf(/turf/open/lava/smooth, flags = CHANGETURF_INHERIT_AIR) + return ..() + /obj/structure/flora/rock/pile/jungle icon_state = "rock1" icon = 'icons/obj/fluff/flora/jungleflora.dmi' diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index d21d2377be4..37575ccffa8 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -47,6 +47,8 @@ var/hand_mine_speed = 15 SECONDS /// Distance to the nearest open turf var/open_turf_distance = DEFAULT_BORDER_DISTANCE + /// Wall plane overlay icon state + var/wall_icon_state = "rock" /turf/closed/mineral/Initialize(mapload) . = ..() @@ -55,7 +57,11 @@ // So we draw them as if they were on the game plane, and then overlay a copy onto // The wall plane (so emissives/light masks behave) // I am so sorry - var/static/mutable_appearance/wall_overlay = mutable_appearance('icons/turf/mining.dmi', "rock", appearance_flags = RESET_TRANSFORM) + var/static/list/mutable_appearance/wall_overlays = list() + var/mutable_appearance/wall_overlay = wall_overlays[wall_icon_state] + if (!wall_overlay) + wall_overlay = mutable_appearance('icons/turf/mining.dmi', wall_icon_state, appearance_flags = RESET_TRANSFORM) + wall_overlays[wall_icon_state] = wall_overlay wall_overlay.plane = MUTATE_PLANE(WALL_PLANE, src) overlays += wall_overlay @@ -608,6 +614,9 @@ tool_mine_speed = 5 SECONDS // 25% harder than basalt hand_mine_speed = 17 SECONDS mineral_chance = 8 // N% functionally, 6.67% default, accounts for ~22% turfs + wall_icon_state = "red_rock" + turf_type = /turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface + baseturfs = /turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface /turf/closed/mineral/random/volcanic/red_rock/mineral_chances() return list( @@ -634,6 +643,9 @@ tool_mine_speed = 7 SECONDS // 75% harder than basalt hand_mine_speed = 20 SECONDS mineral_chance = 8 // N% functionally, 7.01% default, accounts for ~13% turfs + wall_icon_state = "shale" + turf_type = /turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface + baseturfs = /turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface /turf/closed/mineral/random/volcanic/shale/mineral_chances() return list( @@ -929,28 +941,34 @@ icon = 'icons/turf/mining.dmi' icon_state = "volcanic_biome" smoothing_flags = NONE + /// Area type to whose generator we try to default to + var/default_area = /area/lavaland/surface/outdoors/unexplored/danger /turf/closed/mineral/volcanic/lava_land_surface/biome_replace/Initialize(mapload) . = ..() - var/area/cur_area = loc - if (!cur_area) // what - return - // Just spawn a normal lavaland rock if we fail to get a mapgen, such as being spawned over lava var/supposed_type = /turf/closed/mineral/volcanic/lava_land_surface - var/datum/map_generator/cave_generator/map_generator = cur_area.get_generator() - if (istype(map_generator)) - for (var/datum/biome/biome as anything in map_generator.generated_turfs_per_biome) - var/list/gen_turfs = map_generator.generated_turfs_per_biome[biome] - if (gen_turfs[src]) - // Ignore what we were supposed to spawn as in favor of the closed turf - supposed_type = biome.closed_turf_type - break + var/area/cur_area = loc + var/datum/map_generator/cave_generator/map_generator = cur_area?.get_generator() + if (!map_generator) + cur_area = GLOB.areas_by_type[default_area] + map_generator = cur_area?.get_generator() - var/turf/new_turf = new supposed_type(src) - if(turf_flags & NO_RUINS) + if (istype(map_generator)) + var/biome = map_generator.get_biome_for_turf(src) + if (biome) + var/datum/biome/generating_biome = SSmapping.biomes[biome] + supposed_type = generating_biome.closed_turf_type + + var/cur_flags = turf_flags + var/turf/new_turf = ChangeTurf(supposed_type, flags = CHANGETURF_FORCEOP | CHANGETURF_INHERIT_AIR) + if(cur_flags & NO_RUINS) new_turf.turf_flags |= NO_RUINS +/// A turf that can't we can't build openspace chasms on or spawn ruins in. +/turf/closed/mineral/volcanic/lava_land_surface/do_not_chasm + turf_flags = NO_RUINS + /// Wall piece /turf/closed/mineral/ash_rock name = "rock" @@ -1020,6 +1038,7 @@ transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + wall_icon_state = "red_rock" /turf/closed/mineral/random/stationside/asteroid name = "iron rock" @@ -1029,6 +1048,7 @@ transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) smoothing_groups = SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_RED_ROCK_WALLS canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS + wall_icon_state = "red_rock" /turf/closed/mineral/random/stationside/asteroid/porus name = "porous iron rock" @@ -1169,6 +1189,7 @@ canSmoothWith = SMOOTH_GROUP_RED_ROCK_WALLS tool_mine_speed = 5 SECONDS // 25% harder than basalt hand_mine_speed = 17 SECONDS + wall_icon_state = "red_rock" /turf/closed/mineral/gibtonite/volcanic/shale name = "shale" @@ -1180,6 +1201,7 @@ canSmoothWith = SMOOTH_GROUP_SHALE_WALLS tool_mine_speed = 7 SECONDS // 75% harder than basalt hand_mine_speed = 20 SECONDS + wall_icon_state = "shale" /turf/closed/mineral/gibtonite/volcanic/airless turf_type = /turf/open/misc/asteroid/basalt diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index 9675f0c45d3..9ac571c2e6d 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -186,9 +186,34 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins turf_flags = NO_RUINS -/// A turf that can't we can't build openspace chasms on or spawn ruins in. -/turf/closed/mineral/volcanic/lava_land_surface/do_not_chasm - turf_flags = NO_RUINS +/// Variant for ruins which replaces itself with the floor of a biome it generates in +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace + icon = 'icons/turf/mining.dmi' + icon_state = "basalt_biome" + smoothing_flags = NONE + /// Area type to whose generator we try to default to + var/default_area = /area/lavaland/surface/outdoors/unexplored/danger + +/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace/Initialize(mapload) + . = ..() + // Just spawn a normal lavaland rock if we fail to get a mapgen, such as being spawned over lava + var/supposed_type = /turf/open/misc/asteroid/basalt/lava_land_surface + var/area/cur_area = loc + var/datum/map_generator/cave_generator/map_generator = cur_area?.get_generator() + if (!map_generator) + cur_area = GLOB.areas_by_type[default_area] + map_generator = cur_area?.get_generator() + + if (istype(map_generator)) + var/biome = map_generator.get_biome_for_turf(src) + if (biome) + var/datum/biome/generating_biome = SSmapping.biomes[biome] + supposed_type = generating_biome.open_turf_type + + var/cur_flags = turf_flags + var/turf/new_turf = ChangeTurf(supposed_type, flags = CHANGETURF_FORCEOP | CHANGETURF_INHERIT_AIR) + if(cur_flags & NO_RUINS) + new_turf.turf_flags |= NO_RUINS /turf/open/misc/asteroid/lowpressure initial_gas_mix = OPENTURF_LOW_PRESSURE @@ -201,6 +226,77 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) turf_type = /turf/open/misc/asteroid/airless worm_chance = 0 +/turf/open/misc/asteroid/basalt/smooth + smoothing_flags = SMOOTH_BITMASK + layer = MID_TURF_LAYER + floor_variance = 0 + transform = MAP_SWITCH(TRANSLATE_MATRIX(-8, -8), matrix()) + /// DMI used by unsmoothed turfs for variance + var/variant_dmi = null + /// Amount of variants this turf has + var/variant_num = 8 + +/turf/open/misc/asteroid/basalt/smooth/set_smoothed_icon_state(new_junction) + . = ..() + if (new_junction == 255 && variant_dmi) + icon = variant_dmi + icon_state = "[base_icon_state][rand(1, variant_num)]" + else + icon = initial(icon) + +/turf/open/misc/asteroid/basalt/smooth/update_overlays() + . = ..() + if (smoothing_junction != 255 && variant_dmi) + . = list(mutable_appearance(variant_dmi, "[base_icon_state][rand(1, variant_num)]")) + . + +/turf/open/misc/asteroid/basalt/smooth/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) + . = ..() + if (!.) + return + if(!smoothing_flags) + return + underlay_appearance.transform = transform + +/turf/open/misc/asteroid/basalt/smooth/siderite + name = "siderite floor" + baseturfs = /turf/open/misc/asteroid/basalt/smooth/siderite + icon = 'icons/turf/floors/siderite.dmi' + damaged_dmi = 'icons/turf/floors/siderite_variants.dmi' + variant_dmi = 'icons/turf/floors/siderite_variants.dmi' + icon_state = "siderite-255" + base_icon_state = "siderite" + layer = HIGH_TURF_LAYER + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_SIDERITE + canSmoothWith = SMOOTH_GROUP_FLOOR_SIDERITE + SMOOTH_GROUP_CLOSED_TURFS + dig_result = /obj/item/stack/ore/glass/siderite + +/turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + baseturfs = /turf/open/lava/smooth/lava_land_surface + +/turf/open/misc/asteroid/basalt/smooth/siderite/lava_land_surface/no_ruins + turf_flags = NO_RUINS + +/turf/open/misc/asteroid/basalt/smooth/shale + name = "shale floor" + baseturfs = /turf/open/misc/asteroid/basalt/smooth/shale + icon = 'icons/turf/floors/shale.dmi' + damaged_dmi = 'icons/turf/floors/shale_variants.dmi' + variant_dmi = 'icons/turf/floors/shale_variants.dmi' + icon_state = "shale-255" + base_icon_state = "shale" + smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_SHALE + canSmoothWith = SMOOTH_GROUP_FLOOR_SHALE + SMOOTH_GROUP_CLOSED_TURFS + +/turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + baseturfs = /turf/open/lava/smooth/lava_land_surface + +/turf/open/misc/asteroid/basalt/smooth/shale/lava_land_surface/no_ruins + turf_flags = NO_RUINS + /turf/open/misc/asteroid/snow gender = PLURAL name = "snow" diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 97aecdfbf2c..3eabc4f02e7 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -1168,6 +1168,9 @@ if(myseed) to_chat(user, span_warning("[src] already has a plant growing in it!")) return + if(young_plant.seed_flags & NO_PLANTING) + to_chat(user, span_warning("[young_plant] cannot be planted in [src]!")) + return if(istype(young_plant, /obj/item/seeds/kudzu)) investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)].", INVESTIGATE_BOTANY) if(!user.transferItemToLoc(young_plant, src)) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 7f8c16d805e..c9da29aad6e 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -40,7 +40,7 @@ icon_state = base_icon_state /obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things - regrowth_time_low = 4200 + regrowth_time_low = 7 MINUTES /obj/structure/flora/ash/leaf_shroom name = "leafy mushrooms" @@ -54,8 +54,8 @@ harvest_message_med = "You pluck a number of leaves, leaving a few unsuitable ones." harvest_message_high = "You pluck quite a lot of suitable leaves." harvest_time = 20 - regrowth_time_low = 2400 - regrowth_time_high = 6000 + regrowth_time_low = 4 MINUTES + regrowth_time_high = 10 MINUTES /obj/structure/flora/ash/leaf_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_leaf = 1) @@ -72,8 +72,8 @@ harvest_message_med = "You slice off a few conks from the larger mushrooms." harvest_message_high = "You slice off a number of caps and conks from these mushrooms." harvest_time = 50 - regrowth_time_low = 3000 - regrowth_time_high = 5400 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 9 MINUTES /obj/structure/flora/ash/cap_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_cap = 1) @@ -92,8 +92,8 @@ harvest_message_med = "You pick and decapitate several mushrooms for their stems." harvest_message_high = "You acquire a number of stems from these mushrooms." harvest_time = 40 - regrowth_time_low = 3000 - regrowth_time_high = 6000 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 10 MINUTES /obj/structure/flora/ash/stem_shroom/get_potential_products() return list(/obj/item/food/grown/ash_flora/mushroom_stem = 1) @@ -110,8 +110,8 @@ harvest_message_med = "You pick several cactus fruit." //shouldn't show up, because you can't get more than two harvest_message_high = "You pick a pair of cactus fruit." harvest_time = 10 - regrowth_time_low = 4800 - regrowth_time_high = 7200 + regrowth_time_low = 8 MINUTES + regrowth_time_high = 12 MINUTES can_uproot = FALSE //Don't want 50 in one tile to decimate whoever dare step on the mass of cacti /obj/structure/flora/ash/cacti/Initialize(mapload) @@ -133,8 +133,8 @@ harvest_message_med = "You grab a good haul of mushrooms." harvest_message_high = "You hit the mushroom motherlode and make off with a bunch of tasty mushrooms." harvest_time = 25 - regrowth_time_low = 3000 - regrowth_time_high = 5400 + regrowth_time_low = 5 MINUTES + regrowth_time_high = 9 MINUTES number_of_variants = 2 harvest_message_true_thresholds = FALSE @@ -155,8 +155,8 @@ harvest_message_low = "You pluck a single, suitable flower." harvest_message_med = "You pluck a number of flowers, leaving a few unsuitable ones." harvest_message_high = "You pluck quite a lot of suitable flowers." - regrowth_time_low = 2500 - regrowth_time_high = 4000 + regrowth_time_low = 4 MINUTES + regrowth_time_high = 7 MINUTES number_of_variants = 2 /obj/structure/flora/ash/fireblossom/get_potential_products() @@ -174,6 +174,50 @@ update_light() return ..() +/obj/structure/flora/ash/glowgrowth + name = "glowgrowth colony" + desc = "A colony of bioluminescent fungi growing on a hot air vent, feeding off mineral particulate blowing through it." + icon_state = "glowgrowth1" + base_icon_state = "glowgrowth" + density = TRUE // Large rock formations with plants ontop + light_range = 1.7 + light_power = 1.2 + light_color = "#67b6a5" + harvested_name = "hot air vent" + harvested_desc = "A ridged porous rock formation exuming hot air from the depths of the planet." + harvest_amount_high = 4 + harvest_verb = "scrape" + harvest_message_low = "You scrape off a thin layer of glowing fungi." + harvest_message_med = "You pick a sizeable patch of glowing fungi." + harvest_message_high = "You grab a large fistful of glowing fungi." + regrowth_time_low = 8 MINUTES + regrowth_time_high = 16 MINUTES + number_of_variants = 3 + +/obj/structure/flora/ash/glowgrowth/Initialize(mapload) + . = ..() + update_appearance() + +/obj/structure/flora/ash/glowgrowth/get_potential_products() + return list(/obj/item/food/grown/ash_flora/glowgrowth = 1) + +/obj/structure/flora/ash/glowgrowth/after_harvest() + set_light_on(FALSE) + update_light() + update_appearance() + return ..() + +/obj/structure/flora/ash/glowgrowth/regrow() + set_light_on(TRUE) + update_light() + update_appearance() + return ..() + +/obj/structure/flora/ash/glowgrowth/update_overlays() + . = ..() + if (!harvested) + . += emissive_appearance(icon, "[icon_state]e", src, alpha = 120) + ///Snow flora to exist on icebox. /obj/structure/flora/ash/chilly name = "springy grassy fruit" @@ -274,6 +318,13 @@ // Fire flowers make fireproof raptors AddElement(/datum/element/raptor_food, color_chances = string_list(list(/datum/raptor_color/blue = 5))) +/obj/item/food/grown/ash_flora/glowgrowth + name = "glowgrowth sheet" + desc = "A thick sheet of glowing fungi." + icon_state = "glowgrowth" + seed = /obj/item/seeds/lavaland/glowgrowth // Cannot be grown in hydroponics as it feeds off mineral air + wine_power = 50 + // SEEDS /obj/item/seeds/lavaland @@ -401,6 +452,17 @@ growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi' reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment = 0.03, /datum/reagent/carbon = 0.05) +/obj/item/seeds/lavaland/glowgrowth + name = "glowgrowth mycelium pack" + desc = "This mycelium grows into glowgrowth fungi." + plantname = "Glowgrowth Fungi" + icon_state = "mycelium-glowgrowth" + species = "glowgrowth" + product = /obj/item/food/grown/ash_flora/glowgrowth + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/blue) // Fungal metab doesn't do anything (cause it can't be planted) but it shows up in analyzers + reagents_add = list(/datum/reagent/luminescent_fluid/cyan = 0.06, /datum/reagent/consumable/nutriment = 0.01, /datum/reagent/silicon = 0.03) + seed_flags = parent_type::seed_flags | NO_PLANTING + //CRAFTING /datum/crafting_recipe/mushroom_bowl diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 5857738adfc..8f965844558 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -182,6 +182,13 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ mine_experience = 0 merge_type = /obj/item/stack/ore/glass/basalt +/obj/item/stack/ore/glass/siderite + name = "siderite dust" + icon_state = "siderite_sand" + singular_name = "siderite dust pile" + mine_experience = 0 + merge_type = /obj/item/stack/ore/glass/siderite + /obj/item/stack/ore/plasma name = "plasma ore" icon_state = "plasma" diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index 595c71d05a4..a7213e37f38 100644 --- a/code/modules/unit_tests/plantgrowth_tests.dm +++ b/code/modules/unit_tests/plantgrowth_tests.dm @@ -8,6 +8,9 @@ for(var/seedpath in paths) var/obj/item/seeds/seed = new seedpath + if (seed.seed_flags & NO_PLANTING) + continue + for(var/i in 1 to seed.growthstages) if(icon_exists(seed.growing_icon, "[seed.icon_grow][i]")) continue diff --git a/icons/obj/fluff/flora/rocks.dmi b/icons/obj/fluff/flora/rocks.dmi index b972fef0e7e..098f0b03fbb 100644 Binary files a/icons/obj/fluff/flora/rocks.dmi and b/icons/obj/fluff/flora/rocks.dmi differ diff --git a/icons/obj/mining_zones/ash_flora.dmi b/icons/obj/mining_zones/ash_flora.dmi index d796c200071..5d64b1b931b 100644 Binary files a/icons/obj/mining_zones/ash_flora.dmi and b/icons/obj/mining_zones/ash_flora.dmi differ diff --git a/icons/obj/mining_zones/terrain.dmi b/icons/obj/mining_zones/terrain.dmi index f46a677296b..edbd2958a69 100644 Binary files a/icons/obj/mining_zones/terrain.dmi and b/icons/obj/mining_zones/terrain.dmi differ diff --git a/icons/obj/ore.dmi b/icons/obj/ore.dmi index 81a7cb03fdf..5a363aad95b 100644 Binary files a/icons/obj/ore.dmi and b/icons/obj/ore.dmi differ diff --git a/icons/obj/service/hydroponics/seeds.dmi b/icons/obj/service/hydroponics/seeds.dmi index e180060041b..d08fbb8541d 100644 Binary files a/icons/obj/service/hydroponics/seeds.dmi and b/icons/obj/service/hydroponics/seeds.dmi differ diff --git a/icons/turf/floors/shale.dmi b/icons/turf/floors/shale.dmi new file mode 100644 index 00000000000..e7bdc5af6f6 Binary files /dev/null and b/icons/turf/floors/shale.dmi differ diff --git a/icons/turf/floors/shale.png b/icons/turf/floors/shale.png new file mode 100644 index 00000000000..3bc0d0247d5 Binary files /dev/null and b/icons/turf/floors/shale.png differ diff --git a/icons/turf/floors/shale.png.toml b/icons/turf/floors/shale.png.toml new file mode 100644 index 00000000000..2b6b33e54e2 --- /dev/null +++ b/icons/turf/floors/shale.png.toml @@ -0,0 +1,14 @@ +output_name = "shale" +template = "bitmask/diagonal_32x32.toml" + +[icon_size] +x = 48 +y = 48 + +[output_icon_size] +x = 48 +y = 48 + +[cut_pos] +x = 24 +y = 24 diff --git a/icons/turf/floors/shale_variants.dmi b/icons/turf/floors/shale_variants.dmi new file mode 100644 index 00000000000..3a6b6981227 Binary files /dev/null and b/icons/turf/floors/shale_variants.dmi differ diff --git a/icons/turf/floors/siderite.dmi b/icons/turf/floors/siderite.dmi new file mode 100644 index 00000000000..570ddb23c91 Binary files /dev/null and b/icons/turf/floors/siderite.dmi differ diff --git a/icons/turf/floors/siderite.png b/icons/turf/floors/siderite.png new file mode 100644 index 00000000000..989acc29e06 Binary files /dev/null and b/icons/turf/floors/siderite.png differ diff --git a/icons/turf/floors/siderite.png.toml b/icons/turf/floors/siderite.png.toml new file mode 100644 index 00000000000..70f87a5c0ff --- /dev/null +++ b/icons/turf/floors/siderite.png.toml @@ -0,0 +1,14 @@ +output_name = "siderite" +template = "bitmask/diagonal_32x32.toml" + +[icon_size] +x = 48 +y = 48 + +[output_icon_size] +x = 48 +y = 48 + +[cut_pos] +x = 24 +y = 24 diff --git a/icons/turf/floors/siderite_variants.dmi b/icons/turf/floors/siderite_variants.dmi new file mode 100644 index 00000000000..2d4c03d12b0 Binary files /dev/null and b/icons/turf/floors/siderite_variants.dmi differ diff --git a/icons/turf/mining.dmi b/icons/turf/mining.dmi index 5a3a5af61f3..79f41ca92ab 100644 Binary files a/icons/turf/mining.dmi and b/icons/turf/mining.dmi differ