Merge pull request #2994 from Leshana/backpack-drag-issue

Fixes dragging items with storage onto an occupied hand

code/game/objects/items/weapons/storage/internal.dm

@@ -50,10 +50,10 @@
 		if (!( user.restrained() ) && !( user.stat ))
 			switch(over_object.name)
 				if("r_hand")
-					user.u_equip(master_item)
+					user.unEquip(master_item)
 					user.put_in_r_hand(master_item)
 				if("l_hand")
-					user.u_equip(master_item)
+					user.unEquip(master_item)
 					user.put_in_l_hand(master_item)
 			master_item.add_fingerprint(user)
 			return 0

code/game/objects/items/weapons/storage/storage.dm

@@ -77,10 +77,10 @@
 
 		switch(over_object.name)
 			if("r_hand")
-				usr.u_equip(src)
+				usr.unEquip(src)
 				usr.put_in_r_hand(src)
 			if("l_hand")
-				usr.u_equip(src)
+				usr.unEquip(src)
 				usr.put_in_l_hand(src)
 		src.add_fingerprint(usr)
 

code/modules/paperwork/clipboard.dm

@@ -23,10 +23,10 @@
 		if(!M.restrained() && !M.stat)
 			switch(over_object.name)
 				if("r_hand")
-					M.u_equip(src)
+					M.unEquip(src)
 					M.put_in_r_hand(src)
 				if("l_hand")
-					M.u_equip(src)
+					M.unEquip(src)
 					M.put_in_l_hand(src)
 
 			add_fingerprint(usr)

code/modules/paperwork/photography.dm

@@ -98,10 +98,10 @@ var/global/photo_count = 0
 		if((!( M.restrained() ) && !( M.stat ) && M.back == src))
 			switch(over_object.name)
 				if("r_hand")
-					M.u_equip(src)
+					M.unEquip(src)
 					M.put_in_r_hand(src)
 				if("l_hand")
-					M.u_equip(src)
+					M.unEquip(src)
 					M.put_in_l_hand(src)
 			add_fingerprint(usr)
 			return