From b6e7e8501d147c863eddb5bec1f79e0805a3cc95 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 10 Nov 2017 00:21:01 -0500 Subject: [PATCH] Merge pull request #32556 from Cruix/deep_fryer Fixed teleporting food out of the deep fryer --- .../food_and_drinks/kitchen_machinery/deep_fryer.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index a9d3d3489d..1a1b009fff 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -76,14 +76,18 @@ insert ascii eagle on american flag background here visible_message("[src] emits an acrid smell!") +/obj/machinery/deepfryer/attack_ai(mob/user) + return + /obj/machinery/deepfryer/attack_hand(mob/user) if(frying) if(frying.loc == src) to_chat(user, "You eject [frying] from [src].") - var/obj/item/reagent_containers/food/snacks/deepfryholder/S = new(get_turf(src)) + var/obj/item/reagent_containers/food/snacks/deepfryholder/S = new(drop_location()) S.fry(frying, reagents, cook_time) icon_state = "fryer_off" - user.put_in_hands(S) + if(user.Adjacent(src)) + user.put_in_hands(S) frying = null cook_time = 0 return