Merge pull request #665 from Petethegoat/equipfix

Misc fixes- #649 and #663

code/game/objects/items.dm

@@ -566,7 +566,7 @@
 	if(!usr.canmove || usr.stat || usr.restrained() || !in_range(src, usr))
 		return
 
-	if(ishuman(usr))
+	if(ishuman(usr) || ismonkey(usr))
 		if(usr.get_active_hand() == null)
 			src.Click() // Let me know if this has any problems -Giacom
 		/*
@@ -576,7 +576,7 @@
 			usr << "\red You already have something in your hand."
 		*/
 	else
-		usr << "\red This mob type can't use this verb."
+		usr << "<span class='notice'>This mob type can't use this verb.</span>"
 
 //This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'action_button_name'.
 //The default action is attack_self().

code/modules/mob/screen.dm

@@ -446,9 +446,9 @@
 			H << "<span class='notice'>You are not holding anything to equip.</span>"
 			return
 
+		H.drop_from_inventory(I)
 		H.equip_to_appropriate_slot(I)
-		H.update_inv_l_hand(0)
-		H.update_inv_r_hand(0)
+		H.update_hud()
 
 
 /mob/living/verb/resist()