cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
This commit is contained in:
PsiOmegaDelta
2015-10-25 20:28:48 +01:00
parent 7d4f51be8e a3027febee
commit e37394e8fa
7 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/kitchen.dm
+3
View File
@@ -34,6 +34,9 @@
else
return ..()
if(!M.can_eat(src))
return
if (reagents.total_volume > 0)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
if(M == user)