merges #3877 proper

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