Removes unnecessary and cruft procs from mob/inventory.dm

code/game/gamemodes/revolution/rp-revolution.dm

@@ -151,9 +151,9 @@
 
 //	spawn (100)
 //		if (rev_mob.r_store)
-//			rev_mob.equip_if_possible(new /obj/item/weapon/paper/communist_manifesto(rev_mob), rev_mob.slot_l_store)
+//			rev_mob.equip_to_slot_or_del(new /obj/item/weapon/paper/communist_manifesto(rev_mob), rev_mob.slot_l_store)
 //		if (rev_mob.l_store)
-//			rev_mob.equip_if_possible(new /obj/item/weapon/paper/communist_manifesto(rev_mob), rev_mob.slot_r_store)
+//			rev_mob.equip_to_slot_or_del(new /obj/item/weapon/paper/communist_manifesto(rev_mob), rev_mob.slot_r_store)
 
 
 /datum/game_mode/rp_revolution/check_win()

code/game/machinery/kitchen/juicer.dm

@@ -38,7 +38,7 @@
 		if (beaker)
 			return 1
 		else
-			user.before_take_item(O)
+			user.remove_from_mob(O)
 			O.loc = src
 			beaker = O
 			src.verbs += /obj/machinery/juicer/verb/detach
@@ -48,7 +48,7 @@
 	if (!is_type_in_list(O, allowed_items))
 		user << "It looks as not containing any juice."
 		return 1
-	user.before_take_item(O)
+	user.remove_from_mob(O)
 	O.loc = src
 	src.updateUsrDialog()
 	return 0

code/game/machinery/kitchen/microwave.dm

@@ -112,7 +112,7 @@
 				"\blue [user] has added one of [O] to \the [src].", \
 				"\blue You add one of [O] to \the [src].")
 		else
-		//	user.before_take_item(O)	//This just causes problems so far as I can tell. -Pete
+		//	user.remove_from_mob(O)	//This just causes problems so far as I can tell. -Pete
 			user.drop_item()
 			O.loc = src
 			user.visible_message( \

code/game/machinery/kitchen/smartfridge.dm

@@ -169,7 +169,7 @@
 			user << "<span class='notice'>\The [src] is full.</span>"
 			return 1
 		else
-			user.before_take_item(O)
+			user.remove_from_mob(O)
 			O.loc = src
 			if(item_quants[O.name])
 				item_quants[O.name]++

code/game/objects/items/robot/robot_parts.dm

@@ -110,7 +110,7 @@
 			B.loc = get_turf(src)
 			user << "<span class='notice'>You armed the robot frame.</span>"
 			if (user.get_inactive_hand()==src)
-				user.before_take_item(src)
+				user.remove_from_mob(src)
 				user.put_in_inactive_hand(B)
 			del(src)
 		else

code/game/objects/items/stacks/stack.dm

@@ -177,7 +177,7 @@
 		spawn(0) //delete the empty stack once the current context yields
 			if (amount <= 0) //check again in case someone transferred stuff to us
 				if(usr)
-					usr.before_take_item(src)
+					usr.remove_from_mob(src)
 				del(src)
 	return 1
 

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -103,7 +103,7 @@
 		if ((!F.status)||(F.ptank))	return
 		src.master = F
 		F.ptank = src
-		user.before_take_item(src)
+		user.remove_from_mob(src)
 		src.loc = F
 	return
 

code/game/objects/structures/extinguisher.dm

@@ -17,7 +17,7 @@
 		return
 	if(istype(O, /obj/item/weapon/extinguisher))
 		if(!has_extinguisher && opened)
-			user.drop_item(O)
+			user.remove_from_mob(O)
 			contents += O
 			has_extinguisher = O
 			user << "<span class='notice'>You place [O] in [src].</span>"

code/game/objects/structures/target_stake.dm

@@ -26,7 +26,7 @@
 		if(istype(W, /obj/item/target))
 			density = 0
 			W.density = 1
-			user.drop_item(src)
+			user.remove_from_mob(W)
 			W.loc = loc
 			W.layer = 3.1
 			pinned_target = W

code/game/turfs/simulated/floor.dm

@@ -456,7 +456,7 @@ turf/simulated/floor/proc/update_icon()
 	if(istype(C,/obj/item/weapon/light/bulb)) //only for light tiles
 		if(is_light_floor())
 			if(get_lightfloor_state())
-				user.drop_item(C)
+				user.remove_from_mob(C)
 				del(C)
 				set_lightfloor_state(0) //fixing it by bashing it with a light bulb, fun eh?
 				update_icon()