From c540c14f4c649ce8b73d9b87bb88d3c9eb93679a Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 3 Oct 2016 22:15:15 +0000 Subject: [PATCH] Reorder mob living destroy We want to do all custom cleanup before parent call so we are not operating in nullspace when we unbuckle and do other bits and bobs (as that code does not expect this) --- code/modules/mob/living/living.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 37921ac6d34..9c97338acf2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -27,8 +27,6 @@ med_hud_set_status() /mob/living/Destroy() - ..() - if(buckled) buckled.unbuckle_mob(src,force=1) @@ -39,6 +37,8 @@ qdel(I) staticOverlays.len = 0 remove_from_all_data_huds() + ..() + return QDEL_HINT_HARDDEL