Merge pull request #32556 from Cruix/deep_fryer

Fixed teleporting food out of the deep fryer
This commit is contained in:
Jordan Brown
2017-11-10 00:21:01 -05:00
committed by CitadelStationBot
parent 5de28f6eb8
commit b6e7e8501d
@@ -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, "<span class='notice'>You eject [frying] from [src].</span>")
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