merges #3877 proper

code/game/gamemodes/wizard/spellbook.dm

@@ -897,6 +897,9 @@
 	to_chat(user,"<span class='warning'>[src] suddenly vanishes!</span>")
 	qdel(src)
 
+/obj/item/spellbook/oneuse/random
+	icon_state = "random_book"
+
 /obj/item/spellbook/oneuse/random/Initialize()
 	..()
 	var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns)

code/game/machinery/vending.dm

@@ -678,6 +678,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 /obj/machinery/vending/snack/random
 	name = "\improper Random Snackies"
+	icon_state = "random_snack"
 	desc = "Uh oh!"
 
 /obj/machinery/vending/snack/random/Initialize()
@@ -730,6 +731,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 /obj/machinery/vending/cola/random
 	name = "\improper Random Drinkies"
+	icon_state = "random_cola"
 	desc = "Uh oh!"
 
 /obj/machinery/vending/cola/random/Initialize()

code/game/objects/items/cosmetics.dm

@@ -25,9 +25,11 @@
 
 /obj/item/lipstick/random
 	name = "lipstick"
+	icon_state = "random_lipstick"
 
 /obj/item/lipstick/random/New()
 	..()
+	icon_state = "lipstick"
 	colour = pick("red","purple","lime","black","green","blue","white")
 	name = "[colour] lipstick"
 

code/game/objects/items/devices/flashlight.dm

@@ -488,16 +488,14 @@
 
 /obj/item/device/flashlight/glowstick/random
 	name = "random colored glowstick"
+	icon_state = "random_glowstick"
+	color = null
 
 /obj/item/device/flashlight/glowstick/random/Initialize()
-	var/list/glowtypes = typesof(/obj/item/device/flashlight/glowstick)
-	glowtypes -= /obj/item/device/flashlight/glowstick/random
-
-	var/obj/item/device/flashlight/glowstick/glowtype = pick(glowtypes)
-
-	name = initial(glowtype.name)
-	color = initial(glowtype.color)
 	. = ..()
+	var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
 
 /obj/item/device/flashlight/spotlight //invisible lighting source
 	name = "disco light"

code/game/objects/items/devices/taperecorder.dm

@@ -289,6 +289,9 @@
 				fix()
 
 //Random colour tapes
+/obj/item/device/tape/random
+	icon_state = "random_tape"
+
 /obj/item/device/tape/random/New()
 	icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
 	..()

code/game/objects/items/grenades/clusterbuster.dm

@@ -129,6 +129,9 @@
 
 
 //random clusterbuster spawner
+/obj/item/grenade/clusterbuster/random
+	icon_state = "random_clusterbang"
+
 /obj/item/grenade/clusterbuster/random/New()
 	var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster))
 	new real_type(loc)

code/game/objects/items/storage/wallets.dm

@@ -72,6 +72,9 @@
 	else
 		return ..()
 
+/obj/item/storage/wallet/random
+	icon_state = "random_wallet"
+
 /obj/item/storage/wallet/random/PopulateContents()
 	var/item1_type = pick( /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c500)
 	var/item2_type
@@ -86,3 +89,4 @@
 			new item2_type(src)
 		if(item3_type)
 			new item3_type(src)
+	update_icon()

code/game/objects/structures/bedsheet_bin.dm

@@ -225,7 +225,7 @@ LINEN BINS
 
 
 /obj/item/bedsheet/random
-	icon_state = "sheetrainbow"
+	icon_state = "random_bedsheet"
 	item_color = "rainbow"
 	name = "random bedsheet"
 	desc = "If you're reading this description ingame, something has gone wrong! Honk!"

code/game/objects/structures/flora.dm

@@ -285,10 +285,13 @@
 	user.remove_alt_appearance("sneaking_mission")
 
 /obj/item/twohanded/required/kirbyplants/random
+	icon = 'icons/obj/flora/_flora.dmi'
+	icon_state = "random_plant"
 	var/list/static/states
 
 /obj/item/twohanded/required/kirbyplants/random/Initialize()
 	. = ..()
+	icon = 'icons/obj/flora/plants.dmi'
 	if(!states)
 		generate_states()
 	icon_state = pick(states)

code/modules/clothing/gloves/color.dm

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

code/modules/hydroponics/beekeeping/beebox.dm

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

code/modules/library/random_books.dm

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

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -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")
 	. = ..()