From 40012496ffe995f6e6e46fb416029bbdfa596a1e Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Thu, 10 Mar 2016 22:36:20 -0800 Subject: [PATCH] I unborked it --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 1cde4f801f8..2cfa124b9a1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1308,7 +1308,7 @@ /mob/living/carbon/human/revive() if(species && !(species.flags & NO_BLOOD)) - var/blood_reagent = species.exotic_blood ? species.exotic_blood : "blood" + var/blood_reagent = get_blood_name() vessel.add_reagent(blood_reagent, max_blood-vessel.total_volume) fixblood() diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 6a5be72900a..57fe20f7520 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -102,6 +102,11 @@ var/const/INGEST = 2 if (!O.reagents ) return R = O.reagents + else if (istype(target, /mob/living)) + var/mob/living/M = target + if(!M.reagents) + return + R = M.reagents else if(istype(target, /datum/reagents)) R = target else