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
@@ -192,7 +192,7 @@
item_state = "wgloves"
item_color = "mime"
/obj/item/clothing/gloves/color/random/New()
/obj/item/clothing/gloves/color/random/Initialize()
..()
var/list/gloves = list(
/obj/item/clothing/gloves/color/orange = 1,