Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy

This commit is contained in:
Ergovisavi
2014-03-26 18:14:48 -07:00
648 changed files with 33156 additions and 31359 deletions
@@ -302,7 +302,7 @@
continue
G.attackby(NG, user)
user << "<span class='notice'>You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.</span>"
del(src)
qdel(src)
..()
/obj/item/weapon/shard/Crossed(var/mob/AM)
@@ -22,17 +22,17 @@
G.add_fingerprint(user)
if(amount <= 0)
user.unEquip(src, 1)
del(src)
qdel(src)
if(istype(O,/obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O
M.amount--
if(M.amount <= 0)
user.unEquip(M, 1)
del(M)
qdel(M)
amount--
var/obj/item/stack/tile/light/L = new (user.loc)
L.add_fingerprint(user)
if(amount <= 0)
user.unEquip(src, 1)
del(src)
qdel(src)