From 208e6e5edf2b9fc2286201014cc1587ac813087f Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Tue, 11 Oct 2016 10:04:32 -0400
Subject: [PATCH] Ash flora can now spawn in small patches

---
 code/modules/mining/lavaland/ash_flora.dm |   3 +++
 code/modules/mining/mine_turfs.dm         |   7 ++++---
 icons/obj/lavaland/ash_flora.dmi          | Bin 17343 -> 17340 bytes
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index ee16487ab20..dc6d616d366 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -71,6 +71,9 @@
 	else
 		..()
 
+/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
+
 /obj/structure/flora/ash/leaf_shroom
 	icon_state = "s_mushroom"
 	name = "leafy mushrooms"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index ef5da5bb2af..6b0a051dde1 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -268,7 +268,7 @@
 /turf/open/floor/plating/asteroid/airless/cave
 	var/length = 100
 	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
-	var/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 = 2)
+	var/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)
 	var/sanity = 1
 	var/forward_cave_dir = 1
 	var/backward_cave_dir = 2
@@ -391,9 +391,10 @@
 	if(prob(12))
 		if(istype(loc, /area/mine/explored) || istype(loc, /area/lavaland/surface/outdoors/explored))
 			return
-		for(var/obj/structure/flora/ash/F in urange(3,T)) //Allows for growing patches, but not ridiculous stacks of flora
-			return
 		var/randumb = pickweight(flora_spawn_list)
+		for(var/obj/structure/flora/ash/F in range(4, T)) //Allows for growing patches, but not ridiculous stacks of flora
+			if(!istype(F, randumb))
+				return
 		new randumb(T)
 
 
diff --git a/icons/obj/lavaland/ash_flora.dmi b/icons/obj/lavaland/ash_flora.dmi
index d58541612d2b4a3f6cbba1a6fbcb087e99626657..b9ebfbfb662753390ab93da20b699f017a4f778f 100644
GIT binary patch
delta 305
zcmV-10nYxvhXK5Y0gxnr7<yD#bVOxyV{&P5bZKvH004NLm6Sn_f<O>O*YqhWx}S`|
zmW{y}7J3EJVq<p#GN~%``m>Okm4^B|I(hswFE4Cqe>gU0s!xr31eP@2siN}h+hxym
z)kqZ;xyxcmx2Ug!sMkOhZH9K7CGs?lyPu8Au8D;z+PSP}KZe(T^E((|b7VLN*a8_Y
z0JcPi%T>1Xoz7zLyMRW{;B^6woWbV;8aac<1zhC>=~RGD1?g0PP6g>yfKCPJRDezy
zam;{YMjSKXm=VVeIA+8#1CAAOtbk)h94p{h5yuKRR>ZLaj{nG3qJO0OP3&)6rsrV%
zXSF@gNg=ph|IYs-n+(DC7>%rV9)po>(J*54=k+Ze&NbDi#{B|^ou;Un?Z+asNC9_3
D%%GA2

delta 308
zcmdnf&bYswae_*{bX7=1iA!p6a#3bMNoIZ?14G4}tyebYH9PPe`#7_jOZ(<(wunfr
zMIDNjtR<@M?^HOZ=1#i)o*{R7*bnJljbH3v|2UcCpMN~Kc;T-*JKPgIFVEG|ijRx^
z<`do<5;$?UPFqR$u00)9ydf9!GLA<o`CqR1abxG3SrIE1HJ`5fR-YU(ufDs{?Ems@
z4tg;Rxt%<E=C{w4TXi><^Y+H($?nMARl;`O)TE5<xaplYERn&C*S;(_t>D_Qyy?wK
zhH9-7^MK4A3FCw_9fr)u;EXN_?SwTQ8<~#58S$yw7ws?oRr@CV{&KOwzs<MiJzo-V
zCr_>Z`FG#82i0rbmX*tOPrSJ(@yM(F%iq7OSh>>9{GISF;bj(SY4IYPT^Y-r04i>i
A-T(jq