Merge pull request #660 from Citadel-Station-13/upstream-merge-26692

[MIRROR] Fixes debraining messages showing up one place they shouldn't
2017-05-01 08:01:55 -05:00
parent 86ea3efeef 6ec00d29a2
commit 73c1a83d62
1 changed files with 2 additions and 1 deletions
@@ -50,7 +50,8 @@
 		if(C.has_brain_worms())
 			var/mob/living/simple_animal/borer/B = C.has_brain_worms()
 			B.leave_victim() //Should remove borer if the brain is removed - RR
-	transfer_identity(C)
+	if(!gc_destroyed || (owner && !owner.gc_destroyed))
+		transfer_identity(C)
 	C.update_hair()

 /obj/item/organ/brain/prepare_eat()