Fixed some runtimes with specieism, and blood transfer ignoring viruses' racial preferences.

This commit is contained in:
Chinsky
2014-03-10 00:06:22 +04:00
parent 9cad9af0aa
commit 12a97e01eb
2 changed files with 11 additions and 8 deletions

View File

@@ -217,7 +217,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()

View File

@@ -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)