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

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

Browse Source 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
This commit is contained in:
PsiOmegaDelta
2015-10-21 10:38:57 +02:00
parent 55f6c1c0b5 db833735a8
commit 0b9b8feb1e
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))