From c6245681d61a5d1817fed65d107c201200cde0a8 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Wed, 24 Dec 2014 22:23:26 +1030
Subject: [PATCH] Fixes #5910

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

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 0c32f4c0228..c8e67078b2e 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -62,6 +62,7 @@
 		return
 
 	..()
+
 	if(wielded) //Trying to unwield it
 		unwield()
 		user << "<span class='notice'>You are now carrying the [name] with one hand.</span>"
@@ -71,7 +72,6 @@
 		var/obj/item/weapon/twohanded/offhand/O = user.get_inactive_hand()
 		if(O && istype(O))
 			O.unwield()
-		return
 
 	else //Trying to wield it
 		if(user.get_inactive_hand())
@@ -86,7 +86,13 @@
 		O.name = "[initial(name)] - offhand"
 		O.desc = "Your second grip on the [initial(name)]"
 		user.put_in_inactive_hand(O)
-		return
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
+	return
 
 ///////////OFFHAND///////////////
 /obj/item/weapon/twohanded/offhand