Fixes cardboard tube duping (#1854)

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

@@ -26,7 +26,7 @@
 	. = ..()
 	update_desc()
 
-/obj/item/stack/spacecash/use()
+/obj/item/stack/spacecash/use(used, transfer = FALSE)
 	. = ..()
 	update_desc()
 

code/game/objects/items/stacks/sheets/glass.dm

@@ -98,9 +98,9 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 /obj/item/stack/sheet/rglass/cyborg/get_amount()
 	return min(round(source.energy / metcost), round(glasource.energy / glacost))
 
-/obj/item/stack/sheet/rglass/cyborg/use(amount) // Requires special checks, because it uses two storages
-	source.use_charge(amount * metcost)
-	glasource.use_charge(amount * glacost)
+/obj/item/stack/sheet/rglass/cyborg/use(used, transfer = FALSE) // Requires special checks, because it uses two storages
+	source.use_charge(used * metcost)
+	glasource.use_charge(used * glacost)
 
 /obj/item/stack/sheet/rglass/cyborg/add(amount)
 	source.add_charge(amount * metcost)

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

@@ -202,7 +202,7 @@
 		return 0
 	return 1
 
-/obj/item/stack/proc/use(var/used) // return 0 = borked; return 1 = had enough
+/obj/item/stack/proc/use(used, transfer = FALSE) // return 0 = borked; return 1 = had enough
 	if(zero_amount())
 		return 0
 	if (is_cyborg)
@@ -242,7 +242,7 @@
 	if(pulledby)
 		pulledby.start_pulling(S)
 	S.copy_evidences(src)
-	use(transfer)
+	use(transfer, TRUE)
 	S.add(transfer)
 
 /obj/item/stack/Crossed(obj/o)
@@ -291,7 +291,7 @@
 	user.put_in_hands(F)
 	add_fingerprint(user)
 	F.add_fingerprint(user)
-	use(amount)
+	use(amount, TRUE)
 
 
 

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

@@ -14,10 +14,11 @@
 	max_amount = 25
 	resistance_flags = FLAMMABLE
 
-/obj/item/stack/wrapping_paper/Destroy()
-	if(!amount)
-		new /obj/item/weapon/c_tube(get_turf(src))
-	return ..()
+/obj/item/stack/wrapping_paper/use(used, transfer)
+	var/turf/T = get_turf(src)
+	..()
+	if(QDELETED(src) && !transfer)
+		new /obj/item/weapon/c_tube(T)
 
 
 /*
@@ -99,10 +100,11 @@
 	user.visible_message("<span class='notice'>[user] wraps [target].</span>")
 	user.log_message("<font color='blue'>Has used [name] on [target]</font>", INDIVIDUAL_ATTACK_LOG)
 
-/obj/item/stack/packageWrap/Destroy()
-	if(!amount)
-		new /obj/item/weapon/c_tube(get_turf(src))
-	return ..()
+/obj/item/stack/packageWrap/use(used, transfer = FALSE)
+	var/turf/T = get_turf(src)
+	..()
+	if(QDELETED(src) && !transfer)
+		new /obj/item/weapon/c_tube(T)
 
 /obj/item/weapon/c_tube
 	name = "cardboard tube"