From f4a55d844b5bde6325ab8e39312249d5b37df28e Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sun, 16 Oct 2022 09:22:27 -0500 Subject: [PATCH] Grenade GC improvement (#19355) * Grenade GC improvement * Adds commits * farie's suggestion Co-authored-by: Farie82 Co-authored-by: Farie82 --- code/game/objects/items/weapons/grenades/grenade.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 20c1ffc74de..45c502d233d 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -106,5 +106,11 @@ return TRUE /obj/item/grenade/attack_hand() + ///We need to clear the walk_to on grabbing a moving grenade to have it not leap straight out of your hand walk(src, null, null) ..() + +/obj/item/grenade/Destroy() + ///We need to clear the walk_to on destroy to allow a grenade which uses walk_to or related to properly GC + walk_to(src, 0) + return ..()