Removes Disease one and Virology

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -159,7 +159,7 @@
 		if(archive_diseases[id])
 			var/datum/disease/advance/A = archive_diseases[id]
 			A.AssignName(new_name)
-			for(var/datum/disease/advance/AD in disease_master.processing)
+			for(var/datum/disease/advance/AD in active_diseases)
 				AD.Refresh()
 		updateUsrDialog()
 
@@ -205,7 +205,8 @@
 				var/list/vir = Blood.data["viruses"]
 				if(vir.len)
 					var/i = 0
-					for(var/datum/disease/D in Blood.data["viruses"])
+					for(var/thing in Blood.data["viruses"])
+						var/datum/disease/D = thing
 						i++
 						if(!(D.visibility_flags & HIDDEN_PANDEMIC))
 

code/modules/reagents/chemistry/reagents.dm

@@ -7,7 +7,6 @@
 	var/list/data = null
 	var/volume = 0
 	var/metabolization_rate = REAGENTS_METABOLISM
-	//var/list/viruses = list()
 	var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
 	var/shock_reduction = 0
 	var/heart_rate_increase = 0

code/modules/reagents/chemistry/reagents/admin.dm

@@ -46,13 +46,11 @@
 	M.SetConfused(0)
 	M.SetSleeping(0)
 	M.SetJitter(0)
-	for(var/datum/disease/D in M.viruses)
+	for(var/thing in M.viruses)
+		var/datum/disease/D = thing
 		if(D.severity == NONTHREAT)
 			continue
-		D.spread_text = "Remissive"
-		D.stage--
-		if(D.stage < 1)
-			D.cure()
+		D.cure(0)
 	..()
 
 /datum/reagent/medicine/adminordrazine/nanites

code/modules/reagents/chemistry/reagents/water.dm

@@ -196,7 +196,8 @@
 
 /datum/reagent/blood/reaction_mob(mob/living/M, method=TOUCH, volume)
 	if(data && data["viruses"])
-		for(var/datum/disease/D in data["viruses"])
+		for(var/thing in data["viruses"])
+			var/datum/disease/D = thing
 
 			if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
 				continue
@@ -254,22 +255,12 @@
 			blood_prop = new(T)
 			blood_prop.blood_DNA[data["blood_DNA"]] = data["blood_type"]
 
-		for(var/datum/disease/D in data["viruses"])
-			var/datum/disease/newVirus = D.Copy(1)
-			blood_prop.viruses += newVirus
-			newVirus.holder = blood_prop
-
 	else if(istype(data["donor"], /mob/living/carbon/alien))
 		var/obj/effect/decal/cleanable/blood/xeno/blood_prop = locate() in T
 		if(!blood_prop)
 			blood_prop = new(T)
 			blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
 
-		for(var/datum/disease/D in data["viruses"])
-			var/datum/disease/newVirus = D.Copy(1)
-			blood_prop.viruses += newVirus
-			newVirus.holder = blood_prop
-
 /datum/reagent/vaccine
 	//data must contain virus type
 	name = "Vaccine"
@@ -278,7 +269,8 @@
 
 /datum/reagent/vaccine/reaction_mob(mob/living/M, method=TOUCH, volume)
 	if(islist(data) && (method == INGEST))
-		for(var/datum/disease/D in M.viruses)
+		for(var/thing in M.viruses)
+			var/datum/disease/D = thing
 			if(D.GetDiseaseID() in data)
 				D.cure()
 		M.resistances |= data