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

View File

@@ -188,7 +188,7 @@
/obj/item/clothing/gloves/color/random
name = "random gloves"
desc = "These gloves are supposed to be a random color..."
icon_state = "white"
icon_state = "random_gloves"
item_state = "wgloves"
item_color = "mime"

View File

@@ -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

View File

@@ -1,3 +1,6 @@
/obj/item/book/manual/random
icon_state = "random_book"
/obj/item/book/manual/random/Initialize()
..()
var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
@@ -6,6 +9,7 @@
return INITIALIZE_HINT_QDEL
/obj/item/book/random
icon_state = "random_book"
var/amount = 1
var/category = null
@@ -20,6 +24,7 @@
/obj/structure/bookcase/random
var/category = null
var/book_count = 2
icon_state = "random_bookcase"
anchored = TRUE
state = 2

View File

@@ -40,6 +40,9 @@
if(51 to INFINITY)
icon_state = "full"
/obj/item/reagent_containers/blood/random
icon_state = "random_bloodpack"
/obj/item/reagent_containers/blood/random/Initialize()
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
. = ..()