Merge branch 'master' into upstream-merge-33930

This commit is contained in:
LetterJay
2017-12-30 13:37:52 -06:00
committed by GitHub
72 changed files with 1977 additions and 3691 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/clothing/under/color/random
icon_state = "random_jumpsuit"
/obj/item/clothing/under/color/random/New()
/obj/item/clothing/under/color/random/Initialize()
..()
var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost)
if(ishuman(loc))