From c14a85de3887abc5da4f540f8f91c2ed001a1f0f Mon Sep 17 00:00:00 2001 From: oranges Date: Sun, 15 Oct 2017 22:10:47 +0000 Subject: [PATCH] reorder carbon destroy to fix ghosting We cannot qdel these things until after our parent handling has finished, so that we have things like dna available to the ghost intialization from the body --- code/modules/mob/living/carbon/carbon.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 1475c98cd5f..f2952fe4710 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -7,13 +7,15 @@ update_body_parts() //to update the carbon's new bodyparts appearance /mob/living/carbon/Destroy() + //This must be done first, so the mob ghosts correctly before DNA etc is nulled + . = ..() + QDEL_LIST(internal_organs) QDEL_LIST(stomach_contents) QDEL_LIST(bodyparts) QDEL_LIST(implants) remove_from_all_data_huds() QDEL_NULL(dna) - return ..() /mob/living/carbon/relaymove(mob/user, direction) if(user in src.stomach_contents)