cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 21:16:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes some bugs in absorption and struggling

Browse Source
This commit is contained in:
Screemonster
2018-01-04 23:49:06 +00:00
parent bbc84ccce9
commit a0b02b57c1
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/simple_animal_vr.dm
+4
View File
@@ -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.
code/modules/vore/eating/belly_vr.dm
+13 -13
View File
@@ -454,11 +454,11 @@
playsound(R.loc, strsound, 50, 1)
if(escapable) //If the stomach has escapable enabled.
R << "<span class='warning'>You attempt to climb out of \the [name].</span>"
owner << "<span class='warning'>Someone is attempting to climb out of your [name]!</span>"
if(prob(escapechance)) //Let's have it check to see if the prey escapes first.
R << "<span class='warning'>You start to climb out of \the [name].</span>"
owner << "<span class='warning'>Someone is attempting to climb out of your [name]!</span>"
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 << "<span class='warning'>You climb out of \the [name].</span>"
owner << "<span class='warning'>[R] climbs out of your [name]!</span>"
@@ -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 << "<span class='warning'>Your attempt to escape [name] has failed!</span>"
owner << "<span class='notice'>The attempt to escape from your [name] has failed!</span>"
return
else //Belly became inescapable.
R << "<span class='warning'>Your attempt to escape [name] has failed!</span>"
owner << "<span class='notice'>The attempt to escape from your [name] has failed!</span>"
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 << "<span class='warning'>In response to your struggling, \the [name] begins to get more active...</span>"
owner << "<span class='warning'>You feel your [name] beginning to become active!</span>"
else if(prob(absorbchance) && digest_mode != DM_ABSORB) //After that, let's have it run the absorb chance.
R << "<span class='warning'>In response to your struggling, \the [name] begins to cling more tightly...</span>"
owner << "<span class='warning'>You feel your [name] start to cling onto its contents...</span>"
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 << "<span class='warning'>In response to your struggling, \the [name] begins to get more active...</span>"
owner << "<span class='warning'>You feel your [name] beginning to become active!</span>"
digest_mode = DM_DIGEST
return
else //Nothing interesting happened.
R << "<span class='warning'>But make no progress in escaping [owner]'s [name].</span>"
owner << "<span class='warning'>But appears to be unable to make any progress in escaping your [name].</span>"
R << "<span class='warning'>You make no progress in escaping [owner]'s [name].</span>"
owner << "<span class='warning'>Your prey appears to be unable to make any progress in escaping your [name].</span>"
return
//Transfers contents from one belly to another