From e555d1e2b8d5fcee167d3ecf1aba2787f5edf2bf Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Mon, 13 Sep 2021 21:05:11 -0400
Subject: [PATCH 1/4] Remove the twohanded state if the item is equipped on the
 back

---
 code/game/objects/items/weapons/twohanded.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 4d76f796c7e..7cf869f9080 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -92,6 +92,15 @@
 	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(!slot_flags)
+		return FALSE
+	if(wielded && slot_flags)
+		var/obj/item/twohanded/O = M.get_inactive_hand()
+		if(istype(O))
+			O.unwield(M)
+	return TRUE
+
 /obj/item/twohanded/dropped(mob/user)
 	..()
 	//handles unwielding a twohanded weapon when dropped as well as clearing up the offhand

From 21d7fbc829f4d465832d42392f2894b13d1245cc Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Mon, 13 Sep 2021 21:35:25 -0400
Subject: [PATCH 2/4] Simpler

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

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 7cf869f9080..aa62c07e650 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -93,13 +93,11 @@
 	return TRUE
 
 /obj/item/twohanded/mob_can_equip(mob/M, slot) //Unwields twohanded items if they're equipped on the back
-	if(!slot_flags)
-		return FALSE
 	if(wielded && slot_flags)
 		var/obj/item/twohanded/O = M.get_inactive_hand()
 		if(istype(O))
 			O.unwield(M)
-	return TRUE
+	return slot_flags
 
 /obj/item/twohanded/dropped(mob/user)
 	..()

From 20ac4341f360282a36047f38554167b2978ce207 Mon Sep 17 00:00:00 2001
From: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date: Tue, 14 Sep 2021 02:15:05 -0400
Subject: [PATCH 3/4] Changed return value

---
 code/game/objects/items/weapons/twohanded.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index aa62c07e650..72347e08432 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -97,7 +97,7 @@
 		var/obj/item/twohanded/O = M.get_inactive_hand()
 		if(istype(O))
 			O.unwield(M)
-	return slot_flags
+	return ..()
 
 /obj/item/twohanded/dropped(mob/user)
 	..()

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 4/4] 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)