Merge remote-tracking branch 'upstream/dev' into secure-airlock

This commit is contained in:
mwerezak
2014-12-04 17:15:27 -05:00
21 changed files with 13189 additions and 13026 deletions
+1 -1
View File
@@ -214,7 +214,7 @@
visible_message("<span class='notice'>[user] dismantles \the [src].</span>")
if(dir == SOUTHWEST)
var/obj/item/stack/sheet/mats = new glasstype(loc)
mats.amount = 2
mats.amount = is_fulltile() ? 4 : 2
else
new glasstype(loc)
del(src)