From f8c323155288220c57290eb335db233f144f75ff Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 2 May 2011 17:24:40 +0000
Subject: [PATCH]  Hydroponics Glowshrooms now stop growing after a while.
 They're also much less laggy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1518 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj/hydro.dm       |  5 +++++
 code/game/objects/glowshroom.dm | 39 ++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index 51050f66ac6..5fbca5169ba 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -784,6 +784,11 @@
 
 	user << "You plant the glowshroom."
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Del()
+	if(istype(loc,/mob))
+		loc.sd_SetLuminosity(loc.luminosity - potency/10)
+	..()
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
 	src.sd_SetLuminosity(0)
 	user.sd_SetLuminosity(user.luminosity + potency/10)
diff --git a/code/game/objects/glowshroom.dm b/code/game/objects/glowshroom.dm
index 482e6e3521e..effb5870448 100644
--- a/code/game/objects/glowshroom.dm
+++ b/code/game/objects/glowshroom.dm
@@ -12,9 +12,12 @@
 	var/floor = 0
 	var/yield = 3
 	var/spreadChance = 80
-	var/spreadIntoAdjacentChance = 10
+	var/spreadIntoAdjacentChance = 60
 	var/evolveChance = 2
 
+/obj/glowshroom/single
+	spreadChance = 0
+
 /obj/glowshroom/New()
 	..()
 
@@ -43,27 +46,30 @@
 /obj/glowshroom/proc/Spread()
 	set background = 1
 
+	var/spreaded = 0
+
 	for(var/i=1,i<=yield,i++)
 		if(prob(spreadChance))
 			var/list/possibleLocs = list()
+			var/spreadsIntoAdjacent = 0
+
+			if(prob(spreadIntoAdjacentChance))
+				spreadsIntoAdjacent = 1
 
 			for(var/turf/turf in view(3,src))
-				if(!turf.density)
-					possibleLocs += turf
+				if(!turf.density && !istype(turf,/turf/space))
+					var/isAdjacent = 0
+					if(!spreadsIntoAdjacent)
+						for(var/obj/glowshroom in view(1,turf))
+							isAdjacent = 1
+					if(!isAdjacent)
+						possibleLocs += turf
+
+			if(!possibleLocs.len)
+				break
 
 			var/turf/newLoc = pick(possibleLocs)
 
-			if(istype(newLoc,/turf/space))
-				continue
-
-			var/ifContinue = 0 //hacky
-			if(!prob(spreadIntoAdjacentChance))
-				for(var/obj/glowshroom in view(1,newLoc))
-					ifContinue = 1
-					break
-			if(ifContinue)
-				continue
-
 			var/shroomCount = 0 //hacky
 			var/placeCount = 1
 			for(var/obj/glowshroom/shroom in newLoc)
@@ -81,13 +87,16 @@
 			child.delay = delay
 			child.endurance = endurance
 
+			spreaded++
+
 	if(prob(evolveChance)) //very low chance to evolve on its own
 		potency += rand(4,6)
 
 	sleep(delay)
 
 	if(src)
-		.()
+		if(spreaded)
+			.()
 
 /obj/glowshroom/proc/CalcDir(turf/location = loc)
 	var/direction = 16