diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0150fbf5..f2fdcf5c 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -435,3 +435,18 @@ /obj/structure/flora/rock/pile/largejungle/Initialize() . = ..() icon_state = "[initial(icon_state)][rand(1,3)]" + + +//lavaland grass +/obj/structure/flora/redgrass + name = "tall grass" + desc = "A patch of overgrown red grass." + icon = 'icons/obj/lavaland/redgrass.dmi' + gender = PLURAL //"this is grass" not "this is a grass" + +/obj/structure/flora/redgrass/redg + icon_state = "tallgrass1bb" + +/obj/structure/flora/redgrass/redg/Initialize() + icon_state = "tallgrass[rand(1, 4)]bb" + . = ..() diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index b0753751..bbb1afcd 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -169,7 +169,7 @@ if (!megafauna_spawn_list) megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM) if (!flora_spawn_list) - flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/redgrass/redg = 1) . = ..() @@ -283,7 +283,7 @@ return //if the random is a standard mob, avoid spawning if there's another one within 12 tiles if((ispath(randumb, /obj/structure/spawner/lavaland) || istype(H, /obj/structure/spawner/lavaland)) && get_dist(src, H) <= 2) return //prevents tendrils spawning in each other's collapse range - + for (var/area/L in range(8, T)) if (istype(L, /area/lavaland/surface/outdoors/) && !istype(L, /area/lavaland/surface/outdoors/unexplored)\ && istype(L, /area/ruin) && istype(randumb, /mob/living/simple_animal/hostile/megafauna)) diff --git a/icons/obj/lavaland/redgrass.dmi b/icons/obj/lavaland/redgrass.dmi new file mode 100644 index 00000000..ee73118f Binary files /dev/null and b/icons/obj/lavaland/redgrass.dmi differ