From 6cc595278804f480f12de295e6d721272ea70adf Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Tue, 14 Sep 2021 02:54:50 -0400
Subject: [PATCH] Cleaned it up, allows pocketing of deswords

---
 code/game/objects/items/weapons/twohanded.dm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 72347e08432..0aebee8687b 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -92,11 +92,9 @@
 	user.put_in_inactive_hand(O)
 	return TRUE
 
-/obj/item/twohanded/mob_can_equip(mob/M, slot) //Unwields twohanded items if they're equipped on the back
-	if(wielded && slot_flags)
-		var/obj/item/twohanded/O = M.get_inactive_hand()
-		if(istype(O))
-			O.unwield(M)
+/obj/item/twohanded/mob_can_equip(mob/M, slot) //Unwields twohanded items when they're attempted to be equipped to another slot
+	if(wielded)
+		unwield(M)
 	return ..()
 
 /obj/item/twohanded/dropped(mob/user)