diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index c2f7d49ba8..ad191abc45 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -10,6 +10,7 @@ icon_state = "brain1" no_vore = TRUE //VOREStation Edit - PLEASE. lol. can_pain_emote = FALSE // CHOMPEdit: Sanity/safety + low_priority = TRUE //CHOMPEdit /mob/living/carbon/brain/Initialize() . = ..() diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 6efc9b4220..c891146cf1 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -74,6 +74,7 @@ if(!H.ckey) H.can_be_drop_prey = TRUE H.digest_leave_remains = 1 + H.low_priority = TRUE return ..()//CHOMPadd end /datum/species/monkey/tajaran diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm index 9ffbf209ef..8a805dba0d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm @@ -19,13 +19,15 @@ // Most humans leave a corpse var/corpse = null - + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/humanoid/death() ..() if(corpse) - new corpse (src.loc) + var/mob/new_corpse = new corpse(src.loc) //CHOMPEdit + if(istype(new_corpse)) //CHOMPEdit + new_corpse.low_priority = TRUE //CHOMPEdit qdel(src) return diff --git a/code/modules/vore/eating/belly_obj_ch.dm b/code/modules/vore/eating/belly_obj_ch.dm index a4cb81a621..6034152e8f 100644 --- a/code/modules/vore/eating/belly_obj_ch.dm +++ b/code/modules/vore/eating/belly_obj_ch.dm @@ -108,15 +108,9 @@ 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. + var/speedy_mob_processing = FALSE // Independent belly processing to utilize SSobj instead of SSbellies 3x speed. var/cycle_sloshed = FALSE // Has vorgan entrance made a wet slosh this cycle? Soundspam prevention for multiple items entered. - -/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 26193f1b65..c047cc7e09 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -304,15 +304,19 @@ if(isliving(loc)) owner = loc owner.vore_organs |= src - START_PROCESSING(SSbellies, src) - + if(speedy_mob_processing) //CHOMPEdit Start + START_PROCESSING(SSobj, src) + else + START_PROCESSING(SSbellies, src) create_reagents(300) //CHOMP So we can have some liquids in bellies flags |= NOREACT // We dont want bellies to start bubling nonstop due to people mixing when transfering and making different reagents - /obj/belly/Destroy() - STOP_PROCESSING(SSbellies, src) + if(speedy_mob_processing) + STOP_PROCESSING(SSobj, src) + else + STOP_PROCESSING(SSbellies, src) //CHOMPEdit End owner?.vore_organs?.Remove(src) owner = null return ..() diff --git a/modular_chomp/code/modules/mob/dead/observer/observer.dm b/modular_chomp/code/modules/mob/dead/observer/observer.dm index 7928b41556..5c9b519416 100644 --- a/modular_chomp/code/modules/mob/dead/observer/observer.dm +++ b/modular_chomp/code/modules/mob/dead/observer/observer.dm @@ -1,5 +1,6 @@ /mob/observer var/mob/living/body_backup = null //add reforming + low_priority = TRUE /mob/observer/Destroy() if(body_backup) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm index f499d252e8..78267e1962 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm @@ -38,14 +38,14 @@ B.belly_sprite_to_affect = "stomach" B.name = "Churno-Vac" B.desc = "With an abrupt loud WHUMP after a very sucky trip through the hungry bot's vacuum tube, you finally spill out into its waste container, where everything the bot slurps off the floors ends up for swift processing among the caustic sludge, efficiently melting everything down into a thin slurry to fuel its form. More loose dirt and debris occasionally raining in from above as the bot carries on with its duties to keep the station nice and clean." - B.digest_messages_prey = list("Under the heat and internal pressure of the greedy machine's gutworks, you can feel the tides of the hot caustic sludge claiming the last bits of space around your body, a few more squeezes of the synthetic muscles squelching and glurking as your body finally loses its form, completely blending down and merging into the tingly sludge to fuel the mean machine.") + B.digest_messages_prey = list("Under the heat and internal pressure of the greedy machine's gutworks, you can feel the tides of the hot caustic sludge claiming the last bits of space around your body, a few more squeezes of the synthetic muscles squelching and glurking as your body finally loses its form, completely blending down and merging into the tingly sludge to fuel the mean machine.") B.digest_mode = DM_DIGEST B.item_digest_mode = IM_DIGEST B.digest_burn = 3 B.fancy_vore = 1 B.vore_sound = "Stomach Move" - B.belly_fullscreen = "anim_belly" - B.belly_fullscreen_color = "#3e2f27" + B.belly_fullscreen = "VBO_trash" + B.belly_fullscreen_color = "#555B34" B.sound_volume = 25 B.count_items_for_sprite = TRUE @@ -94,6 +94,7 @@ B.desc = "SNAP! You have been sucked up into the big synthbird's beak, the powerful vacuum within the bird roaring somewhere beyond the abyssal deep gullet hungrily gaping before you, eagerly sucking you deeper inside towards a long bulgy ride down the bird's vacuum hose of a neck!" B.autotransferlocation = "vacuum hose" B.autotransfer_max_amount = 0 + B.autotransferwait = 60 vore_selected = B @@ -121,9 +122,6 @@ /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/Life() . =..() - for(var/obj/belly/L in vore_organs) //Speedrun that autotransfer at 2s ticks instead of 6s - if(L.speedy_mob_processing) - L.process() var/turf/T = get_turf(src) if(istype(T)) for(var/obj/O in T)