Merge pull request #8009 from Citadel-Station-13/kevinz000-patch-23

Correctly removes the changeling brain test
This commit is contained in:
deathride58
2019-02-22 13:02:58 -05:00
committed by GitHub
+3 -2
View File
@@ -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, "<span class='notice'>You feel slightly disoriented. That's normal when you're just a brain.</span>")