Merge pull request #9138 from Cerebulon/tasteless

A few food taste fixes

code/modules/food/food/snacks.dm

@@ -1572,7 +1572,7 @@
 
 /obj/item/reagent_containers/food/snacks/meatsteak/Initialize()
 	. = ..()
-	reagents.add_reagent("protein", 4, "grilled meat")
+	reagents.add_reagent("protein", 4, list("grilled meat" = 4))
 	reagents.add_reagent("sodiumchloride", 1)
 	reagents.add_reagent("blackpepper", 1)
 
@@ -7580,6 +7580,7 @@
 	icon_state = "neaera_candied_eyes20"
 	trash = /obj/item/trash/candybowl
 	vendingobject = /obj/item/reagent_containers/food/snacks/neaeracandy
+	nutriment_desc = list("sweet goo" = 2)
 	bitesize = 1
 	unitname = "eye"
 	filling_color = "#7C66DD"
@@ -7623,7 +7624,7 @@
 	center_of_mass = list("x"=17, "y"=15)
 	bitesize = 2
 
-/obj/item/reagent_containers/food/snacks/neaeracandy/Initialize()
+/obj/item/reagent_containers/food/snacks/neaerakabob/Initialize()
 	. = ..()
 	reagents.add_reagent("seafood", 4, list("fatty meat" = 2))
 
@@ -7673,7 +7674,7 @@
 	bitesize = 3
 	filling_color = "#7C66DD"
 
-/obj/item/reagent_containers/food/snacks/ganami/Initialize()
+/obj/item/reagent_containers/food/snacks/garani/Initialize()
 	. = ..()
 	reagents.add_reagent("seafood", 4, list("fatty meat" = 4))
 
@@ -7782,11 +7783,11 @@
 	nutriment_amt = 4
 	nutriment_allergens = ALLERGEN_FRUIT
 	bitesize = 1
-	nutriment_desc = list("meat" = 1, "sweet kirani" = 1,  "minty ga'uli" = 1)
+	nutriment_desc = list("sweet kirani" = 2,  "minty ga'uli" = 2)
 
 /obj/item/reagent_containers/food/snacks/stuffed_gauli/Initialize()
 	. = ..()
-	reagents.add_reagent("protein", 4, nutriment_desc)
+	reagents.add_reagent("protein", 4, list("steamed meat" = 4))
 
 /obj/item/reagent_containers/food/snacks/kirani_stew
 	name = "kirani stew"
@@ -7797,11 +7798,11 @@
 	trash = /obj/item/trash/snack_bowl
 	bitesize = 1
 	nutriment_allergens = ALLERGEN_FRUIT|ALLERGEN_SUGARS
-	nutriment_desc = list("minty qa'zal" = 1, "sweet kirani jelly" = 1)
+	nutriment_desc = list("minty qa'zal" = 2, "sweet kirani jelly" = 2)
 
 /obj/item/reagent_containers/food/snacks/kirani_stew/Initialize()
 	. = ..()
-	reagents.add_reagent("protein", 4, nutriment_desc)
+	reagents.add_reagent("protein", 4, list("stewed meat" = 4))
 
 /obj/item/reagent_containers/food/snacks/qazal_noodles
 	name = "qa'zal noodles"

code/modules/food/food/snacks/meat.dm

@@ -55,9 +55,9 @@
 	filling_color = "#BBBBAA"
 
 /obj/item/reagent_containers/food/snacks/meat/chicken/Initialize()
-		. = ..()
+	. = ..()
-		reagents.remove_reagent("triglyceride", INFINITY)
+	reagents.remove_reagent("triglyceride", INFINITY)
-		//Chicken is low fat. Less total calories than other meats
+	//Chicken is low fat. Less total calories than other meats
 
 /obj/item/reagent_containers/food/snacks/meat/neaera
 	name = "Neaera meat"

code/modules/mob/living/carbon/taste.dm

@@ -22,10 +22,10 @@ catalogue the 'taste strength' of each one
 calculate text size per text.
 */
 /datum/reagents/proc/generate_taste_message(mob/living/carbon/taster = null)
-	var/minimum_percent = 15
+	var/minimum_percent = 10
 	if(ishuman(taster))
 		var/mob/living/carbon/human/H = taster
-		minimum_percent = round(15/ (H.isSynthetic() ? TASTE_DULL : H.species.taste_sensitivity))
+		minimum_percent = round(10/ (H.isSynthetic() ? TASTE_DULL : H.species.taste_sensitivity))
 
 	var/list/out = list()
 	var/list/tastes = list() //descriptor = strength
@@ -33,7 +33,7 @@ calculate text size per text.
 		for(var/datum/reagent/R in reagent_list)
 			if(!R.taste_mult)
 				continue
-			if(istype(R, /datum/reagent/nutriment))
+			if(R.type == /datum/reagent/nutriment)
 				var/list/taste_data = R.get_data()
 				for(var/taste in taste_data)
 					if(taste in tastes)

code/modules/reagents/reagents/food_drinks.dm

@@ -4545,4 +4545,4 @@
 	glass_name = "kiraniade"
 	glass_desc = "Kirani jelly mixed with soda water into a more drinkable form, sweet enough to not even need extra sugar added."
 	glass_special = list(DRINK_FIZZ)
-	allergen_type = ALLERGEN_FRUIT //Made with kirani
+	allergen_type = ALLERGEN_FRUIT //Made with kirani