cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes cutlery ignoring the target's nutriment fullness (#5638)

Browse Source 
Spoons used to allow people to ignore the fact they were already full, this should fix this.
This commit is contained in:
Alberyk
2018-11-19 20:13:43 -02:00
committed by Erki
parent 4778c04dff
commit 107b0aec01
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/material/kitchen.dm
View File

@@ -36,7 +36,6 @@
return ..()
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if (reagents.total_volume > 0)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
if(M == user)
if(!M.can_eat(loaded))
return
@@ -52,6 +51,7 @@
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return
M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
cut_overlays()
return