merges #3877 proper

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