From 4c96cd62a72139071f6ddd6b39a60f6a49763d7c Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 20 Oct 2015 17:11:55 +0200 Subject: [PATCH] Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. --- code/modules/reagents/reagent_containers/food/condiment.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index a8184ac8157..b5fd5e53444 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -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))