diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 18fee160fb..731ebd89a1 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -1711,3 +1711,28 @@ icon_state = "tigresstail" ckeys_allowed = list("hoodoo") */// CHOMPRemove End + +/datum/sprite_accessory/tail/longtail/longflufftail + name = "Long fluffy tail" + icon_state = "longflufftail" + +/datum/sprite_accessory/tail/longtail/ringtailbig + name = "Long ring tail" + icon_state = "bigringtail" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "bigringtail_markings" + +/datum/sprite_accessory/tail/longtail/desert_nightstalker + name = "Desert Nightstalker Tail (vwag)" + icon_state = "nightstalker_desert" + ani_state = "nightstalker_desert_w" + do_colouration = 0 // We're not coloring this, these are pre-colored + color_blend_mode = ICON_ADD + +/datum/sprite_accessory/tail/longtail/diamondback_nightstalker + name = "Diamondback Nightstalker Tail (dual-color, vwag)" + icon_state = "nightstalker_diamondback" + ani_state = "nightstalker_diamondback_w" + extra_overlay = "nightstalker_diamondback_markings" + extra_overlay_w = "nightstalker_diamondback_markings_w" diff --git a/code/modules/mob/new_player/sprite_accessories_tail_ch.dm b/code/modules/mob/new_player/sprite_accessories_tail_ch.dm index 04858d8f45..8feeff9edc 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_ch.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_ch.dm @@ -131,35 +131,6 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "teshfatfirefly_markings" -/datum/sprite_accessory/tail/longtail/longflufftail - name = "Long fluffy tail" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "longflufftail" - -/datum/sprite_accessory/tail/longtail/ringtailbig - name = "Long ring tail" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "bigringtail" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - extra_overlay = "bigringtail_markings" - -/datum/sprite_accessory/tail/longtail/desert_nightstalker - name = "Desert Nightstalker Tail (vwag)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "nightstalker_desert" - ani_state = "nightstalker_desert_w" - do_colouration = 0 // We're not coloring this, these are pre-colored - color_blend_mode = ICON_ADD - -/datum/sprite_accessory/tail/longtail/diamondback_nightstalker - name = "Diamondback Nightstalker Tail (dual-color, vwag)" - icon = 'icons/mob/vore/taurs_ch.dmi' - icon_state = "nightstalker_diamondback" - ani_state = "nightstalker_diamondback_w" - extra_overlay = "nightstalker_diamondback_markings" - extra_overlay_w = "nightstalker_diamondback_markings_w" - /datum/sprite_accessory/tail/orca_f name = "Orca tail (Female)" icon = 'icons/mob/vore/tails_ch.dmi' diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 7a8a143870..820949e722 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -1153,3 +1153,94 @@ 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)" + icon_state = "redpanda" + +/datum/sprite_accessory/tail/taur/redpandadc + name = "Red Panda (Taur dual-color)" + icon_state = "redpanda_dc" + extra_overlay = "redpanda_dc_markings" + +/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c/fatwolfalt + name = "Fat Wolf 3-color-alt (Taur)" + icon_state = "fatwolfalt_s" + extra_overlay = "fatwolfalt_markings1" + extra_overlay2 = "fatwolfalt_markings2" + icon_sprite_tag = "wolf" + +/datum/sprite_accessory/tail/taur/naga/alt + name = "Naga alt (Taur)" + icon_state = "naga_alt_s" + vore_tail_sprite_variant = "NagaAlt" + fullness_icons = 1 + +/datum/sprite_accessory/tail/taur/naga/alt/second + name = "Naga dual-color alt (Taur)" + extra_overlay = "naga_alt_markings" + +/datum/sprite_accessory/tail/taur/naga/synthnaga + name = "Synthetic Naga dual-color (Taur)" + icon_state = "synthnaga" + extra_overlay = "synthnaga_belly" + +/datum/sprite_accessory/tail/taur/horse/scoli + name = "Scolipede (Taur)" + icon_state = "scoli_s" + extra_overlay = "scoli_markings1" + extra_overlay2 = "scoli_markings2" + +/datum/sprite_accessory/tail/taur/sergal/wheaties + name = "Sergal (Taur)" + icon_state = "sergwheat" + icon_sprite_tag = "wolf" + vore_tail_sprite_variant = "N" + fullness_icons = 3 + struggle_anim = TRUE + +/datum/sprite_accessory/tail/taur/longvirus + name = "Long Virus (Taur)" + icon_state = "longvirus_s" + extra_overlay = "longvirus_markings" + icon_sprite_tag = "virus" + +/datum/sprite_accessory/tail/taur/sectdrone + name = "Sect Drone (Taur)" + icon_state = "sectdrone" + extra_overlay = "sectdrone_markings" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + vore_tail_sprite_variant = "SectDrone" + belly_variant_when_loaf = TRUE + struggle_anim = TRUE + loaf_offset = 3 + fullness_icons = 3 + + msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" + msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" + + msg_owner_disarm_walk = "You firmly push your leg down on %prey, painfully but harmlessly pinning them to the ground!" + msg_prey_disarm_walk = "%owner firmly pushes their leg down on you, quite painfully but harmlessly pinning you to the ground!" + + msg_owner_harm_walk = "You methodically place your leg down upon %prey's body, slowly applying pressure, crushing them against the floor!" + msg_prey_harm_walk = "%owner methodically places their leg upon your body, slowly applying pressure, crushing you against the floor!" + + msg_owner_grab_success = "You pin %prey down on the ground with your front leg before using your other leg to pick them up, trapping them between two of your front legs!" + msg_prey_grab_success = "%owner pins you down on the ground with their front leg before using their other leg to pick you up, trapping you between two of their front legs!" + + msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" + msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" + +/datum/sprite_accessory/tail/taur/fatsectdrone + name = "Fat Sect Drone (Taur)" + icon_state = "fatsectdrone" + extra_overlay = "fatsectdrone_markings" + +/datum/sprite_accessory/tail/taur/sergal/fatwheaties + name = "Fat Sergal (Taur)" + icon_state = "fatsergal" + icon_sprite_tag = "wolf" + vore_tail_sprite_variant = "N" + fullness_icons = 3 + struggle_anim = TRUE diff --git a/icons/mob/human_races/sprite_accessories/taurs.dmi b/icons/mob/human_races/sprite_accessories/taurs.dmi index 163822e0d6..d7e65ad8f9 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 index 7845a7c1c5..925735d616 100644 Binary files a/icons/mob/vore/taurs_ch.dmi and b/icons/mob/vore/taurs_ch.dmi differ diff --git a/icons/mob/vore/taurs_vr_loaf.dmi b/icons/mob/vore/taurs_vr_loaf.dmi index a43460c515..aa283765f0 100644 Binary files a/icons/mob/vore/taurs_vr_loaf.dmi and b/icons/mob/vore/taurs_vr_loaf.dmi differ 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 82024f9507..78ecafdbb2 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 @@ -11,88 +11,6 @@ icon_state = "zorgoia_fat" extra_overlay = "zorgoia_fat_overlay" -/datum/sprite_accessory/tail/taur/ch/redpanda - name = "Red Panda (Taur)" - icon_state = "redpanda" - -/datum/sprite_accessory/tail/taur/ch/redpandadc - name = "Red Panda (Taur dual-color)" - icon_state = "redpanda_dc" - extra_overlay = "redpanda_dc_markings" - -/datum/sprite_accessory/tail/taur/ch/wolf/fatwolf_2c/fatwolfalt - name = "Fat Wolf 3-color-alt (Taur)" - icon_state = "fatwolfalt_s" - extra_overlay = "fatwolfalt_markings1" - extra_overlay2 = "fatwolfalt_markings2" - icon_sprite_tag = "wolf" - -/datum/sprite_accessory/tail/taur/ch/naga/alt - name = "Naga alt (Taur)" - icon_state = "naga_alt_s" - suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' - vore_tail_sprite_variant = "NagaAlt" - fullness_icons = 1 - - msg_owner_help_walk = "You carefully slither around %prey." - msg_prey_help_walk = "%owner's huge tail slithers past beside you!" - - msg_owner_help_run = "You carefully slither around %prey." - msg_prey_help_run = "%owner's huge tail slithers past beside you!" - - msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" - msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" - - msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" - msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" - - msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" - msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" - - msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" - msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" - - msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" - msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" - - msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" - msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" - - msg_prey_stepunder = "You jump over %prey's thick tail." - msg_owner_stepunder = "%owner bounds over your tail." - - -/datum/sprite_accessory/tail/taur/ch/naga/alt/second - name = "Naga dual-color alt (Taur)" - extra_overlay = "naga_alt_markings" - -/datum/sprite_accessory/tail/taur/ch/naga/synthnaga - name = "Synthetic Naga dual-color (Taur)" - icon_state = "synthnaga" - extra_overlay = "synthnaga_belly" - -/datum/sprite_accessory/tail/taur/ch/horse/scoli - name = "Scolipede (Taur)" - icon_state = "scoli_s" - extra_overlay = "scoli_markings1" - extra_overlay2 = "scoli_markings2" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties - name = "Sergal (Taur)" - icon_state = "sergwheat" - icon_sprite_tag = "wolf" - vore_tail_sprite_variant = "N" - fullness_icons = 3 - struggle_anim = TRUE - -/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties - name = "Fat Sergal (Taur)" - icon_state = "fatsergal" - icon_sprite_tag = "wolf" - vore_tail_sprite_variant = "N" - fullness_icons = 3 - struggle_anim = TRUE - /datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c name = "Sergal (Taur, dual-color)" icon_state = "sergwheat" @@ -111,12 +29,6 @@ fullness_icons = 3 struggle_anim = TRUE -/datum/sprite_accessory/tail/taur/ch/longvirus - name = "Long Virus (Taur)" - icon_state = "longvirus_s" - extra_overlay = "longvirus_markings" - icon_sprite_tag = "virus" - //suit_sprites = 'icons/mob/taursuits_noodle.dmi' Aye, I've gotta sprite that shit.ยด /datum/sprite_accessory/tail/taur/ch/fox name = "Fox (Taur, 3-color)" @@ -127,38 +39,6 @@ icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' loaf_offset = 4 -/datum/sprite_accessory/tail/taur/ch/sectdrone - name = "Sect Drone (Taur)" - icon_state = "sectdrone" - extra_overlay = "sectdrone_markings" - can_loaf = TRUE - icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi' - vore_tail_sprite_variant = "SectDrone" - belly_variant_when_loaf = TRUE - struggle_anim = TRUE - loaf_offset = 3 - fullness_icons = 3 - - msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" - msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" - - msg_owner_disarm_walk = "You firmly push your leg down on %prey, painfully but harmlessly pinning them to the ground!" - msg_prey_disarm_walk = "%owner firmly pushes their leg down on you, quite painfully but harmlessly pinning you to the ground!" - - msg_owner_harm_walk = "You methodically place your leg down upon %prey's body, slowly applying pressure, crushing them against the floor!" - msg_prey_harm_walk = "%owner methodically places their leg upon your body, slowly applying pressure, crushing you against the floor!" - - msg_owner_grab_success = "You pin %prey down on the ground with your front leg before using your other leg to pick them up, trapping them between two of your front legs!" - msg_prey_grab_success = "%owner pins you down on the ground with their front leg before using their other leg to pick you up, trapping you between two of their front legs!" - - msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" - msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" - -/datum/sprite_accessory/tail/taur/ch/fatsectdrone - name = "Fat Sect Drone (Taur)" - icon_state = "fatsectdrone" - extra_overlay = "fatsectdrone_markings" - /datum/sprite_accessory/tail/taur/ch/kitsune name = "Kitsune (Taur)" icon_state = "kitsune"