From 2099954f7afa21aec6cb9ecd46afb6b1efb27801 Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 17 Nov 2017 10:35:10 +1300 Subject: [PATCH] Merge pull request #32744 from JJRcop/last_res--oh Fixes changeling egg when slug destroyed --- code/modules/mob/living/simple_animal/hostile/headcrab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 831cd471d3..f59cf79f22 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -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)