From a4325d69eb1939ab43abd6fe0ce1613417e3bff4 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Fri, 21 Jun 2013 21:37:20 +0400
Subject: [PATCH] Fixes for runtimes and viruses staying in blood after curing.

---
 code/modules/organs/blood.dm    | 4 ++--
 code/modules/virus2/disease2.dm | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 2dfa262fc90..78ccd65c287 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -163,7 +163,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 	//set reagent data
 	B.data["donor"] = src
-//	B.data["virus2"] = virus_mergelist(B.data["virus2"] , src.virus2)
+	if (!B.data["virus2"])
+		B.data["virus2"] = list()
 	B.data["virus2"] |= virus_copylist(src.virus2)
 	B.data["antibodies"] = src.antibodies
 	B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
@@ -200,7 +201,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	else
 		vessel.add_reagent("blood", amount, injected.data)
 		vessel.update_total()
-//	src.virus2 = virus_mergelist(src.virus2 , injected.data["virus2"])
 	src.virus2 |= virus_copylist(injected.data["virus2"])
 	if (injected.data["antibodies"] && prob(5))
 		antibodies |= injected.data["antibodies"]
diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm
index 7454ecf81ce..dd8905af172 100644
--- a/code/modules/virus2/disease2.dm
+++ b/code/modules/virus2/disease2.dm
@@ -59,8 +59,6 @@
 		if(stage == max_stage)
 			src.cure(mob)
 			mob.antibodies |= src.antigen
-			mob.virus2 -= src
-			del src
 		stage++
 		clicks = 0
 	//Do nasty effects
@@ -74,6 +72,7 @@
 /datum/disease2/disease/proc/cure(var/mob/living/carbon/mob)
 	for(var/datum/disease2/effectholder/e in effects)
 		e.effect.deactivate(mob)
+	mob.virus2.Remove("[uniqueID]")
 
 /datum/disease2/disease/proc/minormutate()
 	var/datum/disease2/effectholder/holder = pick(effects)