From d41ab5251508eca320788e0b0bd4f32a90fb44e6 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Fri, 18 Mar 2016 11:16:21 -0700 Subject: [PATCH] Stop eating my changes --- code/modules/surgery/organs/organ.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index a4c7d0dd01b..911de71e071 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -271,8 +271,8 @@ var/list/organ_cache = list() loc = get_turf(owner) processing_objects |= src var/datum/reagent/blood/organ_blood - if(reagents) organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list - if(!organ_blood || !organ_blood.data["blood_DNA"]) + if(reagents) organ_blood = reagents.get_reagent_from_id(owner.get_blood_name()) + if((!organ_blood || !organ_blood.data["blood_DNA"]) && (owner && !(owner.species.flags & NO_BLOOD))) owner.vessel.trans_to(src, 5, 1, 1) if(owner && vital && is_primary_organ()) // I'd do another check for species or whatever so that you couldn't "kill" an IPC by removing a human head from them, but it doesn't matter since they'll come right back from the dead