mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user