From 19979562c9bcded50b8d613ef64ee2d54523dfdb Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 5 Jan 2014 14:20:23 +1030 Subject: [PATCH] Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. --- code/modules/reagents/reagent_containers/syringes.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 15ddf1259c..3ece2c02e6 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -89,13 +89,16 @@ user << "\red You are unable to locate any blood." return - if(istype(T,/mob/living/carbon/human)) //TODO: make blood sampling take from the reagents datum instead of vessel. + 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) - user << "\red You are unable to locate any blood." + H.reagents.trans_to(src,amount) return - - var/datum/reagent/B = T.take_blood(src,amount) + else + B = T.take_blood(src,amount) + else + B = T.take_blood(src,amount) if (B) src.reagents.reagent_list += B