From 39c5aa0bf7a245bc57952ac639fb6c53cc5b155c Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Wed, 4 Apr 2018 06:03:45 -0400 Subject: [PATCH] one Destroy loop fix --- code/game/objects/items/weapons/twohanded.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 9c78e6f7b94..caa39be73e2 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -79,6 +79,7 @@ var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ O.name = "[name] - offhand" O.desc = "Your second grip on the [name]" + O.wielded = TRUE user.put_in_inactive_hand(O) return @@ -114,11 +115,19 @@ name = "offhand" flags = ABSTRACT +/obj/item/weapon/twohanded/offhand/Destroy() + wielded = FALSE + return ..() + /obj/item/weapon/twohanded/offhand/unwield() - qdel(src) + if(wielded)//Only delete if we're wielded + wielded = FALSE + qdel(src) /obj/item/weapon/twohanded/offhand/wield() - qdel(src) + if(wielded)//Only delete if we're wielded + wielded = FALSE + qdel(src) ///////////Two hand required objects/////////////// //This is for objects that require two hands to even pick up