merges #3877 proper

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()