Merge resolution.

This commit is contained in:
Zuhayr
2015-05-11 11:47:24 +09:30
777 changed files with 22019 additions and 21336 deletions
@@ -20,7 +20,7 @@
new/obj/item/stack/sheet/glass(user.loc)
if(amount <= 0)
user.drop_from_inventory(src)
del(src)
qdel(src)
if(istype(O,/obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O