diff --git a/code/_helpers/vore.dm b/code/_helpers/vore.dm index 77d88ff0646..6ffce252f9d 100644 --- a/code/_helpers/vore.dm +++ b/code/_helpers/vore.dm @@ -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 diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 4097410d480..757e3cba951 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -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)