diff --git a/modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm b/modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm index 16a43a434c..11eae0dc7b 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm @@ -7,3 +7,5 @@ vore_capacity_ex = list("stomach" = 3, "taur belly" = 3) vore_fullness_ex = list("stomach" = 0, "taur belly" = 0) vore_icon_bellies = list("stomach", "taur belly") + var/struggle_anim_stomach = FALSE + var/struggle_anim_taur = FALSE diff --git a/modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm b/modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm index eec809a3d6..15401de957 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm @@ -55,7 +55,7 @@ /mob/living/carbon/human/proc/get_vore_belly_image() if(!(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/vs_fullness = vore_fullness_ex["stomach"] - var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Bellies.dmi', icon_state = "[species.vore_belly_default_variant]Belly[vs_fullness] idle") + var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Bellies.dmi', icon_state = "[species.vore_belly_default_variant]Belly[vs_fullness][struggle_anim_stomach ? "" : " idle"]") vorebelly_s.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) var/image/working = image(vorebelly_s) working.overlays += em_block_image_generic(working) @@ -63,11 +63,12 @@ return null /mob/living/carbon/human/proc/vore_belly_animation() - if(!(wear_suit && wear_suit.flags_inv & HIDETAIL)) - var/vs_fullness = vore_fullness_ex["stomach"] - var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Bellies.dmi', icon_state = "[species.vore_belly_default_variant]Belly[vs_fullness]") - vorebelly_s.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - flick(vorebelly_s, overlays_standing[VORE_BELLY_LAYER]) + if(!struggle_anim_stomach) + struggle_anim_stomach = TRUE + update_vore_belly_sprite() + spawn(12) + struggle_anim_stomach = FALSE + update_vore_belly_sprite() /mob/living/carbon/human/proc/update_vore_tail_sprite() if(QDESTROYING(src)) @@ -85,7 +86,7 @@ /mob/living/carbon/human/proc/get_vore_tail_image() if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant) var/vs_fullness = vore_fullness_ex["taur belly"] - var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Taur_Bellies.dmi', icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[vs_fullness] idle") + var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Taur_Bellies.dmi', icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[vs_fullness][struggle_anim_taur ? "" : " idle"]") vorebelly_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) var/image/working = image(vorebelly_s) working.pixel_x = -16 @@ -95,8 +96,9 @@ return null /mob/living/carbon/human/proc/vore_tail_animation() - if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant) - var/vs_fullness = vore_fullness_ex["taur belly"] - var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Taur_Bellies.dmi', icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[vs_fullness]") - vorebelly_s.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - flick(vorebelly_s, overlays_standing[VORE_TAIL_LAYER]) + if(!struggle_anim_taur) + struggle_anim_taur = TRUE + update_vore_tail_sprite() + spawn(12) + struggle_anim_taur = FALSE + update_vore_tail_sprite() 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 new file mode 100644 index 0000000000..6ec0f1c341 --- /dev/null +++ b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -0,0 +1,6 @@ +/datum/sprite_accessory/tail/taur + var/vore_tail_sprite_variant = "" + + +/datum/sprite_accessory/tail/taur/wolf + vore_tail_sprite_variant = "N" diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur_vr.dm deleted file mode 100644 index 1e21cf50c0..0000000000 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ /dev/null @@ -1,2 +0,0 @@ -/datum/sprite_accessory/tail/taur - var/vore_tail_sprite_variant = "" \ No newline at end of file diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 38338f5f4b..e6ef6edd8b 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -841,6 +841,7 @@ const VoreSelectedBellyVisuals = (props, context) => { {affects_voresprite ? ( + {/* Once other options are added in: {(vore_sprite_flags.length && vore_sprite_flags.join(', ')) || 'None'}