Merge pull request #3968 from Citadel-Station-13/upstream-merge-32744

[MIRROR] Fixes changeling egg when slug destroyed
2017-11-17 02:05:08 +00:00
parent 3db4436d13 3030838432
commit 886ad3d7a1
1 changed files with 1 additions and 1 deletions
@@ -72,7 +72,7 @@
 	for(var/obj/item/organ/I in src)
 		I.Insert(M, 1)

-	if(origin && origin.current && (origin.current.stat == DEAD))
+	if(origin && (origin.current ? (origin.current.stat == DEAD) : origin.get_ghost()))
 		origin.transfer_to(M)
 		var/datum/antagonist/changeling/C = origin.has_antag_datum(/datum/antagonist/changeling)
 		if(!C)