Merge pull request #10292 from AzuleUtama/chameleonSuitFixes

Fix for chameleon suit allowing you to pick an undefined object
This commit is contained in:
variableundefined
2018-11-21 06:54:47 +08:00
committed by GitHub
+3 -2
View File
@@ -12,11 +12,12 @@
New()
..()
for(var/U in subtypesof(/obj/item/clothing/under/color))
var/blocked = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/rank/centcom) // Stops random coloured jumpsuit and undefined centcomm suit appearing in the list.
for(var/U in subtypesof(/obj/item/clothing/under/color) - blocked)
var/obj/item/clothing/under/V = new U
src.clothing_choices += V
for(var/U in subtypesof(/obj/item/clothing/under/rank))
for(var/U in subtypesof(/obj/item/clothing/under/rank) - blocked)
var/obj/item/clothing/under/V = new U
src.clothing_choices += V
return