From c9afcde51c28d5c7e92345be084a263d8cb5e249 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 16 Feb 2019 17:16:25 -0800 Subject: [PATCH] Update brain_item.dm --- code/modules/mob/living/brain/brain_item.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 7d1dc7d1d2..2f3ee10428 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -62,8 +62,9 @@ /obj/item/organ/brain/proc/transfer_identity(mob/living/L) name = "[L.name]'s brain" - if(brainmob || decoy_override) + if(brainmob) return + if(!L.mind) return brainmob = new(src) @@ -80,7 +81,7 @@ var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE) if(ZI) brainmob.set_species(ZI.old_species) //For if the brain is cloned - if(L.mind && L.mind.current) + if(!decoy_override && L.mind && L.mind.current) L.mind.transfer_to(brainmob) to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a brain.")