mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #9079 from VOREStation/upstream-merge-7672
[MIRROR] Fix fat tasting bitter
This commit is contained in:
@@ -139,6 +139,8 @@
|
|||||||
description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein"
|
description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein"
|
||||||
|
|
||||||
reagent_state = SOLID
|
reagent_state = SOLID
|
||||||
|
taste_description = "greasiness"
|
||||||
|
taste_mult = 0.1
|
||||||
nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9
|
nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9
|
||||||
color = "#CCCCCC"
|
color = "#CCCCCC"
|
||||||
|
|
||||||
@@ -148,6 +150,7 @@
|
|||||||
id = "oil"
|
id = "oil"
|
||||||
description = "Oils are liquid fats."
|
description = "Oils are liquid fats."
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
|
taste_description = "oil"
|
||||||
color = "#c79705"
|
color = "#c79705"
|
||||||
touch_met = 1.5
|
touch_met = 1.5
|
||||||
var/lastburnmessage = 0
|
var/lastburnmessage = 0
|
||||||
@@ -224,8 +227,6 @@
|
|||||||
name = "Corn Oil"
|
name = "Corn Oil"
|
||||||
id = "cornoil"
|
id = "cornoil"
|
||||||
description = "An oil derived from various types of corn."
|
description = "An oil derived from various types of corn."
|
||||||
taste_description = "oil"
|
|
||||||
taste_mult = 0.1
|
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
|
|
||||||
/datum/reagent/nutriment/triglyceride/oil/peanut
|
/datum/reagent/nutriment/triglyceride/oil/peanut
|
||||||
|
|||||||
4
html/changelogs/Meghan Rossi - triglyceride taste.yml
Normal file
4
html/changelogs/Meghan Rossi - triglyceride taste.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
author: Meghan-Rossi
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- bugfix: "Fat (triglyceride) now tastes greasy instead of bitter."
|
||||||
Reference in New Issue
Block a user