From 6c0926f06261352f19f532355aa36dec2d60cd06 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Thu, 6 Jul 2017 08:26:00 -0500
Subject: [PATCH] Fixes forced two-handed weapons being unstorable

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

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index ddcbc0a3f8..74d2f48875 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -177,16 +177,21 @@
 	else
 		unwield(user)
 
+/obj/item/weapon/twohanded/required/dropped(mob/living/user, show_message = TRUE)
+	unwield(user, show_message)
+	..()
+
 /obj/item/weapon/twohanded/required/wield(mob/living/carbon/user)
 	..()
 	if(!wielded)
 		user.dropItemToGround(src)
 
 /obj/item/weapon/twohanded/required/unwield(mob/living/carbon/user, show_message = TRUE)
+	if(!wielded)
+		return
 	if(show_message)
 		to_chat(user, "<span class='notice'>You drop [src].</span>")
 	..(user, FALSE)
-	user.dropItemToGround(src)
 
 /*
  * Fireaxe