From 1eea460a17d047118e916dcf8cf6a33bcc070140 Mon Sep 17 00:00:00 2001
From: Twinmold <twinmold93@hotmail.com>
Date: Wed, 12 Apr 2017 02:05:28 -0500
Subject: [PATCH] Protocol Alpha 1-9

Also, apparently the fact that bashing an IPC's head into an oven (which
already does increased damage to the IPC for brute damage) needs to also
do burn damage. So, RIP all IPCs once you get caught in the kitchen.
You're time is up...
---
 .../food_and_drinks/kitchen_machinery/deep_fryer.dm    |  1 +
 .../food_and_drinks/kitchen_machinery/grill_new.dm     |  5 ++---
 .../food_and_drinks/kitchen_machinery/oven_new.dm      | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

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 cd288f8024f..e312b989d70 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -61,6 +61,7 @@
 		head.disfigure("burn")
 		add_logs(user, G.affecting, "deep-fried 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
 
 
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 e083edf5d46..16bdbf976fa 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/grill_new.dm
@@ -48,7 +48,7 @@
 	if(ishuman(G.affecting))
 		if(G.state < GRAB_AGGRESSIVE)
 			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
-			return 1
+			return 0
 		var/mob/living/carbon/human/C = G.affecting
 		C.visible_message("<span class='danger'>[user] forces [C] onto [src], searing [C]'s body!</span>", \
 						"<span class='userdanger'>[user] forces you onto [src]! It burns!</span>")
@@ -58,5 +58,4 @@
 		add_logs(user, G.affecting, "burns on a grill")
 		qdel(G) //Removes the grip to prevent rapid sears and give you a chance to run
 		return 1
-	else
-		return 0
\ No newline at end of file
+	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 e6523b1d419..d6a5921a656 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven_new.dm
@@ -48,22 +48,20 @@
 	if(ishuman(G.affecting))
 		if(G.state < GRAB_AGGRESSIVE)
 			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
-			return 1
+			return 0
 		var/mob/living/carbon/human/C = G.affecting
 		var/obj/item/organ/external/head/head = C.get_organ("head")
 		if(!head)
 			to_chat(user, "<span class='warning'>This person doesn't have a head!</span>")
-			return 1
+			return 0
 		C.visible_message("<span class='danger'>[user] bashes [C]'s head in [src]'s door!</span>", \
 						"<span class='userdanger'>[user] bashes your head in [src]'s door! It feels rather hot in the oven!</span>")
 		C.emote("scream")
 		user.changeNext_move(CLICK_CD_MELEE)
-		if(!(head.status & ORGAN_ROBOT))
-			C.apply_damage(5, BURN, "head") //5 fire damage, 15 brute damage, and weakening because your head was just in a hot oven with the door bashing into your neck!
+		C.apply_damage(5, BURN, "head") //5 fire damage, 15 brute damage, and weakening because your head was just in a hot oven with the door bashing into your neck!
 		C.apply_damage(15, BRUTE, "head")
 		C.Weaken(2)
 		add_logs(user, G.affecting, "head smashed in oven")
 		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
-	else
-		return 0
+	return 0