Reverts the second mob clean up because of incomplete implementation.

This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.

code/modules/paperwork/faxmachine.dm

@@ -122,7 +122,8 @@ var/list/adminfaxes = list()	//cache for faxes that have been sent to admins
 				scan = null
 		else
 			var/obj/item/I = usr.get_active_hand()
-			if (istype(I, /obj/item/weapon/card/id) && usr.removeItem(I, src))
+			if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I))
+				I.loc = src
 				scan = I
 		authenticated = 0
 

code/modules/paperwork/paper.dm

@@ -307,7 +307,7 @@
 				"<span class='[class]'>You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
 
 				if(user.get_inactive_hand() == src)
-					user.removeItem(src)
+					user.drop_from_inventory(src)
 
 				new /obj/effect/decal/cleanable/ash(src.loc)
 				qdel(src)
@@ -415,23 +415,23 @@
 			B.name = name
 		else if (P.name != "paper" && P.name != "photo")
 			B.name = P.name
-		user.removeItem(P)
+		user.drop_from_inventory(P)
 		if (istype(user, /mob/living/carbon/human))
 			var/mob/living/carbon/human/h_user = user
 			if (h_user.r_hand == src)
-				h_user.removeItem(src)
+				h_user.drop_from_inventory(src)
 				h_user.put_in_r_hand(B)
 			else if (h_user.l_hand == src)
-				h_user.removeItem(src)
+				h_user.drop_from_inventory(src)
 				h_user.put_in_l_hand(B)
 			else if (h_user.l_store == src)
-				h_user.removeItem(src)
+				h_user.drop_from_inventory(src)
 				B.loc = h_user
 				B.layer = 20
 				h_user.l_store = B
 				h_user.update_inv_pockets()
 			else if (h_user.r_store == src)
-				h_user.removeItem(src)
+				h_user.drop_from_inventory(src)
 				B.loc = h_user
 				B.layer = 20
 				h_user.r_store = B

code/modules/paperwork/paper_bundle.dm

@@ -34,7 +34,7 @@
 
 	// merging bundles
 	else if(istype(W, /obj/item/weapon/paper_bundle))
-		user.removeItem(W)
+		user.drop_from_inventory(W)
 		for(var/obj/O in W)
 			O.loc = src
 			O.add_fingerprint(usr)
@@ -61,7 +61,8 @@
 	else if(istype(sheet, /obj/item/weapon/photo))
 		user << "<span class='notice'>You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
 
-	user.removeItem(sheet, src)
+	user.drop_from_inventory(sheet)
+	sheet.loc = src
 
 	pages.Insert(index, sheet)
 
@@ -84,7 +85,7 @@
 				"<span class='[class]'>You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
 
 				if(user.get_inactive_hand() == src)
-					user.removeItem(src)
+					user.drop_from_inventory(src)
 
 				new /obj/effect/decal/cleanable/ash(src.loc)
 				qdel(src)
@@ -167,7 +168,7 @@
 
 			if(pages.len <= 1)
 				var/obj/item/weapon/paper/P = src[1]
-				usr.removeItem(src)
+				usr.drop_from_inventory(src)
 				usr.put_in_hands(P)
 				qdel(src)
 
@@ -205,7 +206,8 @@
 		O.loc = usr.loc
 		O.layer = initial(O.layer)
 		O.add_fingerprint(usr)
-	usr.deleteItem(src)
+	usr.drop_from_inventory(src)
+	qdel(src)
 	return
 
 

code/modules/paperwork/papershredder.dm

@@ -31,7 +31,8 @@
 				user << "<span class='warning'>\The [src] is full; please empty it before you continue.</span>"
 				return
 			paperamount += paper_result
-			user.deleteItem(W)
+			user.drop_from_inventory(W)
+			qdel(W)
 			playsound(src.loc, 'sound/items/pshred.ogg', 75, 1)
 			if(paperamount > max_paper)
 				user <<"<span class='danger'>\The [src] was too full, and shredded paper goes everywhere!</span>"
@@ -118,7 +119,7 @@
 /obj/item/weapon/shreddedp/proc/FireBurn()
 	var/mob/living/M = loc
 	if(istype(M))
-		M.removeItem(src)
+		M.drop_from_inventory(src)
 	PoolOrNew(/obj/effect/decal/cleanable/ash,get_turf(src))
 	qdel(src)