From eeb86a0d2f516f383cba41333365e9a6fd513cc9 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Tue, 30 Jul 2019 20:38:03 +0800
Subject: [PATCH 1/6] Stage 1 Functional Code Only
---
code/__DEFINES/mobs.dm | 11 +-
code/__HELPERS/lists.dm | 26 +++
code/modules/food_and_drinks/food.dm | 2 +-
code/modules/food_and_drinks/food/snacks.dm | 18 +-
code/modules/hydroponics/seeds.dm | 24 ++-
code/modules/mob/living/carbon/carbon.dm | 8 +-
code/modules/mob/living/carbon/human/human.dm | 6 -
code/modules/mob/living/living.dm | 38 ----
code/modules/reagents/chemistry/holder.dm | 45 +++++
code/modules/reagents/chemistry/reagents.dm | 4 +-
.../reagents/chemistry/reagents/admin.dm | 4 +-
.../reagents/chemistry/reagents/alcohol.dm | 184 +++++++++---------
.../reagents/chemistry/reagents/drink_base.dm | 2 +-
.../reagents/chemistry/reagents/drink_cold.dm | 30 +--
.../reagents/chemistry/reagents/drinks.dm | 78 ++++----
.../reagents/chemistry/reagents/drugs.dm | 26 +--
.../reagents/chemistry/reagents/food.dm | 144 ++++++++------
.../reagents/chemistry/reagents/medicine.dm | 84 ++++----
.../reagents/chemistry/reagents/misc.dm | 82 ++++----
.../reagents/chemistry/reagents/paint.dm | 4 +-
.../chemistry/reagents/paradise_pop.dm | 14 +-
.../chemistry/reagents/pyrotechnic.dm | 18 +-
.../reagents/chemistry/reagents/toxins.dm | 48 ++---
.../reagents/chemistry/reagents/water.dm | 26 +--
code/modules/reagents/reagent_containers.dm | 3 +
.../reagents/reagent_containers/pill.dm | 2 +-
paradise.dme | 1 +
27 files changed, 507 insertions(+), 425 deletions(-)
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 284b0e4d745..2ca76be31b2 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -64,11 +64,12 @@
// Factor of how fast mob nutrition decreases
#define HUNGER_FACTOR 0.1
-// Taste sensitivity - the more the more reagents you'll taste
-#define TASTE_SENSITIVITY_NORMAL 1
-#define TASTE_SENSITIVITY_SHARP 1.5
-#define TASTE_SENSITIVITY_DULL 0.75
-#define TASTE_SENSITIVITY_NO_TASTE 0
+// Taste sensitivity - lower is more sensitive
+// Represents the minimum portion of total taste the mob can sense
+#define TASTE_SENSITIVITY_NORMAL 15
+#define TASTE_SENSITIVITY_SHARP 7.5
+#define TASTE_SENSITIVITY_DULL 20
+#define TASTE_SENSITIVITY_NO_TASTE 101
// Reagent type flags, defines the types of mobs this reagent will affect
#define ORGANIC 1
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index 9e01753d492..49983658d48 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -799,3 +799,29 @@ proc/dd_sortedObjectList(list/incoming)
L.Swap(start++, end--)
return L
+
+/proc/counterlist_scale(list/L, scalar)
+ var/list/out = list()
+ for(var/key in L)
+ out[key] = L[key] * scalar
+ . = out
+
+/proc/counterlist_sum(list/L)
+ . = 0
+ for(var/key in L)
+ . += L[key]
+
+/proc/counterlist_normalise(list/L)
+ var/avg = counterlist_sum(L)
+ if(avg != 0)
+ . = counterlist_scale(L, 1 / avg)
+ else
+ . = L
+
+/proc/counterlist_combine(list/L1, list/L2)
+ for(var/key in L2)
+ var/other_value = L2[key]
+ if(key in L1)
+ L1[key] += other_value
+ else
+ L1[key] = other_value
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
index e931db813cf..6293e72e689 100644
--- a/code/modules/food_and_drinks/food.dm
+++ b/code/modules/food_and_drinks/food.dm
@@ -12,7 +12,7 @@
var/apply_method = "swallow"
var/transfer_efficiency = 1.0
var/instant_application = 0 //if we want to bypass the forcedfeed delay
- var/taste = TRUE//whether you can taste eating from this
+ var/can_taste = TRUE//whether you can taste eating from this
var/antable = TRUE // Will ants come near it?
var/ant_location = null
var/ant_timer = null
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index b1cd3f091ff..8ee4ea8b06c 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -16,9 +16,22 @@
var/cooktype[0]
var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving
var/total_w_class = 0 //for the total weight an item of food can carry
+ var/list/tastes // for example list("crisps" = 2, "salt" = 1)
+/obj/item/reagent_containers/food/snacks/add_initial_reagents()
+ if(!list_reagents)
+ return
+ if(!tastes || !tastes.len)
+ return ..()
+ var/list/nutritious_reagents = list("nutriment", "protein", "plantmatter")
+ for(var/reagent_id in list_reagents)
+ var/amount = list_reagents[reagent_id]
+ if(reagent_id in nutritious_reagents)
+ reagents.add_reagent(reagent_id, amount, tastes.Copy())
+ else
+ reagents.add_reagent(reagent_id, amount)
- //Placeholder for effect that trigger on eating that aren't tied to reagents.
+//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/M, mob/user)
if(!user)
return
@@ -153,11 +166,13 @@
C.adjustFireLoss(-5)
qdel(src)
G.last_eaten = world.time
+ G.taste(reagents)
else
M.visible_message("[M] takes a bite of [src].","You take a bite of [src].")
playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
bitecount++
G.last_eaten = world.time
+ G.taste(reagents)
else if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
to_chat(N, text("You nibble away at [src]."))
@@ -166,6 +181,7 @@
//N.emote("nibbles away at the [src]")
N.adjustBruteLoss(-1)
N.adjustFireLoss(-1)
+ N.taste(reagents)
/obj/item/reagent_containers/food/snacks/sliceable/examine(mob/user)
. = ..()
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 753186831fd..d35645924fb 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -160,15 +160,23 @@
return result
-/obj/item/seeds/proc/prepare_result(var/obj/item/reagent_containers/food/snacks/grown/T)
- if(T.reagents)
- for(var/reagent_id in reagents_add)
- if(reagent_id == "blood") // Hack to make blood in plants always O-
- T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id], 1), list("blood_type"="O-"))
- continue
+/obj/item/seeds/proc/prepare_result(var/obj/item/T)
+ if(!T.reagents)
+ CRASH("[T] has no reagents.")
+ for(var/reagent_id in reagents_add)
+ 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-")
+ continue
+ var/list/nutritious_reagents = list("nutriment", "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
+ data = grown_edible.tastes
- T.reagents.add_reagent(reagent_id, 1 + round(potency * reagents_add[reagent_id]), 1)
- return 1
+ T.reagents.add_reagent(reagent_id, amount, data)
+ return 1
/// Setters procs ///
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a8dbaa7ac2f..0421481a8d9 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1000,7 +1000,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
else
if(!forceFed(toEat, user, fullness))
return 0
- consume(toEat, bitesize_override, taste = toEat.taste)
+ consume(toEat, bitesize_override, can_taste_container = toEat.can_taste)
score_foodeaten++
return 1
@@ -1051,7 +1051,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/*TO DO - If/when stomach organs are introduced, override this at the human level sending the item to the stomach
so that different stomachs can handle things in different ways VB*/
-/mob/living/carbon/proc/consume(var/obj/item/reagent_containers/food/toEat, var/bitesize_override, var/taste = TRUE)
+/mob/living/carbon/proc/consume(var/obj/item/reagent_containers/food/toEat, var/bitesize_override, var/can_taste_container = TRUE)
var/this_bite = bitesize_override ? bitesize_override : toEat.bitesize
if(!toEat.reagents)
return
@@ -1060,8 +1060,8 @@ so that different stomachs can handle things in different ways VB*/
if(toEat.consume_sound)
playsound(loc, toEat.consume_sound, rand(10,50), 1)
if(toEat.reagents.total_volume)
- if(taste)
- taste_reagents(toEat.reagents)
+ if(can_taste_container)
+ taste(toEat.reagents)
var/fraction = min(this_bite/toEat.reagents.total_volume, 1)
toEat.reagents.reaction(src, toEat.apply_type, fraction)
toEat.reagents.trans_to(src, this_bite*toEat.transfer_efficiency)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6481f6bc04a..d33070ea363 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1946,12 +1946,6 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
.["Make superhero"] = "?_src_=vars;makesuper=[UID()]"
. += "---"
-/mob/living/carbon/human/get_taste_sensitivity()
- if(dna.species)
- return dna.species.taste_sensitivity
- else
- return 1
-
/mob/living/carbon/human/proc/special_post_clone_handling()
if(mind && mind.assigned_role == "Cluwne") //HUNKE your suffering never stops
makeCluwne()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f9dba949b4b..08c032ee541 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -914,44 +914,6 @@
if(pulling && !(pulling in orange(1)))
stop_pulling()
-/mob/living/proc/get_taste_sensitivity()
- return 1
-
-/mob/living/proc/taste_reagents(datum/reagents/tastes)
- if(!get_taste_sensitivity())//this also works for IPCs and stuff that returns 0 here
- return
-
- var/do_not_taste_at_all = 1//so we don't spam with recent tastes
-
- var/taste_sum = 0
- var/list/taste_list = list()//associative list so we can stack stuff that tastes the same
- var/list/final_taste_list = list()//final list of taste strings
-
- for(var/datum/reagent/R in tastes.reagent_list)
- taste_sum += R.volume * R.taste_strength
- if(!R.taste_message)//set to null; no taste, like water
- continue
- taste_list[R.taste_message] += R.volume * R.taste_strength
-
- for(var/R in taste_list)
- if(recent_tastes[R] && (world.time - recent_tastes[R] < 12 SECONDS))
- continue
-
- do_not_taste_at_all = 0//something was fresh enough to taste; could still be bland enough to be unrecognizable
-
- if(taste_list[R] / taste_sum >= 0.15 / get_taste_sensitivity())//we return earlier if the proc returns a 0; won't break the universe
- final_taste_list += R
- recent_tastes[R] = world.time
-
- if(do_not_taste_at_all)
- return //no message spam
-
- if(final_taste_list.len == 0)//too many reagents - none meet their thresholds
- to_chat(src, "You can't really make out what you're tasting...")
- return
-
- to_chat(src, "You can taste [english_list(final_taste_list)].")
-
/mob/living/proc/update_z(new_z) // 1+ to register, null to unregister
if(registered_z != new_z)
if(registered_z)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 69023a3e6e8..f02a8400bb4 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -785,6 +785,51 @@ var/const/INGEST = 2
trans_data["viruses"] = temp
return trans_data
+/datum/reagents/proc/generate_taste_message(minimum_percent=15)
+// the lower the minimum percent, the more sensitive the message is.
+ var/list/out = list()
+ var/list/tastes = list() //descriptor = strength
+ if(minimum_percent <= 100)
+ for(var/datum/reagent/R in reagent_list)
+ if(!R.taste_mult)
+ continue
+
+ if(istype(R, /datum/reagent/consumable/nutriment))
+ var/list/taste_data = R.data
+ for(var/taste in taste_data)
+ var/ratio = taste_data[taste]
+ var/amount = ratio * R.taste_mult * R.volume
+ if(taste in tastes)
+ tastes[taste] += amount
+ else
+ tastes[taste] = amount
+ else
+ var/taste_desc = R.taste_description
+ var/taste_amount = R.volume * R.taste_mult
+ if(taste_desc in tastes)
+ tastes[taste_desc] += taste_amount
+ else
+ tastes[taste_desc] = taste_amount
+ //deal with percentages
+ // TODO it would be great if we could sort these from strong to weak
+ var/total_taste = counterlist_sum(tastes)
+ if(total_taste > 0)
+ for(var/taste_desc in tastes)
+ var/percent = tastes[taste_desc]/total_taste * 100
+ if(percent < minimum_percent)
+ continue
+ var/intensity_desc = "a hint of"
+ if(percent > minimum_percent * 2 || percent == 100)
+ intensity_desc = ""
+ else if(percent > minimum_percent * 3)
+ intensity_desc = "the strong flavor of"
+ if(intensity_desc != "")
+ out += "[intensity_desc] [taste_desc]"
+ else
+ out += "[taste_desc]"
+
+ return english_list(out, "something indescribable")
+
///////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index d4199c3dcec..577b21ce3be 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -26,8 +26,8 @@
var/drink_icon = null
var/drink_name = "Glass of ..what?"
var/drink_desc = "You can't really tell what this is."
- var/taste_strength = 1 //how easy it is to taste - the more the easier
- var/taste_message = "bitterness" //life's bitter by default. Cool points for using a span class for when you're tasting LIQUID FUCKING DEATH
+ var/taste_mult = 1 //how easy it is to taste - the more the easier
+ var/taste_description = "bitterness" //life's bitter by default. Cool points for using a span class for when you're tasting LIQUID FUCKING DEATH
/datum/reagent/Destroy()
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/admin.dm b/code/modules/reagents/chemistry/reagents/admin.dm
index 0856955da2b..c238c63a8ff 100644
--- a/code/modules/reagents/chemistry/reagents/admin.dm
+++ b/code/modules/reagents/chemistry/reagents/admin.dm
@@ -6,7 +6,7 @@
color = "#C8A5DC" // rgb: 200, 165, 220
process_flags = ORGANIC | SYNTHETIC //Adminbuse knows no bounds!
can_synth = FALSE
- taste_message = "admin abuse"
+ taste_description = "admin abuse"
/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M)
M.setCloneLoss(0, FALSE)
@@ -58,4 +58,4 @@
name = "Nanites"
id = "nanites"
description = "Nanomachines that aid in rapid cellular regeneration."
- taste_message = "nanomachines, son"
+ taste_description = "nanomachines, son"
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 6c22360face..6e5ff4846f6 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -8,7 +8,7 @@
color = "#404030" // rgb: 64, 64, 48
var/dizzy_adj = 3
var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0
- taste_message = "liquid fire"
+ taste_description = "liquid fire"
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M)
M.AdjustDrunk(alcohol_perc)
@@ -46,7 +46,7 @@
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
- taste_message = "beer"
+ taste_description = "beer"
/datum/reagent/consumable/ethanol/cider
name = "Cider"
@@ -58,7 +58,7 @@
drink_icon = "rewriter"
drink_name = "Cider"
drink_desc = "a refreshing glass of traditional cider"
- taste_message = "cider"
+ taste_description = "cider"
/datum/reagent/consumable/ethanol/whiskey
name = "Whiskey"
@@ -70,7 +70,7 @@
drink_icon = "whiskeyglass"
drink_name = "Glass of whiskey"
drink_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
- taste_message = "whiskey"
+ taste_description = "whiskey"
/datum/reagent/consumable/ethanol/specialwhiskey
name = "Special Blend Whiskey"
@@ -78,7 +78,7 @@
description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
- taste_message = "class"
+ taste_description = "class"
/datum/reagent/consumable/ethanol/gin
name = "Gin"
@@ -90,7 +90,7 @@
drink_icon = "ginvodkaglass"
drink_name = "Glass of gin"
drink_desc = "A crystal clear glass of Griffeater gin."
- taste_message = "gin"
+ taste_description = "gin"
/datum/reagent/consumable/ethanol/absinthe
name = "Absinthe"
@@ -103,7 +103,7 @@
drink_icon = "absinthebottle"
drink_name = "Glass of Absinthe"
drink_desc = "The green fairy is going to get you now!"
- taste_message = "fucking pain"
+ taste_description = "fucking pain"
//copy paste from LSD... shoot me
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M)
@@ -126,7 +126,7 @@
drink_icon = "rumglass"
drink_name = "Glass of Rum"
drink_desc = "Now you want to Pray for a pirate suit, don't you?"
- taste_message = "rum"
+ taste_description = "rum"
/datum/reagent/consumable/ethanol/rum/overdose_process(mob/living/M, severity)
var/update_flags = STATUS_UPDATE_NONE
@@ -142,7 +142,7 @@
drink_icon = "mojito"
drink_name = "Glass of Mojito"
drink_desc = "Fresh from Spesscuba."
- taste_message = "mojito"
+ taste_description = "mojito"
/datum/reagent/consumable/ethanol/vodka
name = "Vodka"
@@ -153,7 +153,7 @@
drink_icon = "ginvodkaglass"
drink_name = "Glass of vodka"
drink_desc = "The glass contain wodka. Xynta."
- taste_message = "vodka"
+ taste_description = "vodka"
/datum/reagent/consumable/ethanol/sake
name = "Sake"
@@ -164,7 +164,7 @@
drink_icon = "ginvodkaglass"
drink_name = "Glass of Sake"
drink_desc = "A glass of Sake."
- taste_message = "sake"
+ taste_description = "sake"
/datum/reagent/consumable/ethanol/tequila
name = "Tequila"
@@ -175,7 +175,7 @@
drink_icon = "tequilaglass"
drink_name = "Glass of Tequila"
drink_desc = "Now all that's missing is the weird colored shades!"
- taste_message = "tequila"
+ taste_description = "tequila"
/datum/reagent/consumable/ethanol/vermouth
name = "Vermouth"
@@ -186,7 +186,7 @@
drink_icon = "vermouthglass"
drink_name = "Glass of Vermouth"
drink_desc = "You wonder why you're even drinking this straight."
- taste_message = "vermouth"
+ taste_description = "vermouth"
/datum/reagent/consumable/ethanol/wine
name = "Wine"
@@ -198,7 +198,7 @@
drink_icon = "wineglass"
drink_name = "Glass of wine"
drink_desc = "A very classy looking drink."
- taste_message = "wine"
+ taste_description = "wine"
/datum/reagent/consumable/ethanol/cognac
name = "Cognac"
@@ -210,7 +210,7 @@
drink_icon = "cognacglass"
drink_name = "Glass of cognac"
drink_desc = "Damn, you feel like some kind of French aristocrat just by holding this."
- taste_message = "cognac"
+ taste_description = "cognac"
/datum/reagent/consumable/ethanol/suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning".
name = "Suicider"
@@ -222,7 +222,7 @@
drink_icon = "suicider"
drink_name = "Suicider"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- taste_message = "approaching death"
+ taste_description = "approaching death"
/datum/reagent/consumable/ethanol/ale
name = "Ale"
@@ -233,7 +233,7 @@
drink_icon = "aleglass"
drink_name = "Ale glass"
drink_desc = "A freezing pint of delicious Ale"
- taste_message = "ale"
+ taste_description = "ale"
/datum/reagent/consumable/ethanol/thirteenloko
name = "Thirteen Loko"
@@ -247,7 +247,7 @@
drink_icon = "thirteen_loko_glass"
drink_name = "Glass of Thirteen Loko"
drink_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass"
- taste_message = "party"
+ taste_description = "party"
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -272,7 +272,7 @@
drink_icon = "glass_brown"
drink_name = "Glass of bilk"
drink_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
- taste_message = "bilk"
+ taste_description = "bilk"
/datum/reagent/consumable/ethanol/atomicbomb
name = "Atomic Bomb"
@@ -284,7 +284,7 @@
drink_icon = "atomicbombglass"
drink_name = "Atomic Bomb"
drink_desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
- taste_message = "a long, fiery burn"
+ taste_description = "a long, fiery burn"
/datum/reagent/consumable/ethanol/threemileisland
name = "THree Mile Island Iced Tea"
@@ -296,7 +296,7 @@
drink_icon = "threemileislandglass"
drink_name = "Three Mile Island Ice Tea"
drink_desc = "A glass of this is sure to prevent a meltdown."
- taste_message = "a creeping heat"
+ taste_description = "a creeping heat"
/datum/reagent/consumable/ethanol/goldschlager
name = "Goldschlager"
@@ -308,7 +308,7 @@
drink_icon = "ginvodkaglass"
drink_name = "Glass of goldschlager"
drink_desc = "100 proof that teen girls will drink anything with gold in it."
- taste_message = "a deep, spicy warmth"
+ taste_description = "a deep, spicy warmth"
/datum/reagent/consumable/ethanol/patron
name = "Patron"
@@ -320,7 +320,7 @@
drink_icon = "patronglass"
drink_name = "Glass of Patron"
drink_desc = "Drinking patron in the bar, with all the subpar ladies."
- taste_message = "a gift"
+ taste_description = "a gift"
/datum/reagent/consumable/ethanol/gintonic
name = "Gin and Tonic"
@@ -332,7 +332,7 @@
drink_icon = "gintonicglass"
drink_name = "Gin and Tonic"
drink_desc = "A mild but still great cocktail. Drink up, like a true Englishman."
- taste_message = "bitter medicine"
+ taste_description = "bitter medicine"
/datum/reagent/consumable/ethanol/cuba_libre
name = "Cuba Libre"
@@ -344,8 +344,8 @@
drink_icon = "cubalibreglass"
drink_name = "Cuba Libre"
drink_desc = "A classic mix of rum and cola."
- taste_message = "fruity alcohol"
- taste_message = "liberation"
+ taste_description = "fruity alcohol"
+ taste_description = "liberation"
/datum/reagent/consumable/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -357,7 +357,7 @@
drink_icon = "whiskeycolaglass"
drink_name = "Whiskey Cola"
drink_desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
- taste_message = "whiskey and coke"
+ taste_description = "whiskey and coke"
/datum/reagent/consumable/ethanol/martini
name = "Classic Martini"
@@ -369,7 +369,7 @@
drink_icon = "martiniglass"
drink_name = "Classic Martini"
drink_desc = "Damn, the bartender even stirred it, not shook it."
- taste_message = "class"
+ taste_description = "class"
/datum/reagent/consumable/ethanol/vodkamartini
name = "Vodka Martini"
@@ -381,7 +381,7 @@
drink_icon = "martiniglass"
drink_name = "Vodka martini"
drink_desc ="A bastardisation of the classic martini. Still great."
- taste_message = "class and potatoes"
+ taste_description = "class and potatoes"
/datum/reagent/consumable/ethanol/white_russian
name = "White Russian"
@@ -393,7 +393,7 @@
drink_icon = "whiterussianglass"
drink_name = "White Russian"
drink_desc = "A very nice looking drink. But that's just, like, your opinion, man."
- taste_message = "very creamy alcohol"
+ taste_description = "very creamy alcohol"
/datum/reagent/consumable/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -405,7 +405,7 @@
drink_icon = "screwdriverglass"
drink_name = "Screwdriver"
drink_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
- taste_message = "a naughty secret"
+ taste_description = "a naughty secret"
/datum/reagent/consumable/ethanol/booger
name = "Booger"
@@ -417,7 +417,7 @@
drink_icon = "booger"
drink_name = "Booger"
drink_desc = "Eww..."
- taste_message = "a fruity mess"
+ taste_description = "a fruity mess"
/datum/reagent/consumable/ethanol/bloody_mary
name = "Bloody Mary"
@@ -429,7 +429,7 @@
drink_icon = "bloodymaryglass"
drink_name = "Bloody Mary"
drink_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
- taste_message = "tomatoes with booze"
+ taste_description = "tomatoes with booze"
/datum/reagent/consumable/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -441,7 +441,7 @@
drink_icon = "gargleblasterglass"
drink_name = "Pan-Galactic Gargle Blaster"
drink_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
- taste_message = "the number fourty two"
+ taste_description = "the number fourty two"
/datum/reagent/consumable/ethanol/flaming_homer
name = "Flaming Moe"
@@ -453,7 +453,7 @@
drink_icon = "flamingmoeglass"
drink_name = "Flaming Moe"
drink_desc = "Happiness is just a Flaming Moe away!"
- taste_message = "caramelised booze and sweet, salty medicine"
+ taste_description = "caramelised booze and sweet, salty medicine"
/datum/reagent/consumable/ethanol/brave_bull
name = "Brave Bull"
@@ -465,7 +465,7 @@
drink_icon = "bravebullglass"
drink_name = "Brave Bull"
drink_desc = "Tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
- taste_message = "sweet alcohol"
+ taste_description = "sweet alcohol"
/datum/reagent/consumable/ethanol/tequila_sunrise
name = "Tequila Sunrise"
@@ -477,7 +477,7 @@
drink_icon = "tequilasunriseglass"
drink_name = "Tequila Sunrise"
drink_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
- taste_message = "fruity alcohol"
+ taste_description = "fruity alcohol"
/datum/reagent/consumable/ethanol/toxins_special
name = "Toxins Special"
@@ -489,7 +489,7 @@
drink_icon = "toxinsspecialglass"
drink_name = "Toxins Special"
drink_desc = "Whoah, this thing is on FIRE"
- taste_message = "FIRE"
+ taste_description = "FIRE"
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -507,7 +507,7 @@
description = "Whiskey-imbued cream, what else would you expect from the Irish."
drink_name = "Beepsky Smash"
drink_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
- taste_message = "THE LAW"
+ taste_description = "THE LAW"
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
var/update_flag = STATUS_UPDATE_NONE
@@ -523,7 +523,7 @@
drink_icon = "irishcreamglass"
drink_name = "Irish Cream"
drink_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
- taste_message = "creamy alcohol"
+ taste_description = "creamy alcohol"
/datum/reagent/consumable/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -535,7 +535,7 @@
drink_icon = "manlydorfglass"
drink_name = "The Manly Dorf"
drink_desc = "A manly concotion made from Ale and Beer. Intended for true men only."
- taste_message = "manliness"
+ taste_description = "manliness"
/datum/reagent/consumable/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -547,7 +547,7 @@
drink_icon = "longislandicedteaglass"
drink_name = "Long Island Iced Tea"
drink_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- taste_message = "fruity alcohol"
+ taste_description = "fruity alcohol"
/datum/reagent/consumable/ethanol/moonshine
name = "Moonshine"
@@ -559,7 +559,7 @@
drink_icon = "glass_clear"
drink_name = "Moonshine"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- taste_message = "prohibition"
+ taste_description = "prohibition"
/datum/reagent/consumable/ethanol/b52
name = "B-52"
@@ -571,7 +571,7 @@
drink_icon = "b52glass"
drink_name = "B-52"
drink_desc = "Kahlua, Irish Cream, and congac. You will get bombed."
- taste_message = "destruction"
+ taste_description = "destruction"
/datum/reagent/consumable/ethanol/irishcoffee
name = "Irish Coffee"
@@ -583,7 +583,7 @@
drink_icon = "irishcoffeeglass"
drink_name = "Irish Coffee"
drink_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
- taste_message = "coffee and booze"
+ taste_description = "coffee and booze"
/datum/reagent/consumable/ethanol/margarita
name = "Margarita"
@@ -595,7 +595,7 @@
drink_icon = "margaritaglass"
drink_name = "Margarita"
drink_desc = "On the rocks with salt on the rim. Arriba~!"
- taste_message = "daisies"
+ taste_description = "daisies"
/datum/reagent/consumable/ethanol/black_russian
name = "Black Russian"
@@ -607,7 +607,7 @@
drink_icon = "blackrussianglass"
drink_name = "Black Russian"
drink_desc = "For the lactose-intolerant. Still as classy as a White Russian."
- taste_message = "sweet alcohol"
+ taste_description = "sweet alcohol"
/datum/reagent/consumable/ethanol/manhattan
name = "Manhattan"
@@ -619,7 +619,7 @@
drink_icon = "manhattanglass"
drink_name = "Manhattan"
drink_desc = "The Detective's undercover drink of choice. He never could stomach gin..."
- taste_message = "a bustling city"
+ taste_description = "a bustling city"
/datum/reagent/consumable/ethanol/manhattan_proj
name = "Manhattan Project"
@@ -631,7 +631,7 @@
drink_icon = "proj_manhattanglass"
drink_name = "Manhattan Project"
drink_desc = "A scientist's drink of choice, for thinking how to blow up the station."
- taste_message = "the apocalypse"
+ taste_description = "the apocalypse"
/datum/reagent/consumable/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -643,7 +643,7 @@
drink_icon = "whiskeysodaglass2"
drink_name = "Whiskey Soda"
drink_desc = "Ultimate refreshment."
- taste_message = "mediocrity"
+ taste_description = "mediocrity"
/datum/reagent/consumable/ethanol/antifreeze
name = "Anti-freeze"
@@ -655,7 +655,7 @@
drink_icon = "antifreeze"
drink_name = "Anti-freeze"
drink_desc = "The ultimate refreshment."
- taste_message = "poor life choices"
+ taste_description = "poor life choices"
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
@@ -672,7 +672,7 @@
drink_icon = "b&p"
drink_name = "Barefoot"
drink_desc = "Barefoot and pregnant"
- taste_message = "pregnancy"
+ taste_description = "pregnancy"
/datum/reagent/consumable/ethanol/snowwhite
name = "Snow White"
@@ -684,7 +684,7 @@
drink_icon = "snowwhite"
drink_name = "Snow White"
drink_desc = "A cold refreshment."
- taste_message = "a poisoned apple"
+ taste_description = "a poisoned apple"
/datum/reagent/consumable/ethanol/demonsblood
name = "Demons Blood"
@@ -697,7 +697,7 @@
drink_icon = "demonsblood"
drink_name = "Demons Blood"
drink_desc = "Just looking at this thing makes the hair at the back of your neck stand up."
- taste_message = "evil"
+ taste_description = "evil"
/datum/reagent/consumable/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -710,7 +710,7 @@
drink_icon = "vodkatonicglass"
drink_name = "Vodka and Tonic"
drink_desc = "For when a gin and tonic isn't russian enough."
- taste_message = "bitter medicine"
+ taste_description = "bitter medicine"
/datum/reagent/consumable/ethanol/ginfizz
name = "Gin Fizz"
@@ -723,7 +723,7 @@
drink_icon = "ginfizzglass"
drink_name = "Gin Fizz"
drink_desc = "Refreshingly lemony, deliciously dry."
- taste_message = "fizzy alcohol"
+ taste_description = "fizzy alcohol"
/datum/reagent/consumable/ethanol/bahama_mama
name = "Bahama mama"
@@ -735,7 +735,7 @@
drink_icon = "bahama_mama"
drink_name = "Bahama Mama"
drink_desc = "Tropic cocktail"
- taste_message = "HONK"
+ taste_description = "HONK"
/datum/reagent/consumable/ethanol/singulo
name = "Singulo"
@@ -748,7 +748,7 @@
drink_icon = "singulo"
drink_name = "Singulo"
drink_desc = "A blue-space beverage."
- taste_message = "infinity"
+ taste_description = "infinity"
/datum/reagent/consumable/ethanol/sbiten
name = "Sbiten"
@@ -760,7 +760,7 @@
drink_icon = "sbitenglass"
drink_name = "Sbiten"
drink_desc = "A spicy mix of Vodka and Spice. Very hot."
- taste_message = "comforting warmth"
+ taste_description = "comforting warmth"
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
if(M.bodytemperature < 360)
@@ -777,7 +777,7 @@
drink_icon = "devilskiss"
drink_name = "Devils Kiss"
drink_desc = "Creepy time!"
- taste_message = "naughtiness"
+ taste_description = "naughtiness"
/datum/reagent/consumable/ethanol/red_mead
name = "Red Mead"
@@ -789,7 +789,7 @@
drink_icon = "red_meadglass"
drink_name = "Red Mead"
drink_desc = "A True Vikings Beverage, though its color is strange."
- taste_message = "blood"
+ taste_description = "blood"
/datum/reagent/consumable/ethanol/mead
name = "Mead"
@@ -802,7 +802,7 @@
drink_icon = "meadglass"
drink_name = "Mead"
drink_desc = "A Vikings Beverage, though a cheap one."
- taste_message = "honey"
+ taste_description = "honey"
/datum/reagent/consumable/ethanol/iced_beer
name = "Iced Beer"
@@ -814,7 +814,7 @@
drink_icon = "iced_beerglass"
drink_name = "Iced Beer"
drink_desc = "A beer so frosty, the air around it freezes."
- taste_message = "cold beer"
+ taste_description = "cold beer"
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
if(M.bodytemperature > 270)
@@ -831,7 +831,7 @@
drink_icon = "grogglass"
drink_name = "Grog"
drink_desc = "A fine and cepa drink for Space."
- taste_message = "strongly diluted rum"
+ taste_description = "strongly diluted rum"
/datum/reagent/consumable/ethanol/aloe
name = "Aloe"
@@ -843,7 +843,7 @@
drink_icon = "aloe"
drink_name = "Aloe"
drink_desc = "Very, very, very good."
- taste_message = "healthy skin"
+ taste_description = "healthy skin"
/datum/reagent/consumable/ethanol/andalusia
name = "Andalusia"
@@ -855,7 +855,7 @@
drink_icon = "andalusia"
drink_name = "Andalusia"
drink_desc = "A nice, strange named drink."
- taste_message = "sweet alcohol"
+ taste_description = "sweet alcohol"
/datum/reagent/consumable/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -867,7 +867,7 @@
drink_icon = "alliescocktail"
drink_name = "Allies cocktail"
drink_desc = "A drink made from your allies."
- taste_message = "victory"
+ taste_description = "victory"
/datum/reagent/consumable/ethanol/acid_spit
name = "Acid Spit"
@@ -879,7 +879,7 @@
drink_icon = "acidspitglass"
drink_name = "Acid Spit"
drink_desc = "A drink from Nanotrasen. Made from live aliens."
- taste_message = "PAIN"
+ taste_description = "PAIN"
/datum/reagent/consumable/ethanol/amasec
name = "Amasec"
@@ -891,7 +891,7 @@
drink_icon = "amasecglass"
drink_name = "Amasec"
drink_desc = "Always handy before COMBAT!!!"
- taste_message = "a stunbaton"
+ taste_description = "a stunbaton"
/datum/reagent/consumable/ethanol/neurotoxin
name = "Neuro-toxin"
@@ -905,7 +905,7 @@
drink_icon = "neurotoxinglass"
drink_name = "Neurotoxin"
drink_desc = "A drink that is guaranteed to knock you silly."
- taste_message = "brain damageeeEEeee"
+ taste_description = "brain damageeeEEeee"
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -927,7 +927,7 @@
drink_icon = "hippiesdelightglass"
drink_name = "Hippie's Delight"
drink_desc = "A drink enjoyed by people during the 1960's."
- taste_message = "colors"
+ taste_description = "colors"
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -965,7 +965,7 @@
drink_icon = "changelingsting"
drink_name = "Changeling Sting"
drink_desc = "A stingy drink."
- taste_message = "a tiny prick"
+ taste_description = "a tiny prick"
/datum/reagent/consumable/ethanol/irishcarbomb
name = "Irish Car Bomb"
@@ -978,7 +978,7 @@
drink_icon = "irishcarbomb"
drink_name = "Irish Car Bomb"
drink_desc = "An irish car bomb."
- taste_message = "troubles"
+ taste_description = "troubles"
/datum/reagent/consumable/ethanol/syndicatebomb
name = "Syndicate Bomb"
@@ -990,7 +990,7 @@
drink_icon = "syndicatebomb"
drink_name = "Syndicate Bomb"
drink_desc = "A syndicate bomb."
- taste_message = "a job offer"
+ taste_description = "a job offer"
/datum/reagent/consumable/ethanol/erikasurprise
name = "Erika Surprise"
@@ -1002,7 +1002,7 @@
drink_icon = "erikasurprise"
name = "Erika Surprise"
drink_desc = "The surprise is, it's green!"
- taste_message = "disappointment"
+ taste_description = "disappointment"
/datum/reagent/consumable/ethanol/driestmartini
name = "Driest Martini"
@@ -1015,7 +1015,7 @@
drink_icon = "driestmartiniglass"
drink_name = "Driest Martini"
drink_desc = "Only for the experienced. You think you see sand floating in the glass."
- taste_message = "dust and ashes"
+ taste_description = "dust and ashes"
/datum/reagent/consumable/ethanol/driestmartini/on_mob_life(mob/living/M)
if(current_cycle >= 55 && current_cycle < 115)
@@ -1031,7 +1031,7 @@
drink_icon = "kahluaglass"
drink_name = "Glass of RR coffee Liquor"
drink_desc = "DAMN, THIS THING LOOKS ROBUST"
- taste_message = "coffee and alcohol"
+ taste_description = "coffee and alcohol"
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1050,7 +1050,7 @@
drink_icon = "ginsonic"
drink_name = "Gin and Sonic"
drink_desc = "An extremely high amperage drink. Absolutely not for the true Englishman."
- taste_message = "SPEED"
+ taste_description = "SPEED"
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1077,7 +1077,7 @@
drink_icon = "cognacglass"
drink_name = "Glass of applejack"
drink_desc = "When cider isn't strong enough, you gotta jack it."
- taste_message = "strong cider"
+ taste_description = "strong cider"
/datum/reagent/consumable/ethanol/jackrose
name = "Jack Rose"
@@ -1088,7 +1088,7 @@
drink_icon = "patronglass"
drink_name = "Jack Rose"
drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
- taste_message = "style"
+ taste_description = "style"
/datum/reagent/consumable/ethanol/drunkenblumpkin
name = "Drunken Blumpkin"
@@ -1099,7 +1099,7 @@
drink_icon = "drunkenblumpkin"
drink_name = "Drunken Blumpkin"
drink_desc = "A drink for the drunks"
- taste_message = "weirdness"
+ taste_description = "weirdness"
/datum/reagent/consumable/ethanol/eggnog
name = "Eggnog"
@@ -1111,7 +1111,7 @@
drink_icon = "glass_yellow"
drink_name = "Eggnog"
drink_desc = "For enjoying the most wonderful time of the year."
- taste_message = "christmas spirit"
+ taste_description = "christmas spirit"
/datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
name = "Dragon's Breath"
@@ -1121,7 +1121,7 @@
color = "#DC0000"
alcohol_perc = 1
can_synth = FALSE
- taste_message = "LIQUID FUCKING DEATH OH GOD WHAT THE FUCK"
+ taste_description = "LIQUID FUCKING DEATH OH GOD WHAT THE FUCK"
/datum/reagent/consumable/ethanol/dragons_breath/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST && prob(20))
@@ -1170,7 +1170,7 @@
drink_icon = "synthanolglass"
drink_name = "Glass of Synthanol"
drink_desc = "The equivalent of alcohol for synthetic crewmembers. They'd find it awful if they had tastebuds too."
- taste_message = "motor oil"
+ taste_description = "motor oil"
/datum/reagent/consumable/ethanol/synthanol/on_mob_life(mob/living/M)
if(!M.isSynthetic())
@@ -1196,7 +1196,7 @@
drink_icon = "robottearsglass"
drink_name = "Glass of Robot Tears"
drink_desc = "No robots were hurt in the making of this drink."
- taste_message = "existential angst"
+ taste_description = "existential angst"
/datum/reagent/consumable/ethanol/synthanol/trinary
name = "Trinary"
@@ -1208,7 +1208,7 @@
drink_icon = "trinaryglass"
drink_name = "Glass of Trinary"
drink_desc = "Colorful drink made for synthetic crewmembers. It doesn't seem like it would taste well."
- taste_message = "modem static"
+ taste_description = "modem static"
/datum/reagent/consumable/ethanol/synthanol/servo
name = "Servo"
@@ -1220,7 +1220,7 @@
drink_icon = "servoglass"
drink_name = "Glass of Servo"
drink_desc = "Chocolate - based drink made for IPCs. Not sure if anyone's actually tried out the recipe."
- taste_message = "motor oil and cocoa"
+ taste_description = "motor oil and cocoa"
/datum/reagent/consumable/ethanol/synthanol/uplink
name = "Uplink"
@@ -1232,7 +1232,7 @@
drink_icon = "uplinkglass"
drink_name = "Glass of Uplink"
drink_desc = "An exquisite mix of the finest liquoirs and synthanol. Meant only for synthetics."
- taste_message = "a GUI in visual basic"
+ taste_description = "a GUI in visual basic"
/datum/reagent/consumable/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -1244,7 +1244,7 @@
drink_icon = "synthnsodaglass"
drink_name = "Glass of Synth 'n Soda"
drink_desc = "Classic drink altered to fit the tastes of a robot. Bad idea to drink if you're made of carbon."
- taste_message = "fizzy motor oil"
+ taste_description = "fizzy motor oil"
/datum/reagent/consumable/ethanol/synthanol/synthignon
name = "Synthignon"
@@ -1256,7 +1256,7 @@
drink_icon = "synthignonglass"
drink_name = "Glass of Synthignon"
drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious."
- taste_message = "fancy motor oil"
+ taste_description = "fancy motor oil"
/datum/reagent/consumable/ethanol/fruit_wine
name = "Fruit Wine"
@@ -1264,7 +1264,7 @@
description = "A wine made from grown plants."
color = "#FFFFFF"
alcohol_perc = 0.35
- taste_message = "bad coding"
+ taste_description = "bad coding"
can_synth = FALSE
var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit.
var/list/tastes = list("bad coding" = 1) //List of tastes. See above.
@@ -1358,6 +1358,6 @@
if(secondary_tastes.len)
flavor += ", with a hint of "
flavor += english_list(secondary_tastes)
- taste_message = flavor
+ taste_description = flavor
if(holder.my_atom)
holder.my_atom.on_reagent_change()
diff --git a/code/modules/reagents/chemistry/reagents/drink_base.dm b/code/modules/reagents/chemistry/reagents/drink_base.dm
index 236da829c73..8f15156753e 100644
--- a/code/modules/reagents/chemistry/reagents/drink_base.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_base.dm
@@ -4,7 +4,7 @@
description = "Uh, some kind of drink."
reagent_state = LIQUID
color = "#E78108" // rgb: 231, 129, 8
- taste_message = "something which should not exist"
+ taste_description = "something which should not exist"
var/adj_dizzy = 0
var/adj_drowsy = 0
var/adj_sleepy = 0
diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm
index 707aab07b54..66931ae0847 100644
--- a/code/modules/reagents/chemistry/reagents/drink_cold.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm
@@ -1,7 +1,7 @@
/datum/reagent/consumable/drink/cold
name = "Cold drink"
adj_temp_cool = 5
- taste_message = null
+ taste_description = null
/datum/reagent/consumable/drink/cold/tonic
name = "Tonic Water"
@@ -14,7 +14,7 @@
drink_icon = "glass_clear"
drink_name = "Glass of Tonic Water"
drink_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
- taste_message = "bitterness"
+ taste_description = "bitterness"
/datum/reagent/consumable/drink/cold/sodawater
name = "Soda Water"
@@ -26,7 +26,7 @@
drink_icon = "glass_clear"
drink_name = "Glass of Soda Water"
drink_desc = "Soda water. Why not make a scotch and soda?"
- taste_message = "fizz"
+ taste_description = "fizz"
/datum/reagent/consumable/drink/cold/ice
name = "Ice"
@@ -38,7 +38,7 @@
drink_icon = "iceglass"
drink_name = "Glass of ice"
drink_desc = "Generally, you're supposed to put something else in there too..."
- taste_message = "cold"
+ taste_description = "cold"
/datum/reagent/consumable/drink/cold/ice/on_mob_life(mob/living/M)
M.bodytemperature = max(M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
@@ -54,7 +54,7 @@
drink_icon = "glass_brown"
drink_name = "Glass of Space Cola"
drink_desc = "A glass of refreshing Space Cola"
- taste_message = "cola"
+ taste_description = "cola"
/datum/reagent/consumable/drink/cold/nuka_cola
name = "Nuka Cola"
@@ -65,7 +65,7 @@
drink_icon = "nuka_colaglass"
drink_name = "Nuka Cola"
drink_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
- taste_message = "radioactive cola"
+ taste_description = "radioactive cola"
/datum/reagent/consumable/drink/cold/nuka_cola/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -90,7 +90,7 @@
drink_icon = "Space_mountain_wind_glass"
drink_name = "Glass of Space Mountain Wind"
drink_desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
- taste_message = "lime soda"
+ taste_description = "lime soda"
/datum/reagent/consumable/drink/cold/dr_gibb
name = "Dr. Gibb"
@@ -101,7 +101,7 @@
drink_icon = "dr_gibb_glass"
drink_name = "Glass of Dr. Gibb"
drink_desc = "Dr. Gibb. Not as dangerous as the name might imply."
- taste_message = "cherry soda"
+ taste_description = "cherry soda"
/datum/reagent/consumable/drink/cold/space_up
name = "Space-Up"
@@ -112,7 +112,7 @@
drink_icon = "space-up_glass"
drink_name = "Glass of Space-up"
drink_desc = "Space-up. It helps keep your cool."
- taste_message = "lemon soda"
+ taste_description = "lemon soda"
/datum/reagent/consumable/drink/cold/lemon_lime
name = "Lemon Lime"
@@ -120,7 +120,7 @@
id = "lemon_lime"
color = "#878F00" // rgb: 135, 40, 0
adj_temp_cool = 8
- taste_message = "citrus soda"
+ taste_description = "citrus soda"
/datum/reagent/consumable/drink/cold/lemonade
name = "Lemonade"
@@ -130,7 +130,7 @@
drink_icon = "lemonade"
drink_name = "Lemonade"
drink_desc = "Oh the nostalgia..."
- taste_message = "lemonade"
+ taste_description = "lemonade"
/datum/reagent/consumable/drink/cold/kiraspecial
name = "Kira Special"
@@ -140,7 +140,7 @@
drink_icon = "kiraspecial"
drink_name = "Kira Special"
drink_desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
- taste_message = "citrus soda"
+ taste_description = "citrus soda"
/datum/reagent/consumable/drink/cold/brownstar
name = "Brown Star"
@@ -151,7 +151,7 @@
drink_icon = "brownstar"
drink_name = "Brown Star"
drink_desc = "Its not what it sounds like..."
- taste_message = "orange soda"
+ taste_description = "orange soda"
/datum/reagent/consumable/drink/cold/milkshake
name = "Milkshake"
@@ -162,7 +162,7 @@
drink_icon = "milkshake"
drink_name = "Milkshake"
drink_desc = "Glorious brainfreezing mixture."
- taste_message = "milkshake"
+ taste_description = "milkshake"
/datum/reagent/consumable/drink/cold/rewriter
name = "Rewriter"
@@ -172,7 +172,7 @@
drink_icon = "rewriter"
drink_name = "Rewriter"
drink_desc = "The secret of the sanctuary of the Librarian..."
- taste_message = "coffee...soda?"
+ taste_description = "coffee...soda?"
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm
index 850df4f2382..6298e79d71d 100644
--- a/code/modules/reagents/chemistry/reagents/drinks.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks.dm
@@ -6,7 +6,7 @@
drink_icon = "glass_orange"
drink_name = "Glass of Orange juice"
drink_desc = "Vitamins! Yay!"
- taste_message = "orange juice"
+ taste_description = "orange juice"
/datum/reagent/consumable/drink/orangejuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -22,7 +22,7 @@
drink_icon = "glass_red"
drink_name = "Glass of Tomato juice"
drink_desc = "Are you sure this is tomato juice?"
- taste_message = "tomato juice"
+ taste_description = "tomato juice"
/datum/reagent/consumable/drink/pineapplejuice
name = "Pineapple Juice"
@@ -32,7 +32,7 @@
drink_icon = "glass_orange"
drink_name = "Glass of pineapple juice"
drink_desc = "A bright drink, sweet and sugary."
- taste_message = "pineapple juice"
+ taste_description = "pineapple juice"
/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -48,7 +48,7 @@
drink_icon = "glass_green"
drink_name = "Glass of Lime juice"
drink_desc = "A glass of sweet-sour lime juice."
- taste_message = "lime juice"
+ taste_description = "lime juice"
/datum/reagent/consumable/drink/limejuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -64,7 +64,7 @@
drink_icon = "carrotjuice"
drink_name = "Glass of carrot juice"
drink_desc = "It is just like a carrot but without crunching."
- taste_message = "carrot juice"
+ taste_description = "carrot juice"
/datum/reagent/consumable/drink/carrotjuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -87,7 +87,7 @@
drink_icon = "doctorsdelightglass"
drink_name = "Doctor's Delight"
drink_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
- taste_message = "healthy dietary choices"
+ taste_description = "healthy dietary choices"
/datum/reagent/consumable/drink/doctor_delight/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -104,7 +104,7 @@
drink_icon = "triplecitrus"
drink_name = "Glass of Triplecitrus Juice"
drink_desc = "As colorful and healthy as it is delicious."
- taste_message = "citrus juice"
+ taste_description = "citrus juice"
/datum/reagent/consumable/drink/triple_citrus/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -118,7 +118,7 @@
drink_icon = "berryjuice"
drink_name = "Glass of berry juice"
drink_desc = "Berry juice. Or maybe its jam. Who cares?"
- taste_message = "berry juice"
+ taste_description = "berry juice"
/datum/reagent/consumable/drink/poisonberryjuice
name = "Poison Berry Juice"
@@ -128,7 +128,7 @@
drink_icon = "poisonberryjuice"
drink_name = "Glass of poison berry juice"
drink_desc = "A glass of deadly juice."
- taste_message = "berry juice"
+ taste_description = "berry juice"
/datum/reagent/consumable/drink/poisonberryjuice/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -140,14 +140,14 @@
id = "applejuice"
description = "The sweet juice of an apple, fit for all ages."
color = "#ECFF56" // rgb: 236, 255, 86
- taste_message = "apple juice"
+ taste_description = "apple juice"
/datum/reagent/consumable/drink/watermelonjuice
name = "Watermelon Juice"
id = "watermelonjuice"
description = "Delicious juice made from watermelon."
color = "#863333" // rgb: 134, 51, 51
- taste_message = "watermelon juice"
+ taste_description = "watermelon juice"
/datum/reagent/consumable/drink/lemonjuice
name = "Lemon Juice"
@@ -157,14 +157,14 @@
drink_icon = "lemonglass"
drink_name = "Glass of lemonjuice"
drink_desc = "Sour..."
- taste_message = "lemon juice"
+ taste_description = "lemon juice"
/datum/reagent/consumable/drink/grapejuice
name = "Grape Juice"
id = "grapejuice"
description = "This juice is known to stain shirts."
color = "#993399" // rgb: 153, 51, 153
- taste_message = "grape juice"
+ taste_description = "grape juice"
/datum/reagent/consumable/drink/banana
name = "Banana Juice"
@@ -174,7 +174,7 @@
drink_icon = "banana"
drink_name = "Glass of banana juice"
drink_desc = "The raw essence of a banana. HONK"
- taste_message = "banana juice"
+ taste_description = "banana juice"
/datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -190,7 +190,7 @@
drink_icon = "nothing"
drink_name = "Nothing"
drink_desc = "Absolutely nothing."
- taste_message = "nothing... how?"
+ taste_description = "nothing... how?"
/datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -208,7 +208,7 @@
drink_icon = "glass_brown"
drink_name = "Glass of potato juice"
drink_desc = "Who in the hell requests this? Gross!"
- taste_message = "puke, you're pretty sure"
+ taste_description = "puke, you're pretty sure"
/datum/reagent/consumable/drink/milk
name = "Milk"
@@ -218,7 +218,7 @@
drink_icon = "glass_white"
drink_name = "Glass of milk"
drink_desc = "White and nutritious goodness!"
- taste_message = "milk"
+ taste_description = "milk"
/datum/reagent/consumable/drink/milk/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -235,7 +235,7 @@
color = "#DFDFC7" // rgb: 223, 223, 199
drink_name = "Glass of soy milk"
drink_desc = "White and nutritious soy goodness!"
- taste_message = "fake milk"
+ taste_description = "fake milk"
/datum/reagent/consumable/drink/milk/cream
name = "Cream"
@@ -244,14 +244,14 @@
color = "#DFD7AF" // rgb: 223, 215, 175
drink_name = "Glass of cream"
drink_desc = "Ewwww..."
- taste_message = "cream"
+ taste_description = "cream"
/datum/reagent/consumable/drink/milk/chocolate_milk
name = "Chocolate milk"
id ="chocolate_milk"
description = "Chocolate-flavored milk, tastes like being a kid again."
color = "#85432C"
- taste_message = "chocolate milk"
+ taste_description = "chocolate milk"
/datum/reagent/consumable/drink/hot_coco
name = "Hot Chocolate"
@@ -263,7 +263,7 @@
drink_icon = "hot_coco"
drink_name = "Glass of hot coco"
drink_desc = "Delicious and cozy"
- taste_message = "chocolate"
+ taste_description = "chocolate"
/datum/reagent/consumable/drink/coffee
name = "Coffee"
@@ -281,7 +281,7 @@
drink_icon = "glass_brown"
drink_name = "Glass of coffee"
drink_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
- taste_message = "coffee"
+ taste_description = "coffee"
/datum/reagent/consumable/drink/coffee/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -308,7 +308,7 @@
drink_icon = "icedcoffeeglass"
drink_name = "Iced Coffee"
drink_desc = "A drink to perk you up and refresh you!"
- taste_message = "refreshingly cold coffee"
+ taste_description = "refreshingly cold coffee"
/datum/reagent/consumable/drink/coffee/soy_latte
name = "Soy Latte"
@@ -320,7 +320,7 @@
drink_icon = "soy_latte"
drink_name = "Soy Latte"
drink_desc = "A nice and refrshing beverage while you are reading."
- taste_message = "fake milky coffee"
+ taste_description = "fake milky coffee"
/datum/reagent/consumable/drink/coffee/soy_latte/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -339,7 +339,7 @@
drink_icon = "cafe_latte"
drink_name = "Cafe Latte"
drink_desc = "A nice, strong and refreshing beverage while you are reading."
- taste_message = "milky coffee"
+ taste_description = "milky coffee"
/datum/reagent/consumable/drink/coffee/cafe_latte/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -355,7 +355,7 @@
color = "#673629"
drink_name = "Cafe Mocha"
drink_desc = "The perfect blend of coffe, milk, and chocolate."
- taste_message = "chocolatey coffee"
+ taste_description = "chocolatey coffee"
/datum/reagent/consumable/drink/tea
name = "Tea"
@@ -370,7 +370,7 @@
drink_icon = "glass_brown"
drink_name = "Glass of Tea"
drink_desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?"
- taste_message = "tea"
+ taste_description = "tea"
/datum/reagent/consumable/drink/tea/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -388,7 +388,7 @@
drink_icon = "icetea"
drink_name = "Iced Tea"
drink_desc = "No relation to a certain rap artist/ actor."
- taste_message = "cold tea"
+ taste_description = "cold tea"
/datum/reagent/consumable/drink/bananahonk
name = "Banana Honk"
@@ -398,7 +398,7 @@
drink_icon = "bananahonkglass"
drink_name = "Banana Honk"
drink_desc = "A drink from Banana Heaven."
- taste_message = "HONK"
+ taste_description = "HONK"
/datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -415,7 +415,7 @@
drink_icon = "silencerglass"
drink_name = "Silencer"
drink_desc = "A drink from mime Heaven."
- taste_message = "mphhhh"
+ taste_description = "mphhhh"
/datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -433,7 +433,7 @@
drink_icon = "chocolatepudding"
drink_name = "Chocolate Pudding"
drink_desc = "Tasty"
- taste_message = "chocolate"
+ taste_description = "chocolate"
/datum/reagent/consumable/drink/vanillapudding
name = "Vanilla Pudding"
@@ -444,7 +444,7 @@
drink_icon = "vanillapudding"
drink_name = "Vanilla Pudding"
drink_desc = "Tasty."
- taste_message = "vanilla"
+ taste_description = "vanilla"
/datum/reagent/consumable/drink/cherryshake
name = "Cherry Shake"
@@ -455,7 +455,7 @@
drink_icon = "cherryshake"
drink_name = "Cherry Shake"
drink_desc = "A cherry flavored milkshake."
- taste_message = "cherry milkshake"
+ taste_description = "cherry milkshake"
/datum/reagent/consumable/drink/bluecherryshake
name = "Blue Cherry Shake"
@@ -466,7 +466,7 @@
drink_icon = "bluecherryshake"
drink_name = "Blue Cherry Shake"
drink_desc = "An exotic blue milkshake."
- taste_message = "blues"
+ taste_description = "blues"
/datum/reagent/consumable/drink/pumpkin_latte
name = "Pumpkin Latte"
@@ -477,7 +477,7 @@
drink_icon = "pumpkin_latte"
drink_name = "Pumpkin Latte"
drink_desc = "A mix of coffee and pumpkin juice."
- taste_message = "overpriced hipster spices"
+ taste_description = "overpriced hipster spices"
/datum/reagent/consumable/drink/gibbfloats
name = "Gibb Floats"
@@ -488,25 +488,25 @@
drink_icon= "gibbfloats"
drink_name = "Gibbfloat"
drink_desc = "Dr. Gibb with ice cream on top."
- taste_message = "taste revolution"
+ taste_description = "taste revolution"
/datum/reagent/consumable/drink/pumpkinjuice
name = "Pumpkin Juice"
id = "pumpkinjuice"
description = "Juiced from real pumpkin."
color = "#FFA500"
- taste_message = "autumn"
+ taste_description = "autumn"
/datum/reagent/consumable/drink/blumpkinjuice
name = "Blumpkin Juice"
id = "blumpkinjuice"
description = "Juiced from real blumpkin."
color = "#00BFFF"
- taste_message = "caustic puke"
+ taste_description = "caustic puke"
/datum/reagent/consumable/drink/grape_soda
name = "Grape soda"
id = "grapesoda"
description = "Beloved of children and teetotalers."
color = "#E6CDFF"
- taste_message = "grape soda"
+ taste_description = "grape soda"
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index 9e96ed5b56b..a2736cec719 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -19,7 +19,7 @@
description = "A chemical element."
reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128
- taste_message = "metal"
+ taste_description = "metal"
/datum/reagent/lithium/on_mob_life(mob/living/M)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
@@ -35,7 +35,7 @@
description = "A highly potent hallucinogenic substance. Far out, maaaan."
reagent_state = LIQUID
color = "#0000D8"
- taste_message = "a magical journey"
+ taste_description = "a magical journey"
/datum/reagent/lsd/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -52,7 +52,7 @@
metabolization_rate = 0.2
addiction_chance = 65
heart_rate_decrease = 1
- taste_message = "a synthetic high"
+ taste_description = "a synthetic high"
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -69,7 +69,7 @@
id = "psilocybin"
description = "A strong psycotropic derived from certain species of mushroom."
color = "#E700E7" // rgb: 231, 0, 231
- taste_message = "visions"
+ taste_description = "visions"
/datum/reagent/psilocybin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -105,7 +105,7 @@
overdose_threshold = 35
addiction_chance = 70
heart_rate_increase = 1
- taste_message = "calm"
+ taste_description = "calm"
/datum/reagent/nicotine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -242,7 +242,7 @@
color = "#0264B4"
overdose_threshold = 20
addiction_chance = 50
- taste_message = "very poor life choices"
+ taste_description = "very poor life choices"
/datum/reagent/krokodil/on_mob_life(mob/living/M)
@@ -316,7 +316,7 @@
addiction_chance = 60
metabolization_rate = 0.6
heart_rate_increase = 1
- taste_message = "speed"
+ taste_description = "speed"
/datum/reagent/methamphetamine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -376,7 +376,7 @@
overdose_threshold = 20
addiction_chance = 80
metabolization_rate = 0.6
- taste_message = "WAAAAGH"
+ taste_description = "WAAAAGH"
/datum/reagent/bath_salts/on_mob_life(mob/living/M)
var/check = rand(0,100)
@@ -475,7 +475,7 @@
reagent_state = LIQUID
color = "#644600"
addiction_chance = 30
- taste_message = "puke... or worse"
+ taste_description = "puke... or worse"
/datum/reagent/jenkem/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -539,7 +539,7 @@
overdose_threshold = 15
process_flags = ORGANIC | SYNTHETIC //Flipping for everyone!
addiction_chance = 10
- taste_message = "flips"
+ taste_description = "flips"
/datum/reagent/fliptonium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -611,7 +611,7 @@
reagent_state = LIQUID
color = "#AC88CA" //RGB: 172, 136, 202
metabolization_rate = 0.6 * REAGENTS_METABOLISM
- taste_message = "spinning"
+ taste_description = "spinning"
/datum/reagent/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
@@ -645,7 +645,7 @@
overdose_threshold = 20
addiction_chance = 60
metabolization_rate = 0.6
- taste_message = "wiper fluid"
+ taste_description = "wiper fluid"
/datum/reagent/lube/ultra/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -697,7 +697,7 @@
process_flags = SYNTHETIC
overdose_threshold = 20
addiction_chance = 50
- taste_message = "silicone"
+ taste_description = "silicone"
/datum/reagent/surge/on_mob_life(mob/living/M)
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index 6f0c53730b4..35cf0153255 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -5,6 +5,8 @@
/datum/reagent/consumable
name = "Consumable"
id = "consumable"
+ taste_description = "generic food"
+ taste_mult = 4
var/nutriment_factor = 1 * REAGENTS_METABOLISM
var/diet_flags = DIET_OMNI | DIET_HERB | DIET_CARN
@@ -23,7 +25,7 @@
reagent_state = SOLID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
- taste_message = null
+ taste_description = null
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -38,19 +40,41 @@
H.blood_volume += 0.4
return ..() | update_flags
+/datum/reagent/consumable/nutriment/on_new(list/supplied_data)
+ // taste data can sometimes be ("salt" = 3, "chips" = 1)
+ // and we want it to be in the form ("salt" = 0.75, "chips" = 0.25)
+ // which is called "normalizing"
+ if(!supplied_data)
+ supplied_data = data
+ // if data isn't an associative list, this has some WEIRD side effects
+ // TODO probably check for assoc list?
+ data = counterlist_normalise(supplied_data)
+
+/datum/reagent/consumable/nutriment/on_merge(list/newdata, newvolume)
+ if(!islist(newdata) || !newdata.len)
+ return
+ var/list/taste_amounts = list()
+ var/list/other_taste_amounts = newdata.Copy()
+ if(data)
+ taste_amounts = data.Copy()
+ counterlist_scale(taste_amounts, volume)
+ counterlist_combine(taste_amounts, other_taste_amounts)
+ counterlist_normalise(taste_amounts)
+ data = taste_amounts
+
/datum/reagent/consumable/nutriment/protein // Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores
name = "Protein"
id = "protein"
description = "Various essential proteins and fats commonly found in animal flesh and blood."
diet_flags = DIET_CARN | DIET_OMNI
- taste_message = "meat"
+ taste_description = "meat" //TODO: Remove
/datum/reagent/consumable/nutriment/plantmatter // Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores
name = "Plant-matter"
id = "plantmatter"
description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce."
diet_flags = DIET_HERB | DIET_OMNI
- taste_message = "vegetables"
+ taste_description = "vegetables" //TODO: Remove
/datum/reagent/consumable/vitamin
name = "Vitamin"
@@ -58,7 +82,7 @@
description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
reagent_state = SOLID
color = "#664330" // rgb: 102, 67, 48
- taste_message = "nutrition"
+ taste_description = "nutrition"
/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -82,7 +106,8 @@
color = "#FFFFFF" // rgb: 255, 255, 255
nutriment_factor = 5 * REAGENTS_METABOLISM
overdose_threshold = 200 // Hyperglycaemic shock
- taste_message = "sweetness"
+ taste_description = "sweetness"
+ taste_mult = 1.5
/datum/reagent/consumable/sugar/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -117,7 +142,7 @@
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#792300" // rgb: 121, 35, 0
- taste_message = "soy"
+ taste_description = "soy"
/datum/reagent/consumable/ketchup
name = "Ketchup"
@@ -126,7 +151,7 @@
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#731008" // rgb: 115, 16, 8
- taste_message = "ketchup"
+ taste_description = "ketchup"
/datum/reagent/consumable/capsaicin
name = "Capsaicin Oil"
@@ -134,7 +159,8 @@
description = "This is what makes chilis hot."
reagent_state = LIQUID
color = "#B31008" // rgb: 179, 16, 8
- taste_message = "HOTNESS"
+ taste_description = "HOTNESS"
+ taste_mult = 1.5
/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/M)
switch(current_cycle)
@@ -164,7 +190,7 @@
description = "This shit goes in pepperspray."
reagent_state = LIQUID
color = "#B31008" // rgb: 179, 16, 8
- taste_message = "PURE FIRE"
+ taste_description = "PURE FIRE"
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M)
if(prob(5))
@@ -233,7 +259,7 @@
reagent_state = LIQUID
color = "#8BA6E9" // rgb: 139, 166, 233
process_flags = ORGANIC | SYNTHETIC
- taste_message = "cold"
+ taste_description = "cold"
/datum/reagent/consumable/frostoil/on_mob_life(mob/living/M)
switch(current_cycle)
@@ -273,8 +299,8 @@
reagent_state = SOLID
color = "#B1B0B0"
overdose_threshold = 100
- taste_strength = 2
- taste_message = "salt"
+ taste_mult = 2
+ taste_description = "salt"
/datum/reagent/consumable/sodiumchloride/overdose_process(mob/living/M, severity)
var/update_flags = STATUS_UPDATE_NONE
@@ -287,7 +313,7 @@
id = "blackpepper"
description = "A powder ground from peppercorns. *AAAACHOOO*"
reagent_state = SOLID
- taste_message = "pepper"
+ taste_description = "pepper"
/datum/reagent/consumable/cocoa
name = "Cocoa Powder"
@@ -296,7 +322,7 @@
reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
- taste_message = "bitter cocoa"
+ taste_description = "bitter cocoa"
/datum/reagent/consumable/vanilla
name = "Vanilla Powder"
@@ -305,7 +331,7 @@
reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#FFFACD"
- taste_message = "bitter vanilla"
+ taste_description = "bitter vanilla"
/datum/reagent/consumable/hot_coco
name = "Hot Chocolate"
@@ -314,7 +340,7 @@
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#403010" // rgb: 64, 48, 16
- taste_message = "chocolate"
+ taste_description = "chocolate"
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
@@ -326,7 +352,7 @@
id = "sprinkles"
description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
color = "#FF00FF" // rgb: 255, 0, 255
- taste_message = "crunchy sweetness"
+ taste_description = "crunchy sweetness"
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -342,7 +368,7 @@
reagent_state = LIQUID
nutriment_factor = 20 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
- taste_message = "oil"
+ taste_description = "oil"
/datum/reagent/consumable/cornoil/reaction_turf(turf/simulated/T, volume)
if(!istype(T))
@@ -363,7 +389,7 @@
description = "Heated beyond usefulness, this enzyme is now worthless."
reagent_state = LIQUID
color = "#282314" // rgb: 54, 94, 48
- taste_message = null
+ taste_description = null
/datum/reagent/consumable/dry_ramen
name = "Dry Ramen"
@@ -371,7 +397,7 @@
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
reagent_state = SOLID
color = "#302000" // rgb: 48, 32, 0
- taste_message = "dry ramen coated with what might just be your tears"
+ taste_description = "dry ramen coated with what might just be your tears"
/datum/reagent/consumable/hot_ramen
name = "Hot Ramen"
@@ -380,7 +406,7 @@
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
- taste_message = "cheap ramen and memories"
+ taste_description = "cheap ramen and memories"
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M)
if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
@@ -394,7 +420,7 @@
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
- taste_message = "SPICY ramen"
+ taste_description = "SPICY ramen"
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M)
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
@@ -406,7 +432,7 @@
description = "This is what you rub all over yourself to pretend to be a ghost."
reagent_state = SOLID
color = "#FFFFFF" // rgb: 0, 0, 0
- taste_message = "flour"
+ taste_description = "flour"
/datum/reagent/consumable/flour/reaction_turf(turf/T, volume)
if(!isspaceturf(T))
@@ -419,7 +445,7 @@
reagent_state = SOLID
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#FFFFFF" // rgb: 0, 0, 0
- taste_message = "rice"
+ taste_description = "rice"
/datum/reagent/consumable/cherryjelly
name = "Cherry Jelly"
@@ -427,7 +453,7 @@
description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
reagent_state = LIQUID
color = "#801E28" // rgb: 128, 30, 40
- taste_message = "cherry jelly"
+ taste_description = "cherry jelly"
/datum/reagent/consumable/bluecherryjelly
name = "Blue Cherry Jelly"
@@ -435,7 +461,7 @@
description = "Blue and tastier kind of cherry jelly."
reagent_state = LIQUID
color = "#00F0FF"
- taste_message = "the blues"
+ taste_description = "the blues"
/datum/reagent/consumable/egg
name = "Egg"
@@ -443,7 +469,7 @@
description = "A runny and viscous mixture of clear and yellow fluids."
reagent_state = LIQUID
color = "#F0C814"
- taste_message = "eggs"
+ taste_description = "eggs"
/datum/reagent/consumable/egg/on_mob_life(mob/living/M)
if(prob(3))
@@ -456,7 +482,7 @@
description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "flour"
+ taste_description = "flour"
/datum/reagent/consumable/corn_syrup
name = "Corn Syrup"
@@ -464,7 +490,7 @@
description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "cheap sugar substitute"
+ taste_description = "cheap sugar substitute"
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 1.2)
@@ -476,7 +502,7 @@
description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "diabetes"
+ taste_description = "diabetes"
/datum/reagent/consumable/vhfcs/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 2.4)
@@ -489,7 +515,7 @@
reagent_state = LIQUID
color = "#d3a308"
nutriment_factor = 15 * REAGENTS_METABOLISM
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/consumable/honey/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -504,7 +530,7 @@
id = "onionjuice"
description = "A strong tasting substance that can induce partial blindness."
color = "#c0c9a0"
- taste_message = "pungency"
+ taste_description = "pungency"
/datum/reagent/consumable/onion/reaction_mob(mob/living/M, method = TOUCH, volume)
if(method == TOUCH)
@@ -528,7 +554,7 @@
drink_icon = "chocolateglass"
drink_name = "Glass of chocolate"
drink_desc = "Tasty"
- taste_message = "chocolate"
+ taste_description = "chocolate"
/datum/reagent/consumable/chocolate/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 0.8)
@@ -544,7 +570,7 @@
description = "A rather bitter herb once thought to hold magical protective properties."
reagent_state = LIQUID
color = "#21170E"
- taste_message = "tea"
+ taste_description = "tea"
/datum/reagent/consumable/mugwort/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -564,7 +590,7 @@
color = "#AB5D5D"
metabolization_rate = 0.2
overdose_threshold = 133
- taste_message = "bacon"
+ taste_description = "bacon"
/datum/reagent/consumable/porktonium/overdose_process(mob/living/M, severity)
if(prob(15))
@@ -582,7 +608,7 @@
color = "#B4B400"
metabolization_rate = 0.2
nutriment_factor = 2
- taste_message = "broth"
+ taste_description = "broth"
/datum/reagent/consumable/cheese
name = "Cheese"
@@ -590,7 +616,7 @@
description = "Some cheese. Pour it out to make it solid."
reagent_state = SOLID
color = "#FFFF00"
- taste_message = "cheese"
+ taste_description = "cheese"
/datum/reagent/consumable/cheese/on_mob_life(mob/living/M)
if(prob(3))
@@ -608,7 +634,7 @@
reagent_state = LIQUID
color = "#B2B139"
overdose_threshold = 50
- taste_message = "cheese?"
+ taste_description = "cheese?"
/datum/reagent/consumable/fake_cheese/overdose_process(mob/living/M, severity)
var/update_flags = STATUS_UPDATE_NONE
@@ -624,7 +650,7 @@
reagent_state = SOLID
color = "#50FF00"
addiction_chance = 5
- taste_message = "cheeeeeese...?"
+ taste_description = "cheeeeeese...?"
/datum/reagent/consumable/weird_cheese/on_mob_life(mob/living/M)
if(prob(5))
@@ -641,7 +667,7 @@
description = "A dish made of mashed beans cooked with lard."
reagent_state = LIQUID
color = "#684435"
- taste_message = "burritos"
+ taste_description = "burritos"
/datum/reagent/consumable/bread
name = "Bread"
@@ -649,7 +675,7 @@
description = "Bread! Yep, bread."
reagent_state = SOLID
color = "#9C5013"
- taste_message = "bread"
+ taste_description = "bread"
/datum/reagent/consumable/soybeanoil
name = "Space-soybean oil"
@@ -657,7 +683,7 @@
description = "An oil derived from extra-terrestrial soybeans."
reagent_state = LIQUID
color = "#B1B0B0"
- taste_message = "oil"
+ taste_description = "oil"
/datum/reagent/consumable/soybeanoil/on_mob_life(mob/living/M)
if(prob(10))
@@ -674,7 +700,7 @@
color = "#B1B0B0"
metabolization_rate = 0.2
overdose_threshold = 75
- taste_message = "oil"
+ taste_description = "oil"
/datum/reagent/consumable/hydrogenated_soybeanoil/on_mob_life(mob/living/M)
if(prob(15))
@@ -707,7 +733,7 @@
description = "A paste comprised of highly-processed organic material. Uncomfortably similar to deviled ham spread."
reagent_state = LIQUID
color = "#EBD7D7"
- taste_message = "meat?"
+ taste_description = "meat?"
/datum/reagent/consumable/meatslurry/on_mob_life(mob/living/M)
if(prob(4))
@@ -725,7 +751,7 @@
description = "A starchy food paste made from boiled potatoes."
reagent_state = SOLID
color = "#D6D9C1"
- taste_message = "potatoes"
+ taste_description = "potatoes"
/datum/reagent/consumable/gravy
name = "Gravy"
@@ -733,7 +759,7 @@
description = "A savory sauce made from a simple meat-dripping roux and milk."
reagent_state = LIQUID
color = "#B4641B"
- taste_message = "gravy"
+ taste_description = "gravy"
/datum/reagent/consumable/beff
name = "Beff"
@@ -741,7 +767,7 @@
description = "An advanced blend of mechanically-recovered meat and textured synthesized protein product notable for its unusual crystalline grain when sliced."
reagent_state = SOLID
color = "#AC7E67"
- taste_message = "meat"
+ taste_description = "meat"
/datum/reagent/consumable/beff/on_mob_life(mob/living/M)
if(prob(5))
@@ -759,7 +785,7 @@
description = "An Italian-American variety of salami usually made from beef and pork"
reagent_state = SOLID
color = "#AC7E67"
- taste_message = "pepperoni"
+ taste_description = "pepperoni"
/datum/reagent/consumable/pepperoni/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == TOUCH)
@@ -791,7 +817,7 @@
description = "A gross and unidentifiable substance."
reagent_state = LIQUID
color = "#63DE63"
- taste_message = "burned food"
+ taste_description = "burned food"
/datum/reagent/questionmark/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -808,8 +834,8 @@
reagent_state = LIQUID
color = "#F5F5F5"
metabolization_rate = 0.2
- taste_message = "excellent cuisine"
- taste_strength = 4
+ taste_description = "excellent cuisine"
+ taste_mult = 4
/datum/reagent/msg/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -827,7 +853,7 @@
description = "Pure cholesterol. Probably not very good for you."
reagent_state = LIQUID
color = "#FFFAC8"
- taste_message = "heart attack"
+ taste_description = "heart attack"
/datum/reagent/cholesterol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -851,7 +877,7 @@
description = "Scrapings of some unknown fungus found growing on the station walls."
reagent_state = LIQUID
color = "#C87D28"
- taste_message = "mold"
+ taste_description = "mold"
/datum/reagent/fungus/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -872,7 +898,7 @@
reagent_state = LIQUID
color = "#8EAE7B"
process_flags = ORGANIC | SYNTHETIC //Because apparently ghosts in the shell
- taste_message = "spooks"
+ taste_description = "spooks"
/datum/reagent/ectoplasm/on_mob_life(mob/living/M)
var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...")
@@ -901,7 +927,7 @@
description = "Looks like someone lost their lunch. And then collected it. Yuck."
reagent_state = LIQUID
color = "#FFFF00"
- taste_message = "puke"
+ taste_description = "puke"
/datum/reagent/vomit/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -913,7 +939,7 @@
description = "Whoa, that can't be natural. That's horrible."
reagent_state = LIQUID
color = "#78FF74"
- taste_message = "puke"
+ taste_description = "puke"
/datum/reagent/greenvomit/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -926,7 +952,7 @@
id = "entpoly"
description = "An ichor, derived from a certain mushroom, makes for a bad time."
color = "#1d043d"
- taste_message = "mold"
+ taste_description = "mold"
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -946,7 +972,7 @@
description = "A stimulating ichor which causes luminescent fungi to grow on the skin. "
color = "#b5a213"
var/light_activated = 0
- taste_message = "mold"
+ taste_description = "mold"
/datum/reagent/consumable/tinlux/on_mob_life(mob/living/M)
if(!light_activated)
@@ -963,7 +989,7 @@
description = "A bubbly paste that heals wounds of the skin."
color = "#d3a308"
nutriment_factor = 3 * REAGENTS_METABOLISM
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 345ac4a9c6f..412c9f60f99 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -15,7 +15,7 @@
color = "#C805DC"
metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units
shock_reduction = 200
- taste_message = "numbness"
+ taste_description = "numbness"
/datum/reagent/medicine/sterilizine
name = "Sterilizine"
@@ -23,7 +23,7 @@
description = "Sterilizes wounds in preparation for surgery."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- taste_message = "antiseptic"
+ taste_description = "antiseptic"
//makes you squeaky clean
/datum/reagent/medicine/sterilizine/reaction_mob(mob/living/M, method=TOUCH, volume)
@@ -43,7 +43,7 @@
reagent_state = LIQUID
color = "#FA46FA"
overdose_threshold = 40
- taste_message = "stimulant"
+ taste_description = "stimulant"
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -86,7 +86,7 @@
description = "A specialized drug that stimulates the mitochondria of cells to encourage healing of internal organs."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- taste_message = "nurturing"
+ taste_description = "nurturing"
/datum/reagent/medicine/mitocholide/on_mob_life(mob/living/M)
if(ishuman(M))
@@ -110,7 +110,7 @@
reagent_state = LIQUID
color = "#0000C8" // rgb: 200, 165, 220
heart_rate_decrease = 1
- taste_message = "a safe refuge"
+ taste_description = "a safe refuge"
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -134,7 +134,7 @@
reagent_state = SOLID
color = "#669900" // rgb: 102, 153, 0
overdose_threshold = 30
- taste_message = "reformation"
+ taste_description = "reformation"
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -163,7 +163,7 @@
reagent_state = LIQUID
color = "#0AB478"
metabolization_rate = 0.2
- taste_message = "antibiotics"
+ taste_description = "antibiotics"
/datum/reagent/medicine/silver_sulfadiazine
name = "Silver Sulfadiazine"
@@ -172,7 +172,7 @@
reagent_state = LIQUID
color = "#F0C814"
metabolization_rate = 3
- taste_message = "burn cream"
+ taste_description = "burn cream"
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -198,7 +198,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 3
- taste_message = "wound cream"
+ taste_description = "wound cream"
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -226,7 +226,7 @@
color = "#C8A5DC"
penetrates_skin = TRUE
metabolization_rate = 0.15
- taste_message = "salt"
+ taste_description = "salt"
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -246,7 +246,7 @@
description = "A resorbable microfibrillar collagen and protein mixture that can rapidly heal injuries when applied topically."
reagent_state = LIQUID
color = "#FFEBEB"
- taste_message = "blood"
+ taste_description = "blood"
/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
if(iscarbon(M))
@@ -268,7 +268,7 @@
description = "Activated charcoal helps to absorb toxins."
reagent_state = LIQUID
color = "#000000"
- taste_message = "dust"
+ taste_description = "dust"
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -288,7 +288,7 @@
metabolization_rate = 0.2
overdose_threshold = 30
addiction_chance = 5
- taste_message = "health"
+ taste_description = "health"
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -344,7 +344,7 @@
reagent_state = LIQUID
color = "#22AB35"
metabolization_rate = 0.8
- taste_message = "a painful cleansing"
+ taste_description = "a painful cleansing"
/datum/reagent/medicine/calomel/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -363,7 +363,7 @@
description = "Potassium Iodide is a medicinal drug used to counter the effects of radiation poisoning."
reagent_state = LIQUID
color = "#B4DCBE"
- taste_message = "cleansing"
+ taste_description = "cleansing"
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(prob(80))
@@ -376,7 +376,7 @@
description = "Pentetic Acid is an aggressive chelation agent. May cause tissue damage. Use with caution."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "a purge"
+ taste_description = "a purge"
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -400,7 +400,7 @@
metabolization_rate = 0.1
shock_reduction = 25
overdose_threshold = 25
- taste_message = "relief"
+ taste_description = "relief"
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -415,7 +415,7 @@
reagent_state = LIQUID
color = "#00FFFF"
metabolization_rate = 0.2
- taste_message = "safety"
+ taste_description = "safety"
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -431,7 +431,7 @@
color = "#C8A5DC"
metabolization_rate = 0.2
addiction_chance = 20
- taste_message = "oxygenation"
+ taste_description = "oxygenation"
/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -452,7 +452,7 @@
metabolization_rate = 0.3
overdose_threshold = 35
addiction_chance = 25
- taste_message = "stimulation"
+ taste_description = "stimulation"
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -501,7 +501,7 @@
reagent_state = LIQUID
color = "#5BCBE1"
addiction_chance = 10
- taste_message = "antihistamine"
+ taste_description = "antihistamine"
/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/M)
M.AdjustJitter(-20)
@@ -524,7 +524,7 @@
overdose_threshold = 20
addiction_chance = 50
shock_reduction = 50
- taste_message = "a delightful numbing"
+ taste_description = "a delightful numbing"
/datum/reagent/medicine/morphine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -546,7 +546,7 @@
description = "Oculine is a saline eye medication with mydriatic and antibiotic effects."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "clarity"
+ taste_description = "clarity"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -578,7 +578,7 @@
color = "#000000"
metabolization_rate = 0.2
overdose_threshold = 25
- taste_message = "a moment of respite"
+ taste_description = "a moment of respite"
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -606,7 +606,7 @@
color = "#96B1AE"
metabolization_rate = 0.2
overdose_threshold = 20
- taste_message = "borrowed time"
+ taste_description = "borrowed time"
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -662,7 +662,7 @@
reagent_state = LIQUID
color = "#A0E85E"
metabolization_rate = 0.2
- taste_message = "life"
+ taste_description = "life"
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -721,7 +721,7 @@
id = "mannitol"
description = "Mannitol is a sugar alcohol that can help alleviate cranial swelling."
color = "#D1D1F1"
- taste_message = "neurogenisis"
+ taste_description = "neurogenisis"
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -733,7 +733,7 @@
id = "mutadone"
description = "Mutadone is an experimental bromide that can cure genetic abnomalities."
color = "#5096C8"
- taste_message = "cleanliness"
+ taste_description = "cleanliness"
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
if(M.mind && M.mind.assigned_role == "Cluwne") // HUNKE
@@ -762,7 +762,7 @@
id = "antihol"
description = "A medicine which quickly eliminates alcohol in the body."
color = "#009CA8"
- taste_message = "sobriety"
+ taste_description = "sobriety"
/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -849,7 +849,7 @@
description = "A hormone generated by the pancreas responsible for metabolizing carbohydrates and fat in the bloodstream."
reagent_state = LIQUID
color = "#C8A5DC"
- taste_message = "tiredness"
+ taste_description = "tiredness"
/datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
M.reagents.remove_reagent("sugar", 5)
@@ -863,7 +863,7 @@
color = "#D782E6"
addiction_chance = 20
overdose_threshold = 50
- taste_message = "warmth and stability"
+ taste_description = "warmth and stability"
/datum/reagent/medicine/teporone/on_mob_life(mob/living/M)
if(M.bodytemperature > 310)
@@ -878,7 +878,7 @@
description = "Haloperidol is a powerful antipsychotic and sedative. Will help control psychiatric problems, but may cause brain damage."
reagent_state = LIQUID
color = "#FFDCFF"
- taste_message = "stability"
+ taste_description = "stability"
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -910,7 +910,7 @@
reagent_state = LIQUID
color = "#96DEDE"
metabolization_rate = 0.1
- taste_message = "sleepiness"
+ taste_description = "sleepiness"
/datum/reagent/medicine/ether/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -933,7 +933,7 @@
reagent_state = SOLID
color = "#555555"
can_synth = FALSE
- taste_message = "bodily perfection"
+ taste_description = "bodily perfection"
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -953,7 +953,7 @@
color = "#DCDCDC"
overdose_threshold = 30
metabolization_rate = 0.1
- taste_message = "faint hope"
+ taste_description = "faint hope"
/datum/reagent/medicine/omnizine_diluted/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -983,7 +983,7 @@
reagent_state = LIQUID
color = "#CC7A00"
process_flags = SYNTHETIC
- taste_message = "overclocking"
+ taste_description = "overclocking"
/datum/reagent/medicine/degreaser/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1014,7 +1014,7 @@
reagent_state = LIQUID
color = "#D7B395"
process_flags = SYNTHETIC
- taste_message = "heavy metals"
+ taste_description = "heavy metals"
/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1031,7 +1031,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
- taste_message = "knitting wounds"
+ taste_description = "knitting wounds"
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1050,7 +1050,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 30
- taste_message = "soothed burns"
+ taste_description = "soothed burns"
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1069,7 +1069,7 @@
description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain."
color = "#FFAF00"
overdose_threshold = 25
- taste_message = "a gift from nature"
+ taste_description = "a gift from nature"
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1095,7 +1095,7 @@
id = "corazone"
description = "A medication used to treat pain, fever, and inflammation, along with heart attacks."
color = "#F5F5F5"
- taste_message = "a brief respite"
+ taste_description = "a brief respite"
// This reagent's effects are handled in heart attack handling code
@@ -1106,7 +1106,7 @@
color = "#9b3401"
metabolization_rate = 0.5
can_synth = FALSE
- taste_message = "wholeness"
+ taste_description = "wholeness"
/datum/reagent/medicine/nanocalcium/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index 4d42e9060ae..66f58a55003 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -38,7 +38,7 @@
description = "A colorless, odorless gas."
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
- taste_message = null
+ taste_description = null
/datum/reagent/nitrogen
name = "Nitrogen"
@@ -46,7 +46,7 @@
description = "A colorless, odorless, tasteless gas."
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
- taste_message = null
+ taste_description = null
/datum/reagent/hydrogen
name = "Hydrogen"
@@ -54,7 +54,7 @@
description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
- taste_message = null
+ taste_description = null
/datum/reagent/potassium
name = "Potassium"
@@ -62,7 +62,7 @@
description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
reagent_state = SOLID
color = "#A0A0A0" // rgb: 160, 160, 160
- taste_message = "bad ideas"
+ taste_description = "bad ideas"
/datum/reagent/sulfur
name = "Sulfur"
@@ -70,7 +70,7 @@
description = "A chemical element."
reagent_state = SOLID
color = "#BF8C00" // rgb: 191, 140, 0
- taste_message = "impulsive decisions"
+ taste_description = "impulsive decisions"
/datum/reagent/sodium
name = "Sodium"
@@ -78,7 +78,7 @@
description = "A chemical element."
reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128
- taste_message = "horrible misjudgement"
+ taste_description = "horrible misjudgement"
/datum/reagent/phosphorus
name = "Phosphorus"
@@ -86,7 +86,7 @@
description = "A chemical element."
reagent_state = SOLID
color = "#832828" // rgb: 131, 40, 40
- taste_message = "misguided choices"
+ taste_description = "misguided choices"
/datum/reagent/carbon
name = "Carbon"
@@ -94,7 +94,7 @@
description = "A chemical element."
reagent_state = SOLID
color = "#1C1300" // rgb: 30, 20, 0
- taste_message = "like a pencil or something"
+ taste_description = "like a pencil or something"
/datum/reagent/carbon/reaction_turf(turf/T, volume)
if(!(locate(/obj/effect/decal/cleanable/dirt) in T) && !isspaceturf(T)) // Only add one dirt per turf. Was causing people to crash.
@@ -106,7 +106,7 @@
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
reagent_state = SOLID
color = "#F7C430" // rgb: 247, 196, 48
- taste_message = "bling"
+ taste_description = "bling"
/datum/reagent/silver
@@ -115,7 +115,7 @@
description = "A lustrous metallic element regarded as one of the precious metals."
reagent_state = SOLID
color = "#D0D0D0" // rgb: 208, 208, 208
- taste_message = "sub-par bling"
+ taste_description = "sub-par bling"
/datum/reagent/silver/reaction_mob(mob/living/M, method=TOUCH, volume)
if(M.has_bane(BANE_SILVER))
@@ -128,7 +128,7 @@
description = "A silvery white and ductile member of the boron group of chemical elements."
reagent_state = SOLID
color = "#A8A8A8" // rgb: 168, 168, 168
- taste_message = "metal"
+ taste_description = "metal"
/datum/reagent/silicon
@@ -137,7 +137,7 @@
description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
reagent_state = SOLID
color = "#A8A8A8" // rgb: 168, 168, 168
- taste_message = "a CPU"
+ taste_description = "a CPU"
/datum/reagent/copper
@@ -145,7 +145,7 @@
id = "copper"
description = "A highly ductile metal."
color = "#6E3B08" // rgb: 110, 59, 8
- taste_message = "copper"
+ taste_description = "copper"
/datum/reagent/iron
@@ -154,7 +154,7 @@
description = "Pure iron is a metal."
reagent_state = SOLID
color = "#C8A5DC" // rgb: 200, 165, 220
- taste_message = "metal"
+ taste_description = "metal"
/datum/reagent/iron/on_mob_life(mob/living/M)
if(ishuman(M))
@@ -176,7 +176,7 @@
description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
reagent_state = LIQUID
color = "#9E6B38" // rgb: 158, 107, 56
- taste_message = "extreme discomfort"
+ taste_description = "extreme discomfort"
// metal foaming agent
// this is lithium hydride. Add other recipies (e.g. LiH + H2O -> LiOH + H2) eventually
@@ -186,7 +186,7 @@
description = "A caustic substance commonly used in fertilizer or household cleaners."
reagent_state = GAS
color = "#404030" // rgb: 64, 64, 48
- taste_message = "floor cleaner"
+ taste_description = "floor cleaner"
/datum/reagent/diethylamine
name = "Diethylamine"
@@ -194,7 +194,7 @@
description = "A secondary amine, useful as a plant nutrient and as building block for other compounds."
reagent_state = LIQUID
color = "#322D00"
- taste_message = null
+ taste_description = null
/datum/reagent/oil
name = "Oil"
@@ -202,7 +202,7 @@
description = "A decent lubricant for machines. High in benzene, naptha and other hydrocarbons."
reagent_state = LIQUID
color = "#3C3C3C"
- taste_message = "motor oil"
+ taste_description = "motor oil"
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/oil/reaction_temperature(exposed_temperature, exposed_volume)
@@ -227,7 +227,7 @@
description = "A purple gaseous element."
reagent_state = GAS
color = "#493062"
- taste_message = "chemtrail resistance"
+ taste_description = "chemtrail resistance"
/datum/reagent/carpet
name = "Carpet"
@@ -235,7 +235,7 @@
description = "A covering of thick fabric used on floors. This type looks particularly gross."
reagent_state = LIQUID
color = "#701345"
- taste_message = "a carpet...what?"
+ taste_description = "a carpet...what?"
/datum/reagent/carpet/reaction_turf(turf/simulated/T, volume)
if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel))
@@ -249,7 +249,7 @@
description = "A red-brown liquid element."
reagent_state = LIQUID
color = "#4E3A3A"
- taste_message = null
+ taste_description = null
/datum/reagent/phenol
name = "Phenol"
@@ -257,7 +257,7 @@
description = "Also known as carbolic acid, this is a useful building block in organic chemistry."
reagent_state = LIQUID
color = "#525050"
- taste_message = null
+ taste_description = null
/datum/reagent/ash
name = "Ash"
@@ -265,7 +265,7 @@
description = "Ashes to ashes, dust to dust."
reagent_state = LIQUID
color = "#191919"
- taste_message = "ash"
+ taste_description = "ash"
/datum/reagent/acetone
name = "Acetone"
@@ -273,7 +273,7 @@
description = "Pure 100% nail polish remover, also works as an industrial solvent."
reagent_state = LIQUID
color = "#474747"
- taste_message = "nail polish remover"
+ taste_description = "nail polish remover"
/datum/reagent/acetone/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -286,7 +286,7 @@
description = "Volatile."
reagent_state = LIQUID
color = "#60A584" // rgb: 96, 165, 132
- taste_message = "one third of an explosion"
+ taste_description = "one third of an explosion"
/datum/reagent/colorful_reagent
name = "Colorful Reagent"
@@ -294,7 +294,7 @@
description = "It's pure liquid colors. That's a thing now."
reagent_state = LIQUID
color = "#FFFFFF"
- taste_message = "the rainbow"
+ taste_description = "the rainbow"
/datum/reagent/colorful_reagent/on_mob_life(mob/living/M)
if(ishuman(M))
@@ -320,7 +320,7 @@
description = "A rather tubular and gnarly way of coloring totally bodacious hair. Duuuudddeee."
reagent_state = LIQUID
color = "#960096"
- taste_message = "the 2559 Autumn release of the Le Jeune Homme catalogue for professional hairdressers"
+ taste_description = "the 2559 Autumn release of the Le Jeune Homme catalogue for professional hairdressers"
/datum/reagent/hair_dye/reaction_mob(mob/living/M, volume)
if(ishuman(M))
@@ -341,7 +341,7 @@
reagent_state = LIQUID
color = "#5DDA5D"
penetrates_skin = TRUE
- taste_message = "someone's beard"
+ taste_description = "someone's beard"
/datum/reagent/hairgrownium/reaction_mob(mob/living/M, volume)
if(ishuman(M))
@@ -360,7 +360,7 @@
reagent_state = LIQUID
color = "#5DD95D"
penetrates_skin = TRUE
- taste_message = "multiple beards"
+ taste_description = "multiple beards"
/datum/reagent/super_hairgrownium/reaction_mob(mob/living/M, volume)
if(ishuman(M))
@@ -393,7 +393,7 @@
description = "Hugs, in liquid form. Yes, the concept of a hug. As a liquid. This makes sense in the future."
reagent_state = LIQUID
color = "#FF97B9"
- taste_message = "hugs"
+ taste_description = "hugs"
/datum/reagent/love
name = "Pure love"
@@ -402,7 +402,7 @@
reagent_state = LIQUID
color = "#FF83A5"
process_flags = ORGANIC | SYNTHETIC // That's the power of love~
- taste_message = "love"
+ taste_description = "love"
/datum/reagent/love/on_mob_life(mob/living/M)
if(M.a_intent != INTENT_HELP)
@@ -436,7 +436,7 @@
id = "jestosterone"
description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes."
color = "#ff00ff" //Fuchsia, pity we can't do rainbow here
- taste_message = "a funny flavour"
+ taste_description = "a funny flavour"
/datum/reagent/jestosterone/on_new()
..()
@@ -501,7 +501,7 @@
id = "royal_bee_jelly"
description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees."
color = "#00ff80"
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M)
if(prob(2))
@@ -514,7 +514,7 @@
description = "A commercial chemical designed to help older men in the bedroom." //not really it just makes you a giant
color = "#ff0000"//strong red. rgb 255, 0, 0
var/current_size = 1
- taste_message = "enhancement"
+ taste_description = "enhancement"
/datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
var/newsize = current_size
@@ -546,7 +546,7 @@
description = "Finely ground Coffee beans, used to make coffee."
reagent_state = SOLID
color = "#5B2E0D" // rgb: 91, 46, 13
- taste_message = "waste"
+ taste_description = "waste"
/datum/reagent/toxin/teapowder
name = "Ground Tea Leaves"
@@ -554,7 +554,7 @@
description = "Finely shredded Tea leaves, used for making tea."
reagent_state = SOLID
color = "#7F8400" // rgb: 127, 132, 0"
- taste_message = "the future"
+ taste_description = "the future"
//////////////////////////////////Hydroponics stuff///////////////////////////////
@@ -564,7 +564,7 @@
description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
color = "#000000" // RBG: 0, 0, 0
var/tox_prob = 0
- taste_message = "puke"
+ taste_description = "puke"
/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -578,7 +578,7 @@
description = "Cheap and extremely common type of plant nutriment."
color = "#376400" // RBG: 50, 100, 0
tox_prob = 10
- taste_message = "obscurity and toil"
+ taste_description = "obscurity and toil"
/datum/reagent/plantnutriment/left4zednutriment
name = "Left 4 Zed"
@@ -586,7 +586,7 @@
description = "Unstable nutriment that makes plants mutate more often than usual."
color = "#1A1E4D" // RBG: 26, 30, 77
tox_prob = 25
- taste_message = "evolution"
+ taste_description = "evolution"
/datum/reagent/plantnutriment/robustharvestnutriment
name = "Robust Harvest"
@@ -594,7 +594,7 @@
description = "Very potent nutriment that prevents plants from mutating."
color = "#9D9D00" // RBG: 157, 157, 0
tox_prob = 15
- taste_message = "bountifulness"
+ taste_description = "bountifulness"
///Alchemical Reagents
@@ -640,7 +640,7 @@
color = "#FFC080" // rgb: 255, 196, 128 Bright orange
metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
- taste_message = "sour oranges"
+ taste_description = "sour oranges"
/datum/reagent/spraytan/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(ishuman(M))
diff --git a/code/modules/reagents/chemistry/reagents/paint.dm b/code/modules/reagents/chemistry/reagents/paint.dm
index ca6da0d0a23..6c0b04339b0 100644
--- a/code/modules/reagents/chemistry/reagents/paint.dm
+++ b/code/modules/reagents/chemistry/reagents/paint.dm
@@ -4,7 +4,7 @@
description = "Floor paint is used to color floor tiles."
reagent_state = LIQUID
color = "#808080"
- taste_message = "paint"
+ taste_description = "paint"
/datum/reagent/paint/reaction_turf(turf/T, volume)
if(!isspaceturf(T))
@@ -55,7 +55,7 @@
description = "Paint remover is used to remove floor paint from floor tiles."
reagent_state = LIQUID
color = "#808080"
- taste_message = "alcohol"
+ taste_description = "alcohol"
/datum/reagent/paint_remover/reaction_turf(turf/T, volume)
if(!isspaceturf(T))
diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
index 2294088e54a..af59809da27 100644
--- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm
+++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
@@ -15,7 +15,7 @@
description = "Tastes just how you'd think Paradise would if you could bottle it."
reagent_state = LIQUID
color = "#cc0044"
- taste_message = "paradise"
+ taste_description = "paradise"
//Apple-pocalypse: Low chance to cause a goonchem vortex that pulls things within a very small radius (2 tiles?) towards the drinker
/datum/reagent/consumable/drink/apple_pocalypse
@@ -24,7 +24,7 @@
description = "If doomsday came in fruit form, it'd probably be apples."
reagent_state = LIQUID
color = "#44FF44"
- taste_message = "doomsday"
+ taste_description = "doomsday"
/datum/reagent/consumable/drink/apple_pocalypse/on_mob_life(mob/living/M)
if(prob(1))
@@ -40,7 +40,7 @@
description = "Reason for ban: Excessive Flavor."
reagent_state = LIQUID
color = "#FF44FF"
- taste_message = "a permaban"
+ taste_description = "a permaban"
/datum/reagent/consumable/drink/berry_banned/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -69,7 +69,7 @@
description = "Reason for ban: Excessive Flavor."
reagent_state = LIQUID
color = "#FF44FF"
- taste_message = "a permaban"
+ taste_description = "a permaban"
/datum/reagent/consumable/drink/berry_banned2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -91,7 +91,7 @@
description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
reagent_state = LIQUID
color = "#4d2600"
- taste_message = "greytide"
+ taste_description = "greytide"
/datum/reagent/consumable/drink/blackeye_brew/on_mob_life(mob/living/M)
if(prob(25))
@@ -114,7 +114,7 @@
description = "Exploding with grape flavor and a favorite among ERT members system-wide."
reagent_state = LIQUID
color = "#9933ff"
- taste_message = "old people"
+ taste_description = "old people"
/datum/reagent/consumable/drink/grape_granade/on_mob_life(mob/living/M)
if(prob(1))
@@ -133,7 +133,7 @@
description = "Soft drinks have been detected on collision course with your tastebuds."
reagent_state = LIQUID
color = "#cc9900"
- taste_message = "flying space rocks"
+ taste_description = "flying space rocks"
/datum/reagent/consumable/drink/meteor_malt/on_mob_life(mob/living/M)
if(prob(25))
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index d611c3c8d86..e1161bf9a7d 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -84,7 +84,7 @@
drink_icon = "dr_gibb_glass"
drink_name = "Glass of welder fuel"
drink_desc = "Unless you are an industrial tool, this is probably not safe for consumption."
- taste_message = "mistakes"
+ taste_description = "mistakes"
process_flags = ORGANIC | SYNTHETIC
var/max_radius = 7
var/min_radius = 0
@@ -140,7 +140,7 @@
description = "The liquid phase of an unusual extraterrestrial compound."
reagent_state = LIQUID
color = "#7A2B94"
- taste_message = "corporate assets going to waste"
+ taste_description = "corporate assets going to waste"
/datum/reagent/plasma/reaction_temperature(exposed_temperature, exposed_volume)
if(exposed_temperature >= T0C + 100)
@@ -171,7 +171,7 @@
reagent_state = SOLID
color = "#673910" // rgb: 103, 57, 16
process_flags = ORGANIC | SYNTHETIC
- taste_message = "rust"
+ taste_description = "rust"
/datum/reagent/thermite/reaction_mob(mob/living/M, method= TOUCH, volume)
if(method == TOUCH)
@@ -206,7 +206,7 @@
description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
reagent_state = LIQUID
color = "#808080" // rgb: 128, 128, 128
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/stabilizing_agent
name = "Stabilizing Agent"
@@ -214,7 +214,7 @@
description = "A chemical that stabilises normally volatile compounds, preventing them from reacting immediately."
reagent_state = LIQUID
color = "#FFFF00"
- taste_message = "long-term stability"
+ taste_description = "long-term stability"
/datum/reagent/clf3
name = "Chlorine Trifluoride"
@@ -224,7 +224,7 @@
color = "#FF0000"
metabolization_rate = 4
process_flags = ORGANIC | SYNTHETIC
- taste_message = null
+ taste_description = null
/datum/reagent/clf3/on_mob_life(mob/living/M)
if(M.on_fire)
@@ -268,7 +268,7 @@
description = "Sucks everything into the detonation point."
reagent_state = LIQUID
color = "#800080"
- taste_message = "the end of the world"
+ taste_description = "the end of the world"
/datum/reagent/liquid_dark_matter/reaction_turf(turf/T, volume) //Oh gosh, why
if(prob(75))
@@ -287,7 +287,7 @@
color = "#000000"
metabolization_rate = 0.05
penetrates_skin = TRUE
- taste_message = "explosions"
+ taste_description = "explosions"
/datum/reagent/blackpowder/reaction_turf(turf/T, volume) //oh shit
if(volume >= 5 && !isspaceturf(T))
@@ -406,7 +406,7 @@
id = "plasma_dust"
description = "A fine dust of plasma. This chemical has unusual mutagenic properties for viruses and slimes alike."
color = "#500064" // rgb: 80, 0, 100
- taste_message = "corporate assets going to waste"
+ taste_description = "corporate assets going to waste"
/datum/reagent/plasma_dust/reaction_temperature(exposed_temperature, exposed_volume)
if(exposed_temperature >= T0C + 100)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 4cf50c9f661..72c6135cad1 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -28,7 +28,7 @@
description = "Useful for dealing with undesirable customers."
reagent_state = LIQUID
color = "#CF3600" // rgb: 207, 54, 0
- taste_message = "mint"
+ taste_description = "mint"
/datum/reagent/minttoxin/on_mob_life(mob/living/M)
if(FAT in M.mutations)
@@ -41,7 +41,7 @@
description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
reagent_state = LIQUID
color = "#801E28" // rgb: 128, 30, 40
- taste_message = "slimes"
+ taste_description = "slimes"
/datum/reagent/slimejelly/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -59,7 +59,7 @@
reagent_state = LIQUID
color = "#13BC5E" // rgb: 19, 188, 94
can_synth = FALSE
- taste_message = "shadows"
+ taste_description = "shadows"
/datum/reagent/slimetoxin/on_mob_life(mob/living/M)
if(ishuman(M))
@@ -93,7 +93,7 @@
color = "#484848" // rgb: 72, 72, 72
metabolization_rate = 0.2
penetrates_skin = TRUE
- taste_message = "metal"
+ taste_description = "metal"
/datum/reagent/mercury/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -109,7 +109,7 @@
color = "#808080" // rgb: 128, 128, 128
penetrates_skin = TRUE
process_flags = ORGANIC | SYNTHETIC
- taste_message = "fire"
+ taste_description = "fire"
/datum/reagent/chlorine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -124,7 +124,7 @@
color = "#6A6054"
penetrates_skin = TRUE
process_flags = ORGANIC | SYNTHETIC
- taste_message = "spicy freshness"
+ taste_description = "spicy freshness"
/datum/reagent/fluorine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -215,7 +215,7 @@
description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
reagent_state = SOLID
color = "#B8B8C0" // rgb: 184, 184, 192
- taste_message = null
+ taste_description = null
/datum/reagent/uranium/on_mob_life(mob/living/M)
M.apply_effect(2, IRRADIATE, negate_armor = 1)
@@ -247,7 +247,7 @@
reagent_state = LIQUID
color = "#00FF32"
process_flags = ORGANIC | SYNTHETIC
- taste_message = "ACID"
+ taste_description = "ACID"
/datum/reagent/sacid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -340,7 +340,7 @@
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
- taste_message = "beer"
+ taste_description = "beer"
/datum/reagent/beer2/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -361,7 +361,7 @@
metabolization_rate = 0.1
penetrates_skin = TRUE
can_synth = FALSE
- taste_message = null
+ taste_description = null
/datum/reagent/polonium/on_mob_life(mob/living/M)
M.apply_effect(8, IRRADIATE, negate_armor = 1)
@@ -375,7 +375,7 @@
color = "#E7C4C4"
metabolization_rate = 0.2
overdose_threshold = 40
- taste_message = null
+ taste_description = null
/datum/reagent/histamine/reaction_mob(mob/living/M, method=TOUCH, volume) //dumping histamine on someone is VERY mean.
if(iscarbon(M))
@@ -533,7 +533,7 @@
color = "#CF3600"
metabolization_rate = 0.1
penetrates_skin = TRUE
- taste_message = "almonds"
+ taste_description = "almonds"
/datum/reagent/cyanide/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -592,7 +592,7 @@
reagent_state = LIQUID
color = "#5050FF"
process_flags = ORGANIC | SYNTHETIC
- taste_message = "ACID"
+ taste_description = "ACID"
/datum/reagent/facid/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -648,7 +648,7 @@
reagent_state = LIQUID
color = "#7F10C0"
can_synth = FALSE
- taste_message = null
+ taste_description = null
/datum/reagent/initropidril/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -680,7 +680,7 @@
reagent_state = LIQUID
color = "#1E4664"
metabolization_rate = 0.2
- taste_message = null
+ taste_description = null
/datum/reagent/pancuronium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -715,7 +715,7 @@
color = "#5F8BE1"
metabolization_rate = 0.7
can_synth = FALSE
- taste_message = null
+ taste_description = null
/datum/reagent/sodium_thiopental/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -745,7 +745,7 @@
metabolization_rate = 0.8
penetrates_skin = TRUE
can_synth = FALSE
- taste_message = null
+ taste_description = null
/datum/reagent/ketamine/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -797,7 +797,7 @@
description = "A toxin produced by certain mushrooms. Very deadly."
reagent_state = LIQUID
color = "#D9D9D9"
- taste_message = null
+ taste_description = null
/datum/reagent/amanitin/on_mob_delete(mob/living/M)
M.adjustToxLoss(current_cycle*rand(2,4))
@@ -810,7 +810,7 @@
reagent_state = SOLID
color = "#D1DED1"
metabolization_rate = 0.2
- taste_message = "battery acid"
+ taste_description = "battery acid"
/datum/reagent/lipolicide/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -902,7 +902,7 @@
metabolization_rate = 0.1
penetrates_skin = TRUE
overdose_threshold = 25
- taste_message = null
+ taste_description = null
/datum/reagent/sarin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1038,7 +1038,7 @@
reagent_state = LIQUID
color = "#60A584"
heart_rate_stop = 1
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/capulettium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1069,7 +1069,7 @@
reagent_state = LIQUID
color = "#60A584"
heart_rate_stop = 1
- taste_message = "sweetness"
+ taste_description = "sweetness"
/datum/reagent/capulettium_plus/on_mob_life(mob/living/M)
M.Silence(2)
@@ -1142,7 +1142,7 @@
reagent_state = SOLID
color = "#993333"
process_flags = ORGANIC | SYNTHETIC
- taste_message = "ANTS OH GOD"
+ taste_description = "ANTS OH GOD"
/datum/reagent/ants/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -1165,7 +1165,7 @@
metabolization_rate = 0.2
var/shock_timer = 0
process_flags = ORGANIC | SYNTHETIC
- taste_message = "electricity"
+ taste_description = "electricity"
/datum/reagent/teslium/on_mob_life(mob/living/M)
shock_timer++
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index fc79d0b336b..32b26755ab2 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -18,7 +18,7 @@
drink_icon = "glass_clear"
drink_name = "Glass of Water"
drink_desc = "The father of all refreshments."
- taste_message = null
+ taste_description = null
var/water_temperature = 283.15 // As reagents don't have a temperature value, we'll just use 10 celsius.
/datum/reagent/water/reaction_mob(mob/living/M, method = TOUCH, volume)
@@ -36,7 +36,7 @@
description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
reagent_state = LIQUID
color = "#1BB1AB"
- taste_message = "cherry"
+ taste_description = "cherry"
/datum/reagent/lube/reaction_turf(turf/simulated/T, volume)
if(volume >= 1 && istype(T))
@@ -49,7 +49,7 @@
description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
reagent_state = LIQUID
color = "#61C2C2"
- taste_message = "floor cleaner"
+ taste_description = "floor cleaner"
/datum/reagent/space_cleaner/reaction_obj(obj/O, volume)
if(is_cleanable(O))
@@ -123,7 +123,7 @@
drink_icon = "glass_red"
drink_name = "Glass of Tomato juice"
drink_desc = "Are you sure this is tomato juice?"
- taste_message = "blood"
+ taste_description = "blood"
/datum/reagent/blood/reaction_mob(mob/living/M, method=TOUCH, volume)
if(data && data["viruses"])
@@ -205,7 +205,7 @@
name = "Vaccine"
id = "vaccine"
color = "#C81040" // rgb: 200, 16, 64
- taste_message = "antibodies"
+ taste_description = "antibodies"
/datum/reagent/vaccine/reaction_mob(mob/living/M, method=TOUCH, volume)
if(islist(data) && (method == INGEST))
@@ -225,7 +225,7 @@
description = "Smelly water from a fish tank. Gross!"
reagent_state = LIQUID
color = "#757547"
- taste_message = "puke"
+ taste_description = "puke"
/datum/reagent/fishwater/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -245,7 +245,7 @@
description = "Filthy water scoured from a nasty toilet bowl. Absolutely disgusting."
reagent_state = LIQUID
color = "#757547"
- taste_message = "puke"
+ taste_description = "puke"
/datum/reagent/fishwater/toiletwater/reaction_mob(mob/living/M, method=TOUCH, volume) //For shennanigans
return
@@ -260,7 +260,7 @@
drink_icon = "glass_clear"
drink_name = "Glass of Water"
drink_desc = "The father of all refreshments."
- taste_message = null
+ taste_description = null
/datum/reagent/holywater/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -361,7 +361,7 @@
description = "Something that shouldn't exist on this plane of existance."
process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it.
metabolization_rate = 1
- taste_message = "sulfur"
+ taste_description = "sulfur"
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -390,7 +390,7 @@
process_flags = ORGANIC | SYNTHETIC //Admin-bus has no brakes! KILL THEM ALL.
metabolization_rate = 1
can_synth = FALSE
- taste_message = "admin abuse"
+ taste_description = "admin abuse"
/datum/reagent/hellwater/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -407,7 +407,7 @@
color = "#FF9966"
description = "You don't even want to think about what's in here."
reagent_state = LIQUID
- taste_message = "meat"
+ taste_description = "meat"
/datum/reagent/liquidgibs/reaction_turf(turf/T, volume) //yes i took it from synthflesh...
if(volume >= 5 && !isspaceturf(T))
@@ -420,7 +420,7 @@
description = "Also known as sodium hydroxide."
reagent_state = LIQUID
color = "#FFFFD6" // very very light yellow
- taste_message = "ACID"//don't drink lye, kids
+ taste_description = "ACID"//don't drink lye, kids
/datum/reagent/drying_agent
name = "Drying agent"
@@ -428,7 +428,7 @@
description = "Can be used to dry things."
reagent_state = LIQUID
color = "#A70FFF"
- taste_message = "dry mouth"
+ taste_description = "dry mouth"
/datum/reagent/drying_agent/reaction_turf(turf/simulated/T, volume)
if(istype(T) && T.wet)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 829d8fd2226..f9077aafab5 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -35,6 +35,9 @@
var/datum/disease/F = new spawned_disease(0)
var/list/data = list("viruses" = list(F), "blood_color" = "#A10808")
reagents.add_reagent("blood", disease_amount, data)
+ add_initial_reagents()
+
+obj/item/reagent_containers/proc/add_initial_reagents()
if(list_reagents)
reagents.add_reagent_list(list_reagents)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index cffc2f0ef06..e22e9c86793 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -10,7 +10,7 @@
possible_transfer_amounts = null
volume = 100
consume_sound = null
- taste = FALSE
+ can_taste = FALSE
antable = FALSE
/obj/item/reagent_containers/food/pill/New()
diff --git a/paradise.dme b/paradise.dme
index 270d843845c..cc6c94bb57e 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1702,6 +1702,7 @@
#include "code\modules\mob\living\say.dm"
#include "code\modules\mob\living\stat_states.dm"
#include "code\modules\mob\living\status_procs.dm"
+#include "code\modules\mob\living\taste.dm"
#include "code\modules\mob\living\update_status.dm"
#include "code\modules\mob\living\carbon\_defines.dm"
#include "code\modules\mob\living\carbon\carbon.dm"
From ac85e2d630e09ff16497c336b871738ed5f2cc77 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Thu, 1 Aug 2019 23:53:24 +0800
Subject: [PATCH 2/6] Tastes and Sushi
---
.../food_and_drinks/food/customizables.dm | 10 ++++
.../food_and_drinks/food/foods/baked_goods.dm | 51 ++++++++++++++++++-
.../food_and_drinks/food/foods/bread.dm | 17 +++++++
.../food_and_drinks/food/foods/candy.dm | 8 +++
.../food_and_drinks/food/foods/desserts.dm | 5 ++
.../food_and_drinks/food/foods/ethnic.dm | 11 ++++
.../food_and_drinks/food/foods/ingredients.dm | 19 +++++++
.../food_and_drinks/food/foods/junkfood.dm | 8 +++
.../food_and_drinks/food/foods/meat.dm | 27 ++++++++++
.../food_and_drinks/food/foods/misc.dm | 13 +++++
.../food_and_drinks/food/foods/pasta.dm | 7 +++
.../food_and_drinks/food/foods/pizza.dm | 14 +++++
.../food_and_drinks/food/foods/sandwiches.dm | 22 ++++++++
.../food_and_drinks/food/foods/seafood.dm | 36 ++++++++++++-
code/modules/reagents/chemistry/holder.dm | 2 +-
15 files changed, 246 insertions(+), 4 deletions(-)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index b0ac9d20d6c..bebef085297 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -89,6 +89,7 @@
basename = "personal pizza"
snack_overlays = 0
top = 0
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/customizable/pasta
name = "spaghetti"
@@ -107,6 +108,7 @@
basename = "bread"
snack_overlays = 0
top = 0
+ tastes = list("bread" = 10)
/obj/item/reagent_containers/food/snacks/customizable/cook/pie
name = "pie"
@@ -116,6 +118,7 @@
basename = "pie"
snack_overlays = 0
top = 0
+ tastes = list("pie" = 1)
/obj/item/reagent_containers/food/snacks/customizable/cook/cake
name = "cake"
@@ -125,6 +128,7 @@
basename = "cake"
snack_overlays = 0
top = 0
+ tastes = list("cake" = 1)
/obj/item/reagent_containers/food/snacks/customizable/cook/jelly
name = "jelly"
@@ -152,6 +156,7 @@
basename = "kebab"
snack_overlays = 0
top = 0
+ tastes = list("meat" = 3, "metal" = 1)
/obj/item/reagent_containers/food/snacks/customizable/cook/salad
name = "salad"
@@ -161,6 +166,7 @@
basename = "salad"
snack_overlays = 0
top = 0
+ tastes = list("leaves" = 1)
/obj/item/reagent_containers/food/snacks/customizable/cook/waffles
name = "waffles"
@@ -170,6 +176,7 @@
basename = "waffles"
snack_overlays = 0
top = 0
+ tastes = list("waffles" = 1)
/obj/item/reagent_containers/food/snacks/customizable/candy/cookie
name = "cookie"
@@ -179,6 +186,7 @@
basename = "cookie"
snack_overlays = 0
top = 0
+ tastes = list("cookie" = 1)
/obj/item/reagent_containers/food/snacks/customizable/candy/cotton
name = "flavored cotton candy"
@@ -308,6 +316,7 @@
snack_overlays = 0
trash = /obj/item/trash/bowl
top = 0
+ tastes = list("soup" = 1)
/obj/item/reagent_containers/food/snacks/customizable/burger
name = "burger bun"
@@ -316,6 +325,7 @@
baseicon = "burgercustom"
basename = "burger"
toptype = new /obj/item/reagent_containers/food/snacks/bun()
+ tastes = list("bun" = 4)
/obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
if(contents.len > sandwich_limit)
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 0746f37d113..961cb77115f 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -12,6 +12,7 @@
bitesize = 3
filling_color = "#FFD675"
list_reagents = list("nutriment" = 20, "oculine" = 10, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
/obj/item/reagent_containers/food/snacks/carrotcakeslice
name = "carrot cake slice"
@@ -19,6 +20,8 @@
icon_state = "carrotcake_slice"
trash = /obj/item/trash/plate
filling_color = "#FFD675"
+ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
+
/obj/item/reagent_containers/food/snacks/sliceable/braincake
name = "brain cake"
@@ -29,6 +32,7 @@
filling_color = "#E6AEDB"
bitesize = 3
list_reagents = list("protein" = 10, "nutriment" = 10, "mannitol" = 10, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
/obj/item/reagent_containers/food/snacks/braincakeslice
name = "brain cake slice"
@@ -36,6 +40,7 @@
icon_state = "braincakeslice"
trash = /obj/item/trash/plate
filling_color = "#E6AEDB"
+ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake
name = "cheese cake"
@@ -46,6 +51,7 @@
filling_color = "#FAF7AF"
bitesize = 3
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 4, "cream cheese" = 3)
/obj/item/reagent_containers/food/snacks/cheesecakeslice
name = "cheese cake slice"
@@ -53,6 +59,7 @@
icon_state = "cheesecake_slice"
trash = /obj/item/trash/plate
filling_color = "#FAF7AF"
+ tastes = list("cake" = 4, "cream cheese" = 3)
/obj/item/reagent_containers/food/snacks/sliceable/plaincake
name = "vanilla cake"
@@ -63,6 +70,7 @@
bitesize = 3
filling_color = "#F7EDD5"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
/obj/item/reagent_containers/food/snacks/plaincakeslice
name = "vanilla cake slice"
@@ -70,6 +78,7 @@
icon_state = "plaincake_slice"
trash = /obj/item/trash/plate
filling_color = "#F7EDD5"
+ tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/orangecake
name = "orange cake"
@@ -80,6 +89,7 @@
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
/obj/item/reagent_containers/food/snacks/orangecakeslice
name = "orange cake slice"
@@ -87,6 +97,7 @@
icon_state = "orangecake_slice"
trash = /obj/item/trash/plate
filling_color = "#FADA8E"
+ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/bananacake
name = "banana cake"
@@ -97,6 +108,7 @@
bitesize = 3
filling_color = "#FADA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
/obj/item/reagent_containers/food/snacks/bananacakeslice
name = "banana cake slice"
@@ -104,6 +116,7 @@
icon_state = "bananacake_slice"
trash = /obj/item/trash/plate
filling_color = "#FADA8E"
+ tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/limecake
name = "lime cake"
@@ -114,6 +127,7 @@
slices_num = 5
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
/obj/item/reagent_containers/food/snacks/limecakeslice
name = "lime cake slice"
@@ -121,6 +135,7 @@
icon_state = "limecake_slice"
trash = /obj/item/trash/plate
filling_color = "#CBFA8E"
+ tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/lemoncake
name = "lemon cake"
@@ -131,6 +146,7 @@
bitesize = 3
filling_color = "#FAFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
/obj/item/reagent_containers/food/snacks/lemoncakeslice
name = "lemon cake slice"
@@ -138,6 +154,7 @@
icon_state = "lemoncake_slice"
trash = /obj/item/trash/plate
filling_color = "#FAFA8E"
+ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake
name = "chocolate cake"
@@ -148,6 +165,7 @@
bitesize = 3
filling_color = "#805930"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
/obj/item/reagent_containers/food/snacks/chocolatecakeslice
name = "chocolate cake slice"
@@ -155,6 +173,7 @@
icon_state = "chocolatecake_slice"
trash = /obj/item/trash/plate
filling_color = "#805930"
+ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake
name = "birthday cake"
@@ -165,6 +184,7 @@
filling_color = "#FFD6D6"
bitesize = 3
list_reagents = list("nutriment" = 20, "sprinkles" = 10, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 1)
/obj/item/reagent_containers/food/snacks/birthdaycakeslice
name = "birthday cake slice"
@@ -172,6 +192,7 @@
icon_state = "birthdaycakeslice"
trash = /obj/item/trash/plate
filling_color = "#FFD6D6"
+ tastes = list("cake" = 5, "sweetness" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/applecake
name = "apple cake"
@@ -182,13 +203,14 @@
bitesize = 3
filling_color = "#EBF5B8"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
/obj/item/reagent_containers/food/snacks/applecakeslice
name = "apple cake slice"
desc = "A slice of heavenly cake."
icon_state = "applecakeslice"
trash = /obj/item/trash/plate
- filling_color = "#EBF5B8"
+ filling_color = "#EBF5B8"tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
//////////////////////
@@ -202,6 +224,7 @@
bitesize = 1
filling_color = "#DBC94F"
list_reagents = list("nutriment" = 1, "sugar" = 3, "hot_coco" = 5 )
+ tastes = list("cookie" = 1, "crunchy chocolate" = 1)
/obj/item/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
@@ -210,12 +233,14 @@
filling_color = "#E8E79E"
list_reagents = list("nutriment" = 3)
trash = /obj/item/paper/fortune
+ tastes = list("cookie" = 1)
/obj/item/reagent_containers/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon_state = "sugarcookie"
list_reagents = list("nutriment" = 1, "sugar" = 3)
+ tastes = list("sweetness" = 1)
//////////////////////
@@ -230,6 +255,7 @@
filling_color = "#FBFFB8"
bitesize = 3
list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
+ tastes = list("pie" = 1)
/obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
..()
@@ -245,6 +271,7 @@
filling_color = "#948051"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "meat" = 1)
/obj/item/reagent_containers/food/snacks/tofupie
name = "tofu-pie"
@@ -254,6 +281,7 @@
filling_color = "#FFFEE0"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "tofu" = 1)
/obj/item/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
@@ -262,6 +290,7 @@
filling_color = "#FFCCCC"
bitesize = 4
list_reagents = list("nutriment" = 6, "amanitin" = 3, "psilocybin" = 1, "vitamin" = 4)
+ tastes = list("pie" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -270,6 +299,7 @@
filling_color = "#B8279B"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/plump_pie/New()
..()
@@ -285,6 +315,8 @@
trash = /obj/item/trash/plate
filling_color = "#43DE18"
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "meat" = 1, "acid" = 1)
+
/obj/item/reagent_containers/food/snacks/applepie
name = "apple pie"
@@ -293,6 +325,8 @@
filling_color = "#E0EDC5"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "apple" = 1)
+
/obj/item/reagent_containers/food/snacks/cherrypie
name = "cherry pie"
@@ -301,6 +335,7 @@
filling_color = "#FF525A"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("pie" = 1, "cherries" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie
name = "pumpkin pie"
@@ -311,6 +346,7 @@
bitesize = 3
filling_color = "#F5B951"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("pie" = 1, "pumpkin" = 1)
/obj/item/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
@@ -318,7 +354,7 @@
icon_state = "pumpkinpieslice"
trash = /obj/item/trash/plate
filling_color = "#F5B951"
-
+ tastes = list("pie" = 1, "pumpkin" = 1)
//////////////////////
// Donuts //
@@ -333,6 +369,7 @@
var/extra_reagent = null
filling_color = "#D2691E"
var/randomized_sprinkles = 1
+ tastes = list("donut" = 1)
/obj/item/reagent_containers/food/snacks/donut/New()
..()
@@ -353,6 +390,7 @@
name = "chaos donut"
desc = "Like life, it never quite tastes the same."
bitesize = 10
+ tastes = list("donut" = 3, "chaos" = 1)
/obj/item/reagent_containers/food/snacks/donut/chaos/New()
..()
@@ -369,6 +407,7 @@
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "berryjuice"
+ tastes = list("jelly" = 1, "donut" = 3)
/obj/item/reagent_containers/food/snacks/donut/jelly/New()
..()
@@ -403,6 +442,7 @@
icon_state = "muffin"
filling_color = "#E0CF9B"
list_reagents = list("nutriment" = 6)
+ tastes = list("muffin" = 1)
/obj/item/reagent_containers/food/snacks/berryclafoutis
name = "berry clafoutis"
@@ -411,6 +451,8 @@
trash = /obj/item/trash/plate
bitesize = 3
list_reagents = list("nutriment" = 10, "berryjuice" = 5, "vitamin" = 2)
+ tastes = list("pie" = 1, "blackberries" = 1)
+
/obj/item/reagent_containers/food/snacks/poppypretzel
name = "poppy pretzel"
@@ -418,6 +460,7 @@
icon_state = "poppypretzel"
filling_color = "#916E36"
list_reagents = list("nutriment" = 5)
+ tastes = list("pretzel" = 1)
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -425,6 +468,7 @@
icon_state = "phelmbiscuit"
filling_color = "#CFB4C4"
list_reagents = list("nutriment" = 5)
+ tastes = list("mushroom" = 1, "biscuit" = 1)
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/New()
..()
@@ -441,6 +485,8 @@
filling_color = "#FFFF00"
bitesize = 3
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
+ tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1)
+
/obj/item/reagent_containers/food/snacks/cracker
name = "cracker"
@@ -449,3 +495,4 @@
bitesize = 1
filling_color = "#F5DEB8"
list_reagents = list("nutriment" = 1)
+ tastes = list("cracker" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index c841f8d65fa..d888a532c01 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -11,6 +11,7 @@
slices_num = 5
filling_color = "#FF7575"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
+ tastes = list("bread" = 10, "meat" = 10)
/obj/item/reagent_containers/food/snacks/meatbreadslice
name = "meatbread slice"
@@ -27,6 +28,7 @@
slices_num = 5
filling_color = "#8AFF75"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
+ tastes = list("bread" = 10, "acid" = 10)
/obj/item/reagent_containers/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
@@ -42,6 +44,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice
slices_num = 5
list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
+ tastes = list("bread" = 10, "cobwebs" = 5)
/obj/item/reagent_containers/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
@@ -58,6 +61,7 @@
slices_num = 5
filling_color = "#EDE5AD"
list_reagents = list("banana" = 20, "nutriment" = 20)
+ tastes = list("bread" = 10)
/obj/item/reagent_containers/food/snacks/bananabreadslice
name = "Banana-nut bread slice"
@@ -65,6 +69,7 @@
icon_state = "bananabreadslice"
trash = /obj/item/trash/plate
filling_color = "#EDE5AD"
+ tastes = list("bread" = 10)
/obj/item/reagent_containers/food/snacks/sliceable/tofubread
name = "Tofubread"
@@ -74,6 +79,7 @@
slices_num = 5
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("bread" = 10, "tofu" = 10)
/obj/item/reagent_containers/food/snacks/tofubreadslice
name = "Tofubread slice"
@@ -90,6 +96,7 @@
slices_num = 6
filling_color = "#FFE396"
list_reagents = list("nutriment" = 10)
+ tastes = list("bread" = 10)
/obj/item/reagent_containers/food/snacks/breadslice
name = "Bread slice"
@@ -98,6 +105,7 @@
trash = /obj/item/trash/plate
filling_color = "#D27332"
list_reagents = list("nutriment" = 2, "bread" = 5)
+ tastes = list("bread" = 10)
/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread
name = "Cream Cheese Bread"
@@ -107,6 +115,7 @@
slices_num = 5
filling_color = "#FFF896"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
+ tastes = list("bread" = 10, "cheese" = 10)
/obj/item/reagent_containers/food/snacks/creamcheesebreadslice
name = "Cream Cheese Bread slice"
@@ -115,6 +124,7 @@
trash = /obj/item/trash/plate
filling_color = "#FFF896"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
+ tastes = list("bread" = 10, "cheese" = 10)
//////////////////////
@@ -127,6 +137,8 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "bun"
list_reagents = list("nutriment" = 1)
+ tastes = list("bun" = 1)
+
/obj/item/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -134,6 +146,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flatbread"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bread" = 2)
/obj/item/reagent_containers/food/snacks/baguette
name = "baguette"
@@ -142,6 +155,7 @@
filling_color = "#E3D796"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bread" = 2)
/obj/item/reagent_containers/food/snacks/twobread
name = "Two Bread"
@@ -150,6 +164,7 @@
filling_color = "#DBCC9A"
bitesize = 3
list_reagents = list("nutriment" = 2, "vitamin" = 2)
+ tastes = list("bread" = 2)
/obj/item/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -158,6 +173,7 @@
trash = /obj/item/trash/plate
filling_color = "#B572AB"
bitesize = 3
+ tastes = list("toast" = 1, "jelly" = 1)
/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
@@ -173,6 +189,7 @@
filling_color = "#FF00F7"
bitesize = 4
list_reagents = list("nutriment" = 8, "psilocybin" = 2, "vitamin" = 2)
+ tastes = list("waffle" = 1, "mushrooms" = 1)
/obj/item/reagent_containers/food/snacks/waffles
name = "waffles"
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index fb5ea043839..77519d9160e 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -12,6 +12,7 @@
desc = "It's placeholder flavored. This shouldn't be seen."
icon = 'icons/obj/food/candy.dmi'
icon_state = "candy"
+ tastes = list("candy" = 1)
// ***********************************************************
// Candy Ingredients / Flavorings / Byproduct
@@ -23,6 +24,7 @@
icon_state = "chocolatebar"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 2, "chocolate" = 4)
+ tastes = list("chocolate" = 1)
/obj/item/reagent_containers/food/snacks/candy/caramel
name = "caramel"
@@ -107,6 +109,7 @@
icon_state = "candycorn"
filling_color = "#FFFCB0"
list_reagents = list("nutriment" = 4, "sugar" = 2)
+ tastes = list("candy corn" = 1)
// ***********************************************************
// Candy Products (plain / unflavored)
@@ -130,6 +133,7 @@
bitesize = 3
junkiness = 25
list_reagents = list("nutriment" = 1, "chocolate" = 1)
+ tastes = list("chocolate" = 1)
/obj/item/reagent_containers/food/snacks/candy/candycane
@@ -177,6 +181,8 @@
icon_state = "candy_cash"
filling_color = "#302000"
list_reagents = list("nutriment" = 2, "chocolate" = 4)
+ tastes = list("chocolate" = 1)
+
/obj/item/reagent_containers/food/snacks/candy/coin
name = "chocolate coin"
@@ -185,6 +191,8 @@
filling_color = "#302000"
bitesize = 3
list_reagents = list("nutriment" = 2, "chocolate" = 4)
+ tastes = list("chocolate" = 1)
+
/obj/item/reagent_containers/food/snacks/candy/gum
name = "bubblegum"
diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm
index ff99efd07be..9e8ded0bd1b 100644
--- a/code/modules/food_and_drinks/food/foods/desserts.dm
+++ b/code/modules/food_and_drinks/food/foods/desserts.dm
@@ -10,6 +10,7 @@
icon_state = "icecream_cone"
bitesize = 3
list_reagents = list("nutriment" = 1, "sugar" = 1)
+ tastes = list("ice cream" = 1)
/obj/item/reagent_containers/food/snacks/icecream/New()
..()
@@ -61,6 +62,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
list_reagents = list("nutriment" = 7, "vitamin" = 2)
+ tastes = list("rice" = 1, "sweetness" = 1)
/obj/item/reagent_containers/food/snacks/spacylibertyduff
name = "Spacy Liberty Duff"
@@ -70,6 +72,7 @@
filling_color = "#42B873"
bitesize = 3
list_reagents = list("nutriment" = 6, "psilocybin" = 6)
+ tastes = list("jelly" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -79,6 +82,7 @@
filling_color = "#ED0758"
bitesize = 3
list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
+ tastes = list("jelly" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/candiedapple
name = "Candied Apple"
@@ -87,6 +91,7 @@
filling_color = "#F21873"
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 2)
+ tastes = list("apple" = 2, "sweetness" = 2)
/obj/item/reagent_containers/food/snacks/mint
name = "mint"
diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm
index 9404992f5eb..79e7cc8a4fb 100644
--- a/code/modules/food_and_drinks/food/foods/ethnic.dm
+++ b/code/modules/food_and_drinks/food/foods/ethnic.dm
@@ -9,6 +9,7 @@
icon_state = "taco"
bitesize = 3
list_reagents = list("nutriment" = 7, "vitamin" = 1)
+ tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
/obj/item/reagent_containers/food/snacks/burrito
name = "burrito"
@@ -17,6 +18,8 @@
trash = /obj/item/trash/plate
filling_color = "#A36A1F"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
+ tastes = list("torilla" = 2, "meat" = 3)
+
/obj/item/reagent_containers/food/snacks/chimichanga
name = "chimichanga"
@@ -34,6 +37,7 @@
filling_color = "#A36A1F"
bitesize = 4
list_reagents = list("nutriment" = 8, "capsaicin" = 6)
+ tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
/obj/item/reagent_containers/food/snacks/cornchips
name = "corn chips"
@@ -55,6 +59,7 @@
icon_state = "chinese1"
junkiness = 25
list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
+ tastes = list("noodle" = 1, "vegetables" = 1)
/obj/item/reagent_containers/food/snacks/chinese/sweetsourchickenball
name = "sweet & sour chicken balls"
@@ -62,6 +67,7 @@
icon_state = "chickenball"
junkiness = 25
list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2)
+ tastes = list("chicken" = 1, "sweetness" = 1)
/obj/item/reagent_containers/food/snacks/chinese/tao
name = "Admiral Yamamoto carp"
@@ -69,6 +75,7 @@
icon_state = "chinese2"
junkiness = 25
list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4)
+ tastes = list("chicken" = 1)
/obj/item/reagent_containers/food/snacks/chinese/newdles
name = "chinese newdles"
@@ -76,6 +83,7 @@
icon_state = "chinese3"
junkiness = 25
list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3)
+ tastes = list("noodles" = 1)
/obj/item/reagent_containers/food/snacks/chinese/rice
name = "fried rice"
@@ -83,6 +91,7 @@
icon_state = "chinese4"
junkiness = 20
list_reagents = list("nutriment" = 1, "rice" = 3, "msg" = 4, "sugar" = 2)
+ tastes = list("rice" = 1)
//////////////////////
@@ -96,6 +105,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#F0F2E4"
list_reagents = list("nutriment" = 5)
+ taste = list("custard" = 1)
/obj/item/reagent_containers/food/snacks/yakiimo
name = "yaki imo"
@@ -104,6 +114,7 @@
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 5, "vitamin" = 4)
filling_color = "#8B1105"
+ tastes = list("sweet potato" = 1)
//////////////////////
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index 7dda7c0a1c0..8ab0ba3c5ce 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -10,6 +10,7 @@
filling_color = "#FFFEE0"
bitesize = 3
list_reagents = list("plantmatter" = 2)
+ tastes = list("tofu" = 1)
/obj/item/reagent_containers/food/snacks/fried_tofu
name = "fried tofu"
@@ -18,6 +19,7 @@
filling_color = "#FFFEE0"
bitesize = 3
list_reagents = list("plantmatter" = 3)
+ tastes = list("tofu" = 1)
/obj/item/reagent_containers/food/snacks/soydope
name = "soy dope"
@@ -26,6 +28,7 @@
trash = /obj/item/trash/plate
filling_color = "#C4BF76"
list_reagents = list("nutriment" = 2)
+ tastes = list("soy" = 1)
//////////////////////
@@ -40,12 +43,14 @@
slices_num = 5
filling_color = "#FFF700"
list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
+ tastes = list("cheese" = 1)
/obj/item/reagent_containers/food/snacks/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFF700"
+ tastes = list("cheese" = 1)
/obj/item/reagent_containers/food/snacks/weirdcheesewedge
name = "weird cheese"
@@ -66,6 +71,7 @@
filling_color = "#E0D7C5"
bitesize = 6
list_reagents = list("plantmatter" = 3, "vitamin" = 1)
+ tastes = list("mushroom" = 1)
/obj/item/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -74,18 +80,21 @@
filling_color = "#DB0000"
bitesize = 6
list_reagents = list("protein" = 2)
+ tastes = list("tomato" = 1)
/obj/item/reagent_containers/food/snacks/watermelonslice
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice"
filling_color = "#FF3867"
+ tastes = list("watermelon" = 1)
/obj/item/reagent_containers/food/snacks/pineappleslice
name = "pineapple slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice"
filling_color = "#e5b437"
+ tastes = list("pineapple" = 1)
//////////////////////
@@ -98,6 +107,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
list_reagents = list("nutriment" = 6)
+ tastes = list("dough" = 1)
// Dough + rolling pin = flat dough
/obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
@@ -120,6 +130,8 @@
slice_path = /obj/item/reagent_containers/food/snacks/doughslice
slices_num = 3
list_reagents = list("nutriment" = 6)
+ tastes = list("dough" = 1)
+
/obj/item/reagent_containers/food/snacks/doughslice
name = "dough slice"
@@ -127,6 +139,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "doughslice"
list_reagents = list("nutriment" = 1)
+ tastes = list("dough" = 1)
///cookies by Ume
@@ -138,6 +151,8 @@
desc = "The base for tasty cookies."
icon_state = "cookiedough"
list_reagents = list("nutriment" = 5, "sugar" = 5)
+ tastes = list("dough" = 1, "sugar" = 1)
+
/obj/item/reagent_containers/food/snacks/cookiedough/update_icon()
if(flat)
@@ -193,6 +208,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies_choco"
list_reagents = list("nutriment" = 5, "sugar" = 5, "chocolate" = 5)
+ tastes = list("dough" = 1, "sugar" = 1, "chocolate" = 1)
//////////////////////
// Chocolate //
@@ -204,6 +220,7 @@
icon_state = "chocolatebar"
filling_color = "#7D5F46"
list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
+ tastes = list("chocolate" = 1)
///Chocolate crumbles/pile
/obj/item/reagent_containers/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
@@ -224,6 +241,7 @@
icon_state = "cocoa"
filling_color = "#7D5F46"
list_reagents = list("chocolate" = 5)
+ tastes = list("chocolate" = 1)
//////////////////////
@@ -236,3 +254,4 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"
list_reagents = list("ectoplasm" = 10)
+ tastes = list("spookiness" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm
index 3fa20f0d1c3..ad174fcaddd 100644
--- a/code/modules/food_and_drinks/food/foods/junkfood.dm
+++ b/code/modules/food_and_drinks/food/foods/junkfood.dm
@@ -12,6 +12,7 @@
filling_color = "#E8C31E"
junkiness = 20
list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
+ tastes = list("crisps" = 1)
/obj/item/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
@@ -21,6 +22,7 @@
filling_color = "#631212"
junkiness = 25
list_reagents = list("protein" = 1, "sugar" = 3)
+ tastes = list("chewy beef" = 1)
/obj/item/reagent_containers/food/snacks/pistachios
name = "pistachios"
@@ -30,6 +32,7 @@
filling_color = "#BAD145"
junkiness = 20
list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
+ tastes = list("pistachios" = 1)
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
@@ -39,6 +42,7 @@
filling_color = "#343834"
junkiness = 25
list_reagents = list("plantmatter" = 2, "sugar" = 4)
+ tastes = list("dried raisins" = 1)
/obj/item/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
@@ -47,6 +51,7 @@
filling_color = "#FFE591"
junkiness = 25
list_reagents = list("sugar" = 4)
+ tastes = list("twinkies" = 1)
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -56,6 +61,7 @@
filling_color = "#FFA305"
junkiness = 25
list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
+ tastes = list("cheese" = 1, "crisps" = 2)
/obj/item/reagent_containers/food/snacks/syndicake
name = "Syndi-Cakes"
@@ -65,6 +71,7 @@
trash = /obj/item/trash/syndi_cakes
bitesize = 3
list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
+ tastes = list("sweetness" = 3, "cake" = 1)
/obj/item/reagent_containers/food/snacks/tastybread
name = "bread tube"
@@ -74,6 +81,7 @@
filling_color = "#A66829"
junkiness = 20
list_reagents = list("nutriment" = 2, "sugar" = 4)
+ tastes = list("bread" = 1)
//////////////////////
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index eb9569ad356..63d6d2b2195 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -11,6 +11,7 @@
filling_color = "#FF1C1C"
bitesize = 3
list_reagents = list("protein" = 3)
+ tastes = list("meat" = 1)
/obj/item/reagent_containers/food/snacks/meat/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
@@ -30,6 +31,7 @@
name = "-meat"
var/subjectname = ""
var/subjectjob = null
+ tastes = list("tender meat" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
name = "meat product"
@@ -83,6 +85,7 @@
filling_color = "#DB0000"
bitesize = 3
list_reagents = list("protein" = 12, "morphine" = 5, "vitamin" = 2)
+ tastes = list("meat" = 1, "salmon" = 1)
/obj/item/reagent_containers/food/snacks/xenomeat
name = "meat"
@@ -91,6 +94,7 @@
filling_color = "#43DE18"
bitesize = 6
list_reagents = list("protein" = 3, "vitamin" = 1)
+ tastes = list("meat" = 1, "acid" = 1)
/obj/item/reagent_containers/food/snacks/spidermeat
name = "spider meat"
@@ -98,6 +102,7 @@
icon_state = "spidermeat"
bitesize = 3
list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
+ tastes = list("cobwebs" = 1))
/obj/item/reagent_containers/food/snacks/lizardmeat
name = "mutant lizard meat"
@@ -118,12 +123,14 @@
desc = "God's gift to man in uncooked form."
icon_state = "raw_bacon"
list_reagents = list("nutriment" = 1, "porktonium" = 10)
+ tastes = list("bacon" = 1)
/obj/item/reagent_containers/food/snacks/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
+ tastes = list("cobwebs" = 1)
/obj/item/reagent_containers/food/snacks/goliath
name = "goliath meat"
@@ -148,12 +155,14 @@
filling_color = "#7A3D11"
bitesize = 3
list_reagents = list("nutriment" = 5)
+ tastes = list("meat" = 1)
/obj/item/reagent_containers/food/snacks/bacon
name = "bacon"
desc = "It looks crispy and tastes amazing! Mmm... Bacon."
icon_state = "bacon2"
list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4)
+ tastes = list("bacon" = 1)
/obj/item/reagent_containers/food/snacks/telebacon
name = "tele bacon"
@@ -161,6 +170,7 @@
icon_state = "bacon"
var/obj/item/radio/beacon/bacon/baconbeacon
list_reagents = list("nutriment" = 4, "porktonium" = 10)
+ tastes = list("bacon" = 1)
/obj/item/reagent_containers/food/snacks/telebacon/New()
..()
@@ -177,6 +187,7 @@
icon_state = "meatball"
filling_color = "#DB0000"
list_reagents = list("protein" = 4, "vitamin" = 1)
+ tastes = list("meat" = 1)
/obj/item/reagent_containers/food/snacks/sausage
name = "sausage"
@@ -184,6 +195,7 @@
icon_state = "sausage"
filling_color = "#DB0000"
list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10)
+ tastes = list("meat" = 1)
/obj/item/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -191,6 +203,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "cutlet"
list_reagents = list("protein" = 2)
+ tastes = list("meat" = 1)
/obj/item/reagent_containers/food/snacks/spidereggsham
name = "green eggs and ham"
@@ -199,6 +212,7 @@
trash = /obj/item/trash/plate
bitesize = 4
list_reagents = list("nutriment" = 6)
+ tastes = list("cobwebs" = 1, "the colour green" = 1)
/obj/item/reagent_containers/food/snacks/boiledspiderleg
name = "boiled spider leg"
@@ -207,6 +221,7 @@
trash = /obj/item/trash/plate
bitesize = 3
list_reagents = list("nutriment" = 3, "capsaicin" = 2)
+ tastes = list("cobwebs" = 1, "hot peppers" = 1)
/obj/item/reagent_containers/food/snacks/wingfangchu
name = "wing fang chu"
@@ -215,6 +230,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#43DE18"
list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
+ tastes = list("soy" = 1)
/obj/item/reagent_containers/food/snacks/goliath_steak
name = "goliath steak"
@@ -223,6 +239,7 @@
icon_state = "goliathsteak"
trash = null
list_reagents = list("protein" = 6, "vitamin" = 2)
+ tastes = list("meat" = 1)
//////////////////////
// Cubes //
@@ -237,6 +254,7 @@
var/faction
var/datum/species/monkey_type = /datum/species/monkey
list_reagents = list("nutriment" = 2)
+ tastes = list("the jungle" = 1, "bananas" = 1)
/obj/item/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature, source, method = TOUCH)
. = ..()
@@ -293,6 +311,8 @@
icon_state = "egg"
filling_color = "#FDFFD1"
list_reagents = list("protein" = 1, "egg" = 5)
+ tastes = list("egg" = 1)
+
/obj/item/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
..()
@@ -366,6 +386,7 @@
filling_color = "#FFDF78"
bitesize = 1
list_reagents = list("nutriment" = 3, "egg" = 5)
+ tastes = list("egg" = 1, "salt" = 1, "pepper" = 1)
/obj/item/reagent_containers/food/snacks/boiledegg
name = "boiled egg"
@@ -389,6 +410,7 @@
filling_color = "#FFF9A8"
list_reagents = list("nutriment" = 8, "vitamin" = 1)
bitesize = 1
+ tastes = list("egg" = 1, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/benedict
name = "eggs benedict"
@@ -396,6 +418,7 @@
icon_state = "benedict"
bitesize = 3
list_reagents = list("nutriment" = 6, "egg" = 3, "vitamin" = 4)
+ tastes = list("egg" = 1, "bacon" = 1, "bun" = 1)
//////////////////////
@@ -408,6 +431,7 @@
icon_state = "hotdog"
bitesize = 3
list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3)
+ tastes = list("bun" = 3, "meat" = 2)
/obj/item/reagent_containers/food/snacks/meatbun
name = "meat bun"
@@ -415,6 +439,7 @@
icon_state = "meatbun"
bitesize = 6
list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("bun" = 3, "meat" = 2)
/obj/item/reagent_containers/food/snacks/sliceable/turkey
name = "turkey"
@@ -423,6 +448,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice
slices_num = 6
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
+ tastes = list("turkey" = 2, "stuffing" = 2)
/obj/item/reagent_containers/food/snacks/turkeyslice
name = "turkey serving"
@@ -430,6 +456,7 @@
icon_state = "turkeyslice"
trash = /obj/item/trash/plate
filling_color = "#B97A57"
+ tastes = list("turkey" = 1)
/obj/item/reagent_containers/food/snacks/organ
name = "organ"
diff --git a/code/modules/food_and_drinks/food/foods/misc.dm b/code/modules/food_and_drinks/food/foods/misc.dm
index 4845fe4d608..1fcd4a52c18 100644
--- a/code/modules/food_and_drinks/food/foods/misc.dm
+++ b/code/modules/food_and_drinks/food/foods/misc.dm
@@ -10,6 +10,7 @@
trash = /obj/item/trash/plate
filling_color = "#4D2F5E"
list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ tastes = list("eggplant" = 2, "cheese" = 2)
/obj/item/reagent_containers/food/snacks/soylentgreen
name = "soylent green"
@@ -18,6 +19,7 @@
trash = /obj/item/trash/waffles
filling_color = "#B8E6B5"
list_reagents = list("nutriment" = 10, "vitamin" = 1)
+ tastes = list("waffles" = 7, "people" = 1)
/obj/item/reagent_containers/food/snacks/soylentviridians
name = "soylent virdians"
@@ -26,6 +28,7 @@
trash = /obj/item/trash/waffles
filling_color = "#E6FA61"
list_reagents = list("nutriment" = 10, "vitamin" = 1)
+ tastes = list("waffles" = 10)
/obj/item/reagent_containers/food/snacks/monkeysdelight
name = "monkey's delight"
@@ -35,6 +38,7 @@
filling_color = "#5C3C11"
bitesize = 6
list_reagents = list("nutriment" = 10, "banana" = 5, "vitamin" = 5)
+ tastes = list("banana" = 1, "the jungle" = 1)
/obj/item/reagent_containers/food/snacks/dionaroast
name = "roast diona"
@@ -43,6 +47,7 @@
trash = /obj/item/trash/plate
filling_color = "#75754B"
list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2, "vitamin" = 4)
+ tastes = list("chewy vegetables" = 1)
/obj/item/reagent_containers/food/snacks/tofurkey
name = "tofurkey"
@@ -51,6 +56,7 @@
filling_color = "#FFFEE0"
bitesize = 3
list_reagents = list("nutriment" = 12, "ether" = 3)
+ tastes = list("tofu" = 1)
//////////////////////
@@ -65,6 +71,7 @@
filling_color = "#468C00"
bitesize = 3
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
+ tastes = list("divinity" = 1, "lettuce" = 1)
/obj/item/reagent_containers/food/snacks/herbsalad
name = "herb salad"
@@ -74,6 +81,7 @@
filling_color = "#76B87F"
bitesize = 3
list_reagents = list("nutriment" = 8, "vitamin" = 2)
+ tastes = list("lettuce" = 1, "apple" = 1)
/obj/item/reagent_containers/food/snacks/validsalad
name = "valid salad"
@@ -83,6 +91,7 @@
filling_color = "#76B87F"
bitesize = 3
list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2)
+ tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1)
//////////////////////
@@ -95,6 +104,7 @@
icon_state = "donkpocket"
filling_color = "#DEDEAB"
list_reagents = list("nutriment" = 4)
+ tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
/obj/item/reagent_containers/food/snacks/warmdonkpocket
name = "warm Donk-pocket"
@@ -102,6 +112,7 @@
icon_state = "donkpocket"
filling_color = "#DEDEAB"
list_reagents = list("nutriment" = 4)
+ tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
/obj/item/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
M.reagents.add_reagent("omnizine", 15)
@@ -140,6 +151,7 @@
icon_state = "boiledrorocore"
bitesize = 3
list_reagents = list("slimejelly" = 5)
+ tastes = list("jelly" = 3)
/obj/item/reagent_containers/food/snacks/popcorn
name = "Popcorn"
@@ -150,6 +162,7 @@
filling_color = "#FFFAD4"
bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
list_reagents = list("nutriment" = 2)
+ tastes = list("popcorn" = 3, "butter" = 1)
/obj/item/reagent_containers/food/snacks/popcorn/New()
..()
diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm
index 36c340656e3..356b4b4bb67 100644
--- a/code/modules/food_and_drinks/food/foods/pasta.dm
+++ b/code/modules/food_and_drinks/food/foods/pasta.dm
@@ -10,6 +10,7 @@
icon_state = "spaghetti"
filling_color = "#EDDD00"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ tastes = list("raw pasta" = 1)
/obj/item/reagent_containers/food/snacks/macaroni
name = "macaroni twists"
@@ -18,6 +19,7 @@
icon_state = "macaroni"
filling_color = "#EDDD00"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
+ tastes = list("raw pasta" = 1)
//////////////////////
@@ -32,6 +34,7 @@
trash = /obj/item/trash/plate
filling_color = "#FCEE81"
list_reagents = list("nutriment" = 2, "vitamin" = 1)
+ tastes = list("pasta" = 1)
/obj/item/reagent_containers/food/snacks/pastatomato
name = "spaghetti"
@@ -42,6 +45,7 @@
filling_color = "#DE4545"
bitesize = 4
list_reagents = list("nutriment" = 6, "tomatojuice" = 10, "vitamin" = 4)
+ tastes = list("pasta" = 1, "tomato" = 1)
/obj/item/reagent_containers/food/snacks/meatballspaghetti
name = "spaghetti & meatballs"
@@ -51,6 +55,7 @@
trash = /obj/item/trash/plate
filling_color = "#DE4545"
list_reagents = list("nutriment" = 8, "synaptizine" = 5, "vitamin" = 4)
+ tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
/obj/item/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
@@ -59,6 +64,7 @@
icon_state = "spesslaw"
filling_color = "#DE4545"
list_reagents = list("nutriment" = 8, "synaptizine" = 10, "vitamin" = 6)
+ tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2)
/obj/item/reagent_containers/food/snacks/macncheese
name = "mac n cheese"
@@ -68,3 +74,4 @@
icon_state = "macncheese"
filling_color = "#ffe45d"
list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4)
+ tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm
index aabd47194ce..1e116f8a830 100644
--- a/code/modules/food_and_drinks/food/foods/pizza.dm
+++ b/code/modules/food_and_drinks/food/foods/pizza.dm
@@ -7,6 +7,7 @@
icon = 'icons/obj/food/pizza.dmi'
slices_num = 6
filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita
name = "margherita pizza"
@@ -22,6 +23,7 @@
icon_state = "pizzamargheritaslice"
filling_color = "#BAA14C"
list_reagents = list("nutriment" = 5)
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza
name = "meat pizza"
@@ -29,6 +31,7 @@
icon_state = "meatpizza"
slice_path = /obj/item/reagent_containers/food/snacks/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
/obj/item/reagent_containers/food/snacks/meatpizzaslice
name = "meat pizza slice"
@@ -36,6 +39,7 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "meatpizzaslice"
filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
name = "mushroom pizza"
@@ -43,6 +47,8 @@
icon_state = "mushroompizza"
slice_path = /obj/item/reagent_containers/food/snacks/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
+
/obj/item/reagent_containers/food/snacks/mushroompizzaslice
name = "mushroom pizza slice"
@@ -50,6 +56,7 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "mushroompizzaslice"
filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
name = "vegetable pizza"
@@ -57,6 +64,8 @@
icon_state = "vegetablepizza"
slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
+
/obj/item/reagent_containers/food/snacks/vegetablepizzaslice
name = "vegetable pizza slice"
@@ -64,6 +73,7 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "vegetablepizzaslice"
filling_color = "#BAA14C"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza
name = "Hawaiian pizza"
@@ -71,6 +81,7 @@
icon_state = "hawaiianpizza" //NEEDED
slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
/obj/item/reagent_containers/food/snacks/hawaiianpizzaslice
name = "Hawaiian pizza slice"
@@ -78,6 +89,7 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "hawaiianpizzaslice"
filling_color = "#e5b437"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza
name = "mac n cheese pizza"
@@ -86,6 +98,7 @@
slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
filling_color = "#ffe45d"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
/obj/item/reagent_containers/food/snacks/macpizzaslice
name = "mac n cheese pizza slice"
@@ -93,6 +106,7 @@
icon = 'icons/obj/food/pizza.dmi'
icon_state = "macpizzaslice"
filling_color = "#ffe45d"
+ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1)
//////////////////////
diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm
index 43f1b31df0e..216e56af9f9 100644
--- a/code/modules/food_and_drinks/food/foods/sandwiches.dm
+++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm
@@ -10,6 +10,7 @@
filling_color = "#F2B6EA"
bitesize = 3
list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1)
+ tastes = list("bun" = 4, "brains" = 2)
/obj/item/reagent_containers/food/snacks/ghostburger
name = "ghost burger"
@@ -18,6 +19,7 @@
filling_color = "#FFF2FF"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "ectoplasm" = 2)
/obj/item/reagent_containers/food/snacks/human
var/hname = ""
@@ -30,6 +32,7 @@
icon_state = "hburger"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "tender meat" = 2)
/obj/item/reagent_containers/food/snacks/cheeseburger
name = "cheeseburger"
@@ -37,6 +40,7 @@
icon_state = "cheeseburger"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "meat" = 1, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/monkeyburger
name = "burger"
@@ -45,6 +49,7 @@
filling_color = "#D63C3C"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "meat" = 1, "the jungle" = 1)
/obj/item/reagent_containers/food/snacks/tofuburger
name = "tofu burger"
@@ -53,6 +58,7 @@
filling_color = "#FFFEE0"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "tofu" = 4)
/obj/item/reagent_containers/food/snacks/roburger
name = "roburger"
@@ -61,6 +67,7 @@
filling_color = "#CCCCCC"
bitesize = 3
list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1)
+ tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
/obj/item/reagent_containers/food/snacks/roburgerbig
name = "roburger"
@@ -70,6 +77,7 @@
volume = 120
bitesize = 3
list_reagents = list("nutriment" = 6, "nanomachines" = 70, "vitamin" = 5)
+ tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 2)
/obj/item/reagent_containers/food/snacks/xenoburger
name = "xenoburger"
@@ -78,6 +86,7 @@
filling_color = "#43DE18"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "acid" = 4)
/obj/item/reagent_containers/food/snacks/clownburger
name = "clown burger"
@@ -86,6 +95,7 @@
filling_color = "#FF00FF"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "banana" = 1, "magic" = 2)
/obj/item/reagent_containers/food/snacks/mimeburger
name = "mime burger"
@@ -94,6 +104,7 @@
filling_color = "#FFFFFF"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "silence" = 2)
/obj/item/reagent_containers/food/snacks/baseballburger
name = "home run baseball burger"
@@ -102,6 +113,7 @@
filling_color = "#CD853F"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4)
/obj/item/reagent_containers/food/snacks/spellburger
name = "spell burger"
@@ -110,6 +122,7 @@
filling_color = "#D505FF"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "magic" = 2)
/obj/item/reagent_containers/food/snacks/bigbiteburger
name = "BigBite burger"
@@ -118,6 +131,7 @@
filling_color = "#E3D681"
bitesize = 3
list_reagents = list("nutriment" = 10, "vitamin" = 2)
+ tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
/obj/item/reagent_containers/food/snacks/superbiteburger
name = "SuperBite burger"
@@ -126,6 +140,7 @@
filling_color = "#CCA26A"
bitesize = 7
list_reagents = list("nutriment" = 40, "vitamin" = 5)
+ tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
/obj/item/reagent_containers/food/snacks/jellyburger
name = "jelly burger"
@@ -133,6 +148,7 @@
icon_state = "jellyburger"
filling_color = "#B572AB"
bitesize = 3
+ tastes = list("bun" = 4, "jelly" = 2)
/obj/item/reagent_containers/food/snacks/jellyburger/slime
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
@@ -152,6 +168,7 @@
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
/obj/item/reagent_containers/food/snacks/toastedsandwich
name = "toasted sandwich"
@@ -160,6 +177,7 @@
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 6, "carbon" = 2)
+ tastes = list("toast" = 1)
/obj/item/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
@@ -168,6 +186,7 @@
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
+ tastes = list("toast" = 1, "grilled cheese" = 1)
/obj/item/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
@@ -176,6 +195,7 @@
trash = /obj/item/trash/plate
filling_color = "#9E3A78"
bitesize = 3
+ tastes = list("toast" = 1, "jelly" = 1)
/obj/item/reagent_containers/food/snacks/jellysandwich/slime
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
@@ -188,9 +208,11 @@
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon_state = "notasandwich"
list_reagents = list("nutriment" = 6, "vitamin" = 6)
+ tastes = list("nothing suspicious" = 1)
/obj/item/reagent_containers/food/snacks/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "wrap"
list_reagents = list("nutriment" = 5)
+ tastes = list("egg" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 9e4407d9602..4947644bdd4 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -7,6 +7,7 @@
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "carpotoxin" = 2, "vitamin" = 2)
+ tastes = list("white fish" = 1)
/obj/item/reagent_containers/food/snacks/salmonmeat
name = "raw salmon"
@@ -16,6 +17,7 @@
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "vitamin" = 2)
+ tastes = list("raw salmon" = 1)
/obj/item/reagent_containers/food/snacks/salmonsteak
name = "salmon steak"
@@ -26,6 +28,7 @@
filling_color = "#7A3D11"
bitesize = 3
list_reagents = list("nutriment" = 4, "vitamin" = 2)
+ tastes = list("cooked salmon" = 1)
/obj/item/reagent_containers/food/snacks/catfishmeat
name = "raw catfish"
@@ -35,6 +38,7 @@
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "vitamin" = 2)
+ tastes = list("catfish" = 1)
/obj/item/reagent_containers/food/snacks/fishfingers
name = "fish fingers"
@@ -44,6 +48,7 @@
filling_color = "#FFDEFE"
bitesize = 1
list_reagents = list("nutriment" = 4)
+ tastes = list("fish" = 1, "bread" = 1)
/obj/item/reagent_containers/food/snacks/fishburger
name = "Fillet-O-Carp sandwich"
@@ -53,6 +58,7 @@
filling_color = "#FFDEFE"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ tastes = list("bun" = 4, "fish" = 4)
/obj/item/reagent_containers/food/snacks/cubancarp
name = "Cuban carp"
@@ -63,6 +69,7 @@
filling_color = "#E9ADFF"
bitesize = 3
list_reagents = list("nutriment" = 6, "capsaicin" = 1)
+ tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
/obj/item/reagent_containers/food/snacks/fishandchips
name = "fish and chips"
@@ -72,6 +79,7 @@
filling_color = "#E3D796"
bitesize = 3
list_reagents = list("nutriment" = 6)
+ tastes = list("fish" = 1, "chips" = 1)
/obj/item/reagent_containers/food/snacks/sashimi
name = "carp sashimi"
@@ -80,6 +88,7 @@
icon_state = "sashimi"
bitesize = 3
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+ tastes = list("raw carp" = 1, "hot peppers" = 1)
/obj/item/reagent_containers/food/snacks/fried_shrimp
name = "fried shrimp"
@@ -88,6 +97,7 @@
icon_state = "shrimp_fried"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("shrimp" = 1, "bread crumbs" = 1)
/obj/item/reagent_containers/food/snacks/boiled_shrimp
name = "boiled shrimp"
@@ -96,6 +106,7 @@
icon_state = "shrimp_cooked"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("shrimp" = 1)
/obj/item/reagent_containers/food/snacks/shrimp_skewer
name = "shrimp skewer"
@@ -105,6 +116,7 @@
icon_state = "shrimpskewer"
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("shrimp" = 4)
/obj/item/reagent_containers/food/snacks/fish_skewer
name = "fish skewer"
@@ -114,6 +126,7 @@
icon_state = "fishskewer"
bitesize = 3
list_reagents = list("protein" = 6, "vitamin" = 4)
+ tastes = list("shrimp" = 1, "batter" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
name = "ebi makiroll"
@@ -124,6 +137,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Ebi
name = "ebi sushi"
@@ -132,6 +146,7 @@
icon_state = "sushi_Ebi"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
name = "ikura makiroll"
@@ -142,6 +157,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
+ tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Ikura
name = "ikura sushi"
@@ -150,16 +166,18 @@
icon_state = "sushi_Ikura"
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+ tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
name = "sake makiroll"
- desc = "A large unsliced roll of Ebi Sushi."
+ desc = "A large unsliced roll of Sake Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Sake_maki"
slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Sake
name = "sake sushi"
@@ -168,6 +186,7 @@
icon_state = "sushi_Sake"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
name = "smoked salmon makiroll"
@@ -178,6 +197,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1))
/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
name = "smoked salmon sushi"
@@ -186,6 +206,7 @@
icon_state = "sushi_SmokedSalmon"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
name = "tamago makiroll"
@@ -196,6 +217,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Tamago
name = "tamago sushi"
@@ -204,6 +226,7 @@
icon_state = "sushi_Tamago"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
name = "inari makiroll"
@@ -214,6 +237,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Inari
name = "inari sushi"
@@ -222,6 +246,7 @@
icon_state = "sushi_Inari"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
name = "masago makiroll"
@@ -232,6 +257,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
+ tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Masago
name = "masago sushi"
@@ -240,6 +266,7 @@
icon_state = "sushi_Masago"
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+ tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
name = "tobiko makiroll"
@@ -250,6 +277,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
+ tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Tobiko
name = "tobiko sushi"
@@ -258,6 +286,7 @@
icon_state = "sushi_Masago"
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+ tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
name = "tobiko and egg makiroll"
@@ -268,6 +297,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
+ tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
name = "tobiko and egg sushi"
@@ -276,6 +306,7 @@
icon_state = "sushi_TobikoEgg"
bitesize = 3
list_reagents = list("nutriment" = 2, "protein" = 1)
+ tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
name = "tai makiroll"
@@ -286,6 +317,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
+ tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Tai
name = "tai sushi"
@@ -294,6 +326,7 @@
icon_state = "sushi_Tai"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_Unagi
name = "unagi sushi"
@@ -302,3 +335,4 @@
icon_state = "sushi_Hokki"
bitesize = 3
list_reagents = list("nutriment" = 2)
+ tastes = list("grilled eel" = 1, "seaweed" = 1)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index f02a8400bb4..e03ee49f6cb 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -785,7 +785,7 @@ var/const/INGEST = 2
trans_data["viruses"] = temp
return trans_data
-/datum/reagents/proc/generate_taste_message(minimum_percent=15)
+/datum/reagents/proc/generate_0(minimum_percent=15)
// the lower the minimum percent, the more sensitive the message is.
var/list/out = list()
var/list/tastes = list() //descriptor = strength
From f4c8678892bc064de371d75f8448405d2c073403 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Sun, 4 Aug 2019 10:37:18 +0800
Subject: [PATCH 3/6] Hydroponic Stage 1
---
.../food_and_drinks/food/foods/baked_goods.dm | 3 ++-
code/modules/food_and_drinks/food/foods/meat.dm | 4 ++--
.../food_and_drinks/food/foods/side_dishes.dm | 13 +++++++++++++
code/modules/food_and_drinks/food/foods/soups.dm | 16 ++++++++++++++++
code/modules/hydroponics/fermenting_barrel.dm | 4 ++--
code/modules/hydroponics/grown/ambrosia.dm | 6 +++++-
code/modules/hydroponics/grown/apple.dm | 1 +
code/modules/hydroponics/grown/banana.dm | 1 +
code/modules/hydroponics/grown/beans.dm | 2 ++
code/modules/hydroponics/grown/berries.dm | 8 ++++++++
code/modules/hydroponics/grown/cannabis.dm | 1 +
11 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 961cb77115f..57fd36393b5 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -210,7 +210,8 @@
desc = "A slice of heavenly cake."
icon_state = "applecakeslice"
trash = /obj/item/trash/plate
- filling_color = "#EBF5B8"tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
+ filling_color = "#EBF5B8"
+ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
//////////////////////
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 63d6d2b2195..c7ee445911f 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -102,7 +102,7 @@
icon_state = "spidermeat"
bitesize = 3
list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
- tastes = list("cobwebs" = 1))
+ tastes = list("cobwebs" = 1)
/obj/item/reagent_containers/food/snacks/lizardmeat
name = "mutant lizard meat"
@@ -112,7 +112,7 @@
bitesize = 3
list_reagents = list("protein" = 3, "toxin" = 3)
-/obj/item/reagent_containers/food/snacks/spiderleg
+tastes = list("berry" = 1)/obj/item/reagent_containers/food/snacks/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
icon_state = "spiderleg"
diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm
index ec562d4e8bb..e90bf4827cf 100644
--- a/code/modules/food_and_drinks/food/foods/side_dishes.dm
+++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm
@@ -9,6 +9,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawsticks"
list_reagents = list("plantmatter" = 3)
+ tastes = list("raw potatoes" = 1)
//////////////////////
@@ -22,6 +23,7 @@
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
list_reagents = list("nutriment" = 4)
+ tastes = list("fries" = 3, "salt" = 1)
/obj/item/reagent_containers/food/snacks/cheesyfries
name = "cheesy fries"
@@ -30,6 +32,7 @@
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
list_reagents = list("nutriment" = 6)
+ tastes = list("fries" = 3, "cheese" = 1)
/obj/item/reagent_containers/food/snacks/tatortot
name = "tator tot"
@@ -37,6 +40,7 @@
icon_state = "tatortot"
list_reagents = list("nutriment" = 4)
filling_color = "FFD700"
+ tastes = list("fried potato" = 3, "valids" = 1)
/obj/item/reagent_containers/food/snacks/onionrings
name = "onion rings"
@@ -45,6 +49,7 @@
list_reagents = list("nutriment" = 3)
filling_color = "#C0C9A0"
gender = PLURAL
+ tastes = list("onion" = 3, "batter" = 1)
/obj/item/reagent_containers/food/snacks/carrotfries
name = "carrot fries"
@@ -53,6 +58,7 @@
trash = /obj/item/trash/plate
filling_color = "#FAA005"
list_reagents = list("plantmatter" = 3, "oculine" = 3, "vitamin" = 2)
+ tastes = list("carrots" = 3, "salt" = 1)
//////////////////////
@@ -64,6 +70,7 @@
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3)
+ tastes = list("beans" = 1)
/obj/item/reagent_containers/food/snacks/mashed_potatoes //mashed taters
name = "mashed potatoes"
@@ -72,6 +79,7 @@
trash = /obj/item/trash/plate
filling_color = "#D6D9C1"
list_reagents = list("nutriment" = 5, "gravy" = 5, "mashedpotatoes" = 10, "vitamin" = 2)
+ tastes = list("mashed potato" = 3, "gravy" = 1)
/obj/item/reagent_containers/food/snacks/stuffing
name = "stuffing"
@@ -79,6 +87,7 @@
icon_state = "stuffing"
filling_color = "#C9AC83"
list_reagents = list("nutriment" = 3)
+ tastes = list("bread crumbs" = 1, "herbs" = 1)
/obj/item/reagent_containers/food/snacks/loadedbakedpotato
name = "loaded baked potato"
@@ -86,6 +95,7 @@
icon_state = "loadedbakedpotato"
filling_color = "#9C7A68"
list_reagents = list("nutriment" = 6)
+ tastes = list("potato" = 1, "cheese" = 1, "herbs" = 1)
/obj/item/reagent_containers/food/snacks/boiledrice
name = "boiled rice"
@@ -94,6 +104,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ tastes = list("rice" = 1)
/obj/item/reagent_containers/food/snacks/roastparsnip
@@ -103,3 +114,5 @@
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 3, "vitamin" = 4)
filling_color = "#FF5500"
+ tastes = list("parsnip" = 1)
+
diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
index 586912d1f79..6d725037742 100644
--- a/code/modules/food_and_drinks/food/foods/soups.dm
+++ b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -11,6 +11,7 @@
filling_color = "#785210"
bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+ tastes = list("meatball" = 1)
/obj/item/reagent_containers/food/snacks/slimesoup
name = "slime soup"
@@ -19,6 +20,7 @@
filling_color = "#C4DBA0"
bitesize = 5
list_reagents = list("nutriment" = 5, "slimejelly" = 5, "water" = 5, "vitamin" = 4)
+ tastes = list("slime" = 1)
/obj/item/reagent_containers/food/snacks/bloodsoup
name = "tomato soup"
@@ -27,6 +29,7 @@
filling_color = "#FF0000"
bitesize = 5
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
+ tastes = list("iron" = 1)
/obj/item/reagent_containers/food/snacks/clownstears
name = "clown's tears"
@@ -35,6 +38,7 @@
filling_color = "#C4FBFF"
bitesize = 5
list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 5, "vitamin" = 8)
+ tastes = list("a bad joke" = 1)
/obj/item/reagent_containers/food/snacks/vegetablesoup
name = "vegetable soup"
@@ -44,6 +48,7 @@
filling_color = "#AFC4B5"
bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+ tastes = list("vegetables" = 1)
/obj/item/reagent_containers/food/snacks/nettlesoup
name = "nettle soup"
@@ -53,6 +58,7 @@
filling_color = "#AFC4B5"
bitesize = 5
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
+ tastes = list("nettles" = 1)
/obj/item/reagent_containers/food/snacks/mysterysoup
name = "mystery soup"
@@ -61,6 +67,7 @@
var/extra_reagent = null
bitesize = 5
list_reagents = list("nutriment" = 6)
+ tastes = list("chaos" = 1)
/obj/item/reagent_containers/food/snacks/mysterysoup/New()
..()
@@ -75,6 +82,7 @@
filling_color = "#D1F4FF"
bitesize = 5
list_reagents = list("water" = 10)
+ tastes = list("wishes" = 1)
/obj/item/reagent_containers/food/snacks/wishsoup/New()
..()
@@ -91,6 +99,7 @@
filling_color = "#D92929"
bitesize = 5
list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
+ tastes = list("tomato" = 1)
/obj/item/reagent_containers/food/snacks/milosoup
name = "milosoup"
@@ -99,6 +108,7 @@
trash = /obj/item/trash/snack_bowl
bitesize = 5
list_reagents = list("nutriment" = 7, "vitamin" = 2)
+ tastes = list("milo" = 1)
/obj/item/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -108,6 +118,7 @@
filling_color = "#E386BF"
bitesize = 5
list_reagents = list("nutriment" = 8, "vitamin" = 4)
+ tastes = list("mushroom" = 1)
/obj/item/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -117,6 +128,7 @@
bitesize = 5
filling_color = "#FAC9FF"
list_reagents = list("nutriment" = 7, "vitamin" = 2)
+ tastes = list("beet" = 1)
/obj/item/reagent_containers/food/snacks/beetsoup/New()
..()
@@ -134,6 +146,7 @@
filling_color = "#9E673A"
bitesize = 7
list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
+ tastes = list("tomato" = 1, "carrot" = 1)
/obj/item/reagent_containers/food/snacks/stewedsoymeat
name = "stewed soy meat"
@@ -141,6 +154,7 @@
icon_state = "stewedsoymeat"
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 8)
+ tastes = list("soy" = 1, "vegetables" = 1)
//////////////////////
@@ -155,6 +169,7 @@
filling_color = "#FF3C00"
bitesize = 5
list_reagents = list("nutriment" = 5, "capsaicin" = 1, "tomatojuice" = 2, "vitamin" = 2)
+ tastes = list("hot peppers" = 1, "tomato" = 1)
/obj/item/reagent_containers/food/snacks/coldchili
name = "cold chili"
@@ -164,3 +179,4 @@
trash = /obj/item/trash/snack_bowl
bitesize = 5
list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2)
+ tastes = list("tomato" = 1, "mint" = 1)
\ No newline at end of file
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index 9f4dbb7315d..e701406897c 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -32,8 +32,8 @@
data["alcohol_perc"] = G.wine_power
if(G.wine_flavor)
data["tastes"] = list(G.wine_flavor = 1)
- // else // Stub - Will implement when we port over tg's better taste system - I'd rather get the barrel in first.
- // data["tastes"] = list(G.tastes[1] = 1)
+ else
+ data["tastes"] = list(G.tastes[1] = 1)
reagents.add_reagent("fruit_wine", amount, data)
qdel(G)
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index a2085eafaee..1223dd9dba7 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -7,6 +7,7 @@
slot_flags = SLOT_HEAD
filling_color = "#008000"
bitesize_mod = 2
+ tastes = list("ambrosia" = 1)
// Ambrosia Vulgaris
/obj/item/seeds/ambrosia
@@ -52,6 +53,7 @@
filling_color = "#008B8B"
origin_tech = "biotech=4;materials=3"
wine_power = 0.5
+ tastes = list("ambrosia deus" = 1)
//Ambrosia Gaia
/obj/item/seeds/ambrosia/gaia
@@ -78,6 +80,7 @@
seed = /obj/item/seeds/ambrosia/gaia
wine_power = 0.7
wine_flavor = "the earthmother's blessing"
+ tastes = list("ambrosia gaia" = 1)
// Ambrosia Cruciatus
/obj/item/seeds/ambrosia/cruciatus
@@ -88,4 +91,5 @@
/obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus
seed = /obj/item/seeds/ambrosia/cruciatus
- wine_power = 0.7
\ No newline at end of file
+ wine_power = 0.7
+ tastes = list("ambrosia cruciatus" = 1)
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 67948c4beb9..1344a8c39b0 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -23,6 +23,7 @@
icon_state = "apple"
filling_color = "#FF4500"
bitesize = 100 // Always eat the apple in one bite
+ tastes = list("apple" = 1)
distill_reagent = "hcider"
// Posioned Apple
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index dd56ade79be..dc78ff71335 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -24,6 +24,7 @@
filling_color = "#FFFF00"
bitesize = 5
distill_reagent = "bananahonk"
+ tastes = list("banana" = 1)
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.")
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 3649e84b869..206d0984c3d 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -25,6 +25,7 @@
icon_state = "soybeans"
filling_color = "#F0E68C"
bitesize_mod = 2
+ tastes = list("soybean" = 1)
wine_power = 0.2
// Koibean
@@ -47,4 +48,5 @@
icon_state = "koibeans"
filling_color = "#F0E68C"
bitesize_mod = 2
+ tastes = list("koi" = 1)
wine_power = 0.4
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 8e740719fbf..d4161b0a87e 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -25,6 +25,7 @@
gender = PLURAL
filling_color = "#FF00FF"
bitesize_mod = 2
+ tastes = list("berry" = 1)
distill_reagent = "gin"
// Poison Berries
@@ -46,6 +47,7 @@
icon_state = "poisonberrypile"
filling_color = "#C71585"
distill_reagent = null
+ tastes = list("poison-berry" = 1)
wine_power = 0.35
// Death Berries
@@ -69,6 +71,7 @@
icon_state = "deathberrypile"
filling_color = "#708090"
distill_reagent = null
+ tastes = list("death-berry" = 1)
wine_power = 0.5
// Glow Berries
@@ -96,6 +99,7 @@
light_color = "#006622"
distill_reagent = null
wine_power = 0.6
+ tastes = list("glow-berry" = 1)
wine_flavor = "warmth"
// Cherries
@@ -127,6 +131,7 @@
filling_color = "#FF0000"
bitesize_mod = 2
wine_power = 0.3
+ tastes = list("cherry" = 1)
// Blue Cherries
/obj/item/seeds/cherry/blue
@@ -148,6 +153,7 @@
filling_color = "#6495ED"
bitesize_mod = 2
wine_power = 0.5
+ tastes = list("blue cherry" = 1)
// Grapes
/obj/item/seeds/grape
@@ -179,6 +185,7 @@
filling_color = "#FF1493"
bitesize_mod = 2
distill_reagent = "wine"
+ tastes = list("grapes" = 1)
// Green Grapes
/obj/item/seeds/grape/green
@@ -197,4 +204,5 @@
name = "bunch of green grapes"
icon_state = "greengrapes"
filling_color = "#7FFF00"
+ tastes = list("green grape" = 1)
distill_reagent = "cognac"
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index ed05d7a6954..274a1f1e084 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -93,6 +93,7 @@
icon_state = "cannabis"
filling_color = "#00FF00"
bitesize_mod = 2
+ tastes = list("cannabis" = 1)
wine_power = 0.2
From d3f6886433bd4509e669fac5c985c4f522b8134c Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Mon, 5 Aug 2019 00:08:49 +0800
Subject: [PATCH 4/6] Hydroponic, food and reagent taste mult
---
.../food_and_drinks/food/foods/ethnic.dm | 2 +-
.../food_and_drinks/food/foods/meat.dm | 7 +-
.../food_and_drinks/food/foods/seafood.dm | 2 +-
code/modules/hydroponics/grown/cereals.dm | 4 +
code/modules/hydroponics/grown/chili.dm | 3 +
code/modules/hydroponics/grown/citrus.dm | 4 +
.../hydroponics/grown/cocoa_vanilla.dm | 2 +
code/modules/hydroponics/grown/corn.dm | 1 +
code/modules/hydroponics/grown/eggplant.dm | 2 +
code/modules/hydroponics/grown/flowers.dm | 5 ++
.../modules/hydroponics/grown/grass_carpet.dm | 2 +
code/modules/hydroponics/grown/herbals.dm | 2 +
code/modules/hydroponics/grown/kudzu.dm | 1 +
code/modules/hydroponics/grown/melon.dm | 2 +
code/modules/hydroponics/grown/misc.dm | 4 +
code/modules/hydroponics/grown/mushrooms.dm | 11 +++
code/modules/hydroponics/grown/onion.dm | 4 +
code/modules/hydroponics/grown/peanut.dm | 1 +
code/modules/hydroponics/grown/pineapple.dm | 1 +
code/modules/hydroponics/grown/potato.dm | 3 +
code/modules/hydroponics/grown/pumpkin.dm | 2 +
code/modules/hydroponics/grown/root.dm | 16 ++--
code/modules/hydroponics/grown/tea_coffee.dm | 6 ++
code/modules/hydroponics/grown/tobacco.dm | 2 +
code/modules/hydroponics/grown/tomato.dm | 4 +
code/modules/mob/living/taste.dm | 30 +++++++
code/modules/reagents/chemistry/holder.dm | 87 ++++++++++---------
.../reagents/chemistry/reagents/disease.dm | 1 +
.../reagents/chemistry/reagents/misc.dm | 3 +
.../chemistry/reagents/pyrotechnic.dm | 2 +
.../reagents/chemistry/reagents/toxins.dm | 5 ++
.../reagents/chemistry/reagents/water.dm | 1 +
32 files changed, 170 insertions(+), 52 deletions(-)
create mode 100644 code/modules/mob/living/taste.dm
diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm
index 79e7cc8a4fb..0a160967858 100644
--- a/code/modules/food_and_drinks/food/foods/ethnic.dm
+++ b/code/modules/food_and_drinks/food/foods/ethnic.dm
@@ -105,7 +105,7 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#F0F2E4"
list_reagents = list("nutriment" = 5)
- taste = list("custard" = 1)
+ tastes = list("custard" = 1)
/obj/item/reagent_containers/food/snacks/yakiimo
name = "yaki imo"
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index c7ee445911f..ff4707d884d 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -111,12 +111,14 @@
filling_color = "#43DE18"
bitesize = 3
list_reagents = list("protein" = 3, "toxin" = 3)
+ tastes = list("tough meat" = 1)
-tastes = list("berry" = 1)/obj/item/reagent_containers/food/snacks/spiderleg
+/obj/item/reagent_containers/food/snacks/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
icon_state = "spiderleg"
list_reagents = list("protein" = 2, "toxin" = 2)
+ tastes = list("cobwebs" = 1, "creepy motion" = 1)
/obj/item/reagent_containers/food/snacks/raw_bacon
name = "raw bacon"
@@ -130,13 +132,14 @@ tastes = list("berry" = 1)/obj/item/reagent_containers/food/snacks/spiderleg
desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
- tastes = list("cobwebs" = 1)
+ tastes = list("cobwebs" = 1, "spider juice" = 1)
/obj/item/reagent_containers/food/snacks/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
icon_state = "goliathmeat"
list_reagents = list("protein" = 3, "toxin" = 5)
+ tastes = list("tough meat" = 1)
/obj/item/reagent_containers/food/snacks/goliath/burn()
visible_message("[src] finishes cooking!")
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 4947644bdd4..007af8f6eb9 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -197,7 +197,7 @@
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
- tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1))
+ tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
name = "smoked salmon sushi"
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index e864687a551..89b462a19e1 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -20,6 +20,7 @@
gender = PLURAL
icon_state = "wheat"
filling_color = "#F0E68C"
+ tastes = list("wheat" = 1)
bitesize_mod = 2
distill_reagent = "beer"
@@ -40,6 +41,7 @@
gender = PLURAL
icon_state = "oat"
filling_color = "#556B2F"
+ tastes = list("oat" = 1)
bitesize_mod = 2
distill_reagent = "ale"
@@ -62,6 +64,7 @@
icon_state = "rice"
filling_color = "#FAFAD2"
bitesize_mod = 2
+ tastes = list("rice" = 1)
distill_reagent = "sake"
//Meatwheat - grows into synthetic meat
@@ -83,6 +86,7 @@
filling_color = rgb(150, 0, 0)
bitesize_mod = 2
seed = /obj/item/seeds/wheat/meat
+ tastes = list("meatwheat" = 1)
can_distill = FALSE
/obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user)
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 5f4621eff16..1a2b5142e37 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -25,6 +25,7 @@
icon_state = "chilipepper"
filling_color = "#FF0000"
bitesize_mod = 2
+ tastes = list("chili" = 1)
wine_power = 0.2
// Ice Chili
@@ -50,6 +51,7 @@
filling_color = "#0000CD"
bitesize_mod = 2
origin_tech = "biotech=4"
+ tastes = list("chilli" = 1)
wine_power = 0.3
// Ghost Chili
@@ -76,4 +78,5 @@
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
+ tastes = list("ghost chili" = 1)
wine_power = 0.5
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index b6e4a36d164..38e4104c4a7 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -30,6 +30,7 @@
desc = "It's so sour, your face will twist."
icon_state = "lime"
filling_color = "#00FF00"
+ tastes = list("lime" = 1)
distill_reagent = "triple_sec"
// Orange
@@ -56,6 +57,7 @@
name = "orange"
desc = "It's an tangy fruit."
icon_state = "orange"
+ tastes = list("orange" = 1)
filling_color = "#FFA500"
// Lemon
@@ -81,6 +83,7 @@
name = "lemon"
desc = "When life gives you lemons, make lemonade."
icon_state = "lemon"
+ tastes = list("lemonade" = 1)
filling_color = "#FFD700"
// Combustible lemon
@@ -107,6 +110,7 @@
icon_state = "firelemon"
bitesize_mod = 2
wine_power = 0.7
+ tastes = list("burning lemon" = 1)
wine_flavor = "fire"
/obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 745aa006498..744300d9daa 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -25,6 +25,7 @@
icon_state = "cocoapod"
filling_color = "#FFD700"
bitesize_mod = 2
+ tastes = list("cocoa" = 1)
distill_reagent = "creme_de_cacao"
// Vanilla Pod
@@ -45,4 +46,5 @@
desc = "Fattening... Mmmmm... vanilla."
icon_state = "vanillapod"
filling_color = "#FFD700"
+ tastes = list("vanilla" = 1)
distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index dca121d1acb..cf7c185c147 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -24,6 +24,7 @@
filling_color = "#FFFF00"
trash = /obj/item/grown/corncob
bitesize_mod = 2
+ tastes = list("corn" = 1)
distill_reagent = "whiskey"
wine_power = 0.4
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index b9244bfd3ec..2ed28f76226 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -22,6 +22,7 @@
icon_state = "eggplant"
filling_color = "#800080"
bitesize_mod = 2
+ tastes = list("eggplant" = 1)
wine_power = 0.2
// Egg-Plant
@@ -43,4 +44,5 @@
trash = /obj/item/reagent_containers/food/snacks/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
+ tastes = list("egg-plant" = 1)
distill_reagent = "eggnog"
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 2b5817788a6..d662a77e08a 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -25,6 +25,7 @@
slot_flags = SLOT_HEAD
filling_color = "#FF6347"
bitesize_mod = 3
+ tastes = list("poppy" = 1)
distill_reagent = "vermouth"
// Lily
@@ -42,6 +43,7 @@
name = "lily"
desc = "A beautiful orange flower"
icon_state = "lily"
+ tastes = list("lily" = 1)
filling_color = "#FFA500"
// Geranium
@@ -59,6 +61,7 @@
name = "geranium"
desc = "A beautiful blue flower"
icon_state = "geranium"
+ tastes = list("geranium" = 1)
filling_color = "#008B8B"
@@ -88,6 +91,7 @@
icon_state = "harebell"
slot_flags = SLOT_HEAD
filling_color = "#E6E6FA"
+ tastes = list("harebell" = 1)
bitesize_mod = 3
distill_reagent = "vermouth"
@@ -147,6 +151,7 @@
slot_flags = SLOT_HEAD
filling_color = "#E6E6FA"
bitesize_mod = 2
+ tastes = list("moonflower" = 1)
distill_reagent = "absinthe"
// Novaflower
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index c45899a310b..dee15bf75b2 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -27,6 +27,7 @@
bitesize_mod = 2
var/stacktype = /obj/item/stack/tile/grass
var/tile_coefficient = 0.02 // 1/50
+ tastes = list("grass" = 1)
wine_power = 0.15
/obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user)
@@ -66,4 +67,5 @@
desc = "The textile industry's dark secret."
icon_state = "carpetclump"
stacktype = /obj/item/stack/tile/carpet
+ tastes = list("carpet" = 1)
can_distill = FALSE
diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm
index 07734aa268f..6a0ad441ad3 100644
--- a/code/modules/hydroponics/grown/herbals.dm
+++ b/code/modules/hydroponics/grown/herbals.dm
@@ -17,6 +17,7 @@
desc = "Mash to turn into a poultice."
icon_state = "tea_astra_leaves"
color = "#378C61"
+ tastes = list("comfrey" = 1)
bitesize_mod = 2
/obj/item/reagent_containers/food/snacks/grown/comfrey/attack_self(mob/user)
@@ -43,6 +44,7 @@
desc = "Mash to turn into a poultice."
icon_state = "ambrosiavulgaris"
color = "#4CC5C7"
+ tastes = list("aloe" = 1)
bitesize_mod = 2
/obj/item/reagent_containers/food/snacks/grown/aloe/attack_self(mob/user)
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index 64b84649770..41ce7ae957e 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -95,4 +95,5 @@
icon_state = "kudzupod"
filling_color = "#6B8E23"
bitesize_mod = 2
+ tastes = list("kudzu" = 1)
wine_power = 0.2
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index ed7608e21b9..09952a2a405 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -24,6 +24,7 @@
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
+ tastes = list("watermelon" = 1)
bitesize_mod = 3
wine_power = 0.4
@@ -47,4 +48,5 @@
filling_color = "#FFD700"
dried_type = null
wine_power = 0.7 //Water to wine, baby.
+ tastes = list("melon" = 1, "divinity" = 1)
wine_flavor = "divinity"
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 0d60c7d864f..f2adfab0f20 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -53,6 +53,7 @@
icon_state = "cabbage"
filling_color = "#90EE90"
bitesize_mod = 2
+ tastes = list("cabbage" = 1)
wine_power = 0.2
@@ -79,6 +80,7 @@
icon_state = "sugarcane"
filling_color = "#FFD700"
bitesize_mod = 2
+ tastes = list("sugarcane" = 1)
distill_reagent = "rum"
@@ -109,6 +111,7 @@
icon_state = "gatfruit"
origin_tech = "combat=6"
trash = /obj/item/gun/projectile/revolver
+ tastes = list("2nd amendment" = 1, "freedom" = 1)
bitesize_mod = 2
wine_power = 0.9 //It burns going down, too.
@@ -131,6 +134,7 @@
filling_color = rgb(20, 20, 20)
seed = /obj/item/seeds/cherry/bomb
bitesize_mod = 2
+ tastes = list("cherry" = 1, "explosion" = 1)
volume = 125 //Gives enough room for the black powder at max potency
wine_power = 0.8
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 14c4b2a252a..68331c664c9 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -28,6 +28,7 @@
name = "reishi"
desc = "Ganoderma lucidum: A special fungus known for its medicinal and stress relieving properties."
icon_state = "reishi"
+ tastes = list("reishi" = 1)
filling_color = "#FF4500"
@@ -55,6 +56,7 @@
name = "fly amanita"
desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
icon_state = "amanita"
+ tastes = list("amanita" = 1)
filling_color = "#FF0000"
@@ -85,6 +87,7 @@
desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amanitin."
icon_state = "angel"
filling_color = "#C0C0C0"
+ tastes = list("destroying angel" = 1)
wine_power = 0.6
@@ -112,6 +115,7 @@
icon_state = "libertycap"
filling_color = "#DAA520"
wine_power = 0.8
+ tastes = list("liberty-cap" = 1)
wine_flavor = "freedom"
@@ -139,6 +143,7 @@
desc = "Plumus Hellmus: Plump, soft and s-so inviting~"
icon_state = "plumphelmet"
filling_color = "#9370DB"
+ tastes = list("plump helmet" = 1, "dwarven hardiness" = 1)
distill_reagent = "manlydorf"
@@ -166,6 +171,7 @@
icon_state = "walkingmushroom"
filling_color = "#9370DB"
origin_tech = "biotech=4;programming=5"
+ tastes = list("walking mushroom" = 1, "motion" = 1)
can_distill = FALSE
/obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
@@ -205,6 +211,7 @@
name = "chanterelle cluster"
desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!"
icon_state = "chanterelle"
+ tastes = list("chanterelle" = 1)
filling_color = "#FFA500"
@@ -238,6 +245,7 @@
var/effect_path = /obj/structure/glowshroom
origin_tech = "biotech=4;plasmatech=6"
light_color = "#006622"
+ tastes = list("warmth" = 1, "light" = 1, "glowshroom" = 1)
wine_power = 0.5
/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
@@ -287,6 +295,7 @@
effect_path = /obj/structure/glowshroom/glowcap
origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
light_color = "#8E0300"
+ tastes = list("warmth" = 1, "light" = 1, "glowscap" = 1)
wine_power = 0.6
wine_flavor = "warmth"
@@ -311,6 +320,7 @@
name = "fungus"
desc = "A fungus ideal for making antibacterials."
icon_state = "angel"
+ tastes = list("fungus" = 1)
color = "#4f4331"
//Shadowshroom
@@ -335,5 +345,6 @@
icon_state = "shadowshroom"
effect_path = /obj/structure/glowshroom/shadowshroom
origin_tech = "biotech=4;plasmatech=4;magnets=4"
+ tastes = list("strange coldness" = 1, "shadowshroom" = 1)
wine_power = 0.6
wine_flavor = "strange coldness"
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index e39548d9e7c..597d5c70660 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -24,6 +24,7 @@
filling_color = "#C0C9A0"
bitesize_mod = 2
slice_path = /obj/item/reagent_containers/food/snacks/onion_slice
+ tastes = list("onion" = 1, "pungentness" = 1)
slices_num = 2
wine_power = 0.2
wine_flavor = "pungentness"
@@ -45,6 +46,7 @@
icon_state = "onion_red"
filling_color = "#C29ACF"
slice_path = /obj/item/reagent_containers/food/snacks/onion_slice/red
+ tastes = list("red onion" = 1, "pungentness" = 3)
wine_power = 0.6
wine_flavor = "powerful pungentness"
@@ -54,6 +56,7 @@
icon_state = "onionslice"
list_reagents = list("plantmatter" = 5, "vitamin" = 2)
filling_color = "#C0C9A0"
+ tastes = list("onion" = 1, "pungentness" = 1)
gender = PLURAL
cooked_type = /obj/item/reagent_containers/food/snacks/onionrings
@@ -62,4 +65,5 @@
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
filling_color = "#C29ACF"
+ tastes = list("red onion" = 1, "pungentness" = 3)
list_reagents = list("plantmatter" = 5, "vitamin" = 2, "onionjuice" = 2.5)
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm
index 2a02754d4fc..52b74ab795b 100644
--- a/code/modules/hydroponics/grown/peanut.dm
+++ b/code/modules/hydroponics/grown/peanut.dm
@@ -22,4 +22,5 @@
name = "patch of peanuts"
desc = "Best avoided if you have spess allergies."
icon_state = "peanuts"
+ tastes = list("peanut" = 1, "nuttiness" = 1)
gender = PLURAL
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index 589f9456bc2..4a2975fae42 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -25,4 +25,5 @@
filling_color = "#e5b437"
w_class = WEIGHT_CLASS_NORMAL
bitesize_mod = 3
+ tastes = list("pineapple" = 1)
wine_power = 0.4
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 655cb6d69bd..c02b8f72119 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -24,6 +24,7 @@
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
icon_state = "potato"
filling_color = "#E9967A"
+ tastes = list("potato" = 1)
bitesize = 100
distill_reagent = "vodka"
@@ -33,6 +34,7 @@
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
filling_color = "#E9967A"
+ tastes = list("potato" = 1)
bitesize = 100
distill_reagent = "sbiten"
@@ -64,4 +66,5 @@
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
+ tastes = list("sweet potato" = 1)
icon_state = "sweetpotato"
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index f05a6847dc2..aa7030bc6db 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -23,6 +23,7 @@
icon_state = "pumpkin"
filling_color = "#FFA500"
bitesize_mod = 2
+ tastes = list("pumpkin" = 1)
wine_power = 0.2
/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -53,4 +54,5 @@
icon_state = "blumpkin"
filling_color = "#87CEFA"
bitesize_mod = 2
+ tastes = list("blumpkin" = 1)
wine_power = 0.5
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index 35bb5ee195c..e7cdcee2cad 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -21,6 +21,7 @@
icon_state = "carrot"
filling_color = "#FFA500"
bitesize_mod = 2
+ tastes = list("carrot" = 1)
wine_power = 0.3
/obj/item/reagent_containers/food/snacks/grown/carrot/wedges
@@ -60,16 +61,17 @@
desc = "Closely related to carrots."
icon_state = "parsnip"
bitesize_mod = 2
+ tastes = list("parsnip" = 1)
wine_power = 0.35
// White-Beet
/obj/item/seeds/whitebeet
- name = "pack of white-beet seeds"
+ name = "pack of white beet seeds"
desc = "These seeds grow into sugary beet producing plants."
icon_state = "seed-whitebeet"
species = "whitebeet"
- plantname = "White-Beet Plants"
+ plantname = "White Beet Plants"
product = /obj/item/reagent_containers/food/snacks/grown/whitebeet
lifespan = 60
endurance = 50
@@ -81,20 +83,21 @@
/obj/item/reagent_containers/food/snacks/grown/whitebeet
seed = /obj/item/seeds/whitebeet
- name = "white-beet"
- desc = "You can't beat white-beet."
+ name = "white beet"
+ desc = "You can't beat white beet."
icon_state = "whitebeet"
filling_color = "#F4A460"
bitesize_mod = 2
+ tastes = list("white beet" = 1)
wine_power = 0.4
// Red Beet
/obj/item/seeds/redbeet
name = "pack of redbeet seeds"
desc = "These seeds grow into red beet producing plants."
- icon_state = "seed-redbeet"
+ icon_state = "seedredbeet"
species = "redbeet"
- plantname = "Red-Beet Plants"
+ plantname = "Red Beet Plants"
product = /obj/item/reagent_containers/food/snacks/grown/redbeet
lifespan = 60
endurance = 50
@@ -109,5 +112,6 @@
name = "red beet"
desc = "You can't beat red beet."
icon_state = "redbeet"
+ tastes = list("red beet" = 1)
bitesize_mod = 2
wine_power = 0.6
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 1139c03cad5..cec0a8598e0 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -21,6 +21,7 @@
name = "Tea Aspera tips"
desc = "These aromatic tips of the tea plant can be dried to make tea."
icon_state = "tea_aspera_leaves"
+ tastes = list("tea leaves" = 1)
filling_color = "#008000"
can_distill = FALSE
@@ -28,6 +29,7 @@
/obj/item/seeds/tea/astra
name = "pack of tea astra seeds"
icon_state = "seed-teaastra"
+ desc = "These seeds grow into Tea Astra, a more potent variant of tea"
species = "teaastra"
plantname = "Tea Astra Plant"
product = /obj/item/reagent_containers/food/snacks/grown/tea/astra
@@ -38,7 +40,9 @@
/obj/item/reagent_containers/food/snacks/grown/tea/astra
seed = /obj/item/seeds/tea/astra
name = "Tea Astra tips"
+ desc = "Knock away your fatigue!"
icon_state = "tea_astra_leaves"
+ tastes = list("tea leaves" = 1, "pure energy" = 1)
filling_color = "#4582B4"
@@ -67,6 +71,7 @@
desc = "Dry them out to make coffee."
icon_state = "coffee_arabica"
filling_color = "#DC143C"
+ tastes = list("coffee beans" = 1)
bitesize_mod = 2
distill_reagent = "kahlua"
@@ -86,4 +91,5 @@
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
desc = "Increases robustness by 37 percent!"
+ tastes = list("coffee beans" = 1, "robustness" = 1)
icon_state = "coffee_robusta"
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 95333bba31a..09d7d484f53 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -20,6 +20,7 @@
name = "tobacco leaves"
desc = "Dry them out to make some smokes."
icon_state = "tobacco_leaves"
+ tastes = list("tobacco" = 1)
filling_color = "#008000"
distill_reagent = "creme_de_menthe" //Menthol, I guess.
@@ -40,5 +41,6 @@
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
icon_state = "stobacco_leaves"
+ tastes = list("space tobacco" = 1)
distill_reagent = null
wine_power = 0.5
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 58bf18057ad..873b08f151e 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -21,6 +21,7 @@
icon_state = "tomato"
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
+ tastes = list("tomato" = 1)
bitesize_mod = 2
distill_reagent = "enzyme"
@@ -43,6 +44,7 @@
icon_state = "bloodtomato"
splat_type = /obj/effect/gibspawner/generic
filling_color = "#FF0000"
+ tastes = list("tomato" = 1, "blood" = 2)
origin_tech = "biotech=5"
distill_reagent = "bloodymary"
@@ -67,6 +69,7 @@
name = "blue-tomato"
desc = "I say blue-mah-to, you say blue-mae-to."
icon_state = "bluetomato"
+ tastes = list("bluemato" = 1)
splat_type = /obj/effect/decal/cleanable/blood/oil
filling_color = "#0000FF"
@@ -90,6 +93,7 @@
name = "bluespace tomato"
desc = "So lubricated, you might slip through space-time."
icon_state = "bluespacetomato"
+ tastes = list("bluemato" = 1, "taste bud dislocation" = 1)
origin_tech = "biotech=4;bluespace=5"
distill_reagent = null
wine_power = 0.8
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
new file mode 100644
index 00000000000..794d7a642ee
--- /dev/null
+++ b/code/modules/mob/living/taste.dm
@@ -0,0 +1,30 @@
+/mob/living
+ var/last_taste_time
+ var/last_taste_text
+
+/mob/living/proc/get_taste_sensitivity()
+ return TASTE_SENSITIVITY_NORMAL
+
+/mob/living/carbon/get_taste_sensitivity()
+ if(dna.species)
+ return dna.species.taste_sensitivity
+ else
+ return TASTE_SENSITIVITY_NORMAL
+
+// non destructively tastes a reagent container
+/mob/living/proc/taste(datum/reagents/from)
+ if(last_taste_time + 50 < world.time)
+ var/taste_sensitivity = get_taste_sensitivity()
+ var/text_output = from.generate_taste_message(taste_sensitivity)
+ // We dont want to spam the same message over and over again at the
+ // person. Give it a bit of a buffer.
+ if(hallucination > 50 && prob(25))
+ text_output = pick("spiders","dreams","nightmares","the future","the past","victory",\
+ "defeat","pain","bliss","revenge","poison","time","space","death","life","truth","lies","justice","memory",\
+ "regrets","your soul","suffering","music","noise","blood","hunger","the american way")
+ if(text_output != last_taste_text || last_taste_time + 100 < world.time)
+ to_chat(src, "You can taste [text_output].")
+ // "something indescribable" -> too many tastes, not enough flavor.
+
+ last_taste_time = world.time
+ last_taste_text = text_output
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index e03ee49f6cb..7aba1924446 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -784,51 +784,54 @@ var/const/INGEST = 2
temp.Add(v.Copy())
trans_data["viruses"] = temp
return trans_data
-
-/datum/reagents/proc/generate_0(minimum_percent=15)
-// the lower the minimum percent, the more sensitive the message is.
+/datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL)
var/list/out = list()
- var/list/tastes = list() //descriptor = strength
- if(minimum_percent <= 100)
- for(var/datum/reagent/R in reagent_list)
- if(!R.taste_mult)
- continue
-
- if(istype(R, /datum/reagent/consumable/nutriment))
- var/list/taste_data = R.data
- for(var/taste in taste_data)
- var/ratio = taste_data[taste]
- var/amount = ratio * R.taste_mult * R.volume
- if(taste in tastes)
- tastes[taste] += amount
- else
- tastes[taste] = amount
+ var/list/reagent_tastes = list() //in the form reagent_tastes["descriptor"] = strength
+ //mobs should get this message when either they cannot taste, the tastes are all too weak for them to detect, or the tastes somehow don't have any strength
+ var/no_taste_text = "something indescribable"
+ if(minimum_percent > 100)
+ return no_taste_text
+ for(var/datum/reagent/R in reagent_list)
+ if(!R.taste_mult)
+ continue
+ //nutriment carries a list of tastes that originates from the snack food that the nutriment came from
+ if(istype(R, /datum/reagent/consumable/nutriment))
+ var/list/nutriment_taste_data = R.data
+ for(var/nutriment_taste in nutriment_taste_data)
+ var/ratio = nutriment_taste_data[nutriment_taste]
+ var/amount = ratio * R.taste_mult * R.volume
+ if(nutriment_taste in reagent_tastes)
+ reagent_tastes[nutriment_taste] += amount
+ else
+ reagent_tastes[nutriment_taste] = amount
+ else
+ var/taste_desc = R.taste_description
+ var/taste_amount = R.volume * R.taste_mult
+ if(taste_desc in reagent_tastes)
+ reagent_tastes[taste_desc] += taste_amount
else
- var/taste_desc = R.taste_description
- var/taste_amount = R.volume * R.taste_mult
- if(taste_desc in tastes)
- tastes[taste_desc] += taste_amount
- else
- tastes[taste_desc] = taste_amount
- //deal with percentages
- // TODO it would be great if we could sort these from strong to weak
- var/total_taste = counterlist_sum(tastes)
- if(total_taste > 0)
- for(var/taste_desc in tastes)
- var/percent = tastes[taste_desc]/total_taste * 100
- if(percent < minimum_percent)
- continue
- var/intensity_desc = "a hint of"
- if(percent > minimum_percent * 2 || percent == 100)
- intensity_desc = ""
- else if(percent > minimum_percent * 3)
- intensity_desc = "the strong flavor of"
- if(intensity_desc != "")
- out += "[intensity_desc] [taste_desc]"
- else
- out += "[taste_desc]"
+ reagent_tastes[taste_desc] = taste_amount
+ //deal with percentages
+ //TODO: may want to sort these from strong to weak
+ var/total_taste = counterlist_sum(reagent_tastes)
+ if(total_taste <= 0)
+ return no_taste_text
+ for(var/taste_desc in reagent_tastes)
+ var/percent = (reagent_tastes[taste_desc] / total_taste) * 100
+ if(percent < minimum_percent) //the lower the minimum percent, the more sensitive the message is
+ continue
+ var/intensity_desc = "a hint of"
+ if(percent > minimum_percent * 3 && percent != 100)
+ intensity_desc = "a strong flavor of"
+ else if(percent > minimum_percent * 2 || percent == 100)
+ intensity_desc = ""
- return english_list(out, "something indescribable")
+ if(intensity_desc != "")
+ out += "[intensity_desc] [taste_desc]"
+ else
+ out += "[taste_desc]"
+
+ return english_list(out, no_taste_text)
///////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/reagents/chemistry/reagents/disease.dm b/code/modules/reagents/chemistry/reagents/disease.dm
index 9ce636b466a..27fe0dacc40 100644
--- a/code/modules/reagents/chemistry/reagents/disease.dm
+++ b/code/modules/reagents/chemistry/reagents/disease.dm
@@ -181,6 +181,7 @@
name = "sucrose agar"
id = "sugarvirusfood"
color = "#41B0C0" // rgb: 65,176,192
+ taste_mult = 1.5
/datum/reagent/medicine/diphenhydramine/diphenhydraminevirusfood
name = "virus rations"
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index 66f58a55003..5db2805beae 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -39,6 +39,7 @@
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
taste_description = null
+ taste_mult = 0
/datum/reagent/nitrogen
name = "Nitrogen"
@@ -47,6 +48,7 @@
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
taste_description = null
+ taste_mult = 0
/datum/reagent/hydrogen
name = "Hydrogen"
@@ -55,6 +57,7 @@
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
taste_description = null
+ taste_mult = 0
/datum/reagent/potassium
name = "Potassium"
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index e1161bf9a7d..982433f8ee1 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -141,6 +141,7 @@
reagent_state = LIQUID
color = "#7A2B94"
taste_description = "corporate assets going to waste"
+ taste_mult = 1.5
/datum/reagent/plasma/reaction_temperature(exposed_temperature, exposed_volume)
if(exposed_temperature >= T0C + 100)
@@ -407,6 +408,7 @@
description = "A fine dust of plasma. This chemical has unusual mutagenic properties for viruses and slimes alike."
color = "#500064" // rgb: 80, 0, 100
taste_description = "corporate assets going to waste"
+ taste_mult = 1.5
/datum/reagent/plasma_dust/reaction_temperature(exposed_temperature, exposed_volume)
if(exposed_temperature >= T0C + 100)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 72c6135cad1..0d052daa76e 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -4,6 +4,7 @@
description = "A Toxic chemical."
reagent_state = LIQUID
color = "#CF3600" // rgb: 207, 54, 0
+ taste_mult = 1.2
/datum/reagent/toxin/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -42,6 +43,7 @@
reagent_state = LIQUID
color = "#801E28" // rgb: 128, 30, 40
taste_description = "slimes"
+ taste_mult = 1.3
/datum/reagent/slimejelly/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -94,6 +96,7 @@
metabolization_rate = 0.2
penetrates_skin = TRUE
taste_description = "metal"
+ taste_mult = 0 // elemental mercury is tasteless
/datum/reagent/mercury/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -156,6 +159,7 @@
reagent_state = LIQUID
color = "#04DF27"
metabolization_rate = 0.3
+ taste_mult = 0.9
/datum/reagent/mutagen/reaction_mob(mob/living/M, method=TOUCH, volume)
if(!..())
@@ -681,6 +685,7 @@
color = "#1E4664"
metabolization_rate = 0.2
taste_description = null
+ taste_mult = 0
/datum/reagent/pancuronium/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 32b26755ab2..335f2ba1647 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -124,6 +124,7 @@
drink_name = "Glass of Tomato juice"
drink_desc = "Are you sure this is tomato juice?"
taste_description = "blood"
+ taste_mult = 1.3
/datum/reagent/blood/reaction_mob(mob/living/M, method=TOUCH, volume)
if(data && data["viruses"])
From c3b48f686217db7d733cbf407281889de9335507 Mon Sep 17 00:00:00 2001
From: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date: Tue, 27 Aug 2019 18:06:13 -0400
Subject: [PATCH 5/6] Some minor grammar thing
---
code/modules/food_and_drinks/food/foods/pasta.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm
index 8596972ad39..41de9f4f565 100644
--- a/code/modules/food_and_drinks/food/foods/pasta.dm
+++ b/code/modules/food_and_drinks/food/foods/pasta.dm
@@ -79,7 +79,7 @@
/obj/item/reagent_containers/food/snacks/lasagna
name = "Lasagna"
icon_state = "lasagna"
- desc = "Tajarans loves to eat this, for some reason."
+ desc = "Tajara love to eat this, for some reason."
filling_color = "#E18712"
list_reagents = list("nutriment" = 10, "msg" = 3, "vitamin" = 4, "tomatojuice" = 10)
tastes = list("pasta" = 1, "cheese" = 1, "tomato" = 1, "meat" = 1)
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 6/6] 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