Merge pull request #3421 from CHOMPStation2/upstream-merge-11807

[MIRROR] Adds general-purpose cooking oil, replaces usages of corn oil

code/modules/economy/vending_machines.dm

@@ -57,7 +57,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
-					/obj/item/weapon/reagent_containers/food/condiment/cornoil = 5,
+					/obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5,
@@ -587,7 +587,7 @@
 	icon_state = "dinnerware"
 	products = list(
 	/obj/item/weapon/reagent_containers/food/condiment/yeast = 5,
-	/obj/item/weapon/reagent_containers/food/condiment/cornoil = 5,
+	/obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5,
 	/obj/item/weapon/tray = 8,
 	/obj/item/weapon/material/kitchen/utensil/fork = 6,
 	/obj/item/weapon/material/knife/plastic = 6,

code/modules/food/food/condiment.dm

@@ -101,9 +101,9 @@
 				desc = "Often used to flavor food or make people sneeze."
 				icon_state = "peppermillsmall"
 				center_of_mass = list("x"=17, "y"=11)
-			if("cornoil")
+			if("cookingoil")
-				name = "Corn Oil"
+				name = "Cooking Oil"
-				desc = "A delicious oil used in cooking. Made from corn."
+				desc = "A delicious oil used in cooking. General purpose."
 				icon_state = "oliveoil"
 				center_of_mass = list("x"=16, "y"=6)
 			if("sugar")
@@ -175,6 +175,13 @@
 	. = ..()
 	reagents.add_reagent("capsaicin", 50)
 
+/obj/item/weapon/reagent_containers/food/condiment/cookingoil
+	name = "Cooking Oil"
+
+/obj/item/weapon/reagent_containers/food/condiment/cookingoil/Initialize()
+	. = ..()
+	reagents.add_reagent("cookingoil", 50)
+
 /obj/item/weapon/reagent_containers/food/condiment/cornoil
 	name = "Corn Oil"
 

code/modules/food/food/snacks.dm

@@ -3263,7 +3263,7 @@
 	. = ..()
 	reagents.add_reagent("blackpepper", 1)
 	reagents.add_reagent("sodiumchloride", 1)
-	reagents.add_reagent("cornoil", 1)
+	reagents.add_reagent("cookingoil", 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
 	name = "turkey drumstick"

code/modules/food/kitchen/cooking_machines/fryer.dm

@@ -45,7 +45,7 @@
 	if(prob(20))
 		// Sometimes the fryer will start with much less than full oil, significantly impacting efficiency until filled
 		variance = rand()*0.5
-	oil.add_reagent("cornoil", optimal_oil*(1 - variance))
+	oil.add_reagent("cookingoil", optimal_oil*(1 - variance))
 
 /obj/machinery/appliance/cooker/fryer/Destroy()
 	QDEL_NULL(fry_loop)

code/modules/food/recipes_microwave.dm

@@ -522,13 +522,20 @@ I said no!
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cutlet
 
-/datum/recipe/roastedsunflowerseeds
+/datum/recipe/roastedcornsunflowerseeds
 	reagents = list("sodiumchloride" = 1, "cornoil" = 1)
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/rawsunflower
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower
 
+/datum/recipe/roastedsunflowerseeds
+	reagents = list("sodiumchloride" = 1, "cookingoil" = 1)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/rawsunflower
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower
+
 /datum/recipe/roastedpeanutsunflowerseeds
 	reagents = list("sodiumchloride" = 1, "peanutoil" = 1)
 	items = list(
@@ -537,10 +544,20 @@ I said no!
 	result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower
 
 /datum/recipe/roastedpeanuts
+	fruit = list("peanut" = 2)
+	reagents = list("sodiumchloride" = 2, "cookingoil" = 1)
+	result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts
+
+/datum/recipe/roastedpeanutscorn
 	fruit = list("peanut" = 2)
 	reagents = list("sodiumchloride" = 2, "cornoil" = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts
 
+/datum/recipe/roastedpeanutspeanut
+	fruit = list("peanut" = 2)
+	reagents = list("sodiumchloride" = 2, "peanutoil" = 1)
+	result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts
+
 /datum/recipe/mint
 	reagents = list("sugar" = 5, "frostoil" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/mint

code/modules/reagents/machinery/dispenser/reagent_tank.dm

@@ -461,7 +461,7 @@
 
 /obj/structure/reagent_dispensers/cookingoil/New()
 		..()
-		reagents.add_reagent("cornoil",5000)
+		reagents.add_reagent("cookingoil",5000)
 
 /obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj)
 	if(Proj.get_structure_damage())

code/modules/reagents/reactions/instant/drinks.dm

@@ -141,7 +141,7 @@
 	name = "Space Beer"
 	id = "spacebeer"
 	result = "beer"
-	required_reagents = list("cornoil" = 10)
+	required_reagents = list("cornoil" = 5, "flour" = 5)
 	catalysts = list("enzyme" = 5)
 	result_amount = 10
 
@@ -908,7 +908,7 @@
 	name = "Debugger"
 	id = "debugger"
 	result = "debugger"
-	required_reagents = list("fuel" = 1, "sugar" = 2, "cornoil" = 2)
+	required_reagents = list("fuel" = 1, "sugar" = 2, "cookingoil" = 2)
 	result_amount = 5
 
 /decl/chemical_reaction/instant/drinks/spacersbrew
@@ -1206,14 +1206,14 @@
 	name = "Oil Slick"
 	id = "oilslick"
 	result = "oilslick"
-	required_reagents = list("cornoil" = 2, "honey" = 1)
+	required_reagents = list("cookingoil" = 2, "honey" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/drinks/slimeslam
 	name = "Slick Slime Slammer"
 	id = "slimeslammer"
 	result = "slimeslammer"
-	required_reagents = list("cornoil" = 2, "peanutbutter" = 1)
+	required_reagents = list("cookingoil" = 2, "peanutbutter" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/drinks/virginsexonthebeach
@@ -1255,7 +1255,7 @@
 	name = "Soda Oil"
 	id = "sodaoil"
 	result = "sodaoil"
-	required_reagents = list("cornoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1)
+	required_reagents = list("cookingoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/fusionnaire

code/modules/reagents/reactions/instant/food.dm

@@ -54,6 +54,22 @@
 		new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
 	return
 
+/decl/chemical_reaction/instant/food/cookingoilcorn
+	name = "Cooking Oil"
+	id = "cookingoilcorn"
+	result = "cookingoil"
+	required_reagents = list("cornoil" = 10)
+	catalysts = list("enzyme" = 5)
+	result_amount = 10
+
+/decl/chemical_reaction/instant/food/cookingoilpeanut
+	name = "Cooking Oil"
+	id = "cookingoilpeanut"
+	result = "cookingoil"
+	required_reagents = list("peanutoil" = 10)
+	catalysts = list("enzyme" = 5)
+	result_amount = 10
+
 /decl/chemical_reaction/instant/food/soysauce
 	name = "Soy Sauce"
 	id = "soysauce"
@@ -87,7 +103,7 @@
 	name = "mayonnaise"
 	id = "mayo"
 	result = "mayo"
-	required_reagents = list("egg" = 9, "cornoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1)
+	required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1)
 	result_amount = 15
 
 /decl/chemical_reaction/instant/food/cheesewheel

code/modules/reagents/reagents/food_drinks.dm

@@ -234,6 +234,12 @@
 			to_chat(M, "<span class='danger'>Searing hot oil burns you, wash it off quick!</span>")
 			lastburnmessage = world.time
 
+/datum/reagent/nutriment/triglyceride/oil/cooking
+	name = "Cooking Oil"
+	id = "cookingoil"
+	description = "A general-purpose cooking oil."
+	reagent_state = LIQUID
+
 /datum/reagent/nutriment/triglyceride/oil/corn
 	name = "Corn Oil"
 	id = "cornoil"