From 797873c76998b4898073f3017eb846de5d9e24f9 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 21 Sep 2020 09:54:26 -0700 Subject: [PATCH 1/2] Merge pull request #7672 from Meghan-Rossi/triglyceride_taste Fix fat tasting bitter --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 5 +++-- html/changelogs/Meghan Rossi - triglyceride taste.yml | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Meghan Rossi - triglyceride taste.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 68c0b1d116..6bd4e2aedb 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -139,6 +139,8 @@ description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID + taste_description = "greasiness" + taste_mult = 0.1 nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9 color = "#CCCCCC" @@ -148,6 +150,7 @@ id = "oil" description = "Oils are liquid fats." reagent_state = LIQUID + taste_description = "oil" color = "#c79705" touch_met = 1.5 var/lastburnmessage = 0 @@ -224,8 +227,6 @@ name = "Corn Oil" id = "cornoil" description = "An oil derived from various types of corn." - taste_description = "oil" - taste_mult = 0.1 reagent_state = LIQUID /datum/reagent/nutriment/triglyceride/oil/peanut diff --git a/html/changelogs/Meghan Rossi - triglyceride taste.yml b/html/changelogs/Meghan Rossi - triglyceride taste.yml new file mode 100644 index 0000000000..c18e6ff8e9 --- /dev/null +++ b/html/changelogs/Meghan Rossi - triglyceride taste.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Fat (triglyceride) now tastes greasy instead of bitter." \ No newline at end of file