Fixes glowshroom runtimes.

tgstation · Jul 9, 2020 · 1bebc50 · 1bebc50
1 parent 4a9d8dd
commit 1bebc50
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
@@ -45,11 +45,6 @@
 	. = ..()
 	. += "This is a [generation]\th generation [name]!"
 
-/obj/structure/glowshroom/Destroy()
-	if(myseed)
-		QDEL_NULL(myseed)
-	return ..()
-
 /**
   *	Creates a new glowshroom structure.
   *
@@ -142,6 +137,8 @@
 				continue
 
 			Decay(TRUE, 2) // Decay before spawning new mushrooms to reduce their endurance
+			if(QDELETED(src))	//Decay can end us
+				return
 			var/obj/structure/glowshroom/child = new type(newLoc, myseed, TRUE, TRUE)
 			child.generation = generation + 1
 			shrooms_planted++