From 3dca5d09ecdd0d0cc303db409ae4da2602e72448 Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Sat, 31 Aug 2019 20:00:52 -0400 Subject: [PATCH] Code styling + Vitamin --- code/modules/food_and_drinks/food/snacks.dm | 2 +- code/modules/hydroponics/seeds.dm | 4 ++-- code/modules/mob/living/taste.dm | 2 +- code/modules/reagents/chemistry/holder.dm | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 8ee4ea8b06c..41d549c6bc1 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -23,7 +23,7 @@ return if(!tastes || !tastes.len) return ..() - var/list/nutritious_reagents = list("nutriment", "protein", "plantmatter") + var/list/nutritious_reagents = list("nutriment", "vitamin", "protein", "plantmatter") for(var/reagent_id in list_reagents) var/amount = list_reagents[reagent_id] if(reagent_id in nutritious_reagents) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index d35645924fb..ec07a4cdfc9 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -167,9 +167,9 @@ var/amount = 1 + round(potency * reagents_add[reagent_id], 1) var/list/data = null if(reagent_id == "blood") // Hack to make blood in plants always O- - data = list("blood_type"="O-") + data = list("blood_type" = "O-") continue - var/list/nutritious_reagents = list("nutriment", "protein", "plantmatter") + var/list/nutritious_reagents = list("nutriment", "vitamin", "protein", "plantmatter") if(reagent_id in nutritious_reagents) if(istype(T, /obj/item/reagent_containers/food/snacks/grown)) var/obj/item/reagent_containers/food/snacks/grown/grown_edible = T diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm index 794d7a642ee..a403aa39244 100644 --- a/code/modules/mob/living/taste.dm +++ b/code/modules/mob/living/taste.dm @@ -5,7 +5,7 @@ /mob/living/proc/get_taste_sensitivity() return TASTE_SENSITIVITY_NORMAL -/mob/living/carbon/get_taste_sensitivity() +/mob/living/carbon/human/get_taste_sensitivity() if(dna.species) return dna.species.taste_sensitivity else diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 7aba1924446..9b64161f58b 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -784,6 +784,7 @@ var/const/INGEST = 2 temp.Add(v.Copy()) trans_data["viruses"] = temp return trans_data + /datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL) var/list/out = list() var/list/reagent_tastes = list() //in the form reagent_tastes["descriptor"] = strength