diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 731ebd89a1..cecb22bf9b 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -1555,6 +1555,14 @@ name = "Shadekin Long Tail" icon_state = "shadekin_long_s" +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_fat + name = "Shadekin Fat Tail" + icon_state = "shadekin_fat_s" + +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_fat/spots + name = "Shadekin Fat Tail (Spotted)" + extra_overlay = "shadekin_fat_spots" + /datum/sprite_accessory/tail/longtail/zaprat name = "bolt-shaped tail, dual color" icon = 'icons/mob/human_races/sprite_accessories/taurs.dmi' diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 820949e722..1c61f2acc1 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -131,7 +131,7 @@ set category = "Abilities.General" set desc = "Let people ride on you." - if(LAZYLEN(buckled_mobs)) + if(LAZYLEN(buckled_mobs) && riding_datum) //CHOMPEdit var/datum/riding/R = riding_datum for(var/rider in buckled_mobs) R.force_dismount(rider) @@ -172,7 +172,7 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 4 vore_tail_sprite_variant = "N" fullness_icons = 3 @@ -198,20 +198,17 @@ /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' //Ported from Chomp - icon_state = "fatwolf_s" - extra_overlay = "fatwolf_markings" - extra_overlay2 = "fatwolf_markings_2" //Ported from Chomp - //icon_sprite_tag = "fatwolf2c" + icon_state = "fatwolf2_s" + extra_overlay = "fatwolf2_markings" + extra_overlay2 = "fatwolf2_markings_2" loaf_offset = 3 /datum/sprite_accessory/tail/taur/wolf/wolf_2c_wag name = "Wolf 3-color (Taur, Fat vwag)" - icon = 'icons/mob/vore/taurs_ch.dmi' //Ported from Chomp - icon_state = "wolf_s" - extra_overlay = "wolf_markings" - extra_overlay2 = "wolf_markings_2" - ani_state = "fatwolf_s" + icon_state = "wolf2_s" + extra_overlay = "wolf2_markings" + extra_overlay2 = "wolf2_markings_2" + ani_state = "fatwolf2_s" /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" @@ -244,7 +241,7 @@ extra_overlay2 = "skunk_markings_2" icon_sprite_tag = "skunk" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 vore_tail_sprite_variant = "Skunk" //Sadly there appears to be no sprites... For now! belly_variant_when_loaf = TRUE @@ -299,28 +296,28 @@ /datum/sprite_accessory/tail/taur/naga/alt_2c name = "Naga alt style dual-color (Taur)" - suit_sprites = 'icons/mob/taursuits_naga_alt.dmi' + suit_sprites = 'icons/mob/taursuits_naga.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. icon_state = "altnaga_s" extra_overlay = "altnaga_markings" //icon_sprite_tag = "altnaga2c" /datum/sprite_accessory/tail/taur/naga/alt_3c name = "Naga alt style tri-color (Taur)" - suit_sprites = 'icons/mob/taursuits_naga_alt.dmi' + suit_sprites = 'icons/mob/taursuits_naga.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. icon_state = "altnaga_s" extra_overlay = "altnaga_markings" extra_overlay2 = "altnaga_stripes" /datum/sprite_accessory/tail/taur/naga/alt_3c_rattler name = "Naga alt style tri-color, rattler (Taur)" - suit_sprites = 'icons/mob/taursuits_naga_alt.dmi' + suit_sprites = 'icons/mob/taursuits_naga.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. icon_state = "altnaga_s" extra_overlay = "altnaga_markings" extra_overlay2 = "altnaga_rattler" /datum/sprite_accessory/tail/taur/naga/alt_3c_tailmaw name = "Naga alt style tri-color, tailmaw (Taur)" - suit_sprites = 'icons/mob/taursuits_naga_alt.dmi' + suit_sprites = 'icons/mob/taursuits_naga.dmi' //TODO: PORT CHOMPS NAGA_ALT AND MAKE THESE NAGA_ALT. icon_state = "altnagatailmaw_s" extra_overlay = "altnagatailmaw_markings" extra_overlay2 = "altnagatailmaw_eyes" @@ -332,7 +329,7 @@ suit_sprites = 'icons/mob/taursuits_horse.dmi' icon_sprite_tag = "horse" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 4 vore_tail_sprite_variant = "Horse" fullness_icons = 1 @@ -364,7 +361,7 @@ extra_overlay2 = "synthhorse_glow" //icon_sprite_tag = "synthhorse" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/cow @@ -373,7 +370,7 @@ suit_sprites = 'icons/mob/taursuits_cow.dmi' icon_sprite_tag = "cow" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 vore_tail_sprite_variant = "Cow" fullness_icons = 1 @@ -409,7 +406,7 @@ suit_sprites = 'icons/mob/taursuits_deer.dmi' icon_sprite_tag = "deer" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 7 vore_tail_sprite_variant = "Deer" belly_variant_when_loaf = TRUE @@ -448,7 +445,7 @@ suit_sprites = 'icons/mob/taursuits_lizard_ch.dmi' icon_sprite_tag = "lizard" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 5 vore_tail_sprite_variant = "Lizard" fullness_icons = 1 @@ -457,7 +454,7 @@ name = "Fat Lizard (Taur)" icon_state = "fatlizard_s" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/lizard_wag @@ -471,7 +468,7 @@ extra_overlay = "lizard_markings" //icon_sprite_tag = "lizard2c" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 5 /datum/sprite_accessory/tail/taur/lizard/fatlizard_2c @@ -479,7 +476,7 @@ icon_state = "fatlizard_s" extra_overlay = "fatlizard_markings" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/lizard_2c_wag @@ -496,7 +493,7 @@ extra_overlay2 = "synthlizard_glow" //icon_sprite_tag = "synthlizard" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 vore_tail_sprite_variant = "SynthLiz" fullness_icons = 1 @@ -507,7 +504,7 @@ extra_overlay = "fatsynthlizard_markings" extra_overlay2 = "fatsynthlizard_glow" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/synthlizard_wag @@ -579,7 +576,7 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 5 vore_tail_sprite_variant = "Feline" belly_variant_when_loaf = TRUE @@ -590,7 +587,7 @@ icon_state = "fatfeline_s" //icon_sprite_tag = "fatfeline" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/fatfeline_wag @@ -598,7 +595,7 @@ icon_state = "fatfeline_s" ani_state = "fatfeline_w" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/feline_2c @@ -608,28 +605,25 @@ extra_overlay2 = "feline_markings_2" //icon_sprite_tag = "feline2c" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline 3-color (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' //Ported from Chomp - icon_state = "fatfeline_s" - extra_overlay = "fatfeline_markings" - extra_overlay2 = "fatfeline_markings_2" //Ported from Chomp - //icon_sprite_tag = "fatfeline2c" + icon_state = "fatfeline2_s" + extra_overlay = "fatfeline2_markings" + extra_overlay2 = "fatfeline2_markings_2" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/feline_2c_wag name = "Feline 3-color (Taur, Fat vwag)" - icon = 'icons/mob/vore/taurs_ch.dmi' //Ported from Chomp - icon_state = "feline_s" - extra_overlay = "feline_markings" - extra_overlay2 = "feline_markings_2" + icon_state = "feline2_s" + extra_overlay = "feline2_markings" + extra_overlay2 = "feline2_markings_2" ani_state = "fatfeline_s" extra_overlay_w = "fatfeline_markings" - extra_overlay2_w = "fatfeline_markings_2" //Ported from Chomp + extra_overlay2_w = "fatfeline_markings_2" loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/synthfeline @@ -639,7 +633,7 @@ extra_overlay2 = "synthfeline_glow" //icon_sprite_tag = "synthfeline" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/fatsynthfeline @@ -648,7 +642,7 @@ extra_overlay = "fatsynthfeline_markings" extra_overlay2 = "fatsynthfeline_glow" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/synthfeline_wag @@ -668,7 +662,7 @@ extra_overlay = "tiger_markings" extra_overlay2 = "tiger_markings_2" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 5 vore_tail_sprite_variant = "Feline" belly_variant_when_loaf = TRUE @@ -679,7 +673,7 @@ icon_state = "fattiger_s" extra_overlay = "fattiger_markings" extra_overlay2 = "fattiger_markings_2" - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 3 /datum/sprite_accessory/tail/taur/tiger/fat_vwag @@ -765,7 +759,7 @@ suit_sprites = 'icons/mob/taursuits_drake_ch.dmi' icon_sprite_tag = "drake" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 6 vore_tail_sprite_variant = "Drake" belly_variant_when_loaf = TRUE @@ -776,7 +770,7 @@ icon_state = "fatdrake_s" extra_overlay = "fatdrake_markings" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 6 /datum/sprite_accessory/tail/taur/drake/drake_vwag @@ -795,7 +789,7 @@ suit_sprites = 'icons/mob/taursuits_otie.dmi' icon_sprite_tag = "otie" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 5 vore_tail_sprite_variant = "Otie" belly_variant_when_loaf = TRUE @@ -1032,7 +1026,7 @@ extra_overlay = "fox_markings" extra_overlay2 = "fox_markings2" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' loaf_offset = 4 /datum/sprite_accessory/tail/taur/kitsune @@ -1065,7 +1059,7 @@ can_loaf = TRUE icon_loaf = 'icons/rogue-star/loafs_64x32.dmi' loaf_offset = 4 -/*// Special snowflake tails/taurhalves // CHOMPRemove Start +// Special snowflake tails/taurhalves //spoopylizz: Roiz Lizden /datum/sprite_accessory/tail/taur/roiz_long_lizard // Not ACTUALLY a taur, but it uses 32x64 so it wouldn't fit in tails.dmi, and having it as a tail bugs up the sprite. @@ -1152,7 +1146,6 @@ msg_owner_grab_fail = "You step down onto %prey with one of your vines, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their vines, squishing you and forcing you onto the ground!" -*/// CHOMPRemove End /datum/sprite_accessory/tail/taur/redpanda name = "Red Panda (Taur)" @@ -1210,7 +1203,7 @@ icon_state = "sectdrone" extra_overlay = "sectdrone_markings" can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' vore_tail_sprite_variant = "SectDrone" belly_variant_when_loaf = TRUE struggle_anim = TRUE @@ -1244,3 +1237,197 @@ vore_tail_sprite_variant = "N" fullness_icons = 3 struggle_anim = TRUE + +/datum/sprite_accessory/tail/taur/sergal/wheaties_2c + name = "Sergal (Taur, dual-color)" + icon_state = "sergwheat" + extra_overlay = "sergwheat_markings" + icon_sprite_tag = "wolf" + vore_tail_sprite_variant = "N" + fullness_icons = 3 + struggle_anim = TRUE + +/datum/sprite_accessory/tail/taur/sergal/fatwheaties_2c + name = "Fat Sergal (Taur, dual-color)" + icon_state = "fatsergal" + extra_overlay = "sergwheat_markings" + icon_sprite_tag = "wolf" + vore_tail_sprite_variant = "N" + fullness_icons = 3 + struggle_anim = TRUE + +/datum/sprite_accessory/tail/taur/cow_alt + name = "Cow Alt (Taur dual-color)" + icon_state = "cow_alt" + extra_overlay = "cow_alt_2" + vore_tail_sprite_variant = "CowAlt" + fullness_icons = 1 + +/datum/sprite_accessory/tail/taur/bigleggy + name = "Big Leggies" + icon_state = "bigleggy" + extra_overlay = "bigleggy_markings" + vore_tail_sprite_variant = "bigleggy" + fullness_icons = 3 + ani_state = "bigleggy_stanced" + extra_overlay_w = "bigleggy_markings_stanced" + +/datum/sprite_accessory/tail/taur/bigleggy/canine + name = "Big Leggies (Canine Tail)" + extra_overlay2 = "bigleggy_canine" + extra_overlay2_w = "bigleggy_canine" + +/datum/sprite_accessory/tail/taur/bigleggy/feline + name = "Big Leggies (Feline Tail)" + extra_overlay2 = "bigleggy_feline" + extra_overlay2_w = "bigleggy_feline" + +/datum/sprite_accessory/tail/taur/bigleggy/reptile + name = "Big Leggies (Reptile Tail)" + extra_overlay2 = "bigleggy_reptile" + extra_overlay2_w = "bigleggy_reptile" + +/datum/sprite_accessory/tail/taur/bigleggy/snake + name = "Big Leggies (Snake Tail)" + extra_overlay2 = "bigleggy_snake" + extra_overlay2_w = "bigleggy_snake" + +/datum/sprite_accessory/tail/taur/bigleggy/fox + name = "Big Leggies (Fox Tail)" + extra_overlay2 = "bigleggy_vulpine" + extra_overlay2_w = "bigleggy_vulpine" + +/datum/sprite_accessory/tail/taur/bigleggy/bird + name = "Big Leggies (Bird)" + icon_state = "bigleggy" + extra_overlay = "bigleggy_m_bird" + extra_overlay2 = "bigleggy_bird" + extra_overlay_w = "bigleggy_m_bird_stanced" + extra_overlay2_w = "bigleggy_bird" + +/datum/sprite_accessory/tail/taur/bigleggy/plug + name = "Big Leggies (Plug Tail)" + extra_overlay2 = "bigleggy_plug" + extra_overlay2_w = "bigleggy_plug" + +/datum/sprite_accessory/tail/taur/bigleggy/AlienSlug + name = "Big Leggies (Alien Slug Tail)" + icon_state = "bigleggy_full_alienslug" + extra_overlay = "bigleggy_alienslug" + extra_overlay_w = "bigleggy_alienslug" + extra_overlay2 = "bigleggy_alienslug_m" + extra_overlay2_w = "bigleggy_alienslug_m" + +/datum/sprite_accessory/tail/taur/drake/extended + name = "Fat Drake Extended (Taur)" + icon_state = "extended_fatdrake" + extra_overlay = "extended_fatdrake_markings" + extra_overlay2 = "extended_fatdrake_markings2" + fullness_icons = 2 + can_loaf = TRUE //Soon //Actually, NOW + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 5 + +/datum/sprite_accessory/tail/taur/lizard/spotty + name = "Spotted Lizard (Taur, Tricolor)" + icon_state = "spottedlizard_s" + extra_overlay = "spottedlizard_markings" + extra_overlay_w = "spottedlizard_markings" + extra_overlay2 = "spottedlizard_markings_2" + extra_overlay2_w = "spottedlizard_markings_2" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 5 + +/datum/sprite_accessory/tail/taur/lizard/fat/spotty + name = "Fat Spotted Lizard (Taur, Tricolor)" + icon_state = "fatspottedlizard_s" + extra_overlay = "fatspottedlizard_markings" + extra_overlay_w = "fatspottedlizard_markings" + extra_overlay2 = "fatspottedlizard_markings_2" + extra_overlay2_w = "fatspottedlizard_markings_2" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 3 + +/datum/sprite_accessory/tail/taur/drake/extended/spotty + name = "Fat Spotted Drake Extended (Taur)" + vore_tail_sprite_variant = "FatDrake" + icon_state = "spottedextended_fatdrake" + extra_overlay = "spottedextended_fatdrake_markings" + extra_overlay_w = "spottedextended_fatdrake_markings" + extra_overlay2 = "spottedextended_fatdrake_markings_2" + extra_overlay2_w = "spottedextended_fatdrake_markings_2" + fullness_icons = 2 + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 5 + +/datum/sprite_accessory/tail/taur/drake/spotty + name = "Spotted Drake (Taur, Tricolor)" + icon_state = "spotteddrake_s" + extra_overlay = "spotteddrake_markings" + extra_overlay_w = "spotteddrake_markings" + extra_overlay2 = "spotteddrake_markings_2" + extra_overlay2_w = "spotteddrake_markings_2" + suit_sprites = 'icons/mob/taursuits_drake_ch.dmi' + icon_sprite_tag = "drake" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 6 + +/datum/sprite_accessory/tail/taur/drake/fat/spotty + name = "Fat Spotted Drake (Taur, Tricolor)" + vore_tail_sprite_variant = "FatDrake" + icon_state = "fatspotteddrake_s" + extra_overlay = "fatspotteddrake_markings" + extra_overlay_w = "fatspotteddrake_markings" + extra_overlay2 = "fatspotteddrake_markings_2" + extra_overlay2_w = "fatspotteddrake_markings_2" + fullness_icons = 2 + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 6 + +/datum/sprite_accessory/tail/taur/drake/extended_alt + name = "Drake Extended (Taur)" + vore_tail_sprite_variant = "Drake" + icon_state = "extended_drake" + extra_overlay = "extended_drake_markings" + extra_overlay_w = "extended_drake_markings" + extra_overlay2 = "extended_drake_markings_2" + extra_overlay2_w = "extended_drake_markings_2" + fullness_icons = 3 + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' + loaf_offset = 5 + +/datum/sprite_accessory/tail/taur/drake/extended_alt/spotted + name = "Spotted Drake Extended (Taur)" + vore_tail_sprite_variant = "Drake" + icon_state = "spottedextended_drake" + extra_overlay = "spottedextended_drake_markings" + extra_overlay_w = "spottedextended_drake_markings" + extra_overlay2 = "spottedextended_drake_markings_2" + extra_overlay2_w = "spottedextended_drake_markings_2" + fullness_icons = 3 + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_loaf.dmi' //This file needs to be nuked during the removal of 'taurs_ch_loaf.dmi' into the normal loaf file. + loaf_offset = 5 + +/datum/sprite_accessory/tail/taur/zorgoia_new + name = "Zorgoia (Taur) (New)" + icon_state = "zorgoia_new" + extra_overlay = "zorgoia_new_fluff" + +/datum/sprite_accessory/tail/taur/zorgoia_new/fat + name = "Zorgoia (Fat Taur) (New)" + icon_state = "zorgoia_new_fat" + extra_overlay = "zorgoia_new_fat_overlay" + +/datum/sprite_accessory/tail/taur/sloog + name = "Sloog (Taur)" + icon_state = "sloog" + extra_overlay = "sloog_glowstripe" + extra_overlay_w = "sloog_glowstripe" + can_loaf = FALSE diff --git a/icons/mob/human_races/sprite_accessories/taurs.dmi b/icons/mob/human_races/sprite_accessories/taurs.dmi index d7e65ad8f9..e42f109b95 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/taurs_ch.dmi b/icons/mob/vore/taurs_ch.dmi deleted file mode 100644 index 925735d616..0000000000 Binary files a/icons/mob/vore/taurs_ch.dmi and /dev/null differ diff --git a/icons/mob/vore/taurs_ch_loaf.dmi b/icons/mob/vore/taurs_ch_loaf.dmi deleted file mode 100644 index ec16262b94..0000000000 Binary files a/icons/mob/vore/taurs_ch_loaf.dmi and /dev/null differ diff --git a/icons/mob/vore/taurs_loaf.dmi b/icons/mob/vore/taurs_loaf.dmi new file mode 100644 index 0000000000..bc5ecfaf34 Binary files /dev/null and b/icons/mob/vore/taurs_loaf.dmi differ diff --git a/icons/mob/vore/taurs_vr_loaf.dmi b/icons/mob/vore/taurs_vr_loaf.dmi deleted file mode 100644 index aa283765f0..0000000000 Binary files a/icons/mob/vore/taurs_vr_loaf.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 index d2b112d5c4..c73f1898dd 100644 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -32,15 +32,6 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_fat - name = "Shadekin Fat Tail" - icon = 'icons/mob/vore/taurs_ch.dmi' //long tails in taurs for some reason - icon_state = "shadekin_fat_s" - -/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_fat/spots - name = "Shadekin Fat Tail (Spotted)" - extra_overlay = "shadekin_fat_spots" - /datum/sprite_accessory/tail/featheredraptor name = "feathered Raptor" icon = 'icons/mob/vore/tails_ch.dmi' @@ -87,4 +78,4 @@ /datum/sprite_accessory/tail/longtail/largeshark/stripes2/finless name = "Large Shark (striped, finless, underbelly)" - icon_state = "large-shark-finless" \ No newline at end of file + icon_state = "large-shark-finless" diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm index 78ecafdbb2..60b997e901 100644 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -1,238 +1,4 @@ -/datum/sprite_accessory/tail/taur/ch - icon = 'icons/mob/vore/taurs_ch.dmi'//Parent which allows us to not need to set icon every time. - -/datum/sprite_accessory/tail/taur/ch/zorgoia - name = "Zorgoia (Taur)" - icon_state = "zorgoia" - extra_overlay = "zorgoia_fluff" - -/datum/sprite_accessory/tail/taur/ch/zorgoia/fat - name = "Zorgoia (Fat Taur)" - icon_state = "zorgoia_fat" - extra_overlay = "zorgoia_fat_overlay" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c - name = "Sergal (Taur, dual-color)" - icon_state = "sergwheat" - extra_overlay = "sergwheat_markings" - icon_sprite_tag = "wolf" - vore_tail_sprite_variant = "N" - fullness_icons = 3 - struggle_anim = TRUE - -/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties_2c - name = "Fat Sergal (Taur, dual-color)" - icon_state = "fatsergal" - extra_overlay = "sergwheat_markings" - icon_sprite_tag = "wolf" - vore_tail_sprite_variant = "N" - fullness_icons = 3 - struggle_anim = TRUE - - -/datum/sprite_accessory/tail/taur/ch/fox - name = "Fox (Taur, 3-color)" - icon_state = "fox" - extra_overlay = "fox_markings" - extra_overlay2 = "fox_markings2" - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 4 - -/datum/sprite_accessory/tail/taur/ch/kitsune - name = "Kitsune (Taur)" - icon_state = "kitsune" - -/datum/sprite_accessory/tail/taur/ch/cow_alt - name = "Cow Alt (Taur dual-color)" - icon_state = "cow_alt" - extra_overlay = "cow_alt_2" - vore_tail_sprite_variant = "CowAlt" - fullness_icons = 1 - -/datum/sprite_accessory/tail/taur/ch/bigleggy - name = "Big Leggies" - icon_state = "bigleggy" - extra_overlay = "bigleggy_markings" - vore_tail_sprite_variant = "bigleggy" - fullness_icons = 3 - ani_state = "bigleggy_stanced" - extra_overlay_w = "bigleggy_markings_stanced" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/canine - name = "Big Leggies (Canine Tail)" - extra_overlay2 = "bigleggy_canine" - extra_overlay2_w = "bigleggy_canine" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/feline - name = "Big Leggies (Feline Tail)" - extra_overlay2 = "bigleggy_feline" - extra_overlay2_w = "bigleggy_feline" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/reptile - name = "Big Leggies (Reptile Tail)" - extra_overlay2 = "bigleggy_reptile" - extra_overlay2_w = "bigleggy_reptile" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/snake - name = "Big Leggies (Snake Tail)" - extra_overlay2 = "bigleggy_snake" - extra_overlay2_w = "bigleggy_snake" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/fox - name = "Big Leggies (Fox Tail)" - extra_overlay2 = "bigleggy_vulpine" - extra_overlay2_w = "bigleggy_vulpine" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/bird - name = "Big Leggies (Bird)" - icon_state = "bigleggy" - extra_overlay = "bigleggy_m_bird" - extra_overlay2 = "bigleggy_bird" - extra_overlay_w = "bigleggy_m_bird_stanced" - extra_overlay2_w = "bigleggy_bird" - -/datum/sprite_accessory/tail/taur/ch/bigleggy/plug - name = "Big Leggies (Plug Tail)" - extra_overlay2 = "bigleggy_plug" - extra_overlay2_w = "bigleggy_plug" - -/datum/sprite_accessory/tail/taur/drake/extended //Sub-pathing drake taur so we can steal their cloaks - name = "Fat Drake Extended (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "extended_fatdrake" - extra_overlay = "extended_fatdrake_markings" - extra_overlay2 = "extended_fatdrake_markings2" - fullness_icons = 2 - can_loaf = TRUE //Soon //Actually, NOW - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 5 - -/datum/sprite_accessory/tail/taur/ch/bigleggy/AlienSlug - name = "Big Leggies (Alien Slug Tail)" - icon_state = "bigleggy_full_alienslug" - extra_overlay = "bigleggy_alienslug" - extra_overlay_w = "bigleggy_alienslug" - extra_overlay2 = "bigleggy_alienslug_m" - extra_overlay2_w = "bigleggy_alienslug_m" - /datum/sprite_accessory/tail/taur/naga/alt_3c // Dirty readjustment of the suit_sprites path for experimentation because I dunno a better way to do this. suit_sprites = 'icons/mob/taursuits_naga_alt_ch.dmi' vore_tail_sprite_variant = "Naga3Piece" fullness_icons = 1 - -/datum/sprite_accessory/tail/taur/drake/spotty - name = "Spotted Drake (Taur, Tricolor)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "spotteddrake_s" - extra_overlay = "spotteddrake_markings" - extra_overlay_w = "spotteddrake_markings" - extra_overlay2 = "spotteddrake_markings_2" - extra_overlay2_w = "spotteddrake_markings_2" - suit_sprites = 'icons/mob/taursuits_drake_ch.dmi' - icon_sprite_tag = "drake" - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 6 - -/datum/sprite_accessory/tail/taur/drake/fat/spotty - name = "Fat Spotted Drake (Taur, Tricolor)" - icon = 'icons/mob/vore/taurs_ch.dmi' - vore_tail_sprite_variant = "FatDrake" - icon_state = "fatspotteddrake_s" - extra_overlay = "fatspotteddrake_markings" - extra_overlay_w = "fatspotteddrake_markings" - extra_overlay2 = "fatspotteddrake_markings_2" - extra_overlay2_w = "fatspotteddrake_markings_2" - fullness_icons = 2 - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 6 - -/datum/sprite_accessory/tail/taur/lizard/spotty - name = "Spotted Lizard (Taur, Tricolor)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "spottedlizard_s" - extra_overlay = "spottedlizard_markings" - extra_overlay_w = "spottedlizard_markings" - extra_overlay2 = "spottedlizard_markings_2" - extra_overlay2_w = "spottedlizard_markings_2" - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 5 - -/datum/sprite_accessory/tail/taur/lizard/fat/spotty - name = "Fat Spotted Lizard (Taur, Tricolor)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "fatspottedlizard_s" - extra_overlay = "fatspottedlizard_markings" - extra_overlay_w = "fatspottedlizard_markings" - extra_overlay2 = "fatspottedlizard_markings_2" - extra_overlay2_w = "fatspottedlizard_markings_2" - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 3 - -/datum/sprite_accessory/tail/taur/drake/extended/spotty - name = "Fat Spotted Drake Extended (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' - vore_tail_sprite_variant = "FatDrake" - icon_state = "spottedextended_fatdrake" - extra_overlay = "spottedextended_fatdrake_markings" - extra_overlay_w = "spottedextended_fatdrake_markings" - extra_overlay2 = "spottedextended_fatdrake_markings_2" - extra_overlay2_w = "spottedextended_fatdrake_markings_2" - fullness_icons = 2 - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 5 - -/datum/sprite_accessory/tail/taur/drake/extended_alt - name = "Drake Extended (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' - vore_tail_sprite_variant = "Drake" - icon_state = "extended_drake" - extra_overlay = "extended_drake_markings" - extra_overlay_w = "extended_drake_markings" - extra_overlay2 = "extended_drake_markings_2" - extra_overlay2_w = "extended_drake_markings_2" - fullness_icons = 3 - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 5 - -/datum/sprite_accessory/tail/taur/drake/extended_alt/spotted - name = "Spotted Drake Extended (Taur)" - icon = 'icons/mob/vore/taurs_ch.dmi' - vore_tail_sprite_variant = "Drake" - icon_state = "spottedextended_drake" - extra_overlay = "spottedextended_drake_markings" - extra_overlay_w = "spottedextended_drake_markings" - extra_overlay2 = "spottedextended_drake_markings_2" - extra_overlay2_w = "spottedextended_drake_markings_2" - fullness_icons = 3 - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - loaf_offset = 5 - -/datum/sprite_accessory/tail/taur/longtail - //hide body parts list() makes it so no limbs are hidden - //made its own child so we can reuse this - offset_x = -16 - hide_body_parts = list() - - -/datum/sprite_accessory/tail/taur/longtail/dragonmaidtail_ch - name = "Dragon maid Tail" - icon = 'modular_chomp/icons/mob/vore/Tails64x32.dmi' - icon_state = "Dragon_maid_tail" - fullness_icons = 3 - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/taur/ch/sloog - name = "Sloog (Taur)" - icon_state = "sloog" - extra_overlay = "sloog_glowstripe" - extra_overlay_w = "sloog_glowstripe" - can_loaf = FALSE