cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix resist animation, hide a currently unused option

Browse Source
This commit is contained in:
TheGreatKitsune
2022-07-09 14:30:19 -05:00
parent 79e3f9d0f5
commit 6c8bc4f8f4
7 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -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

26
modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -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()

6
modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm Normal file
View File

@@ -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"

2
modular_chomp/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
View File

@@ -1,2 +0,0 @@
/datum/sprite_accessory/tail/taur
var/vore_tail_sprite_variant = ""

3
tgui/packages/tgui/interfaces/VorePanel.js
View File

@@ -841,6 +841,7 @@ const VoreSelectedBellyVisuals = (props, context) => {
</LabeledList.Item>
{affects_voresprite ? (
<span>
{/* Once other options are added in:
<LabeledList.Item label="Vore Sprite Mode">
{(vore_sprite_flags.length && vore_sprite_flags.join(', ')) || 'None'}
<Button
@@ -848,7 +849,7 @@ const VoreSelectedBellyVisuals = (props, context) => {
ml={1}
icon="plus"
/>
</LabeledList.Item>
</LabeledList.Item>*/}
<LabeledList.Item label="Count Absorbed prey for vore sprites">
<Button
onClick={() => act('set_attribute', { attribute: 'b_count_absorbed_prey_for_sprites' })}

2
tgui/public/tgui.bundle.js
View File

File diff suppressed because one or more lines are too long

2
vorestation.dme
View File

@@ -4510,7 +4510,7 @@
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\vore.dm"
#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\wolf.dm"
#include "modular_chomp\code\modules\mob\new_player\sprite_accessories_taur_vr.dm"
#include "modular_chomp\code\modules\mob\new_player\sprite_accessories_taur.dm"
#include "modular_chomp\code\modules\power\cells\device_cells.dm"
#include "modular_chomp\code\modules\power\cells\esoteric_cells.dm"
#include "modular_chomp\code\modules\power\cells\power_cells.dm"