From 11f767d412b114c795d36ea283b4d61751ce529a Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 27 Feb 2020 16:16:21 +0100 Subject: [PATCH] A couple mob holder oversights. Again? --- code/datums/elements/mob_holder.dm | 3 ++- code/modules/mob/living/silicon/pai/pai_shell.dm | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm index 8687d89b2f..06ff0c1386 100644 --- a/code/datums/elements/mob_holder.dm +++ b/code/datums/elements/mob_holder.dm @@ -150,7 +150,8 @@ L.forceMove(get_turf(L)) L.reset_perspective() L.setDir(SOUTH) - qdel(src) + if(!QDELETED(src)) + qdel(src) /obj/item/clothing/head/mob_holder/relaymove(mob/user) return diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 8ae44c042f..641ad6dde0 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -96,12 +96,10 @@ dynamic_chassis = choice resist_a_rest(FALSE, TRUE) update_icon() + current_mob_holder?.Detach(src) + current_mob_holder = null if(possible_chassis[chassis]) current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD) - else - current_mob_holder?.Detach(src) - current_mob_holder = null - return to_chat(src, "You switch your holochassis projection composite to [chassis]") /mob/living/silicon/pai/lay_down()