cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move stuff to modular_chomp, and add struggle animation

Browse Source
This commit is contained in:
TheGreatKitsune
2022-06-21 10:24:38 -05:00
parent 63c9549ab7
commit 30c79dc929
11 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/vore/eating/belly_obj_vr.dm
View File

@@ -944,6 +944,11 @@
var/sound/struggle_snuggle var/sound/struggle_snuggle
var/sound/struggle_rustle = sound(get_sfx("rustle")) var/sound/struggle_rustle = sound(get_sfx("rustle"))
//CHOMPEdit Start - vore sprites struggle animation
if((vore_sprite_flags & DM_FLAG_VORESPRITE_BELLY) && (owner.vore_capacity_ex[belly_sprite_to_affect] >= 1))
owner.vs_animate(belly_sprite_to_affect)
//CHOMPEdit End
if(is_wet) if(is_wet)
if(!fancy_vore) if(!fancy_vore)
struggle_snuggle = sound(get_sfx("classic_struggle_sounds")) struggle_snuggle = sound(get_sfx("classic_struggle_sounds"))

10
code/modules/mob/living/carbon/human/human_ch.dm → modular_chomp/code/modules/mob/living/carbon/human/human.dm
View File

@@ -7,4 +7,12 @@
if(vore_fullness_ex["stomach"] != previous_stomach_fullness) if(vore_fullness_ex["stomach"] != previous_stomach_fullness)
update_vore_belly_sprite() update_vore_belly_sprite()
if(vore_fullness_ex["taur belly"] != previous_taur_fullness) if(vore_fullness_ex["taur belly"] != previous_taur_fullness)
update_vore_tail_sprite() update_vore_tail_sprite()
/mob/living/carbon/human/vs_animate(var/belly_to_animate)
if(belly_to_animate == "stomach")
vore_belly_animation()
else if(belly_to_animate == "taur belly")
vore_tail_animation()
else
return

0
code/modules/mob/living/carbon/human/human_defines_ch.dm → modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm
View File

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

@@ -1,3 +1,3 @@
/datum/species /datum/species
var/crit_mod = 1 var/crit_mod = 1
var/vore_belly_default_variant = "h" var/vore_belly_default_variant = "H"

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

@@ -1,2 +1,2 @@
/datum/species/unathi /datum/species/unathi
vore_belly_default_variant = "l" vore_belly_default_variant = "L"

2
modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
View File

@@ -1,2 +1,2 @@
/datum/species/teshari /datum/species/teshari
vore_belly_default_variant = "t" vore_belly_default_variant = "T"

0
code/modules/mob/living/carbon/human/update_icons_ch.dm → modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm
View File

2
modular_chomp/code/modules/mob/living/living.dm Normal file
View File

@@ -0,0 +1,2 @@
/mob/living/proc/vs_animate(var/belly_to_animate)
return

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

@@ -750,65 +750,63 @@ const VoreSelectedBellyVisuals = (props, context) => {
<Fragment> <Fragment>
<Section title="Vore Sprites"> <Section title="Vore Sprites">
<Flex direction="row"> <Flex direction="row">
<Flex.Item basis="49%" grow={1}> <LabeledList>
<LabeledList> <LabeledList.Item label="Affect Vore Sprites">
<LabeledList.Item label="Affect Vore Sprites"> <Button
<Button onClick={() => act("set_attribute", { attribute: "b_affects_vore_sprites" })}
onClick={() => act("set_attribute", { attribute: "b_affects_vore_sprites" })} icon={affects_voresprite ? "toggle-on" : "toggle-off"}
icon={affects_voresprite ? "toggle-on" : "toggle-off"} selected={affects_voresprite}
selected={affects_voresprite} content={affects_voresprite ? "Yes" : "No"}
content={affects_voresprite ? "Yes" : "No"} />
/> </LabeledList.Item>
</LabeledList.Item> {affects_voresprite ? (
{affects_voresprite ? ( <span>
<span> <LabeledList.Item label="Vore Sprite Mode">
<LabeledList.Item label="Vore Sprite Mode"> {vore_sprite_flags.length && vore_sprite_flags.join(", ") || "None"}
{vore_sprite_flags.length && vore_sprite_flags.join(", ") || "None"} <Button
onClick={() => act("set_attribute", { attribute: "b_vore_sprite_flags" })}
ml={1}
icon="plus" />
</LabeledList.Item>
<LabeledList.Item label="Count Absorbed prey for vore sprites">
<Button
onClick={() => act("set_attribute", { attribute: "b_count_absorbed_prey_for_sprites" })}
icon={absorbed_voresprite ? "toggle-on" : "toggle-off"}
selected={absorbed_voresprite}
content={absorbed_voresprite ? "Yes" : "No"}
/>
</LabeledList.Item>
<LabeledList.Item label="Animation when prey resist">
<Button
onClick={() => act("set_attribute", { attribute: "b_resist_animation" })}
icon={resist_animation ? "toggle-on" : "toggle-off"}
selected={resist_animation}
content={resist_animation ? "Yes" : "No"}
/>
</LabeledList.Item>
<LabeledList.Item label="Vore Sprite Size Factor">
<Button
onClick={() => act("set_attribute", { attribute: "b_size_factor_sprites" })}
content={voresprite_size_factor} />
</LabeledList.Item>
{belly_sprite_option_shown ? (
<LabeledList.Item label="Belly Sprite to affect">
<Button <Button
onClick={() => act("set_attribute", { attribute: "b_vore_sprite_flags" })} onClick={() => act("set_attribute", { attribute: "b_belly_sprite_to_affect" })}
ml={1} content={belly_sprite_to_affect} />
icon="plus" />
</LabeledList.Item> </LabeledList.Item>
<LabeledList.Item label="Count Absorbed prey for vore sprites"> ) : ""}
{tail_option_shown && vore_sprite_flags.includes("Tail adjustment") ? (
<LabeledList.Item label="Tail to change to">
<Button <Button
onClick={() => act("set_attribute", { attribute: "b_count_absorbed_prey_for_sprites" })} onClick={() => act("set_attribute", { attribute: "b_tail_to_change_to" })}
icon={absorbed_voresprite ? "toggle-on" : "toggle-off"} content={tail_to_change_to}
selected={absorbed_voresprite}
content={absorbed_voresprite ? "Yes" : "No"}
/> />
</LabeledList.Item> </LabeledList.Item>
<LabeledList.Item label="Animation when prey resist"> ) : ""}
<Button </span>
onClick={() => act("set_attribute", { attribute: "b_resist_animation" })} ) : ""}
icon={resist_animation ? "toggle-on" : "toggle-off"} </LabeledList>
selected={resist_animation}
content={resist_animation ? "Yes" : "No"}
/>
</LabeledList.Item>
<LabeledList.Item label="Vore Sprite Size Factor">
<Button
onClick={() => act("set_attribute", { attribute: "b_size_factor_sprites" })}
content={voresprite_size_factor} />
</LabeledList.Item>
{belly_sprite_option_shown ? (
<LabeledList.Item label="Belly Sprite to affect">
<Button
onClick={() => act("set_attribute", { attribute: "b_belly_sprite_to_affect" })}
content={belly_sprite_to_affect} />
</LabeledList.Item>
) : ""}
{tail_option_shown && vore_sprite_flags.includes("Tail adjustment") ? (
<LabeledList.Item label="Tail to change to">
<Button
onClick={() => act("set_attribute", { attribute: "b_tail_to_change_to" })}
content={tail_to_change_to}
/>
</LabeledList.Item>
) : ""}
</span>
) : ""}
</LabeledList>
</Flex.Item>
</Flex> </Flex>
</Section> </Section>
<Section title="Belly Fullscreens Preview and Coloring"> <Section title="Belly Fullscreens Preview and Coloring">

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

File diff suppressed because one or more lines are too long

7
vorestation.dme
View File

@@ -2964,11 +2964,9 @@
#include "code\modules\mob\living\carbon\human\gradient.dm" #include "code\modules\mob\living\carbon\human\gradient.dm"
#include "code\modules\mob\living\carbon\human\human.dm" #include "code\modules\mob\living\carbon\human\human.dm"
#include "code\modules\mob\living\carbon\human\human_attackhand.dm" #include "code\modules\mob\living\carbon\human\human_attackhand.dm"
#include "code\modules\mob\living\carbon\human\human_ch.dm"
#include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_damage.dm"
#include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm"
#include "code\modules\mob\living\carbon\human\human_defines.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm"
#include "code\modules\mob\living\carbon\human\human_defines_ch.dm"
#include "code\modules\mob\living\carbon\human\human_defines_vr.dm" #include "code\modules\mob\living\carbon\human\human_defines_vr.dm"
#include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm"
#include "code\modules\mob\living\carbon\human\human_helpers_vr.dm" #include "code\modules\mob\living\carbon\human\human_helpers_vr.dm"
@@ -2995,7 +2993,6 @@
#include "code\modules\mob\living\carbon\human\stripping.dm" #include "code\modules\mob\living\carbon\human\stripping.dm"
#include "code\modules\mob\living\carbon\human\unarmed_attack.dm" #include "code\modules\mob\living\carbon\human\unarmed_attack.dm"
#include "code\modules\mob\living\carbon\human\update_icons.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm"
#include "code\modules\mob\living\carbon\human\update_icons_ch.dm"
#include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled.dm" #include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled.dm"
#include "code\modules\mob\living\carbon\human\descriptors\_descriptors.dm" #include "code\modules\mob\living\carbon\human\descriptors\_descriptors.dm"
#include "code\modules\mob\living\carbon\human\descriptors\descriptors_generic.dm" #include "code\modules\mob\living\carbon\human\descriptors\descriptors_generic.dm"
@@ -4483,6 +4480,10 @@
#include "modular_chomp\code\modules\admin\functions\modify_traits.dm" #include "modular_chomp\code\modules\admin\functions\modify_traits.dm"
#include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm"
#include "modular_chomp\code\modules\mob\holder.dm" #include "modular_chomp\code\modules\mob\holder.dm"
#include "modular_chomp\code\modules\mob\living\living.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\human.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\human_defines.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\update_icons.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station.dm"
#include "modular_chomp\code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\teshari.dm"