From eab0ae8af0bbb5402e4d06e8e240e672dc6a12c1 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 20 Jul 2020 17:20:54 +0100
Subject: [PATCH] small changes

---
 code/modules/food_and_drinks/food/snacks.dm   |  7 ++++++-
 .../chemistry/reagents/food_reagents.dm       |  5 ++---
 .../chemistry/reagents/toxin_reagents.dm      | 19 -------------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 7c2cba0c95..3c26ff7048 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -409,5 +409,10 @@ All foods are distributed among various categories. Use common sense.
 
 // //////////////////////////////////////////////Frying////////////////////////////////////////
 /atom/proc/fry(cook_time = 30) //you can truly fry anything
-	if(!GetComponent(/datum/component/fried))
+	//don't fry reagent containers that aren't food items, indestructable items, or items that are already fried
+	if(isitem(src))
+		var/obj/item/fried_item = src
+		if(fried_item.resistance_flags & INDESTRUCTIBLE)
+			return
+	if(!GetComponent(/datum/component/fried) && (!reagents || isfood(src)))
 		AddComponent(/datum/component/fried, frying_power = cook_time)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 6acc4d5a64..d449fa310c 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -141,10 +141,9 @@
 /datum/reagent/consumable/cooking_oil/reaction_turf(turf/open/T, reac_volume)
 	if(!istype(T) || isgroundlessturf(T))
 		return
-	if(reac_volume >= 5)
+	if(reac_volume >= 5 && holder && holder.chem_temp >= fry_temperature)
 		T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10 SECONDS, wet_time_to_add = reac_volume * 1.5 SECONDS)
-		T.name = "deep-fried [initial(T.name)]"
-		T.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
+		T.fry(reac_volume/4)
 
 /datum/reagent/consumable/sugar
 	name = "Sugar"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 02e4a89e1d..c7add16fcf 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -520,25 +520,6 @@
 	taste_description = "bad cooking"
 	value = REAGENT_VALUE_NONE
 
-/datum/reagent/toxin/condensed_cooking_oil
-	name = "Condensed Cooking Oil"
-	description = "Taste the consequences of your mistakes."
-	reagent_state = LIQUID
-	color = "#d6d6d8"
-	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	toxpwr = 0
-	taste_mult = -2
-	taste_description = "awful cooking"
-	value = REAGENT_VALUE_NONE
-
-/datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M)
-	if(prob(5))
-		M.vomit()
-	else
-		if(prob(40))
-			M.adjustOrganLoss(ORGAN_SLOT_HEART, 0.5) //For reference, bungotoxin does 3
-	..()
-
 /datum/reagent/toxin/itching_powder
 	name = "Itching Powder"
 	description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."