Merge branch 'master' into development

This commit is contained in:
skull132
2017-01-30 16:42:38 -05:00
11 changed files with 108 additions and 35 deletions

View File

@@ -157,7 +157,7 @@
else return 1
else if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
return 0
return ..()
/obj/structure/closet/crate/Move(var/turf/destination, dir)
if(..())
@@ -708,4 +708,4 @@
if ("2")
return pickweight(random_stock_uncommon)
if ("3")
return pickweight(random_stock_common)
return pickweight(random_stock_common)