annoying pathology fixes

Monkestation · Dec 1, 2024 · 7240efd · 7240efd
1 parent 4545c04
commit 7240efd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm b/monkestation/code/modules/virology/disease/symptom_varients/recursive.dm
@@ -17,10 +17,9 @@
 	UnregisterSignal(host_symptom, COMSIG_SYMPTOM_TRIGGER)
 
 /datum/symptom_varient/recursive/proc/start_chain()
-	trigger_symptom()
-
-	addtimer(CALLBACK(src, PROC_REF(trigger)), 2 SECONDS)
-	addtimer(CALLBACK(src, PROC_REF(trigger)), 4 SECONDS)
+	if(trigger_symptom())
+		addtimer(CALLBACK(src, PROC_REF(trigger)), 2 SECONDS, TIMER_DELETE_ME)
+		addtimer(CALLBACK(src, PROC_REF(trigger)), 4 SECONDS, TIMER_DELETE_ME)
 
 /datum/symptom_varient/recursive/proc/trigger()
 	host_symptom.run_effect(host_disease.affected_mob, host_disease)
diff --git a/monkestation/code/modules/virology/disease/symtoms/_symptom.dm b/monkestation/code/modules/virology/disease/symtoms/_symptom.dm
@@ -32,6 +32,9 @@
 	var/datum/symptom_varient/attached_varient
 		// This is our attached varient used for updating desc and Symptom copy code.
 
+/datum/symptom/Destroy(force)
+	QDEL_NULL(attached_varient)
+	return ..()
 
 /datum/symptom/proc/minormutate()
 	if (prob(20))