From 8b935b9abfe9746b5fbcc633db1211ff8bd79b6c Mon Sep 17 00:00:00 2001
From: BurgerLua <mattwasnothere@gmail.com>
Date: Thu, 9 May 2019 21:10:44 -0700
Subject: [PATCH] Reverts cooking change, adds safety checks.

---
 code/modules/events/vent_clog.dm                  | 6 +++---
 code/modules/food_and_drinks/food/snacks_bread.dm | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 8cd1706479..f504565ab2 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -48,8 +48,6 @@
 		"sugar",
 		"white_glitter",
 		"growthserum",
-
-		"cooking_oil",
 		"cornoil",
 		"uranium",
 		"carpet",
@@ -69,8 +67,10 @@
 	endWhen = rand(120, 180)
 	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
 		var/turf/T = get_turf(temp_vent)
-		if(T && is_station_level(T.z) && !temp_vent.welded)
+		var/area/A = T.loc
+		if(T && is_station_level(T.z) && !temp_vent.welded && !A.safe)
 			vents += temp_vent
+
 	if(!vents.len)
 		return kill()
 
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 1cb8706ea5..0f11fc8ed2 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -234,6 +234,11 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 		QDEL_NULL(trash)
 	. = ..()
 
+/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater)
+	if(trash)
+		QDEL_NULL(trash)
+	..()
+
 /obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30)
 	switch(cook_time)
 		if(0 to 15)