Merge pull request #33905 from ShizCalev/jumpsuit-fix

Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
This commit is contained in:
Jordan Brown
2017-12-29 11:09:56 -05:00
committed by CitadelStationBot
parent 48e0c47410
commit d38a4a2aa5
7 changed files with 22 additions and 27 deletions
+4 -6
View File
@@ -4,13 +4,11 @@
/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)
name = initial(C.name)
icon_state = initial(C.icon_state)
item_state = initial(C.item_state)
item_color = initial(C.item_color)
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)
new C(loc)
return INITIALIZE_HINT_QDEL
/obj/item/clothing/under/color/black
name = "black jumpsuit"