From 65ce3e4c2066433c2e85bda261b85857fee51b2b Mon Sep 17 00:00:00 2001 From: Krausus Date: Mon, 11 May 2015 08:53:14 -0400 Subject: [PATCH] Fixes numbered contents grouping different things Also fixes a runtime from the black powder fix. Whoops! --- code/game/objects/items/weapons/storage/storage.dm | 2 +- code/modules/reagents/newchem/pyro.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 613fe2d844c..07ded953aaf 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -207,7 +207,7 @@ for(var/obj/item/I in contents) var/found = 0 for(var/datum/numbered_display/ND in numbered_contents) - if(ND.sample_object.type == I.type) + if(ND.sample_object.type == I.type && ND.sample_object.name == I.name) ND.number++ found = 1 break diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 6ec65cc1a05..dcf252df632 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -208,7 +208,8 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit explosion(T,ex_severe,ex_heavy,ex_light,ex_flash, 1) // If this black powder is in a decal, remove the decal, because it just exploded if(istype(holder.my_atom, /obj/effect/decal/cleanable/dirt/blackpowder)) - qdel(holder.my_atom) + spawn(0) + qdel(holder.my_atom) return /datum/reagent/flash_powder