mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Move stuff to modular_chomp, and add struggle animation
This commit is contained in:
@@ -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"))
|
||||||
|
|||||||
@@ -8,3 +8,11 @@
|
|||||||
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
|
||||||
@@ -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"
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
/datum/species/unathi
|
/datum/species/unathi
|
||||||
vore_belly_default_variant = "l"
|
vore_belly_default_variant = "L"
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
/datum/species/teshari
|
/datum/species/teshari
|
||||||
vore_belly_default_variant = "t"
|
vore_belly_default_variant = "T"
|
||||||
2
modular_chomp/code/modules/mob/living/living.dm
Normal file
2
modular_chomp/code/modules/mob/living/living.dm
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
/mob/living/proc/vs_animate(var/belly_to_animate)
|
||||||
|
return
|
||||||
@@ -750,7 +750,6 @@ 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
|
||||||
@@ -808,7 +807,6 @@ const VoreSelectedBellyVisuals = (props, context) => {
|
|||||||
</span>
|
</span>
|
||||||
) : ""}
|
) : ""}
|
||||||
</LabeledList>
|
</LabeledList>
|
||||||
</Flex.Item>
|
|
||||||
</Flex>
|
</Flex>
|
||||||
</Section>
|
</Section>
|
||||||
<Section title="Belly Fullscreens Preview and Coloring">
|
<Section title="Belly Fullscreens Preview and Coloring">
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -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"
|
||||||
|
|||||||
Reference in New Issue
Block a user