[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)

* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag * really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
parent b6c4bd6e01
commit 7126b61205
56 changed files with 348 additions and 311 deletions
@@ -142,8 +142,9 @@
 		S.use(1)
 		cell.give(1000)
 		to_chat(user, "<span class='notice'>You insert [A] in [src], recharging it.</span>")
-	else if(istype(A, /obj/item/ore/plasma))
-		qdel(A)
+	else if(istype(A, /obj/item/stack/ore/plasma))
+		var/obj/item/stack/ore/S = A
+		S.use(1)
 		cell.give(500)
 		to_chat(user, "<span class='notice'>You insert [A] in [src], recharging it.</span>")
 	else