From 467cbdd5baa65eeef1ba2be672fad99e816ab868 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Mon, 10 Mar 2014 00:06:22 +0400
Subject: [PATCH] Fixed some runtimes with specieism, and blood transfer
 ignoring viruses' racial preferences.

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

diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 4acabdff079..c100b379b41 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -268,7 +268,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 	var/datum/reagent/blood/injected = get_blood(container.reagents)
 	if (!injected)
 		return
-	src.virus2 |= virus_copylist(injected.data["virus2"])
+	var/list/sniffles = virus_copylist(injected.data["virus2"])
+	for(var/datum/disease2/disease/sniffle in sniffles)
+		infect_virus2(src,sniffle,1)
 	if (injected.data["antibodies"] && prob(5))
 		antibodies |= injected.data["antibodies"]
 	var/list/chems = list()
diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm
index fa53f784bb7..21e17a5e7ea 100644
--- a/code/modules/virus2/disease2.dm
+++ b/code/modules/virus2/disease2.dm
@@ -34,15 +34,16 @@
 	if(all_species.len)
 		affected_species.Cut()
 		var/list/meat = list()
-		for (var/datum/species/S in all_species)
+		for (var/specie in all_species)
+			var/datum/species/S = all_species[specie]
 			if(!(S.flags & IS_SYNTHETIC))
 				meat += S.name
-
-		var/num = rand(1,meat.len)
-		for(var/i=0,i<num,i++)
-			var/picked = pick(meat)
-			meat -= picked
-			affected_species += picked
+		if(meat.len)
+			var/num = rand(1,meat.len)
+			for(var/i=0,i<num,i++)
+				var/picked = pick(meat)
+				meat -= picked
+				affected_species += picked
 
 /datum/disease2/disease/proc/activate(var/mob/living/carbon/mob)
 	if(dead)