Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.

code/game/objects/items/ashtray.dm

@@ -21,7 +21,7 @@
 		if (contents.len >= max_butts)
 			user << "This ashtray is full."
 			return
-		user.u_equip(W)
+		user.remove_from_mob(W)
 		W.loc = src
 
 		if (istype(W,/obj/item/clothing/mask/cigarette))

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

@@ -198,7 +198,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(ismob(loc))
 		var/mob/living/M = loc
 		M << "<span class='notice'>Your [name] goes out.</span>"
-		M.u_equip(src)	//un-equip it so the overlays can update
+		M.remove_from_mob(src)	//un-equip it so the overlays can update
 		M.update_inv_wear_mask(0)
 	processing_objects.Remove(src)
 	del(src)

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

@@ -109,7 +109,7 @@
 	if(!ispath(gift_type,/obj/item))	return
 
 	var/obj/item/I = new gift_type(M)
-	M.u_equip(src)
+	M.remove_from_mob(src)
 	M.put_in_hands(I)
 	I.add_fingerprint(M)
 	del(src)

code/game/objects/items/weapons/implants/implanter.dm

@@ -123,7 +123,7 @@
 		c.scanned = A
 		if(istype(A.loc,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = A.loc
-			H.u_equip(A)
+			H.remove_from_mob(A)
 		else if(istype(A.loc,/obj/item/weapon/storage))
 			var/obj/item/weapon/storage/S = A.loc
 			S.remove_from_storage(A)

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

@@ -156,7 +156,7 @@
 				break
 
 		if(!inserted || !S.amount)
-			usr.u_equip(S)
+			usr.remove_from_mob(S)
 			usr.update_icons()	//update our overlays
 			if (usr.client && usr.s_active != src)
 				usr.client.screen -= S

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

@@ -256,7 +256,7 @@
 /obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
 	if(!istype(W)) return 0
 	if(usr)
-		usr.u_equip(W)
+		usr.remove_from_mob(W)
 		usr.update_icons()	//update our overlays
 	W.loc = src
 	W.on_enter_storage(src)

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

@@ -188,12 +188,12 @@
 		if (user.client)
 			user.client.screen -= src
 		if (user.r_hand == src)
-			user.u_equip(src)
+			user.remove_from_mob(src)
 		else
-			user.u_equip(src)
+			user.remove_from_mob(src)
 		src.master = F
 		src.layer = initial(src.layer)
-		user.u_equip(src)
+		user.remove_from_mob(src)
 		if (user.client)
 			user.client.screen -= src
 		src.loc = F

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -61,7 +61,7 @@
 	origin.loc = get_turf(src)
 
 	if(user)
-		user.u_equip(src)
+		user.remove_from_mob(src)
 		user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
 
 	del src
@@ -78,7 +78,7 @@
 /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
 	if (prob(5) && istype(M,/mob/living))
 		user.visible_message("\red [user] breaks [src] over [M]'s back!")
-		user.u_equip(src)
+		user.remove_from_mob(src)
 		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
 		m.loc = get_turf(src)
 		del src