merges #3877 proper

2017-11-22 17:37:22 -05:00
parent 60b2c25668
commit b6630b41d1
13 changed files with 37 additions and 9 deletions
@@ -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!"
@@ -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)