diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 3694acaf233..7ac301e8953 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -145,32 +145,25 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/matrix/M = matrix() var/anim_time = 3 - // VOREStation Edit Start: Porting Taur Loafing - if(tail_style?.can_loaf && resting) // Only call these if we're resting? - update_tail_showing() - return // No need to do the rest, we return early - /* // Commenting this out as sleeping is fucky - if(tail_style?.can_loaf && lying && sleeping) // If we're put under by anesthetic or fainting - update_tail_showing() - // return // No need to do the rest, we return early - */ - // VOREStation Edit End - //Due to some involuntary means, you're laying now if(lying && !resting && !sleeping) anim_time = 1 //Thud if(lying && !species.prone_icon) //Only rotate them if we're not drawing a specific icon for being prone. - var/randn = rand(1, 2) - if(randn <= 1) // randomly choose a rotation - M.Turn(-90) + if(tail_style?.can_loaf && resting) // Only call these if we're resting? + update_tail_showing() + M.Scale(desired_scale_x, desired_scale_y) else - M.Turn(90) - M.Scale(desired_scale_y, desired_scale_x)//VOREStation Edit - if(species.icon_height == 64)//VOREStation Edit - M.Translate(13,-22) - else - M.Translate(1,-6) + var/randn = rand(1, 2) + if(randn <= 1) // randomly choose a rotation + M.Turn(-90) + else + M.Turn(90) + if(species.icon_height == 64) + M.Translate(13,-22) + else + M.Translate(1,-6) + M.Scale(desired_scale_y, desired_scale_x) layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters else M.Scale(desired_scale_x, desired_scale_y)//VOREStation Edit @@ -1270,13 +1263,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() //If you have a custom tail selected if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL && !istaurtail(tail_style)) && !tail_hidden) - var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = (tail_style.can_loaf && resting) ? "[tail_style.icon_state]_loaf" : (wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state)) // VOREStation Edit: Taur Loafing + var/icon/tail_s = new/icon("icon" = (tail_style.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = (wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state)) //CHOMPEdit if(tail_style.can_loaf && !is_shifted) pixel_y = (resting) ? -tail_style.loaf_offset*size_multiplier : default_pixel_y //move player down, then taur up, to fit the overlays correctly // VOREStation Edit: Taur Loafing if(tail_style.do_colouration) tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) if(tail_style.extra_overlay) - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = (tail_style?.can_loaf && resting) ? "[tail_style.extra_overlay]_loaf" : tail_style.extra_overlay) // VOREStation Edit: Taur Loafing + var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay) //CHOMPEdit if(wagging && tail_style.ani_state) overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay_w) overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) @@ -1288,7 +1281,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() qdel(overlay) if(tail_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2) + var/icon/overlay = new/icon("icon" = (tail_style?.can_loaf && resting) ? tail_style.icon_loaf : tail_style.icon, "icon_state" = tail_style.extra_overlay2) //CHOMPEdit if(wagging && tail_style.ani_state) overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2_w) overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) @@ -1306,7 +1299,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(istaurtail(tail_style)) var/datum/sprite_accessory/tail/taur/taurtype = tail_style working.pixel_x = -16 - working.pixel_y = (tail_style.can_loaf && resting) ? tail_style.loaf_offset : 0 // VOREStation Edit: Taur Loafing if(taurtype.can_ride && !riding_datum) riding_datum = new /datum/riding/taur(src) verbs |= /mob/living/carbon/human/proc/taur_mount diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index ab16df28d17..44aa7538a0a 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -12,6 +12,7 @@ species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_ALTEVIAN) //This lets all races use var/list/lower_layer_dirs = list(SOUTH) + var/icon_loaf = null /datum/sprite_accessory/tail/New() . = ..() diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 6f46487b4dc..2a290f488dd 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -56,11 +56,15 @@ under_sprites = 'icons/mob/taursuits_wolf_vr.dmi' suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' icon_sprite_tag = "wolf" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 4 /datum/sprite_accessory/tail/taur/wolf/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" //icon_sprite_tag = "wolf" //This could be modified later. + loaf_offset = 3 /datum/sprite_accessory/tail/taur/wolf/wolf_wag name = "Wolf (Taur, Fat vwag)" @@ -76,19 +80,22 @@ /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" + icon = 'icons/mob/vore/taurs_ch.dmi' //CHOMPEdit icon_state = "fatwolf_s" extra_overlay = "fatwolf_markings" - extra_overlay2 = "wolf_markings_2" + extra_overlay2 = "fatwolf_markings_2" //CHOMPEdit //icon_sprite_tag = "fatwolf2c" + 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' //CHOMPEdit icon_state = "wolf_s" extra_overlay = "wolf_markings" extra_overlay2 = "wolf_markings_2" ani_state = "fatwolf_s" extra_overlay_w = "fatwolf_markings" - extra_overlay2_w = "wolf_markings_2" + extra_overlay2_w = "fatwolf_markings_2" //CHOMPEdit /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" @@ -96,12 +103,14 @@ extra_overlay = "synthwolf_markings" extra_overlay2 = "synthwolf_glow" //icon_sprite_tag = "synthwolf" + loaf_offset = 3 /datum/sprite_accessory/tail/taur/wolf/fatsynthwolf name = "Fat SynthWolf dual-color (Taur)" icon_state = "fatsynthwolf_s" extra_overlay = "fatsynthwolf_markings" extra_overlay2 = "fatsynthwolf_glow" + loaf_offset = 3 /datum/sprite_accessory/tail/taur/wolf/fatsynthwolf_wag name = "SynthWolf dual-color (Taur, Fat vwag)" @@ -118,6 +127,9 @@ extra_overlay = "skunk_markings" extra_overlay2 = "skunk_markings_2" icon_sprite_tag = "skunk" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" @@ -192,6 +204,9 @@ under_sprites = 'icons/mob/taursuits_horse_vr.dmi' suit_sprites = 'icons/mob/taursuits_horse_vr.dmi' icon_sprite_tag = "horse" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 4 msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -214,12 +229,18 @@ extra_overlay = "synthhorse_markings" extra_overlay2 = "synthhorse_glow" //icon_sprite_tag = "synthhorse" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/cow name = "Cow (Taur)" icon_state = "cow_s" suit_sprites = 'icons/mob/taursuits_cow_vr.dmi' icon_sprite_tag = "cow" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -242,6 +263,9 @@ extra_overlay = "deer_markings" suit_sprites = 'icons/mob/taursuits_deer_vr.dmi' icon_sprite_tag = "deer" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 6 msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -261,12 +285,19 @@ /datum/sprite_accessory/tail/taur/lizard name = "Lizard (Taur)" icon_state = "lizard_s" - suit_sprites = 'icons/mob/taursuits_lizard_vr.dmi' +// suit_sprites = 'icons/mob/taursuits_lizard_vr.dmi' ///Chomp edit + suit_sprites = 'icons/mob/taursuits_lizard_ch.dmi' icon_sprite_tag = "lizard" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 5 /datum/sprite_accessory/tail/taur/lizard/fatlizard name = "Fat Lizard (Taur)" icon_state = "fatlizard_s" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/lizard_wag name = "Lizard (Taur, Fat vwag)" @@ -278,11 +309,17 @@ icon_state = "lizard_s" extra_overlay = "lizard_markings" //icon_sprite_tag = "lizard2c" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 5 /datum/sprite_accessory/tail/taur/lizard/fatlizard_2c name = "Fat Lizard (Taur, dual-color)" icon_state = "fatlizard_s" extra_overlay = "fatlizard_markings" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/lizard_2c_wag name = "Fat Lizard (Taur, dual-color, Fat vwag)" @@ -297,12 +334,18 @@ extra_overlay = "synthlizard_markings" extra_overlay2 = "synthlizard_glow" //icon_sprite_tag = "synthlizard" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/fatsynthlizard name = "Fat SynthLizard dual-color (Taur)" icon_state = "fatsynthlizard_s" extra_overlay = "fatsynthlizard_markings" extra_overlay2 = "fatsynthlizard_glow" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/lizard/synthlizard_wag name = "SynthLizard dual-color (Taur, Fat vwag)" @@ -366,16 +409,25 @@ icon_state = "feline_s" suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' icon_sprite_tag = "feline" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 5 /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" //icon_sprite_tag = "fatfeline" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/fatfeline_wag name = "Fat Feline (Taur, Fat vwag)" icon_state = "fatfeline_s" ani_state = "fatfeline_w" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/feline_2c name = "Feline 3-color (Taur)" @@ -383,22 +435,30 @@ extra_overlay = "feline_markings" extra_overlay2 = "feline_markings_2" //icon_sprite_tag = "feline2c" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline 3-color (Taur)" + icon = 'icons/mob/vore/taurs_ch.dmi' //CHOMPEdit icon_state = "fatfeline_s" extra_overlay = "fatfeline_markings" - extra_overlay2 = "feline_markings_2" + extra_overlay2 = "fatfeline_markings_2" //CHOMPEdit //icon_sprite_tag = "fatfeline2c" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_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' //CHOMPEdit icon_state = "feline_s" extra_overlay = "feline_markings" extra_overlay2 = "feline_markings_2" ani_state = "fatfeline_s" extra_overlay_w = "fatfeline_markings" - extra_overlay2_w = "feline_markings_2" + extra_overlay2_w = "fatfeline_markings_2" //CHOMPEdit + loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/synthfeline name = "SynthFeline dual-color (Taur)" @@ -406,12 +466,18 @@ extra_overlay = "synthfeline_markings" extra_overlay2 = "synthfeline_glow" //icon_sprite_tag = "synthfeline" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/fatsynthfeline name = "Fat SynthFeline dual-color (Taur)" icon_state = "fatsynthfeline_s" extra_overlay = "fatsynthfeline_markings" extra_overlay2 = "fatsynthfeline_glow" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 3 /datum/sprite_accessory/tail/taur/feline/synthfeline_wag name = "SynthFeline dual-color (Taur, Fat vwag)" @@ -491,16 +557,20 @@ name = "Drake (Taur)" icon_state = "drake_s" extra_overlay = "drake_markings" - suit_sprites = 'icons/mob/taursuits_drake_vr.dmi' +/// suit_sprites = 'icons/mob/taursuits_drake_vr.dmi' ///Chomp edit + suit_sprites = 'icons/mob/taursuits_drake_ch.dmi' icon_sprite_tag = "drake" - can_loaf = TRUE // VOREStation Edit: Taur Loafing - loaf_offset = 6 // VOREStation Edit: Taur Loafing + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 6 /datum/sprite_accessory/tail/taur/drake/fat name = "Fat Drake (Taur)" icon_state = "fatdrake_s" extra_overlay = "fatdrake_markings" - can_loaf = FALSE + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 6 /datum/sprite_accessory/tail/taur/drake/drake_vwag name = "Drake (Taur, Fat vwag)" @@ -508,8 +578,7 @@ extra_overlay = "drake_markings" ani_state = "fatdrake_s" extra_overlay_w = "fatdrake_markings" - can_loaf = FALSE - + can_loaf = TRUE /datum/sprite_accessory/tail/taur/otie name = "Otie (Taur)" @@ -518,6 +587,9 @@ extra_overlay2 = "otie_markings_2" suit_sprites = 'icons/mob/taursuits_otie_vr.dmi' icon_sprite_tag = "otie" + can_loaf = TRUE + icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi' + loaf_offset = 5 /datum/sprite_accessory/tail/taur/alraune/alraune_2c name = "Alraune (dual color)" @@ -624,12 +696,14 @@ name = "Feline (wickedtemp) (Taur)" icon_state = "tempest_s" ckeys_allowed = list("wickedtemp") + can_loaf = FALSE //silencedmp5a5: Serdykov Antoz /datum/sprite_accessory/tail/taur/wolf/serdy name = "CyberSerdy (silencedmp5a5) (Taur)" icon_state = "serdy_s" ckeys_allowed = list("silencedmp5a5") + can_loaf = FALSE //liquidfirefly: Ariana Scol /datum/sprite_accessory/tail/taur/centipede @@ -700,7 +774,7 @@ suit_sprites = 'icons/mob/taursuits_noodle_vr.dmi' clip_mask_state = "taur_clip_mask_noodle" icon_sprite_tag = "noodle" - +/* CHOMPEdit - removed as a sprite accessory of the same name already exists for us, and having this here stops it from registering as a sprite accessory. /datum/sprite_accessory/tail/taur/sect_drone name = "Sect Drone (Taur)" icon_state = "sect_drone" @@ -721,11 +795,12 @@ 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/sect_drone/fat name = "Fat Sect Drone (Taur)" icon_state = "fat_sect_drone" extra_overlay = "fat_sect_drone_markings" + icon_sprite_tag = "sect_drone" //CHOMPEdit addition /datum/sprite_accessory/tail/taur/sect_drone/drone_wag name = "Sect Drone (Taur, Fat vwag)" @@ -733,6 +808,7 @@ extra_overlay = "sect_drone_markings" ani_state = "fat_sect_drone" extra_overlay_w = "fat_sect_drone_markings" + icon_sprite_tag = "sect_drone" //CHOMPEdit addition /datum/sprite_accessory/tail/taur/giantspider_colorable//these are honestly better fit for vass icontypes whoops name = "Giant Spider dual-color (Taur)" diff --git a/icons/mob/taursuits_drake_ch.dmi b/icons/mob/taursuits_drake_ch.dmi new file mode 100644 index 00000000000..e4271405714 Binary files /dev/null and b/icons/mob/taursuits_drake_ch.dmi differ diff --git a/icons/mob/taursuits_lizard_ch.dmi b/icons/mob/taursuits_lizard_ch.dmi new file mode 100644 index 00000000000..f4385ef1130 Binary files /dev/null and b/icons/mob/taursuits_lizard_ch.dmi differ diff --git a/icons/mob/vore/taurs_ch.dmi b/icons/mob/vore/taurs_ch.dmi new file mode 100644 index 00000000000..9320c96d40f Binary files /dev/null and b/icons/mob/vore/taurs_ch.dmi differ diff --git a/icons/mob/vore/taurs_ch_loaf.dmi b/icons/mob/vore/taurs_ch_loaf.dmi new file mode 100644 index 00000000000..2b4c0acbdc5 Binary files /dev/null and b/icons/mob/vore/taurs_ch_loaf.dmi differ diff --git a/icons/mob/vore/taurs_vr_loaf.dmi b/icons/mob/vore/taurs_vr_loaf.dmi new file mode 100644 index 00000000000..835225049db Binary files /dev/null and b/icons/mob/vore/taurs_vr_loaf.dmi differ