diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 268f3f3c66..431ec71589 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -508,6 +508,8 @@ I think I covered everything. /// My thanks to Raeschen for these descriptions /mob/living/simple_mob/vore/bigdragon/init_vore() + if(!voremob_loaded) //CHOMPEdit + return var/obj/belly/B = new /obj/belly/dragon/maw(src) B.affects_vore_sprites = FALSE //CHOMPEdit - Added so that the new system handles these not affecting the sprite. B.emote_lists[DM_HOLD] = list( diff --git a/code/modules/vore/eating/belly_obj_ch.dm b/code/modules/vore/eating/belly_obj_ch.dm index b475d67d49..bb2f956ba3 100644 --- a/code/modules/vore/eating/belly_obj_ch.dm +++ b/code/modules/vore/eating/belly_obj_ch.dm @@ -97,8 +97,18 @@ var/tail_extra_overlay2 = FALSE //var/marking_to_add = NULL //var/marking_color = NULL + var/special_entrance_sound // Mob specific custom entry sound set by mob's init_vore when applicable + var/slow_digestion = FALSE // Gradual corpse digestion + var/slow_brutal = FALSE // Gradual corpse digestion: Stumpy's Special + var/sound_volume = 100 // Volume knob. + var/speedy_mob_processing = FALSE // Independent belly processing to utilize mob Life() instead of subsystem for 3x speed. +/obj/belly/Initialize() + . = ..() + if(speedy_mob_processing) //Breaking free from subsystem. Can be implemented in mob's Life() proc for example (as seen in swoopie.dm) + STOP_PROCESSING(SSbellies, src) + /obj/belly/proc/GetFullnessFromBelly() if(!affects_vore_sprites) return 0 diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index a0f977d789..319da399e4 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -54,10 +54,6 @@ var/emote_active = TRUE // Are we even giving emotes out at all or not? var/next_emote = 0 // When we're supposed to print our next emote, as a world.time var/selective_preference = DM_DIGEST // Which type of selective bellymode do we default to? - var/special_entrance_sound // CHOMPEdit: Mob specific custom entry sound set by mob's init_vore when applicable - var/slow_digestion = FALSE // CHOMPEdit: Gradual corpse digestion - var/slow_brutal = FALSE // CHOMPEdit: Gradual corpse digestion: Stumpy's Special - var/sound_volume = 100 // CHOMPEdit: Volume knob. // Generally just used by AI var/autotransferchance = 0 // % Chance of prey being autotransferred to transfer location @@ -278,7 +274,8 @@ "autotransfer_max_amount", "slow_digestion", "slow_brutal", - "sound_volume", //CHOMP end of variables from CHOMP + "sound_volume", + "speedy_mob_processing", //CHOMP end of variables from CHOMP "egg_type", "save_digest_mode" ) diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index 7f11b715cc..06c2f1d391 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -31,7 +31,7 @@ return */ feed_grabbed_to_self(src,T) - update_icon() + //update_icon() CHOMPEdit //CHOMPedit: On-demand belly loading. /mob/living/simple_mob/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm index ea38ce4cf8..df76a573fb 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm @@ -97,3 +97,10 @@ // This from original living.dm update_transforms too handle_status_indicators() + +/mob/living/simple_mob/update_icon() + . = ..() + for(var/belly_class in vore_fullness_ex) + var/vs_fullness = vore_fullness_ex[belly_class] + if(vs_fullness > 0) + add_overlay("[icon_state]_[belly_class]-[vs_fullness]") diff --git a/modular_chomp/icons/mob/vore64x64_ch.dmi b/modular_chomp/icons/mob/vore64x64_ch.dmi index 3327715d4c..a78167ef50 100644 Binary files a/modular_chomp/icons/mob/vore64x64_ch.dmi and b/modular_chomp/icons/mob/vore64x64_ch.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 90330f2645..c46a838329 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4568,6 +4568,7 @@ #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\mechanical\mecha\gygax.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\bigdragon.dm" #include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\greatwolf.dm" +#include "modular_chomp\code\modules\mob\living\simple_mob\subtypes\vore\swoopie.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\living\simple_mob\subtypes\vore\shadekin\shadekin.dm"