cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 02:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11340 from Baystation12/master

Browse Source 
Dev-freeze.
This commit is contained in:
PsiOmegaDelta
2015-10-21 10:36:30 +02:00
parent f6fd5ffd2d 7080020997
commit db833735a8
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/reagent_containers/food/condiment.dm
View File

@@ -25,7 +25,10 @@
if(standard_feed_mob(user, M))
return
afterattack(var/obj/target, var/mob/user, var/flag)
afterattack(var/obj/target, var/mob/user, var/proximity)
if(!proximity)
return
if(standard_dispenser_refill(user, target))
return
if(standard_pour_into(user, target))