From e8cdadbd52ddb549e3541be0c20aa3ca3b8f2266 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Tue, 4 Oct 2022 11:35:50 -0400 Subject: [PATCH] implant merge (#19282) --- code/game/objects/items/weapons/implants/implant.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 989e584575d..38afe0f2dda 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -62,6 +62,8 @@ implant_data = new implant_data /obj/item/implant/Destroy() + if(imp_in) + removed(imp_in) QDEL_NULL(implant_data) return ..() @@ -222,11 +224,6 @@ return TRUE -/obj/item/implant/Destroy() - if(imp_in) - removed(imp_in) - return ..() - /obj/item/implant/dropped(mob/user) . = TRUE ..()