From 2e93eeea511eb826841cb2846b8ca1f6b9f77454 Mon Sep 17 00:00:00 2001 From: Haevacht Date: Thu, 5 Jan 2017 17:05:25 +1100 Subject: [PATCH] Offhand backup plan (#22679) * no longer asks the offhand to neatly unwield should fix the issues?? * re-callbacks the sky bulge * revert the qdel --- code/game/objects/items/weapons/twohanded.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 7dbcb73d5d6..07959ceac2f 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -132,6 +132,12 @@ wielded = FALSE qdel(src) +/obj/item/weapon/twohanded/offhand/attack_self(mob/living/carbon/user) //You should never be able to do this in standard use of two handed items. This is a backup for lingering offhands. + var/obj/item/weapon/twohanded/O = user.get_inactive_held_item() + if (istype(O) && !istype(O, /obj/item/weapon/twohanded/offhand/)) //If you have a proper item in your other hand that the offhand is for, do nothing. This should never happen. + return + qdel(src) //If it's another offhand, or literally anything else, qdel. If I knew how to add logging messages I'd put one here. + ///////////Two hand required objects/////////////// //This is for objects that require two hands to even pick up /obj/item/weapon/twohanded/required