exotic blood changes

This commit is contained in:
ZomgPonies
2015-12-05 16:46:07 -05:00
parent dc089e3146
commit fab7f1f6b0
8 changed files with 21 additions and 25 deletions
@@ -371,6 +371,9 @@ var/const/INGEST = 2
//Species with PROCESS_DUO are only affected by reagents that affect both organics and synthetics, like acid and hellwater
if((R.process_flags & ORGANIC) && (R.process_flags & SYNTHETIC) && (H.species.reagent_tag & PROCESS_DUO))
can_process = 1
if(H.species && H.species.exotic_blood)
if(R.id == H.species.exotic_blood)
can_process = 0
//We'll assume that non-human mobs lack the ability to process synthetic-oriented reagents (adjust this if we need to change that assumption)
else
if(R.process_flags != SYNTHETIC)
@@ -97,7 +97,7 @@
var/time = 30 //Injecting through a hardsuit takes longer due to needing to find a port.
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = T
if((H.species.bloodflags & BLOOD_SLIME) || (H.species.flags & NO_BLOOD))
if(H.species.flags & NO_BLOOD)
usr << "<span class='warning'>You are unable to locate any blood.</span>"
return
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
@@ -118,7 +118,7 @@
var/datum/reagent/B
if(istype(T,/mob/living/carbon/human))
var/mob/living/carbon/human/H = T
if(H.species && H.species.flags & NO_BLOOD)
if(H.species && H.species.exotic_blood && H.reagents.total_volume)
H.reagents.trans_to(src,amount)
else
B = T.take_blood(src,amount)