Merge pull request #2318 from Fox-McCloud/no-pools-allowed

Axes Some Pooling of Specific Objects
This commit is contained in:
Mark van Alphen
2015-10-08 19:28:38 +02:00
19 changed files with 66 additions and 74 deletions
@@ -8,7 +8,7 @@
..()
if (istype(W, /obj/item/weapon/wrench) && sheets_refunded)
//new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
var/obj/item/stack/sheet/metal/M = PoolOrNew(/obj/item/stack/sheet/metal, get_turf(src))
var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(get_turf(src))
M.amount = sheets_refunded
qdel(src)
@@ -35,10 +35,6 @@
else
..()
/obj/item/weapon/shard/Destroy()
..()
return QDEL_HINT_PUTINPOOL
/obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = I