Fix advanced disease mixing (stupid fucking reagent code)

code/modules/reagents/Chemistry-Colours.dm

@@ -12,7 +12,7 @@
 	var/vol_temp
 	// see libs/IconProcs/IconProcs.dm
 	for(var/datum/reagent/reagent in reagent_list)
-		if(reagent.id == "blood" && reagent.data["blood_colour"])
+		if(reagent.id == "blood" && reagent.data && reagent.data["blood_colour"])
 			reagent_color = reagent.data["blood_colour"]
 		else
 			reagent_color = reagent.color

code/modules/reagents/Chemistry-Holder.dm

@@ -304,13 +304,6 @@ var/const/INGEST = 2
 						if(!C.no_message)
 							M << "\blue \icon[my_atom] [C.mix_message]"
 
-				/*	if(istype(my_atom, /obj/item/slime_core))
-						var/obj/item/slime_core/ME = my_atom
-						ME.Uses--
-						if(ME.Uses <= 0) // give the notification that the slime core is dead
-							for(var/mob/M in viewers(4, get_turf(my_atom)) )
-								M << "\blue \icon[my_atom] The innards begin to boil!"
-					*/
 					if(istype(my_atom, /obj/item/slime_extract))
 						var/obj/item/slime_extract/ME2 = my_atom
 						ME2.Uses--
@@ -454,33 +447,6 @@ var/const/INGEST = 2
 			R.volume += amount
 			update_total()
 			my_atom.on_reagent_change()
-/*
-			// mix dem viruses
-			if(R.id == "blood" && reagent == "blood")
-				if(R.data && data)
-
-					if(R.data["viruses"] || data["viruses"])
-
-						var/list/mix1 = R.data["viruses"]
-						var/list/mix2 = data["viruses"]
-
-						// Stop issues with the list changing during mixing.
-						var/list/to_mix = list()
-
-						for(var/datum/disease/advance/AD in mix1)
-							to_mix += AD
-						for(var/datum/disease/advance/AD in mix2)
-							to_mix += AD
-
-						var/datum/disease/advance/AD = Advance_Mix(to_mix)
-						if(AD)
-							var/list/preserve = list(AD)
-							for(var/D in R.data["viruses"])
-								if(!istype(D, /datum/disease/advance))
-									preserve += D
-							R.data["viruses"] = preserve
-*/
-
 			handle_reactions()
 			return 0
 

code/modules/reagents/newchem/disease.dm

@@ -109,7 +109,6 @@
 /datum/chemical_reaction/mix_virus
 	name = "Mix Virus"
 	id = "mixvirus"
-	result = "blood"
 	required_reagents = list("virusfood" = 1)
 	required_catalysts = list("blood" = 1)
 	var/level_min = 0

code/modules/reagents/oldchem/reagents/reagents_water.dm

@@ -190,8 +190,8 @@
 						preserve += D
 				data["viruses"] = preserve
 
-		if(data["blood_colour"])
-			color = data["blood_colour"]
+	if(mix_data["blood_colour"])
+		color = mix_data["blood_colour"]
 	return 1
 
 /datum/reagent/blood/on_update(var/atom/A)

code/modules/reagents/reagent_containers.dm

@@ -35,7 +35,7 @@
 	processing_objects.Add(src)
 	if(spawned_disease)
 		var/datum/disease/F = new spawned_disease(0)
-		var/list/data = list("viruses"= list(F))
+		var/list/data = list("viruses" = list(F), "blood_colour" = "#A10808")
 		reagents.add_reagent("blood", disease_amount, data)
 	if(list_reagents)
 		reagents.add_reagent_list(list_reagents)