Merge remote-tracking branch 'upstream/master' into dev-freeze

This commit is contained in:
PsiOmegaDelta
2015-07-11 09:51:24 +02:00
2 changed files with 5 additions and 4 deletions

View File

@@ -342,8 +342,8 @@
R.amount = rand(5,25)
if(2)
var/obj/item/stack/tile/R = new(src)
R.amount = rand(1,5)
var/obj/item/stack/tile/plasteel/R = new(src)
R.amount = rand(5,25)
if(3)
var/obj/item/stack/material/steel/R = new(src)