Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -201,12 +201,11 @@
 GLOBAL_VAR_INIT(frying_hardmode, TRUE)
 GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
 GLOBAL_LIST_INIT(frying_bad_chems, list(
-/datum/reagent/toxin/bad_food = 10,
-/datum/reagent/clf3 = 2,
+/datum/reagent/toxin/bad_food = 3,
 /datum/reagent/drug/aranesp = 2,
-/datum/reagent/blackpowder = 10,
-/datum/reagent/phlogiston = 3,
-/datum/reagent/toxin/cyanide = 3,
+/datum/reagent/toxin = 2,
+/datum/reagent/lithium = 2,
+/datum/reagent/mercury = 2,
 ))
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
@@ -239,8 +238,10 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 			var/bad_chem = GLOB.frying_bad_chems[R]
 			var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
 			if(GLOB.frying_bad_chem_add_volume)
-				reagents.maximum_volume += bad_chem_amount
+				reagents.maximum_volume += bad_chem_amount + 2 //Added room for condensed cooking oil
 			reagents.add_reagent(bad_chem, bad_chem_amount)
+			//All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
+			reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
 	if(trash)

code/modules/food_and_drinks/food/snacks_pie.dm

@@ -44,7 +44,7 @@
 	if(ishuman(hit_atom))
 		var/mob/living/carbon/human/H = hit_atom
 		var/mutable_appearance/creamoverlay = mutable_appearance('icons/effects/creampie.dmi')
-		if((("mam_snouts" in H.dna.species.default_features) && H.dna.features["mam_snouts"] != "None") || (("snout" in H.dna.species.default_features) && H.dna.features["snout"] != "None"))
+		if((H.dna.species.mutant_bodyparts["mam_snouts"] && H.dna.features["mam_snouts"] != "None") || (H.dna.species.mutant_bodyparts["snout"] && H.dna.features["snout"] != "None"))
 			creamoverlay.icon_state = "creampie_snout"
 		else
 			creamoverlay.icon_state = "creampie_human"

code/modules/food_and_drinks/food/snacks_salad.dm

@@ -116,3 +116,12 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("rice" = 1, "egg" = 1)
 	foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017
+
+/obj/item/reagent_containers/food/snacks/salad/caesar
+	name = "caesar salad"
+	desc = "You too?"
+	icon_state = "ceasar_salad"
+	trash = /obj/item/kitchen/knife
+	bonus_reagents = list(/datum/reagent/medicine/earthsblood = 1, /datum/reagent/iron = 4)
+	tastes = list("iron" = 1, "conspiracy" = 1)
+	foodtype = VEGETABLES

code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm

@@ -84,3 +84,13 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/validsalad
 	subcategory = CAT_SALAD
+
+/datum/crafting_recipe/food/caesarsalad
+	name = "Caesar salad"
+	reqs = list(
+		/obj/item/kitchen/knife = 1,
+		/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia = 1,
+		/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/salad/caesar
+	subcategory = CAT_SALAD