diff --git a/code/modules/client/preferences/migrations/17_tails.dm b/code/modules/client/preferences/migrations/17_tails.dm new file mode 100644 index 0000000000..efe90cdad8 --- /dev/null +++ b/code/modules/client/preferences/migrations/17_tails.dm @@ -0,0 +1,19 @@ +/// Changes a few tails to their new paths. +/datum/preferences/proc/migration_17_tails(datum/json_savefile/S) + for(var/slot in 1 to CONFIG_GET(number/character_slots)) + var/list/prefs = S.get_entry("character[slot]", null) + if(!islist(prefs)) + continue + prefs["tail_style"] = replacetext(prefs["tail_style"], "Kitsune 3 tails - colorable", "Kitsune 3 tails, colorable") + prefs["tail_style"] = replacetext(prefs["tail_style"], "Kitsune 9 tails - colorable", "Kitsune 9 tails, colorable") + + prefs["tail_style"] = replacetext(prefs["tail_style"], "Male teshari tail(Pattern)", "Teshari male tail pattern") + prefs["tail_style"] = replacetext(prefs["tail_style"], "Female teshari tail(Pattern)", "Teshari female tail pattern") + + prefs["tail_style"] = replacetext(prefs["tail_style"], "Male teshari tail(Pattern, Alt.)", "Teshari male tail alt. pattern") + prefs["tail_style"] = replacetext(prefs["tail_style"], "Female teshari tail(Pattern, Alt.)", "Teshari fem tail alt. pattern") + + prefs["tail_style"] = replacetext(prefs["tail_style"], "feathered Raptor, duel colorable", "feathered Raptor, dual colorable") + S.set_entry("character[slot]", prefs) + + S.save() diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 661c750655..1605e2d7bf 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -1,5 +1,5 @@ #define SAVEFILE_VERSION_MIN 8 -#define SAVEFILE_VERSION_MAX 16 +#define SAVEFILE_VERSION_MAX 17 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn @@ -79,6 +79,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car log_debug("[client_ckey] preferences successfully migrated from [current_version] to v16.") to_chat(client, span_danger("v16 savefile migration complete.")) + // Migration for old named tails so downstream doesn't have their savefiles borked + if(current_version < 17) + log_debug("[client_ckey] preferences migrating from [current_version] to v17....") + to_chat(client, span_danger("Migrating savefile from version [current_version] to v17...")) + + migration_17_tails(S) + + log_debug("[client_ckey] preferences successfully migrated from [current_version] to v17.") + to_chat(client, span_danger("v17 savefile migration complete.")) /datum/preferences/proc/update_character(current_version, list/save_data) // Migration from BYOND savefiles to JSON: Important milemark. diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 2a5c81286f..e3d0d0f81f 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -31,7 +31,7 @@ // Taur Loafing var/can_loaf = FALSE var/loaf_offset = 0 - var/list/lower_layer_dirs = list(SOUTH) + var/list/lower_layer_dirs = list(SOUTH, WEST, EAST) var/icon_loaf = null // Taur Vore @@ -1630,7 +1630,34 @@ icon_state = "demitesh_fluffytail" extra_overlay = "demitesh_fluffytail_marks" -//RS backport tails +/datum/sprite_accessory/tail/longtail/largeshark + name = "Large Shark" + icon_state = "large-shark" + extra_overlay = "large-shark-underbelly" + extra_overlay2 = "large-shark-tips" + +/datum/sprite_accessory/tail/longtail/largeshark/finless + name = "Large Shark (finless)" + icon_state = "large-shark-finless" + extra_overlay2 = "large-shark-tips-finless" + +/datum/sprite_accessory/tail/longtail/largeshark/stripes + name = "Large Shark (striped)" + extra_overlay = "large-shark-stripes" + extra_overlay2 = "large-shark-stripes-underbelly" + +/datum/sprite_accessory/tail/longtail/largeshark/stripes2 + name = "Large Shark (striped, underbelly)" + extra_overlay = "large-shark-underbelly" + extra_overlay2 = "large-shark-stripes-underbelly" + +/datum/sprite_accessory/tail/longtail/largeshark/stripes/finless + name = "Large Shark (striped, finless)" + icon_state = "large-shark-finless" + +/datum/sprite_accessory/tail/longtail/largeshark/stripes2/finless + name = "Large Shark (striped, finless, underbelly)" + icon_state = "large-shark-finless" /datum/sprite_accessory/tail/longtail/flagtail name = "Flagtail" @@ -1646,8 +1673,140 @@ extra_overlay = "chonksqrl-m1" extra_overlay2 = "chonksqrl-m2" -/* // Exclusive Tails // CHOMPRemove start +/datum/sprite_accessory/tail/longtail/qaavos + name = "Qaavos Tail" + icon_state = "qaavos_tail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/longtail/anteater + name = "Anteater tail" + icon_state = "anteater_tail" + + +/datum/sprite_accessory/tail/small_bugbum + name = "Bug Abdomen, Alt, Small (Dual-Color)" + icon_state = "smallbug1" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "smallbug2" + +/datum/sprite_accessory/tail/mid_bugbum + name = "Bug Abdomen, Alt, Medium (Dual-Color)" + icon_state = "midbug1" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "midbug2" + +/datum/sprite_accessory/tail/big_bugbum + name = "Bug Abdomen, Alt, Big (Dual-Color)" + icon_state = "bigbug1" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "bigbug2" + +/datum/sprite_accessory/tail/succubustail + name = "Succubus Tail" + icon_state = "Succubustail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/snaketail_stripes + name = "snake tail with stripes, dual-color" + desc = "" + icon_state = "snaketail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "snaketail_stripes" + +/datum/sprite_accessory/tail/leopard + name = "Leopard tail, dual-color (vwag)" + icon_state = "leopard" + ani_state = "leopard_w" + extra_overlay = "leopard_spots" + extra_overlay_w = "leopard_spots_w" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/vale_tail + name = "Vale Tail, dual color (vwag)" + desc = "" + icon_state = "valetail" + ani_state = "valetail_w" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "valetail_mark" + extra_overlay_w = "valetail_mark_w" + +/datum/sprite_accessory/tail/orca_f + name = "Orca tail (Female)" + icon_state = "orca_tail_f" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "orca_tail_markings" + +/datum/sprite_accessory/tail/anthrovirus_tail + name = "Anthro Virus Tail" + icon_state = "anthrovirustail_mark" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "anthrovirustail" + +/datum/sprite_accessory/tail/tyranid_tail + name = "Tyranid" + icon_state = "tyranid" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/bigsnaketeshari + name = "Large snake tail, Teshari" + icon_state = "snaketailteshari" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/featheredraptor + name = "feathered Raptor" + icon_state = "feathered_raptor" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/featheredraptor/twotone + name = "feathered Raptor, dual colorable" + extra_overlay = "feather_raptor-overlay" + +/datum/sprite_accessory/tail/wolf_tail + name = "Wolf Tail" + desc = "" + icon_state = "wolf_tail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/vulpkanin_alt_color + name = "Vulpkanin alt" + desc = "" + icon_state = "vulpkanin_alt_color" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "vulpkanin_alt_color_tips" + ani_state = "vulpkanin_alt_color_w" + extra_overlay_w = "vulpkanin_alt_color_tips_w" + +/datum/sprite_accessory/tail/raccoon_tail + name = "Raccoon gray tail" + desc = "" + icon_state = "raccoon_tail" + do_colouration = 0 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/striped_tail + name = "Striped tail, colorable" + desc = "" + icon_state = "stripedtail_colorable" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "stripedtail_colorable_w" + +/* // Exclusive Tails // CHOMPRemove start /datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date name = "Peacock tail (vwag)" desc = "" diff --git a/code/modules/mob/new_player/sprite_accessories_tail_ch.dm b/code/modules/mob/new_player/sprite_accessories_tail_ch.dm deleted file mode 100644 index 8feeff9edc..0000000000 --- a/code/modules/mob/new_player/sprite_accessories_tail_ch.dm +++ /dev/null @@ -1,164 +0,0 @@ -/*/datum/sprite_accessory/tail/alien_slug //Is now a base vorestation feature - name = "Alien slug tail" - desc = "The tail of a slug from space" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "alien_slug" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "alien_slug_markings" -*/ -/datum/sprite_accessory/tail/snaketail_stripes - name = "snake tail with stripes, dual-color" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "snaketail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "snaketail_stripes" - -/datum/sprite_accessory/tail/leopard - name = "Leopard tail, dual-color (vwag)" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "leopard" - ani_state = "leopard_w" - extra_overlay = "leopard_spots" - extra_overlay_w = "leopard_spots_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/vale_tail - name = "Vale Tail, dual color (vwag)" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "valetail" - ani_state = "valetail_w" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "valetail_mark" - extra_overlay_w = "valetail_mark_w" - -/datum/sprite_accessory/tail/teshbeethorax - name = "Teshari bee thorax" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "beethorax_tesh" - -/datum/sprite_accessory/tail/teshbuggo - name = "Teshari bug abdomen, colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbug_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/teshbuggobee - name = "Teshari bug abdomen, bee top, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbug_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshbee_markings" - -/datum/sprite_accessory/tail/teshbeefull - name = "Teshari bug abdomen, bee full, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbug_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshbeefull_markings" - -/datum/sprite_accessory/tail/teshbuggounder - name = "Teshari bug abdomen, underside, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbug_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshunder_markings" - -/datum/sprite_accessory/tail/teshbuggofirefly - name = "Teshari bug abdomen, firefly, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbug_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshfirefly_markings" - -/datum/sprite_accessory/tail/fatteshbuggo - name = "Teshari fat bug abdomen, colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbugfat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/fatteshbuggobee - name = "Teshari fat bug abdomen, bee top, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbugfat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshfatbee_markings" - -/datum/sprite_accessory/tail/fatteshbeefull - name = "Teshari fat bug abdomen, bee full, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbugfat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshfatbeefull_markings" - -/datum/sprite_accessory/tail/fatteshbuggounder - name = "Teshari fat bug abdomen, underside, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbugfat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshfatunder_markings" - -/datum/sprite_accessory/tail/fatteshbuggofirefly - name = "Teshari fat bug abdomen, firefly, dual-colorable" - desc = "" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "teshbugfat_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshfatfirefly_markings" - -/datum/sprite_accessory/tail/orca_f - name = "Orca tail (Female)" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "orca_tail_f" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "orca_tail_markings" - -/datum/sprite_accessory/tail/small_bugbum - name = "Bug Abdomen, Alt, Small (Dual-Color)" - icon = 'modular_chomp/icons/mob/vore/tails.dmi' - icon_state = "smallbug1" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "smallbug2" - -/datum/sprite_accessory/tail/mid_bugbum - name = "Bug Abdomen, Alt, Medium (Dual-Color)" - icon = 'modular_chomp/icons/mob/vore/tails.dmi' - icon_state = "midbug1" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "midbug2" - -/datum/sprite_accessory/tail/big_bugbum - name = "Bug Abdomen, Alt, Big (Dual-Color)" - icon = 'modular_chomp/icons/mob/vore/tails.dmi' - icon_state = "bigbug1" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "bigbug2" diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index c7efde0b36..890ecd69f8 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -1408,3 +1408,32 @@ extra_overlay = "sloog_glowstripe" extra_overlay_w = "sloog_glowstripe" can_loaf = FALSE + +/datum/sprite_accessory/tail/taur/horse/big + name = "Kentauri (Taur)" + icon_state = "kentauri_s" + extra_overlay = "kentauri_markings" + +/datum/sprite_accessory/tail/taur/wolf/husky + name = "Husky (Taur)" + icon_state = "husky_s" + +/datum/sprite_accessory/tail/taur/wolf/huskyfat + name = "Fat Husky (Taur)" + icon_state = "huskyf_s" + +/datum/sprite_accessory/tail/taur/wolf/wolf_2 + name = "WolfTG (Taur)" + icon_state = "wolf3_s" + +/datum/sprite_accessory/tail/taur/long_lizard + name = "Large Dragon Tail" + icon_state = "big_liz" + can_ride = 0 + hide_body_parts = null + clip_mask_icon = null + clip_mask_state = null + +/datum/sprite_accessory/tail/taur/long_lizard/scaled + name = "Large Dragon Tail/W scales" + extra_overlay = "big_liz_mark" diff --git a/code/modules/vore/appearance/sprite_accessories_taur_yw.dm b/code/modules/vore/appearance/sprite_accessories_taur_yw.dm deleted file mode 100644 index 20d5b7d7e5..0000000000 --- a/code/modules/vore/appearance/sprite_accessories_taur_yw.dm +++ /dev/null @@ -1,35 +0,0 @@ -/datum/sprite_accessory/tail/taur/horse/big - icon = 'icons/mob/vore/taurs_yw.dmi' //CHOMP Fix - name = "Kentauri (Taur)" - icon_state = "kentauri_s" - extra_overlay = "kentauri_markings" - icon = 'icons/mob/vore/taurs_yw.dmi' - -/datum/sprite_accessory/tail/taur/wolf/husky - icon = 'icons/mob/vore/taurs_yw.dmi' //CHOMP Fix - name = "Husky (Taur)" - icon_state = "husky_s" - icon = 'icons/mob/vore/taurs_yw.dmi' - -/datum/sprite_accessory/tail/taur/wolf/huskyfat - icon = 'icons/mob/vore/taurs_yw.dmi' //CHOMP Fix - name = "Fat Husky (Taur)" - icon_state = "huskyf_s" - -/datum/sprite_accessory/tail/taur/wolf/wolf_2 - icon = 'icons/mob/vore/taurs_yw.dmi' //CHOMP Fix - name = "WolfTG (Taur)" - icon_state = "wolf2_s" - -/datum/sprite_accessory/tail/taur/long_lizard - name = "Large Dragon Tail" - icon_state = "big_liz" - icon = 'icons/mob/vore/taurs_yw.dmi' - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - -/datum/sprite_accessory/tail/taur/long_lizard/scaled - name = "Large Dragon Tail/W scales" - extra_overlay = "big_liz_mark" diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm index 2b7b1f1fb9..1ea5344fca 100644 --- a/code/modules/vore/appearance/sprite_accessories_yw.dm +++ b/code/modules/vore/appearance/sprite_accessories_yw.dm @@ -43,138 +43,6 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -//Tails -/datum/sprite_accessory/tail/tripplekitsune_colorable_yw - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Kitsune 3 tails - colorable" - desc = "" - icon_state = "triplekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "triplekitsune_tips" - -/datum/sprite_accessory/tail/lizard_tail_smooth - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Lizard Tail (Smooth)" - desc = "" - icon_state = "lizard_tail_smooth" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/lizard_tail_dark_tiger - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Lizard Tail (Dark Tiger)" - desc = "" - icon_state = "lizard_tail_dark_tiger" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/lizard_tail_light_tiger - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Lizard Tail (Light Tiger)" - desc = "" - icon_state = "lizard_tail_light_tiger" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/lizard_tail_spiked - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Lizard Tail (Spiked)" - desc = "" - icon_state = "lizard_tail_spiked" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/wolf_tail - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Wolf Tail" - desc = "" - icon_state = "wolf_tail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/ninekitsune_colorable_yw - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Kitsune 9 tails - colorable" - desc = "" - icon_state = "ninekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "ninekitsune-tips" - -/datum/sprite_accessory/tail/vulpkanin_alt_color - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Vulpkanin alt" - desc = "" - icon_state = "vulpkanin_alt_color" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "vulpkanin_alt_color_tips" - ani_state = "vulpkanin_alt_color_w" - extra_overlay_w = "vulpkanin_alt_color_tips_w" - -/datum/sprite_accessory/tail/raccoon_tail - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Raccoon gray tail" - desc = "" - icon_state = "raccoon_tail" - do_colouration = 0 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/striped_tail - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Striped tail, colorable" - desc = "" - icon_state = "stripedtail_colorable" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "stripedtail_colorable_w" - -/datum/sprite_accessory/tail/tesh_pattern_fem - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Female teshari tail(Pattern)" - desc = "" - icon_state = "seromitail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshpattern_fem_tail" - -/datum/sprite_accessory/tail/tesh_pattern_male - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Male teshari tail(Pattern)" - desc = "" - icon_state = "seromitail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshpattern_male_tail" - -/datum/sprite_accessory/tail/tesh_pattern_fem_alt - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Female teshari tail(Pattern, Alt.)" - desc = "" - icon_state = "teshari_fluffytail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshpattern_fem_alt" - - -/datum/sprite_accessory/tail/tesh_pattern_male_alt - icon = 'icons/mob/vore/tails_yw.dmi' - name = "Male teshari tail(Pattern, Alt.)" - desc = "" - icon_state = "teshari_fluffytail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "teshpattern_male_alt" - -/datum/sprite_accessory/tail/jeanne_nanovulp - icon = 'icons/mob/human_races/cyberlimbs/dopiotl/jeanne_nanovulp.dmi' - name = "Jeanne kitsune nine tails" - desc = "" - icon_state = "tails" - do_colouration = 0 - ckeys_allowed = list("dopiotl") - //ears /datum/sprite_accessory/ears/large_dragon diff --git a/icons/mob/human_races/sprite_accessories/tails.dmi b/icons/mob/human_races/sprite_accessories/tails.dmi index 9cb485e26c..0f01bccc0c 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 8e4f8112ce..56e8c717de 100644 Binary files a/icons/mob/human_races/sprite_accessories/taurs.dmi and b/icons/mob/human_races/sprite_accessories/taurs.dmi differ diff --git a/icons/mob/vore/tails_ch.dmi b/icons/mob/vore/tails_ch.dmi deleted file mode 100644 index bfd9690783..0000000000 Binary files a/icons/mob/vore/tails_ch.dmi and /dev/null differ diff --git a/icons/mob/vore/tails_yw.dmi b/icons/mob/vore/tails_yw.dmi deleted file mode 100644 index 8ac201dfe7..0000000000 Binary files a/icons/mob/vore/tails_yw.dmi and /dev/null differ diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm deleted file mode 100644 index c73f1898dd..0000000000 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm +++ /dev/null @@ -1,81 +0,0 @@ -/datum/sprite_accessory/tail - lower_layer_dirs = list(SOUTH, WEST, EAST) - - -/datum/sprite_accessory/tail/anthrovirus_tail - name = "Anthro Virus Tail" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "anthrovirustail_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "anthrovirustail" - -/datum/sprite_accessory/tail/tyranid_tail - name = "Tyranid" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "tyranid" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/sectdrone_tail - name = "Sect Drone Tail (To use with bodytype-marking)" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "sectdrone_tail" - extra_overlay = "sectdrone_tail_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/bigsnaketeshari - name = "Large snake tail, Teshari" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "snaketailteshari" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/featheredraptor - name = "feathered Raptor" - icon = 'icons/mob/vore/tails_ch.dmi' - icon_state = "feathered_raptor" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/featheredraptor/twotone - name = "feathered Raptor, duel colorable" - extra_overlay = "feather_raptor-overlay" - -/datum/sprite_accessory/tail/succubustail_ch - name = "Succubus Tail" - icon = 'modular_chomp/icons/mob/vore/tails.dmi' - icon_state = "Succubustail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/longtail/largeshark - name = "Large Shark" - icon = 'modular_chomp/icons/mob/vore/tails64x32.dmi' - icon_state = "large-shark" - extra_overlay = "large-shark-underbelly" - extra_overlay2 = "large-shark-tips" - -/datum/sprite_accessory/tail/longtail/largeshark/finless - name = "Large Shark (finless)" - icon_state = "large-shark-finless" - extra_overlay2 = "large-shark-tips-finless" - -/datum/sprite_accessory/tail/longtail/largeshark/stripes - name = "Large Shark (striped)" - extra_overlay = "large-shark-stripes" - extra_overlay2 = "large-shark-stripes-underbelly" - -/datum/sprite_accessory/tail/longtail/largeshark/stripes2 - name = "Large Shark (striped, underbelly)" - extra_overlay = "large-shark-underbelly" - extra_overlay2 = "large-shark-stripes-underbelly" - -/datum/sprite_accessory/tail/longtail/largeshark/stripes/finless - name = "Large Shark (striped, finless)" - icon_state = "large-shark-finless" - -/datum/sprite_accessory/tail/longtail/largeshark/stripes2/finless - name = "Large Shark (striped, finless, underbelly)" - icon_state = "large-shark-finless" diff --git a/modular_chomp/icons/mob/vore/Tails64x32.dmi b/modular_chomp/icons/mob/vore/Tails64x32.dmi deleted file mode 100644 index 08465f2525..0000000000 Binary files a/modular_chomp/icons/mob/vore/Tails64x32.dmi and /dev/null differ diff --git a/modular_chomp/icons/mob/vore/tails.dmi b/modular_chomp/icons/mob/vore/tails.dmi deleted file mode 100644 index 87f892cda1..0000000000 Binary files a/modular_chomp/icons/mob/vore/tails.dmi and /dev/null differ diff --git a/vorestation.dme b/vorestation.dme index 794719fdee..320bbedb88 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2302,6 +2302,7 @@ #include "code\modules\client\preferences\migrations\14_nifs.dm" #include "code\modules\client\preferences\migrations\15_nif_path.dm" #include "code\modules\client\preferences\migrations\16_colors.dm" +#include "code\modules\client\preferences\migrations\17_tails.dm" #include "code\modules\client\preferences\types\character\antagonism\01_basic.dm" #include "code\modules\client\preferences\types\character\general\01_basic.dm" #include "code\modules\client\preferences\types\character\general\03_body.dm" @@ -3766,7 +3767,6 @@ #include "code\modules\mob\new_player\sprite_accessories_hair.dm" #include "code\modules\mob\new_player\sprite_accessories_markings.dm" #include "code\modules\mob\new_player\sprite_accessories_tail.dm" -#include "code\modules\mob\new_player\sprite_accessories_tail_ch.dm" #include "code\modules\mob\new_player\sprite_accessories_taur.dm" #include "code\modules\mob\new_player\sprite_accessories_wing.dm" #include "code\modules\mob\new_player\sprite_accessories_wing_large.dm" @@ -4604,7 +4604,6 @@ #include "code\modules\vore\mouseray.dm" #include "code\modules\vore\trycatch_vr.dm" #include "code\modules\vore\appearance\preferences_vr.dm" -#include "code\modules\vore\appearance\sprite_accessories_taur_yw.dm" #include "code\modules\vore\appearance\sprite_accessories_yw.dm" #include "code\modules\vore\appearance\update_icons_vr.dm" #include "code\modules\vore\eating\belly_dat_vr.dm" @@ -5089,7 +5088,6 @@ #include "modular_chomp\code\modules\mob\new_player\sprite_accessories.dm" #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_ear.dm" #include "modular_chomp\code\modules\mob\new_player\sprite_accessories_extra.dm" -#include "modular_chomp\code\modules\mob\new_player\sprite_accessories_tail.dm" #include "modular_chomp\code\modules\organs\organ_icon.dm" #include "modular_chomp\code\modules\organs\robolimbs.dm" #include "modular_chomp\code\modules\organs\internal\malignant\malignant.dm"