diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm index 60006f4121..bb27160807 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -36,6 +36,8 @@ /mob/living/simple_animal/Destroy() for(var/I in vore_organs) var/datum/belly/B = vore_organs[I] + for(var/mob/living/M in B.internal_contents) // because release_all_contents doesn't release absorbed things + M.absorbed = 0 B.release_all_contents() // When your stomach is empty prey_excludes.Cut() . = ..() @@ -127,6 +129,8 @@ /mob/living/simple_animal/death() for(var/I in vore_organs) var/datum/belly/B = vore_organs[I] + for(var/mob/living/M in B.internal_contents) // because release_all_contents doesn't release absorbed things + M.absorbed = 0 B.release_all_contents() // When your stomach is empty ..() // then you have my permission to die. diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm index 5d36943a6a..9e35646eb5 100644 --- a/code/modules/vore/eating/belly_vr.dm +++ b/code/modules/vore/eating/belly_vr.dm @@ -454,11 +454,11 @@ playsound(R.loc, strsound, 50, 1) if(escapable) //If the stomach has escapable enabled. - R << "You attempt to climb out of \the [name]." - owner << "Someone is attempting to climb out of your [name]!" if(prob(escapechance)) //Let's have it check to see if the prey escapes first. + R << "You start to climb out of \the [name]." + owner << "Someone is attempting to climb out of your [name]!" if(do_after(R, escapetime)) - if((escapable) && (R in internal_contents)) //Does the owner still have escapable enabled? + if((escapable) && (R in internal_contents) && !R.absorbed) //Does the owner still have escapable enabled? release_specific_contents(R) R << "You climb out of \the [name]." owner << "[R] climbs out of your [name]!" @@ -467,10 +467,10 @@ return else if(!(R in internal_contents)) //Aren't even in the belly. Quietly fail. return - else //Belly became inescapable. - R << "Your attempt to escape [name] has failed!" - owner << "The attempt to escape from your [name] has failed!" - return + else //Belly became inescapable. + R << "Your attempt to escape [name] has failed!" + owner << "The attempt to escape from your [name] has failed!" + return else if(prob(transferchance) && istype(transferlocation)) //Next, let's have it see if they end up getting into an even bigger mess then when they started. var/location_found = 0 @@ -499,20 +499,20 @@ transfer_contents(R, transferlocation) return - else if(prob(absorbchance)) //After that, let's have it run the absorb chance. - R << "In response to your struggling, \the [name] begins to get more active..." - owner << "You feel your [name] beginning to become active!" + else if(prob(absorbchance) && digest_mode != DM_ABSORB) //After that, let's have it run the absorb chance. + R << "In response to your struggling, \the [name] begins to cling more tightly..." + owner << "You feel your [name] start to cling onto its contents..." digest_mode = DM_ABSORB return - else if(prob(digestchance)) //Finally, let's see if it should run the digest chance. + else if(prob(digestchance) && digest_mode != DM_DIGEST) //Finally, let's see if it should run the digest chance. R << "In response to your struggling, \the [name] begins to get more active..." owner << "You feel your [name] beginning to become active!" digest_mode = DM_DIGEST return else //Nothing interesting happened. - R << "But make no progress in escaping [owner]'s [name]." - owner << "But appears to be unable to make any progress in escaping your [name]." + R << "You make no progress in escaping [owner]'s [name]." + owner << "Your prey appears to be unable to make any progress in escaping your [name]." return //Transfers contents from one belly to another