cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emagged deepfryer no longer tries to deepfry grabs (#20679)

Browse Source 
* Deepfryer no longer tries to deepfry grabs

* Update code/modules/food_and_drinks/kitchen_machinery/cooker.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
Adrer
2023-03-26 12:48:40 +02:00
committed by GitHub
parent f13b45bf0a
commit eb724e1fee
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+3 -4
View File
@@ -110,8 +110,6 @@
if(on)
to_chat(user, "<span class='notice'>[src] is still active!</span>")
return FALSE
if(istype(check, /obj/item/grab))
return can_grab_attack(check, user, TRUE) // tell the user here
if(has_specials && checkSpecials(check))
return TRUE
if(istype(check, /obj/item/reagent_containers/food/snacks) || emagged)
@@ -191,6 +189,8 @@
if(panel_open)
to_chat(user, "<span class='warning'>Close the panel first!</span>")
return
if(istype(I, /obj/item/grab))
return special_attack_grab(I, user)
if(!checkValid(I, user))
return
if(!burns)
@@ -207,8 +207,7 @@
else
L.death()
break
if(istype(I, /obj/item/grab))
return special_attack_grab(I, user)
addtimer(CALLBACK(src, PROC_REF(finish_cook), I, user), cooktime)
/obj/machinery/cooker/proc/finish_cook(obj/item/I, mob/user, params)