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

Vore preference helpers (#18656)

Browse Source 
* Procs

* Pref checks

* Snack eat changes

* Fix
This commit is contained in:
Guti
2025-10-30 23:26:10 -04:00
committed by GitHub
parent fb73d362a0
commit aa14f1fbcc
18 changed files with 140 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/drinks.dm
+13 -17
View File
@@ -91,26 +91,22 @@
user = M
if(food_inserted_micros && food_inserted_micros.len)
if(M.can_be_drop_pred && M.food_vore && M.vore_selected)
for(var/mob/living/F in food_inserted_micros)
if(!F.can_be_drop_prey || !F.food_vore)
continue
for(var/mob/living/F in food_inserted_micros)
var/do_nom = FALSE
if(!reagents.total_volume)
do_nom = TRUE
else
var/nom_chance = (1 - (reagents.total_volume / volume))*100
if(prob(nom_chance))
do_nom = TRUE
if(do_nom)
if(!CanFoodVore(M, F))
continue
if(isanimal(M) && !F.allowmobvore && !M.ckey) //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)
do_nom = TRUE
else
var/nom_chance = (1 - (reagents.total_volume / volume))*100
if(prob(nom_chance))
do_nom = TRUE
if(do_nom)
F.forceMove(M.vore_selected)
food_inserted_micros -= F
F.forceMove(M.vore_selected)
food_inserted_micros -= F
if(!reagents.total_volume && changed)
M.visible_message(span_notice("[M] finishes drinking from \the [src]."),span_notice("You finish drinking from \the [src]."))
code/modules/food/food/snacks.dm
+12 -14
View File
@@ -59,23 +59,21 @@
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/M)
if(food_inserted_micros && food_inserted_micros.len)
if(M.can_be_drop_pred && M.food_vore && M.vore_selected)
for(var/mob/living/F in food_inserted_micros)
if(!F.can_be_drop_prey || !F.food_vore)
continue
for(var/mob/living/F in food_inserted_micros)
var/do_nom = FALSE
var/do_nom = FALSE
if(!reagents.total_volume)
if(!reagents.total_volume)
do_nom = TRUE
else
var/nom_chance = (bitecount/(bitecount + (bitesize / reagents.total_volume) + 1))*100
if(prob(nom_chance))
do_nom = TRUE
else
var/nom_chance = (bitecount/(bitecount + (bitesize / reagents.total_volume) + 1))*100
if(prob(nom_chance))
do_nom = TRUE
if(do_nom)
F.forceMove(M.vore_selected)
food_inserted_micros -= F
if(do_nom)
if(!CanFoodVore(M, F))
continue
F.forceMove(M.vore_selected)
food_inserted_micros -= F
if(!reagents.total_volume)
M.balloon_alert_visible("eats \the [src].","finishes eating \the [src].")