cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some bad mobvore checks (#17528)

Browse Source
This commit is contained in:
Kashargul
2025-04-14 05:57:18 -04:00
committed by GitHub
parent 095f8c639d
commit 834571b0fe
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -400,7 +400,7 @@ emp_act
// I put more comments here for ease of reading.
if(isliving(AM))
var/mob/living/thrown_mob = AM
if(isanimal(thrown_mob) && !allowmobvore) //Is the thrown_mob an animal and we don't allow mobvore?
if(isanimal(thrown_mob) && !allowmobvore && !thrown_mob.ckey) //Is the thrown_mob an animal and we don't allow mobvore?
return
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
// PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY.
code/modules/mob/living/living_defense.dm
+2 -2
View File
@@ -330,9 +330,9 @@
if(isliving(AM))
var/mob/living/thrown_mob = AM
if(!allowmobvore && isanimal(thrown_mob)) //Does the person being hit not allow mob vore and the perrson being thrown a simple_mob?
if(!allowmobvore && isanimal(thrown_mob) && !thrown_mob.ckey) //Does the person being hit not allow mob vore and the perrson being thrown a simple_mob?
return
if(!thrown_mob.allowmobvore && isanimal(src)) //Does the person being thrown not allow mob vore and is the person being hit (us) a simple_mob?
if(!thrown_mob.allowmobvore && isanimal(src) && !ckey) //Does the person being thrown not allow mob vore and is the person being hit (us) a simple_mob?
return
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
code/modules/vore/eating/slipvore_vr.dm
+4
View File
@@ -10,6 +10,8 @@
return FALSE
if(is_incorporeal())
return FALSE
if(!target.allowmobvore && isanimal(src) && !ckey)
return FALSE
if(world.time <= target.slip_protect)
return FALSE
if(!(src.can_be_drop_pred && target.devourable && target.can_be_drop_prey)) //Make sure both of their prefs align with what we're gonna do.
@@ -27,6 +29,8 @@
return FALSE
if(is_incorporeal())
return FALSE
if(!allowmobvore && isanimal(target) && !target.ckey)
return FALSE
if(world.time <= target.slip_protect)
return FALSE
if(!(target.can_be_drop_pred && src.devourable && src.can_be_drop_prey)) //Make sure both of their prefs align with what we're gonna do.