mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-22 04:37:45 +01:00
[MIRROR] Fixes accidental vore ignoring prefs with simple mobs (#12214)
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
co-authored by
Guti
parent
2161930bd8
commit
b642ccc8b2
@@ -21,6 +21,8 @@
|
||||
return FALSE
|
||||
if(!prey.can_be_afk_prey && (!prey.client || prey.away_from_keyboard))
|
||||
return FALSE
|
||||
if(!prey.allowmobvore && isanimal(pred) && !pred.ckey || (!pred.allowmobvore && isanimal(prey) && !prey.ckey))
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
/// Basic spont vore check.
|
||||
@@ -77,10 +79,3 @@
|
||||
if(world.time <= prey.slip_protect)
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
/proc/can_animal_vore(mob/living/pred, mob/living/prey)
|
||||
if(!can_vore(pred, prey))
|
||||
return FALSE
|
||||
if(!prey.allowmobvore && isanimal(pred) && !pred.ckey || (!pred.allowmobvore && isanimal(prey) && !prey.ckey))
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
@@ -101,9 +101,6 @@
|
||||
if(!can_food_vore(eater, micro))
|
||||
continue
|
||||
|
||||
if(!can_animal_vore(eater, micro)) //If the one doing the eating is a simple mob controlled by AI, check mob vore prefs
|
||||
continue
|
||||
|
||||
var/do_nom = FALSE
|
||||
|
||||
if(!reagents.total_volume)
|
||||
|
||||
Reference in New Issue
Block a user