cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556

Browse Source 
[MIRROR] Fixed teleporting food out of the deep fryer
This commit is contained in:
LetterJay
2017-11-12 08:20:10 -06:00
committed by GitHub
parent 1c8ae63808 022e2d3f50
commit 94bdcb6848
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
View File

@@ -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