From 636f39ce971106a10e01b8b6a66dc34ceffb779e Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 18 Oct 2017 10:34:39 -0200 Subject: [PATCH 1/2] reorder carbon destroy to fix ghosting --- code/modules/mob/living/carbon/carbon.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 75b53d11cb..80f034b0bf 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -7,6 +7,7 @@ ..() /mob/living/carbon/Destroy() +<<<<<<< HEAD for(var/guts in internal_organs) qdel(guts) for(var/atom/movable/food in stomach_contents) @@ -20,6 +21,17 @@ if(dna) qdel(dna) return ..() +======= + //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) +>>>>>>> 9176e2f... Merge pull request #31774 from optimumtact/dummiecode /mob/living/carbon/relaymove(mob/user, direction) if(user in src.stomach_contents) From 1966b9b052baebe2add1d09bb9ae30c04b0eff67 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 18 Oct 2017 08:53:55 -0500 Subject: [PATCH 2/2] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 80f034b0bf..218af45c6e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -7,22 +7,7 @@ ..() /mob/living/carbon/Destroy() -<<<<<<< HEAD - for(var/guts in internal_organs) - qdel(guts) - for(var/atom/movable/food in stomach_contents) - qdel(food) - for(var/BP in bodyparts) - qdel(BP) - for(var/imp in implants) - qdel(imp) - bodyparts = list() - remove_from_all_data_huds() - if(dna) - qdel(dna) - return ..() -======= - //This must be done first, so the mob ghosts correctly before DNA etc is nulled +//This must be done first, so the mob ghosts correctly before DNA etc is nulled . = ..() QDEL_LIST(internal_organs) @@ -31,7 +16,6 @@ QDEL_LIST(implants) remove_from_all_data_huds() QDEL_NULL(dna) ->>>>>>> 9176e2f... Merge pull request #31774 from optimumtact/dummiecode /mob/living/carbon/relaymove(mob/user, direction) if(user in src.stomach_contents)