diff --git a/code/modules/mob/new_player/sprite_accessories_ear.dm b/code/modules/mob/new_player/sprite_accessories_ear.dm index 0eeb4af6eb..3d976f3139 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear.dm @@ -8,30 +8,23 @@ /datum/sprite_accessory/ears name = "You should not see this..." icon = 'icons/mob/human_races/sprite_accessories/ears.dmi' - do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color - - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + do_colouration = TRUE // If you're overrding this you're doing it wrong + color_blend_mode = ICON_MULTIPLY // Only appliciable if do_coloration = 1 var/extra_overlay // Icon state of an additional overlay to blend in. var/extra_overlay2 - var/desc = "You should not see this..." species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_PROMETHEAN) /datum/sprite_accessory/ears/shadekin - name = "Shadekin Ears, colorable" - desc = "" + name = "Shadekin Ears" icon_state = "shadekin" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list() // SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW - whitelist_allowed = list() + whitelist_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_PROMETHEAN) /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) whitelist_allowed = list(SPECIES_PROMETHEAN) extra_overlay = "ears_plain-inner" @@ -39,497 +32,223 @@ /datum/sprite_accessory/ears/taj_ears_tall name = "Tajaran Tall Ears" icon_state = "msai_plain" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list(SPECIES_PROMETHEAN) extra_overlay = "msai_plain-inner" -/datum/sprite_accessory/ears/squirrel_orange - name = "squirel, orange" - desc = "" - icon_state = "squirrel-orange" - -/datum/sprite_accessory/ears/squirrel_red - name = "squirrel, red" - desc = "" - icon_state = "squirrel-red" - -/datum/sprite_accessory/ears/bunny_white - name = "bunny, white" - desc = "" - icon_state = "bunny" - -/datum/sprite_accessory/ears/bear_brown - name = "bear, brown" - desc = "" - icon_state = "bear-brown" - -/datum/sprite_accessory/ears/bear_panda - name = "bear, panda" - desc = "" - icon_state = "panda" - -/datum/sprite_accessory/ears/wolf_grey - name = "wolf, grey" - desc = "" - icon_state = "wolf-grey" - -/datum/sprite_accessory/ears/wolf_green - name = "wolf, green" - desc = "" - icon_state = "wolf-green" - -/datum/sprite_accessory/ears/wisewolf - name = "wolf, wise" - desc = "" - icon_state = "wolf-wise" - -/datum/sprite_accessory/ears/mouse_grey - name = "mouse, grey" - desc = "" - icon_state = "mouse-grey" - -/datum/sprite_accessory/ears/bee - name = "bee antennae" - desc = "" - icon_state = "bee" - /datum/sprite_accessory/ears/antennae - name = "antennae, colorable" - desc = "" + name = "antennae" icon_state = "antennae" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/curly_bug - name = "curly antennae, colorable" - desc = "" + name = "curly antennae" icon_state = "curly_bug" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/dual_robot - name = "synth antennae, colorable" - desc = "" + name = "synth antennae" icon_state = "dual_robot_antennae" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/right_robot - name = "right synth, colorable" - desc = "" + name = "right synth" + icon_state = "right_robot_antennae" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/left_robot - name = "left synth, colorable" - desc = "" + name = "left synth" icon_state = "left_robot_antennae" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/oni_h1 name = "oni horns" - desc = "" - icon_state = "oni-h1" - -/datum/sprite_accessory/ears/oni_h1_c - name = "oni horns, colorable" - desc = "" icon_state = "oni-h1_c" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/demon_horns1 name = "demon horns" - desc = "" - icon_state = "demon-horns1" - -/datum/sprite_accessory/ears/demon_horns1_c - name = "demon horns, colorable" - desc = "" icon_state = "demon-horns1_c" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/demon_horns2 - name = "demon horns, colorable(outward)" - desc = "" + name = "demon horns (outward)" icon_state = "demon-horns2" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/ears/dragon_horns - name = "dragon horns, colorable" - desc = "" - icon_state = "dragon-horns" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/foxears - name = "highlander zorren ears" - desc = "" - icon_state = "foxears" - whitelist_allowed = list() + name = "fox ears" + icon_state = "foxearshc" /datum/sprite_accessory/ears/fenears - name = "flatland zorren ears" - desc = "" - icon_state = "fenears" - whitelist_allowed = list() - -/datum/sprite_accessory/ears/sergal //Redundant - name = "Sergal ears" - icon_state = "serg_plain_s" - whitelist_allowed = list() - -/datum/sprite_accessory/ears/foxearshc - name = "highlander zorren ears, colorable" - desc = "" - icon_state = "foxearshc" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/ears/fenearshc - name = "flatland zorren ears, colorable" - desc = "" + name = "fennec ears" icon_state = "fenearshc" extra_overlay = "fenears-inner" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() -/datum/sprite_accessory/ears/sergalhc - name = "Sergal ears, colorable" +/datum/sprite_accessory/ears/sergal + name = "fluffy ears" icon_state = "serg_plain_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() -/datum/sprite_accessory/ears/mousehc - name = "mouse, colorable" - desc = "" +/datum/sprite_accessory/ears/mouse + name = "mouse (monotone)" icon_state = "mouse" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/mouse/dual + name = "mouse (dual tone)" extra_overlay = "mouseinner" -/datum/sprite_accessory/ears/mousehcno - name = "mouse, colorable, no inner" - desc = "" - icon_state = "mouse" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/ears/wolfhc - name = "wolf, colorable" - desc = "" +/datum/sprite_accessory/ears/wolf + name = "wolf" icon_state = "wolf" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "wolfinner" -/datum/sprite_accessory/ears/bearhc - name = "bear, colorable" - desc = "" +/datum/sprite_accessory/ears/bear + name = "bear" icon_state = "bear" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/smallbear name = "small bear" - desc = "" icon_state = "smallbear" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/ears/squirrelhc - name = "squirrel, colorable" - desc = "" +/datum/sprite_accessory/ears/squirrel + name = "squirrel" icon_state = "squirrel" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/ears/kittyhc - name = "kitty, colorable" - desc = "" +/datum/sprite_accessory/ears/kitty + name = "kitty" icon_state = "kitty" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "kittyinner" -/datum/sprite_accessory/ears/bunnyhc - name = "bunny, colorable" - desc = "" +/datum/sprite_accessory/ears/bunny + name = "bunny" icon_state = "bunny" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/antlers name = "antlers" - desc = "" icon_state = "antlers" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/ears/antlers_e - name = "antlers with ears" - desc = "" - icon_state = "cow-nohorns" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "antlers_mark" /datum/sprite_accessory/ears/smallantlers name = "small antlers" - desc = "" icon_state = "smallantlers" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/ears/smallantlers_e - name = "small antlers with ears" - desc = "" - icon_state = "smallantlers" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "deer" /datum/sprite_accessory/ears/deer name = "deer ears" - desc = "" icon_state = "deer" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/deer/antlers + name = "small antlers with ears" + extra_overlay = "smallantlers" + +/datum/sprite_accessory/ears/cow_horns + name = "cow horns" + icon_state = "cow-c" /datum/sprite_accessory/ears/cow - name = "cow, horns" - desc = "" - icon_state = "cow" - -/datum/sprite_accessory/ears/cowc - name = "cow, horns, colorable" - desc = "" - icon_state = "cow-c" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/ears/cow_nohorns - name = "cow, no horns" - desc = "" + name = "cow ears" icon_state = "cow-nohorns" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/cow/antlers + name = "antlers with ears" + extra_overlay = "antlers_mark" /datum/sprite_accessory/ears/caprahorns name = "caprine horns" - desc = "" icon_state = "caprahorns" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/otie - name = "otie, colorable" - desc = "" + name = "otie" icon_state = "otie" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "otie-inner" - whitelist_allowed = list() /datum/sprite_accessory/ears/donkey - name = "donkey, colorable" - desc = "" + name = "donkey" icon_state = "donkey" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "otie-inner" -/datum/sprite_accessory/ears/zears - name = "jagged ears" - desc = "" - icon_state = "zears" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/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) - -/datum/sprite_accessory/ears/elfs +/datum/sprite_accessory/ears/elf name = "pointed ears (tall)" - desc = "" 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) -/datum/sprite_accessory/ears/elfs3 +/datum/sprite_accessory/ears/elf2 + name = "pointed ears" + icon_state = "ears_pointy" + species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + +/datum/sprite_accessory/ears/elf3 name = "pointed ears (down)" - desc = "" 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) -/datum/sprite_accessory/ears/elfs4 +/datum/sprite_accessory/ears/elf4 name = "pointed ears (long)" - desc = "" 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) -/datum/sprite_accessory/ears/elfs5 +/datum/sprite_accessory/ears/elf5 name = "pointed ears (long, down)" - desc = "" 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) /datum/sprite_accessory/ears/sleek name = "sleek ears" - desc = "" icon_state = "sleek" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/drake - name = "drake frills" - desc = "" + name = "frills" icon_state = "drake" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() + species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + whitelist_allowed = list(SPECIES_PROMETHEAN) /datum/sprite_accessory/ears/vulp - name = "vulpkanin, dual-color" - desc = "" + name = "canine (dual tone)" icon_state = "vulp" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "vulp-inner" /datum/sprite_accessory/ears/vulp_short - name = "vulpkanin short" - desc = "" + name = "canine short" icon_state = "vulp_terrier" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/ears/vulp_short_dc - name = "vulpkanin short, dual-color" - desc = "" - icon_state = "vulp_terrier" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/vulp_short/dc + name = "canine short (dual tone)" extra_overlay = "vulp_terrier-inner" /datum/sprite_accessory/ears/vulp_jackal - name = "vulpkanin thin, dual-color" - desc = "" + name = "canine thin (dual tone)" icon_state = "vulp_jackal" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "vulp_jackal-inner" /datum/sprite_accessory/ears/bunny_floppy - name = "floopy bunny ears (colorable)" - desc = "" + name = "floopy bunny ears" icon_state = "floppy_bun" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/ears/teshari name = "Teshari (colorable fluff)" - desc = "" icon_state = "teshari" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "teshariinner" species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list() /datum/sprite_accessory/ears/tesharihigh name = "Teshari upper ears (colorable fluff)" - desc = "" icon_state = "tesharihigh" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharihighinner" species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list() /datum/sprite_accessory/ears/tesharilow name = "Teshari lower ears (colorable fluff)" - desc = "" icon_state = "tesharilow" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharilowinner" species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list() -/datum/sprite_accessory/ears/inkling - name = "colorable mature inkling hair" - desc = "" - icon = 'icons/mob/human_face_alt.dmi' - icon_state = "inkling-colorable" - color_blend_mode = ICON_MULTIPLY - do_colouration = 1 - whitelist_allowed = list() - -/datum/sprite_accessory/ears/large_dragon - name = "Large dragon horns" - desc = "" - icon_state = "big_liz" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - // Special snowflake ears go below here. -/datum/sprite_accessory/ears/elf_caprine_colorable - name = "Caprine horns with pointy ears, colorable" - desc = "" - icon_state = "elfs" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/elf/caprine + name = "Caprine horns with pointy ears" extra_overlay = "caprahorns" -/datum/sprite_accessory/ears/elf_oni_colorable - name = "oni horns with pointy ears, colorable" - desc = "" - icon_state = "elfs" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/elf/oni + name = "oni horns with pointy ears" extra_overlay = "oni-h1_c" -/datum/sprite_accessory/ears/elf_demon_colorable - name = "Demon horns with pointy ears, colorable" - desc = "" - icon_state = "elfs" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/elf/demon + name = "Demon horns with pointy ears" extra_overlay = "demon-horns1_c" -/datum/sprite_accessory/ears/elf_demon_outwards_colorable - name = "Demon horns with pointy ears, outwards, colourable" - desc = "" - icon_state = "elfs" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/elf/demon_outwards + name = "Demon horns with pointy ears (outwards)" extra_overlay = "demon-horns2" - -/datum/sprite_accessory/ears/elf_dragon_colorable - name = "Dragon horns with pointy ears, colourable" - desc = "" - icon_state = "elfs" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "dragon-horns" \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_extra.dm b/code/modules/mob/new_player/sprite_accessories_extra.dm index a124eff96b..ece6e560f9 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra.dm @@ -4,61 +4,61 @@ species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/marking/vr/vulp_belly - name = "belly fur (Vulp)" + name = "belly fur (canine)" icon_state = "vulp_belly" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vr/vulp_fullbelly - name = "full belly fur (Vulp)" + name = "full belly fur (canine)" icon_state = "vulp_fullbelly" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vr/vulp_crest - name = "belly crest (Vulp)" + name = "belly crest (canine)" icon_state = "vulp_crest" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vr/vulp_nose - name = "nose (Vulp)" + name = "nose (canine)" icon_state = "vulp_nose" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/vulp_short_nose - name = "nose, short (Vulp)" + name = "nose, short (canine)" icon_state = "vulp_short_nose" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/snoutstripe - name = "snout stripe (Vulp)" + name = "snout stripe (canine)" icon_state = "snoutstripe" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/vulp_face - name = "face (Vulp)" + name = "face (canine)" icon_state = "vulp_face" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/vulp_facealt - name = "face, alt. (Vulp)" + name = "face, alt. (canine)" icon_state = "vulp_facealt" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/vulp_earsface - name = "ears and face (Vulp)" + name = "ears and face (canine)" icon_state = "vulp_earsface" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vr/vulp_all - name = "all head highlights (Vulp)" + name = "all head highlights (canine)" icon_state = "vulp_all" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) @@ -479,62 +479,11 @@ color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) -/datum/sprite_accessory/marking/vr/tentacle_head - name = "Squid Head" - icon_state = "tentaclehead" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - -/datum/sprite_accessory/marking/vr/tentacle_mouth - name = "Tentacle Mouth" - icon_state = "tentaclemouth" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - /datum/sprite_accessory/marking/vr/rosette name = "Rosettes" icon_state = "rosette" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) -/* -werewolf_nose - name = "Werewolf nose" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' - icon_state = "werewolf_nose" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_WEREBEAST) -werewolf_face - name = "Werewolf face" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' - icon_state = "werewolf" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_WEREBEAST) - -werewolf_belly - name = "Werewolf belly" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' - icon_state = "werewolf" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_GROIN,BP_TORSO) - species_allowed = list(SPECIES_WEREBEAST) - -werewolf_socks - name = "Werewolf socks" - icon = 'icons/mob/species/werebeast/werebeast_markings.dmi' - icon_state = "werewolf" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) - species_allowed = list(SPECIES_WEREBEAST) - -shadekin_snoot - name = "Shadekin Snoot" - icon_state = "shadekin-snoot" - color_blend_mode = ICON_MULTIPLY - body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) -*/ /datum/sprite_accessory/marking/vr/taj_nose_alt name = "Nose Color, alt. (Taj)" icon_state = "taj_nosealt" diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index f067c1c5dd..4c1f104522 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -8,14 +8,13 @@ /datum/sprite_accessory/tail name = "You should not see this..." icon = 'icons/mob/human_races/sprite_accessories/tails.dmi' - do_colouration = 0 //Set to 1 to enable coloration using the tail color. + do_colouration = TRUE // If you set it to false you're doing it wrong - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + color_blend_mode = ICON_MULTIPLY // Only appliciable if do_coloration = 1 var/extra_overlay // Icon state of an additional overlay to blend in. var/extra_overlay2 //Tertiary. var/show_species_tail = 0 // If false, do not render species' tail. var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it - var/desc = "You should not see this..." var/ani_state // State when wagging/animated var/extra_overlay_w // Wagging state for extra overlay var/extra_overlay2_w // Tertiary wagging. @@ -40,416 +39,174 @@ name = "hide species-sprite tail" icon = null icon_state = null - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) -/datum/sprite_accessory/tail/squirrel_orange - name = "squirel, orange" - desc = "" - icon_state = "squirrel-orange" - -/datum/sprite_accessory/tail/squirrel_red - name = "squirrel, red" - desc = "" - icon_state = "squirrel-red" - /datum/sprite_accessory/tail/squirrel - name = "squirrel, colorable" - desc = "" + name = "squirrel" icon_state = "squirrel" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/kitty - name = "kitty, colorable, downwards" - desc = "" + name = "kitty, downwards" icon_state = "kittydown" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/kittyup - name = "kitty, colorable, upwards" - desc = "" + name = "kitty, upwards" icon_state = "kittyup" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/tiger_white - name = "tiger, colorable" - desc = "" + name = "tiger" icon_state = "tiger" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "tigerinnerwhite" /datum/sprite_accessory/tail/stripey - name = "stripey taj, colorable" - desc = "" + name = "stripey taj" icon_state = "stripeytail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "stripeytail_mark" - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) -/datum/sprite_accessory/tail/stripeytail_brown - name = "stripey taj, brown" - desc = "" - icon_state = "stripeytail-brown" - -/datum/sprite_accessory/tail/chameleon - name = "Chameleon, colorable" - desc = "" - icon_state = "chameleon" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/bunny - name = "bunny, colorable" - desc = "" + name = "bunny" icon_state = "bunny" - do_colouration = 1 - -/datum/sprite_accessory/tail/bear_brown - name = "bear, brown" - desc = "" - icon_state = "bear-brown" + color_blend_mode = ICON_ADD /datum/sprite_accessory/tail/bear - name = "bear, colorable" - desc = "" + name = "bear" icon_state = "bear" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/dragon - name = "dragon, colorable" - desc = "" + name = "lizard" icon_state = "dragon" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/wolf_grey - name = "wolf, grey" - desc = "" - icon_state = "wolf-grey" - -/datum/sprite_accessory/tail/wolf_green - name = "wolf, green" - desc = "" - icon_state = "wolf-green" - -/datum/sprite_accessory/tail/wisewolf - name = "wolf, wise" - desc = "" - icon_state = "wolf-wise" - -/datum/sprite_accessory/tail/blackwolf - name = "wolf, black" - desc = "" - icon_state = "wolf" /datum/sprite_accessory/tail/wolf - name = "wolf, colorable" - desc = "" + name = "wolf" icon_state = "wolf" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "wolfinner" -/datum/sprite_accessory/tail/mouse_pink - name = "mouse, pink" - desc = "" - icon_state = "mouse-pink" - /datum/sprite_accessory/tail/mouse - name = "mouse, colorable" - desc = "" + name = "mouse" icon_state = "mouse" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/horse - name = "horse tail, colorable" - desc = "" + name = "horse tail" icon_state = "horse" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/cow - name = "cow tail, colorable" - desc = "" + name = "cow tail" icon_state = "cow" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/fantail - name = "avian fantail, colorable" - desc = "" + name = "avian fantail" icon_state = "fantail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + whitelist_allowed = list() /datum/sprite_accessory/tail/wagtail - name = "avian wagtail, colorable" - desc = "" + name = "avian wagtail" icon_state = "wagtail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/nevreandc - name = "nevrean tail, dual-color" - desc = "" - icon_state = "nevreantail_dc" - extra_overlay = "nevreantail_dc_tail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY whitelist_allowed = list() -/datum/sprite_accessory/tail/nevreanwagdc - name = "nevrean wagtail, dual-color" - desc = "" - icon_state = "wagtail" +/datum/sprite_accessory/tail/wagtail/dc + name = "avian wagtail, dual-color" extra_overlay = "wagtail_dc_tail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() /datum/sprite_accessory/tail/nevreanwagdc_alt - name = "nevrean wagtail, marked, dual-color" - desc = "" + name = "avian wagtail, marked, dual-color" icon_state = "wagtail2_dc" extra_overlay = "wagtail2_dc_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY whitelist_allowed = list() /datum/sprite_accessory/tail/crossfox name = "cross fox" - desc = "" + do_colouration = FALSE // DOING IT WRONG icon_state = "crossfox" -/datum/sprite_accessory/tail/beethorax - name = "bee thorax" - desc = "" - icon_state = "beethorax" - whitelist_allowed = list() - /datum/sprite_accessory/tail/doublekitsune - name = "double kitsune tail, colorable" - desc = "" + name = "double kitsune tail" icon_state = "doublekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/spade_color - name = "spade-tail (colorable)" - desc = "" + name = "demon tail" icon_state = "spadetail-black" - do_colouration = 1 - whitelist_allowed = list() - -/datum/sprite_accessory/tail/snag - name = "xenomorph tail 1" - desc = "" - icon_state = "snag" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/xenotail - name = "xenomorph tail 2" - desc = "" - icon_state = "xenotail" - whitelist_allowed = list() + color_blend_mode = ICON_ADD /datum/sprite_accessory/tail/eboop name = "EGN mech tail (dual color)" - desc = "" icon_state = "eboop" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "eboop_mark" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/ketrai_wag - name = "fennix tail (vwag)" - desc = "" - icon_state = "ketraitail" - ani_state = "ketraitail_w" - //ckeys_allowed = list("ketrai") //They requested it to be enabled for everyone. - whitelist_allowed = list() - -/datum/sprite_accessory/tail/ketrainew_wag - name = "new fennix tail (vwag)" - desc = "" - icon_state = "ketraitailnew" - ani_state = "ketraitailnew_w" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/redpanda - name = "red panda" - desc = "" - icon_state = "redpanda" /datum/sprite_accessory/tail/ringtail - name = "ringtail, colorable" - desc = "" + name = "ringtail" icon_state = "ringtail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "ringtail_mark" - -/datum/sprite_accessory/tail/satyr - name = "goat legs, colorable" - desc = "" - icon_state = "satyr" - color_blend_mode = ICON_MULTIPLY - do_colouration = 1 - hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. - clip_mask_icon = 'icons/mob/human_races/sprite_accessories/taurs.dmi' - clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms. - whitelist_allowed = list() - -/datum/sprite_accessory/tail/tailmaw - name = "tailmaw, colorable" - desc = "" - icon_state = "tailmaw" - color_blend_mode = ICON_MULTIPLY - do_colouration = 1 - whitelist_allowed = list() + whitelist_allowed = list() // Too excessive /datum/sprite_accessory/tail/curltail name = "curltail (vwag)" - desc = "" icon_state = "curltail" ani_state = "curltail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "curltail_mark" extra_overlay_w = "curltail_mark_w" /datum/sprite_accessory/tail/shorttail name = "shorttail (vwag)" - desc = "" icon_state = "straighttail" ani_state = "straighttail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/sneptail - name = "Snep/Furry Tail (vwag)" - desc = "" + name = "snow leopard Tail (vwag)" icon_state = "sneptail" ani_state = "sneptail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "sneptail_mark" extra_overlay_w = "sneptail_mark_w" - whitelist_allowed = list() /datum/sprite_accessory/tail/tiger_new name = "tiger tail (vwag)" - desc = "" icon_state = "tigertail" ani_state = "tigertail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "tigertail_mark" extra_overlay_w = "tigertail_mark_w" /datum/sprite_accessory/tail/vulp_new - name = "new vulp tail (vwag)" - desc = "" + name = "new canine tail (vwag)" icon_state = "vulptail" ani_state = "vulptail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "vulptail_mark" extra_overlay_w = "vulptail_mark_w" - whitelist_allowed = list() /datum/sprite_accessory/tail/otietail name = "otie tail (vwag)" - desc = "" icon_state = "otie" ani_state = "otie_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/newtailmaw - name = "new tailmaw (vwag)" - desc = "" - icon_state = "newtailmaw" - ani_state = "newtailmaw_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() /datum/sprite_accessory/tail/ztail name = "jagged flufftail" - desc = "" icon_state = "ztail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/snaketail - name = "snake tail, colorable" - desc = "" + name = "snake tail" icon_state = "snaketail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + whitelist_allowed = list() // Too excessive /datum/sprite_accessory/tail/vulpan_alt - name = "vulpkanin alt style, colorable" - desc = "" + name = "canine alt style" icon_state = "vulptail_alt" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/sergaltaildc - name = "sergal, dual-color" - desc = "" - icon_state = "sergal" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "sergal_mark" - whitelist_allowed = list() /datum/sprite_accessory/tail/skunktail name = "skunk, dual-color" - desc = "" icon_state = "skunktail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "skunktail_mark" /datum/sprite_accessory/tail/deertail name = "deer, dual-color" - desc = "" icon_state = "deertail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "deertail_mark" /datum/sprite_accessory/tail/teshari_fluffytail - name = "Teshari alternative, colorable" - desc = "" + name = "Teshari alternative" icon_state = "teshari_fluffytail" extra_overlay = "teshari_fluffytail_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) whitelist_allowed = list() -/datum/sprite_accessory/tail/nightstalker - name = "Nightstalker, colorable" - desc = "" - icon_state = "nightstalker" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - //For all species tails. Includes haircolored tails. /datum/sprite_accessory/tail/special name = "Blank tail. Do not select." @@ -458,542 +215,96 @@ /datum/sprite_accessory/tail/special/unathi name = "unathi tail" - desc = "" icon_state = "sogtail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) - whitelist_allowed = list() /datum/sprite_accessory/tail/special/tajaran name = "tajaran tail" - desc = "" icon_state = "tajtail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) - whitelist_allowed = list() - -/datum/sprite_accessory/tail/special/sergal - name = "sergal tail" - desc = "" - icon_state = "sergtail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/special/akula - name = "akula tail" - desc = "" - icon_state = "sharktail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/special/nevrean - name = "nevrean tail" - desc = "" - icon_state = "nevreantail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/armalis - name = "armalis tail" - desc = "" - icon_state = "armalis_tail_humanoid_s" - -/datum/sprite_accessory/tail/special/xenodrone - name = "xenomorph drone tail" - desc = "" - icon_state = "xenos_drone_tail_s" - -/datum/sprite_accessory/tail/special/xenosentinel - name = "xenomorph sentinel tail" - desc = "" - icon_state = "xenos_sentinel_tail_s" - -/datum/sprite_accessory/tail/special/xenohunter - name = "xenomorph hunter tail" - desc = "" - icon_state = "xenos_hunter_tail_s" - -/datum/sprite_accessory/tail/special/xenoqueen - name = "xenomorph queen tail" - desc = "" - icon_state = "xenos_queen_tail_s" /datum/sprite_accessory/tail/special/monkey name = "monkey tail" - desc = "" icon_state = "chimptail_s" /datum/sprite_accessory/tail/special/tesharitail name = "teshari tail" - desc = "" icon_state = "seromitail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/tail/special/tesharitailfeathered name = "teshari tail w/ feathers" - desc = "" icon_state = "seromitail_s" extra_overlay = "seromitail_feathers_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/tail/special/unathihc - name = "unathi tail, colorable" - desc = "" + name = "unathi tail" icon_state = "sogtail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/tail/special/tajaranhc - name = "tajaran tail, colorable" - desc = "" + name = "tajaran tail" icon_state = "tajtail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) -/datum/sprite_accessory/tail/special/sergalhc - name = "sergal tail, colorable" - desc = "" - icon_state = "sergtail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/akulahc - name = "akula tail, colorable" - desc = "" - icon_state = "sharktail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/nevreanhc - name = "nevrean tail, colorable" - desc = "" - icon_state = "nevreantail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/special/foxhc - name = "highlander zorren tail, colorable" - desc = "" + name = "fox tail" icon_state = "foxtail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/special/fennechc - name = "flatland zorren tail, colorable" - desc = "" + name = "fennec tail" icon_state = "fentail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/special/armalishc - name = "armalis tail, colorable" - desc = "" - icon_state = "armalis_tail_humanoid_hc_s" - do_colouration = 1 - -/datum/sprite_accessory/tail/special/xenodronehc - name = "xenomorph drone tail, colorable" - desc = "" - icon_state = "xenos_drone_tail_hc_s" - do_colouration = 1 - -/datum/sprite_accessory/tail/special/xenosentinelhc - name = "xenomorph sentinel tail, colorable" - desc = "" - icon_state = "xenos_sentinel_tail_hc_s" - do_colouration = 1 - -/datum/sprite_accessory/tail/special/xenohunterhc - name = "xenomorph hunter tail, colorable" - desc = "" - icon_state = "xenos_hunter_tail_hc_s" - do_colouration = 1 - -/datum/sprite_accessory/tail/special/xenoqueenhc - name = "xenomorph queen tail, colorable" - desc = "" - icon_state = "xenos_queen_tail_hc_s" - do_colouration = 1 /datum/sprite_accessory/tail/special/monkeyhc - name = "monkey tail, colorable" - desc = "" + name = "monkey tail" icon_state = "chimptail_hc_s" - do_colouration = 1 /datum/sprite_accessory/tail/special/tesharitailhc - name = "teshari tail, colorable" - desc = "" + name = "teshari tail" icon_state = "seromitail_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/special/tesharitailfeatheredhc - name = "teshari tail w/ feathers, colorable" - desc = "" + name = "teshari tail w/ feathers" icon_state = "seromitail_feathers_hc_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/special/vulpan - name = "vulpkanin, colorable" - desc = "" + name = "canine" icon_state = "vulptail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/zenghu_taj name = "Zeng-Hu Tajaran Synth tail" - desc = "" icon_state = "zenghu_taj" - whitelist_allowed = list() + do_colouration = FALSE // It's cursed anyways //Taurs moved to a separate file due to extra code around them -//Buggo Abdomens! - -/datum/sprite_accessory/tail/buggo - name = "Bug abdomen, colorable" - desc = "" - icon_state = "buggo_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggobee - name = "Bug abdomen, bee top, dual-colorable" - desc = "" - icon_state = "buggo_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobee_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggobeefull - name = "Bug abdomen, bee full, dual-colorable" - desc = "" - icon_state = "buggo_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobeefull_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggounder - name = "Bug abdomen, underside, dual-colorable" - desc = "" - icon_state = "buggo_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggounder_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofirefly - name = "Bug abdomen, firefly, dual-colorable" - desc = "" - icon_state = "buggo_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofirefly_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofat - name = "Fat bug abdomen, colorable" - desc = "" - icon_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofatbee - name = "Fat bug abdomen, bee top, dual-colorable" - desc = "" - icon_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatbee_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofatbeefull - name = "Fat bug abdomen, bee full, dual-colorable" - desc = "" - icon_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatbeefull_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofatunder - name = "Fat bug abdomen, underside, dual-colorable" - desc = "" - icon_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatunder_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofatfirefly - name = "Fat bug abdomen, firefly, dual-colorable" - desc = "" - icon_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatfirefly_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggowag - name = "Bug abdomen, colorable, vwag change" - desc = "" - icon_state = "buggo_s" - ani_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggobeewag - name = "Bug abdomen, bee top, dual color, vwag" - desc = "" - icon_state = "buggo_s" - ani_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobee_markings" - extra_overlay_w = "buggofatbee_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggobeefullwag - name = "Bug abdomen, bee full, dual color, vwag" - desc = "" - icon_state = "buggo_s" - ani_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobeefull_markings" - extra_overlay_w = "buggofatbeefull_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggounderwag - name = "Bug abdomen, underside, dual color, vwag" - desc = "" - icon_state = "buggo_s" - ani_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggounder_markings" - extra_overlay_w = "buggofatunder_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggofireflywag - name = "Bug abdomen, firefly, dual color, vwag" - desc = "" - icon_state = "buggo_s" - ani_state = "buggofat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofirefly_markings" - extra_overlay_w = "buggofatfirefly_markings" - whitelist_allowed = list() - -//Vass buggo variants! - -/datum/sprite_accessory/tail/buggovass - name = "Bug abdomen, vass, colorable" - desc = "" - icon_state = "buggo_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassbee - name = "Bug abdomen, bee top, dc, vass" - desc = "" - icon_state = "buggo_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobee_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassbeefull - name = "Bug abdomen, bee full, dc, vass" - desc = "" - icon_state = "buggo_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobeefull_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassunder - name = "Bug abdomen, underside, dc, vass" - desc = "" - icon_state = "buggo_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggounder_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfirefly - name = "Bug abdomen, firefly, dc, vass" - desc = "" - icon_state = "buggo_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofirefly_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfat - name = "Fat bug abdomen, vass, colorable" - desc = "" - icon_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfatbee - name = "Fat bug abdomen, bee top, dc, vass" - desc = "" - icon_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatbee_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfatbeefull - name = "Fat bug abdomen, bee full, dc, vass" - desc = "" - icon_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatbeefull_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfatunder - name = "Fat bug abdomen, underside, dc, vass" - desc = "" - icon_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatunder_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfatfirefly - name = "Fat bug abdomen, firefly, dc, vass" - desc = "" - icon_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofatfirefly_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovasswag - name = "Bug abdomen, vass, colorable, vwag change" - desc = "" - icon_state = "buggo_vass_s" - ani_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassbeewag - name = "Bug abdomen, bee top, dc, vass, vwag" - desc = "" - icon_state = "buggo_vass_s" - ani_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobee_vass_markings" - extra_overlay_w = "buggofatbee_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassbeefullwag - name = "Bug abdomen, bee full, dc, vass, vwag" - desc = "" - icon_state = "buggo_vass_s" - ani_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggobeefull_vass_markings" - extra_overlay_w = "buggofatbeefull_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassunderwag - name = "Bug abdomen, underside, dc, vass, vwag" - desc = "" - icon_state = "buggo_vass_s" - ani_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggounder_vass_markings" - extra_overlay_w = "buggofatunder_vass_markings" - whitelist_allowed = list() - -/datum/sprite_accessory/tail/buggovassfireflywag - name = "Bug abdomen, firefly, dc, vass, vwag" - desc = "" - icon_state = "buggo_vass_s" - ani_state = "buggofat_vass_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "buggofirefly_vass_markings" - extra_overlay_w = "buggofatfirefly_vass_markings" - whitelist_allowed = list() - /datum/sprite_accessory/tail/tail_smooth - name = "Smooth Lizard Tail, colorable" - desc = "" + name = "Smooth Lizard Tail" icon_state = "tail_smooth" ani_state = "tail_smooth_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/tail/triplekitsune_colorable - name = "Kitsune 3 tails, colorable" - desc = "" + name = "Kitsune 3 tails" icon_state = "triplekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "triplekitsune_tips" /datum/sprite_accessory/tail/ninekitsune_colorable - name = "Kitsune 9 tails, colorable" - desc = "" + name = "Kitsune 9 tails" icon_state = "ninekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "ninekitsune-tips" + whitelist_allowed = list() // Too excessive /datum/sprite_accessory/tail/shadekin_short - name = "Shadekin Short Tail, colorable" - desc = "" + name = "Shadekin Short Tail" icon_state = "shadekin-short" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - whitelist_allowed = list() /datum/sprite_accessory/tail/wartacosushi_tail //brightened +20RGB from matching roboparts name = "Ward-Takahashi Tail" - desc = "" icon_state = "wardtakahashi_vulp" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - whitelist_allowed = list() /datum/sprite_accessory/tail/wartacosushi_tail_dc name = "Ward-Takahashi Tail, dual-color" - desc = "" icon_state = "wardtakahashi_vulp_dc" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY extra_overlay = "wardtakahashi_vulp_dc_mark" - whitelist_allowed = list() diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 2964ff2823..aff5f84298 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -147,10 +147,10 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" -/datum/sprite_accessory/tail/taur/fatwolf - name = "Fat Wolf (Taur)" - icon_state = "fatwolf_s" - icon_sprite_tag = "wolf" //This could be modified later. +// /datum/sprite_accessory/tail/taur/fatwolf +// name = "Fat Wolf (Taur)" +// icon_state = "fatwolf_s" +// icon_sprite_tag = "wolf" //This could be modified later. /datum/sprite_accessory/tail/taur/wolf/wolf_2c name = "Wolf dual-color (Taur)" @@ -158,11 +158,11 @@ extra_overlay = "wolf_markings" //icon_sprite_tag = "wolf2c" -/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c - name = "Fat Wolf dual-color (Taur)" - icon_state = "fatwolf_s" - extra_overlay = "fatwolf_markings" - //icon_sprite_tag = "fatwolf2c" +// /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c +// name = "Fat Wolf dual-color (Taur)" +// icon_state = "fatwolf_s" +// extra_overlay = "fatwolf_markings" +// //icon_sprite_tag = "fatwolf2c" /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" @@ -244,15 +244,15 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" -/datum/sprite_accessory/tail/taur/fatfeline - name = "Fat Feline (Taur)" - icon_state = "fatfeline_s" - //icon_sprite_tag = "fatfeline" +// /datum/sprite_accessory/tail/taur/fatfeline +// name = "Fat Feline (Taur)" +// icon_state = "fatfeline_s" +// //icon_sprite_tag = "fatfeline" -/datum/sprite_accessory/tail/taur/fatfeline_wag - name = "Fat Feline (Taur) (vwag)" - icon_state = "fatfeline_s" - ani_state = "fatfeline_w" +// /datum/sprite_accessory/tail/taur/fatfeline_wag +// name = "Fat Feline (Taur) (vwag)" +// icon_state = "fatfeline_s" +// ani_state = "fatfeline_w" /datum/sprite_accessory/tail/taur/feline/feline_2c name = "Feline dual-color (Taur)" diff --git a/icons/mob/human_races/sprite_accessories/ears.dmi b/icons/mob/human_races/sprite_accessories/ears.dmi index b3e21ecead..29bf8052dc 100644 Binary files a/icons/mob/human_races/sprite_accessories/ears.dmi and b/icons/mob/human_races/sprite_accessories/ears.dmi differ diff --git a/icons/mob/human_races/sprite_accessories/tails.dmi b/icons/mob/human_races/sprite_accessories/tails.dmi index 5e4a27597f..57d3233177 100644 Binary files a/icons/mob/human_races/sprite_accessories/tails.dmi and b/icons/mob/human_races/sprite_accessories/tails.dmi differ diff --git a/icons/mob/human_races/sprite_accessories/taurs.dmi b/icons/mob/human_races/sprite_accessories/taurs.dmi index 69d0a91388..9f8d0c689f 100644 Binary files a/icons/mob/human_races/sprite_accessories/taurs.dmi and b/icons/mob/human_races/sprite_accessories/taurs.dmi differ