From 8ae95fc28ad28accfd322bca4ab2d050cb100f54 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Mon, 19 Jul 2021 05:59:02 +0800
Subject: [PATCH] fixed sentient diseases reinfecting when dead (#60107)

---
 code/modules/antagonists/disease/disease_disease.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/antagonists/disease/disease_disease.dm b/code/modules/antagonists/disease/disease_disease.dm
index 3c2ee86b0dd..e669910ba7e 100644
--- a/code/modules/antagonists/disease/disease_disease.dm
+++ b/code/modules/antagonists/disease/disease_disease.dm
@@ -5,6 +5,7 @@
 	viable_mobtypes = list(/mob/living/carbon/human)
 	mutable = FALSE
 	var/mob/camera/disease/overmind
+	var/disease_id
 
 /datum/disease/advance/sentient_disease/New()
 	..()
@@ -38,6 +39,7 @@
 /datum/disease/advance/sentient_disease/Copy()
 	var/datum/disease/advance/sentient_disease/D = ..()
 	D.overmind = overmind
+	D.disease_id = disease_id
 	return D
 
 /datum/disease/advance/sentient_disease/after_add()
@@ -46,7 +48,9 @@
 
 
 /datum/disease/advance/sentient_disease/GetDiseaseID()
-	return "[type]|[overmind ? overmind.tag : null]"
+	if (!disease_id) //if we don't set this here it can reinfect people after the disease dies, since overmind.tag won't be null when the disease is alive, but will be null afterwards, thus the disease ID changes
+		disease_id = "[type]|[overmind?.tag]"
+	return disease_id
 
 /datum/disease/advance/sentient_disease/GenerateCure()
 	if(cures.len)