This commit is contained in:
Codingale
2016-09-23 16:49:20 -04:00
parent 4a0c9f7e74
commit 4beac970c6
+12 -1
View File
@@ -231,6 +231,9 @@
var/datum/reagent/blood/injected = get_blood(container.reagents)
if (!istype(injected)) //Sanity..
return
if(species && species.flags & NO_BLOOD)
reagents.add_reagent("blood", amount, injected.data)
reagents.update_total()
@@ -238,8 +241,16 @@
var/datum/reagent/blood/our = get_blood(vessel)
if(!istype(injected) || !istype(our))
if(!istype(our)) // Do we not have blood?
vessel.add_reagent("blood", amount, injected.data) // This is only ran once, so we need to add back thier DNA.
vessel.update_total()
..()
our = get_blood(vessel) // Get the new blood.
our.data["blood_DNA"] = src.dna.unique_enzymes // Give it the proper DNA we had before
our.data["blood_type"] = src.dna.b_type // Proper blood type.
our.data["donor"] = src // Without this, it'd be random each time it was extracted or Null.
return
if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"]) )
reagents.add_reagent("toxin",amount * 0.5)
reagents.update_total()