Merge pull request #10622 from comma/virofixes

Virofixes

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm

@@ -110,6 +110,19 @@
 		M.resistances += data
 	return
 
+// pure concentrated antibodies
+/datum/reagent/antibodies
+	data = list("antibodies"=list())
+	name = "Antibodies"
+	id = "antibodies"
+	reagent_state = LIQUID
+	color = "#0050F0"
+
+/datum/reagent/antibodies/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(src.data)
+		M.antibodies |= src.data["antibodies"]
+	..()
+
 #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
 /datum/reagent/water
 	name = "Water"
@@ -143,7 +156,7 @@
 		environment.add_thermal_energy(-removed_heat)
 		if (prob(5))
 			T.visible_message("<span class='warning'>The water sizzles as it lands on \the [T]!</span>")
-	
+
 	else if(volume >= 10)
 		if(T.wet >= 1)
 			return

code/modules/virus2/antibodies.dm

@@ -1,44 +1,5 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
 
-/*
-// reserving some numbers for later special antigens
-var/global/const/ANTIGEN_A  = 1
-var/global/const/ANTIGEN_B  = 2
-var/global/const/ANTIGEN_C  = 4
-var/global/const/ANTIGEN_D  = 8
-var/global/const/ANTIGEN_E  = 16
-var/global/const/ANTIGEN_M  = 32
-var/global/const/ANTIGEN_N  = 64
-var/global/const/ANTIGEN_O  = 128
-var/global/const/ANTIGEN_P  = 256
-var/global/const/ANTIGEN_Q  = 512
-var/global/const/ANTIGEN_U  = 1024
-var/global/const/ANTIGEN_V  = 2048
-var/global/const/ANTIGEN_W  = 4096
-var/global/const/ANTIGEN_X  = 8192
-var/global/const/ANTIGEN_Y  = 16384
-var/global/const/ANTIGEN_Z  = 32768
-
-var/global/list/ANTIGENS = list(
-"[ANTIGEN_A]" = "A",
-"[ANTIGEN_B]" = "B",
-"[ANTIGEN_C]" = "C",
-"[ANTIGEN_E]" = "E",
-"[ANTIGEN_D]" = "D",
-"[ANTIGEN_M]" = "M",
-"[ANTIGEN_N]" = "N",
-"[ANTIGEN_O]" = "O",
-"[ANTIGEN_P]" = "P",
-"[ANTIGEN_Q]" = "Q",
-"[ANTIGEN_U]" = "U",
-"[ANTIGEN_V]" = "V",
-"[ANTIGEN_W]" = "W",
-"[ANTIGEN_X]" = "X",
-"[ANTIGEN_Y]" = "Y",
-"[ANTIGEN_Z]" = "Z"
-)
-*/
-
 var/global/list/ALL_ANTIGENS = list(
 		"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"
 	)
@@ -47,23 +8,6 @@ var/global/list/ALL_ANTIGENS = list(
 	ALL_ANTIGENS = shuffle(ALL_ANTIGENS)
 	return 1
 
-// pure concentrated antibodies
-datum/reagent/antibodies
-	data = list("antibodies"=list())
-	name = "Antibodies"
-	id = "antibodies"
-	reagent_state = LIQUID
-	color = "#0050F0"
-
-	reaction_mob(var/mob/M, var/method=CHEM_TOUCH, var/volume)
-		if(istype(M,/mob/living/carbon))
-			var/mob/living/carbon/C = M
-			if(src.data && method == CHEM_INGEST)
-				//if(C.virus2) if(src.data["antibodies"] & C.virus2.antigen)
-				//	C.virus2.dead = 1
-				C.antibodies |= src.data["antibodies"]
-		return
-
 // iterate over the list of antigens and see what matches
 /proc/antigens2string(list/antigens, none="None")
 	if(!istype(antigens))

code/modules/virus2/disease2.dm

@@ -45,14 +45,17 @@
 	var/list/res = list()
 	for (var/specie in all_species)
 		var/datum/species/S = all_species[specie]
-		if(!(S.flags & IS_SYNTHETIC))
-			meat += S.name
+		if(!(S.flags & IS_SYNTHETIC) && S.flags & CAN_JOIN)
+			meat += S
 	if(meat.len)
 		var/num = rand(1,meat.len)
 		for(var/i=0,i<num,i++)
-			var/picked = pick(meat)
-			meat -= picked
-			res += picked
+			var/datum/species/picked = pick_n_take(meat)
+			res |= picked.name
+			if(picked.greater_form)
+				res |= picked.greater_form
+			if(picked.primitive_form)
+				res |= picked.primitive_form
 	return res
 
 /datum/disease2/disease/proc/activate(var/mob/living/carbon/mob)