merges #3877 proper

This commit is contained in:
deathride58
2017-11-22 17:37:22 -05:00
parent 60b2c25668
commit b6630b41d1
13 changed files with 37 additions and 9 deletions
@@ -58,6 +58,7 @@
/obj/structure/beebox/premade/New()
..()
icon_state = "beebox"
var/datum/reagent/R = null
if(random_reagent)
R = pick(subtypesof(/datum/reagent))
@@ -80,6 +81,7 @@
/obj/structure/beebox/premade/random
icon_state = "random_beebox"
random_reagent = TRUE