From 01031e0a0bb7fad6968549da019e1198e597f488 Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 21 Aug 2012 22:35:35 +0000
Subject: [PATCH] - Fixed Issue 829

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4505 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/modules/mob/living/carbon/human/inventory.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index ff88591efb9..69f7cf9501e 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -125,8 +125,10 @@
 	if(!slot) return
 	if(!istype(W)) return
 
-	if(W == get_active_hand())
-		u_equip(W)
+	if(W == src.l_hand)
+		src.l_hand = null
+	else if(W == src.r_hand)
+		src.r_hand = null
 
 	W.loc = src
 	switch(slot)
@@ -208,6 +210,8 @@
 			W.equipped(src, slot)
 			update_inv_s_store(redraw_mob)
 		if(slot_in_backpack)
+			if(src.get_active_hand() == W)
+				src.u_equip(W)
 			W.loc = src.back
 		else
 			src << "\red You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..."