cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3596 from CHOMPStation2/upstream-merge-12124

Browse Source 
[MIRROR] Removes Polaris whitelists from certain sprite accessories
This commit is contained in:
Nadyr
2022-01-29 17:21:50 -05:00
committed by GitHub
parent 663cb32830 1259624360
commit 27dd908ddf
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/mob/new_player/sprite_accessories_ear.dm
View File

@@ -16,7 +16,7 @@
var/desc = "You should not see this..." var/desc = "You should not see this..."
em_block = TRUE 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 /datum/sprite_accessory/ears/shadekin
name = "Shadekin Ears, colorable" name = "Shadekin Ears, colorable"
@@ -24,14 +24,14 @@
icon_state = "shadekin" icon_state = "shadekin"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/ears/taj_ears
name = "Tajaran Ears" name = "Tajaran Ears"
icon_state = "ears_plain" icon_state = "ears_plain"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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" extra_overlay = "ears_plain-inner"
/datum/sprite_accessory/ears/taj_ears_tall /datum/sprite_accessory/ears/taj_ears_tall
@@ -39,7 +39,7 @@
icon_state = "msai_plain" icon_state = "msai_plain"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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" extra_overlay = "msai_plain-inner"
/datum/sprite_accessory/ears/squirrel_orange /datum/sprite_accessory/ears/squirrel_orange
@@ -351,14 +351,14 @@
icon_state = "elfs" icon_state = "elfs"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/ears/elfs2
name = "pointed ears" name = "pointed ears"
desc = "" desc = ""
icon_state = "ears_pointy" icon_state = "ears_pointy"
do_colouration = 1 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 /datum/sprite_accessory/ears/elfs3
name = "pointed ears (down)" name = "pointed ears (down)"
@@ -366,7 +366,7 @@
icon_state = "ears_pointy_down" icon_state = "ears_pointy_down"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/ears/elfs4
name = "pointed ears (long)" name = "pointed ears (long)"
@@ -374,7 +374,7 @@
icon_state = "ears_pointy_long" icon_state = "ears_pointy_long"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/ears/elfs5
name = "pointed ears (long, down)" name = "pointed ears (long, down)"
@@ -382,7 +382,7 @@
icon_state = "ears_pointy_long_down" icon_state = "ears_pointy_long_down"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/ears/sleek
name = "sleek ears" name = "sleek ears"
@@ -443,7 +443,7 @@
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
extra_overlay = "teshariinner" 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 /datum/sprite_accessory/ears/tesharihigh
name = "Teshari upper ears (colorable fluff)" name = "Teshari upper ears (colorable fluff)"
@@ -452,7 +452,7 @@
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
extra_overlay = "tesharihighinner" 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 /datum/sprite_accessory/ears/tesharilow
name = "Teshari lower ears (colorable fluff)" name = "Teshari lower ears (colorable fluff)"
@@ -461,7 +461,7 @@
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
extra_overlay = "tesharilowinner" 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 /datum/sprite_accessory/ears/inkling
name = "colorable mature inkling hair" name = "colorable mature inkling hair"

20
code/modules/mob/new_player/sprite_accessories_tail.dm
View File

@@ -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/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 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() /datum/sprite_accessory/tail/New()
. = ..() . = ..()
@@ -41,7 +41,7 @@
icon = null icon = null
icon_state = 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 /datum/sprite_accessory/tail/squirrel_orange
name = "squirel, orange" name = "squirel, orange"
@@ -90,7 +90,7 @@
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
extra_overlay = "stripeytail_mark" 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 /datum/sprite_accessory/tail/stripeytail_brown
name = "stripey taj, brown" name = "stripey taj, brown"
@@ -422,7 +422,7 @@
extra_overlay = "teshari_fluffytail_mark" extra_overlay = "teshari_fluffytail_mark"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/nightstalker
name = "Nightstalker, colorable" name = "Nightstalker, colorable"
@@ -443,7 +443,7 @@
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/tajaran
name = "tajaran tail" name = "tajaran tail"
@@ -451,7 +451,7 @@
icon_state = "tajtail_s" icon_state = "tajtail_s"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/sergal
name = "sergal tail" name = "sergal tail"
@@ -510,7 +510,7 @@
icon_state = "seromitail_s" icon_state = "seromitail_s"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/tesharitailfeathered
name = "teshari tail w/ feathers" name = "teshari tail w/ feathers"
@@ -519,7 +519,7 @@
extra_overlay = "seromitail_feathers_s" extra_overlay = "seromitail_feathers_s"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/unathihc
name = "unathi tail, colorable" name = "unathi tail, colorable"
@@ -527,7 +527,7 @@
icon_state = "sogtail_hc_s" icon_state = "sogtail_hc_s"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/tajaranhc
name = "tajaran tail, colorable" name = "tajaran tail, colorable"
@@ -535,7 +535,7 @@
icon_state = "tajtail_hc_s" icon_state = "tajtail_hc_s"
do_colouration = 1 do_colouration = 1
color_blend_mode = ICON_MULTIPLY 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 /datum/sprite_accessory/tail/special/sergalhc
name = "sergal tail, colorable" name = "sergal tail, colorable"

2
code/modules/mob/new_player/sprite_accessories_wing.dm
View File

@@ -21,7 +21,7 @@
var/extra_overlay_w // Flapping state for extra overlay var/extra_overlay_w // Flapping state for extra overlay
var/extra_overlay2_w 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! /datum/sprite_accessory/wing/featheredlarge //Made by Natje!
name = "large feathered wings (colorable)" name = "large feathered wings (colorable)"