From e72d810c31e34c87e1f7fd5deaa0f752d7f04f05 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 21 Sep 2020 13:54:40 -0400 Subject: [PATCH] Update _appliance.dm --- .../food/kitchen/cooking_machines/_appliance.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index e030b2dbdd..b2f51eacd7 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -266,19 +266,6 @@ to_chat(user, "\The [src] is not working.") return FALSE -<<<<<<< HEAD - var/result = can_insert(I, user) - if(!result) - if(!(default_deconstruction_screwdriver(user, I))) - default_part_replacement(user, I) - return FALSE - - if(result == 2) - var/obj/item/weapon/grab/G = I - if (G && istype(G) && G.affecting) - cook_mob(G.affecting, user) - return FALSE -======= var/obj/item/ToCook = I if(istype(I, /obj/item/weapon/gripper)) @@ -310,7 +297,6 @@ if(!(default_deconstruction_screwdriver(user, I))) default_part_replacement(user, I) return ->>>>>>> f518a31... Hydro upkeep (#7475) if(result == 2) var/obj/item/weapon/grab/G = I