From cd9fb045e18b6e86db4b0674d799d399a7eb0001 Mon Sep 17 00:00:00 2001
From: Kabra_men <46802162+Kabramen@users.noreply.github.com>
Date: Thu, 21 Jan 2021 12:02:42 -0300
Subject: [PATCH] GRASS

---
 code/game/objects/structures/flora.dm            |  15 +++++++++++++++
 .../turfs/simulated/floor/plating/asteroid.dm    |   4 ++--
 icons/obj/lavaland/redgrass.dmi                  | Bin 0 -> 1598 bytes
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 icons/obj/lavaland/redgrass.dmi

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 0000000000000000000000000000000000000000..ee73118f6a8d95a9be6e4c9cd52462b9ce4cbb88
GIT binary patch
literal 1598
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

literal 0
HcmV?d00001