From bc7ca17c0895649d1dc598892f9a05d7d7383961 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 28 Jan 2022 17:26:38 -0500 Subject: [PATCH 1/2] Merge pull request #12124 from Heroman3003/unwhitelist Removes Polaris whitelists from certain sprite accessories --- .../mob/new_player/sprite_accessories_ear.dm | 24 +++++++++---------- .../mob/new_player/sprite_accessories_tail.dm | 20 ++++++++-------- .../mob/new_player/sprite_accessories_wing.dm | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories_ear.dm b/code/modules/mob/new_player/sprite_accessories_ear.dm index 9abd218dc4..26638a04bb 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear.dm @@ -16,7 +16,7 @@ var/desc = "You should not see this..." em_block = TRUE - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/shadekin name = "Shadekin Ears, colorable" @@ -24,14 +24,14 @@ icon_state = "shadekin" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list() // SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW + //species_allowed = list() // SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/taj_ears name = "Tajaran Ears" icon_state = "ears_plain" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files extra_overlay = "ears_plain-inner" /datum/sprite_accessory/ears/taj_ears_tall @@ -39,7 +39,7 @@ icon_state = "msai_plain" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files extra_overlay = "msai_plain-inner" /datum/sprite_accessory/ears/squirrel_orange @@ -351,14 +351,14 @@ icon_state = "elfs" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs2 name = "pointed ears" desc = "" icon_state = "ears_pointy" do_colouration = 1 - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs3 name = "pointed ears (down)" @@ -366,7 +366,7 @@ icon_state = "ears_pointy_down" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs4 name = "pointed ears (long)" @@ -374,7 +374,7 @@ icon_state = "ears_pointy_long" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs5 name = "pointed ears (long, down)" @@ -382,7 +382,7 @@ icon_state = "ears_pointy_long_down" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/sleek name = "sleek ears" @@ -443,7 +443,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "teshariinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/tesharihigh name = "Teshari upper ears (colorable fluff)" @@ -452,7 +452,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharihighinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/tesharilow name = "Teshari lower ears (colorable fluff)" @@ -461,7 +461,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharilowinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/inkling name = "colorable mature inkling hair" diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index c8d8cd4940..2f0940b7a6 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -25,7 +25,7 @@ var/clip_mask_state = null //Icon state to generate clip mask. Clip mask is used to 'clip' off the lower part of clothing such as jumpsuits & full suits. var/icon/clip_mask = null //Instantiated clip mask of given icon and state - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/New() . = ..() @@ -41,7 +41,7 @@ icon = null icon_state = null - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/squirrel_orange name = "squirel, orange" @@ -90,7 +90,7 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "stripeytail_mark" - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/stripeytail_brown name = "stripey taj, brown" @@ -422,7 +422,7 @@ extra_overlay = "teshari_fluffytail_mark" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/nightstalker name = "Nightstalker, colorable" @@ -443,7 +443,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tajaran name = "tajaran tail" @@ -451,7 +451,7 @@ icon_state = "tajtail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/sergal name = "sergal tail" @@ -510,7 +510,7 @@ icon_state = "seromitail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tesharitailfeathered name = "teshari tail w/ feathers" @@ -519,7 +519,7 @@ extra_overlay = "seromitail_feathers_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/unathihc name = "unathi tail, colorable" @@ -527,7 +527,7 @@ icon_state = "sogtail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tajaranhc name = "tajaran tail, colorable" @@ -535,7 +535,7 @@ icon_state = "tajtail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/sergalhc name = "sergal tail, colorable" diff --git a/code/modules/mob/new_player/sprite_accessories_wing.dm b/code/modules/mob/new_player/sprite_accessories_wing.dm index 85bdedd04a..ded7a70937 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing.dm @@ -21,7 +21,7 @@ var/extra_overlay_w // Flapping state for extra overlay var/extra_overlay2_w - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/wing/featheredlarge //Made by Natje! name = "large feathered wings (colorable)"