From acf9d1efcb8878600811cb1c68772ce78b72902a Mon Sep 17 00:00:00 2001
From: Twinmold93 <twinmold93@hotmail.com>
Date: Sun, 7 May 2017 02:08:37 -0500
Subject: [PATCH] Fixes Deep-Fried Grabs and Display Case Grabs (#7240)

* Fixes Grab's on Lethal Kitchen

Fixes the issue that I didn't have in testing. Fixes #7239

:cl: Twinmold
Fix: No longer able to cook grabs.
/:cl:

* Fixes Display Case

Fixes #7212

* Changes Display Case to use ABSTRACT

So you can't put Ei'Nath into the case... Also, you already can't put
things like that in the deep fryer/other kitchen equipment, so that's
good.
---
 code/game/objects/structures/displaycase.dm                  | 3 +++
 code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 2 +-
 code/modules/food_and_drinks/kitchen_machinery/grill_new.dm  | 2 +-
 code/modules/food_and_drinks/kitchen_machinery/oven_new.dm   | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 9ecf82a54fb..72638ff0943 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -256,6 +256,9 @@ var/global/list/captain_display_cases = list()
 			new /obj/machinery/constructable_frame/machine_frame(T)
 		qdel(src)
 		return
+	if(W.flags & ABSTRACT)
+		to_chat(user, "<span class='danger'>You can't put this into the case.</span>")
+		return
 	if(user.a_intent == I_HARM)
 		if(locked && !destroyed)
 			src.health -= W.force
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 1781479ec6c..5862de7d6ca 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -61,7 +61,7 @@
 		head.disfigure("burn")
 		add_logs(user, G.affecting, "deep-fried", addition="'s face")
 		qdel(G) //Removes the grip so the person MIGHT have a small chance to run the fuck away and to prevent rapid dunks.
-		return 1
+		return 0
 	return 0
 
 
diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm b/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
index d63971dcc30..1a1dd34196d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
@@ -57,5 +57,5 @@
 		C.adjustFireLoss(30)
 		add_logs(user, G.affecting, "burned", src)
 		qdel(G) //Removes the grip to prevent rapid sears and give you a chance to run
-		return 1
+		return 0
 	return 0
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm b/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
index bd850288bc4..5c1ed4ac6df 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
@@ -63,5 +63,5 @@
 		C.Weaken(2)
 		add_logs(user, G.affecting, "smashed", addition="'s head on [src]")
 		qdel(G) //Removes the grip to prevent rapid bashes. With the weaken, you PROBABLY can't run unless they are slow to grab you again...
-		return 1
+		return 0
 	return 0