From e6cd5ce676228f8a7a1645a7318ffc6bd3d4bd05 Mon Sep 17 00:00:00 2001 From: dopamiin0 <112458553+dopamiin0@users.noreply.github.com> Date: Thu, 15 Sep 2022 20:33:24 -0600 Subject: [PATCH] The Tastening (makes multiple adjustments to taste text, not very exciting) (#69900) --- code/game/objects/items/food/burgers.dm | 6 ++++++ code/game/objects/items/food/cake.dm | 4 ++-- code/game/objects/items/food/donkpocket.dm | 2 +- code/game/objects/items/food/lizard.dm | 2 +- code/game/objects/items/food/pastries.dm | 8 ++++---- code/game/objects/items/food/soup.dm | 2 +- code/game/objects/items/food/spaghetti.dm | 6 +++--- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index 6ccdf353377..304ad4b9e5c 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -49,6 +49,7 @@ name = "corgi burger" desc = "You monster." food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("bun" = 4, "corgi meat" = 2) foodtypes = GRAIN | MEAT | GORE venue_value = FOOD_PRICE_EXOTIC @@ -112,6 +113,7 @@ desc = "Best served rawr." icon_state = "bearger" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 5) + tastes = list("bun" = 2, "meat" = 2, "salmon" = 2) foodtypes = GRAIN | MEAT venue_value = FOOD_PRICE_EXOTIC @@ -120,6 +122,7 @@ desc = "This tastes funny..." icon_state = "clownburger" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("bun" = 2, "a bad joke" = 4) foodtypes = GRAIN | FRUIT venue_value = FOOD_PRICE_NORMAL @@ -308,6 +311,7 @@ desc = "HOT! HOT!" icon_state = "fivealarmburger" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("extreme heat" = 4, "bun" = 2) foodtypes = GRAIN | MEAT venue_value = FOOD_PRICE_NORMAL @@ -316,6 +320,7 @@ desc = "Pretty much what you'd expect..." icon_state = "ratburger" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("dead rat" = 4, "bun" = 2) foodtypes = GRAIN | MEAT | GORE venue_value = FOOD_PRICE_CHEAP @@ -324,6 +329,7 @@ desc = "It's still warm. The steam coming off of it looks like baseball." icon_state = "baseball" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("bun" = 2, "a home run" = 4) foodtypes = GRAIN | GROSS custom_price = PAYCHECK_CREW * 0.8 venue_value = FOOD_PRICE_NORMAL diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index 3990279dc9e..818d1918c51 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -360,7 +360,7 @@ desc = "A condensed cake made for filling people up quickly." icon_state = "pound_cake" food_reagents = list(/datum/reagent/consumable/nutriment = 60, /datum/reagent/consumable/nutriment/vitamin = 5) - tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1) + tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) foodtypes = GRAIN | DAIRY | SUGAR | JUNKFOOD venue_value = FOOD_PRICE_CHEAP @@ -444,7 +444,7 @@ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/trumpet, 5, 3 SECONDS, table_required = TRUE) /obj/item/food/cakeslice/trumpet - name = "spaceman's cake" + name = "spaceman's cake slice" desc = "A spaceman's trumpet frosted cake." icon_state = "trumpetcakeslice" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/berryjuice = 1) diff --git a/code/game/objects/items/food/donkpocket.dm b/code/game/objects/items/food/donkpocket.dm index 3b4e9bddd37..73e9c219afa 100644 --- a/code/game/objects/items/food/donkpocket.dm +++ b/code/game/objects/items/food/donkpocket.dm @@ -100,7 +100,7 @@ desc = "The award-winning donk-pocket, now warm and toasty." icon_state = "donkpocketbanana" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/banana = 4, /datum/reagent/consumable/laughter = 6) - tastes = list("dough" = 2, "children's antibiotics" = 1) + tastes = list("banana" = 2, "dough" = 2, "children's antibiotics" = 1) foodtypes = GRAIN /obj/item/food/donkpocket/berry diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm index ed60b6600b9..743df9373d8 100644 --- a/code/game/objects/items/food/lizard.dm +++ b/code/game/objects/items/food/lizard.dm @@ -212,7 +212,7 @@ icon = 'icons/obj/food/lizard.dmi' icon_state = "moonfish_demiglace" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment = 2) - tastes = list("fish" = 1) + tastes = list("fish" = 2, "potatoes" = 1, "carrots" = 1) foodtypes = SEAFOOD w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 1e42b1f500c..3f4215fb0e3 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -88,7 +88,7 @@ trash_type = /obj/item/trash/waffles bite_consumption = 4 food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/drug/mushroomhallucinogen = 2, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("waffle" = 1, "mushrooms" = 1) + tastes = list("waffles" = 1, "mushrooms" = 1) foodtypes = GRAIN | VEGETABLES | SUGAR | BREAKFAST w_class = WEIGHT_CLASS_SMALL @@ -131,13 +131,13 @@ if (fortune) fortune.forceMove(drop_location) return fortune - + // Otherwise, use a generic one var/obj/item/paperslip/fortune_slip = new trash_type(drop_location) - fortune_slip.name = "fortune slip" + fortune_slip.name = "fortune slip" // if someone adds lottery tickets in the future, be sure to add random numbers to this fortune_slip.desc = pick(GLOB.wisdoms) - + return fortune_slip /obj/item/food/fortunecookie/MakeLeaveTrash() diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index 222cd85fd3b..3a5fc8228d3 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -160,7 +160,7 @@ foodtypes = MEAT | GORE /obj/item/food/soup/miso - name = "misosoup" + name = "miso soup" desc = "The universes best soup! Yum!!!" icon_state = "misosoup" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 4) diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index 1aa5f854c79..a02eca5271a 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -69,7 +69,7 @@ desc = "A nice mix of noodles and fried vegetables." icon_state = "chowmein" food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("noodle" = 1, "tomato" = 1) + tastes = list("noodle" = 1, "meat" = 1, "fried vegetables" = 1) foodtypes = GRAIN | MEAT | VEGETABLES /obj/item/food/spaghetti/beefnoodle @@ -78,7 +78,7 @@ icon_state = "beefnoodle" trash_type = /obj/item/reagent_containers/cup/bowl food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3) - tastes = list("noodle" = 1, "meat" = 1) + tastes = list("noodles" = 1, "meat" = 1) foodtypes = GRAIN | MEAT | VEGETABLES /obj/item/food/spaghetti/butternoodles @@ -86,7 +86,7 @@ desc = "Noodles covered in savory butter. Simple and slippery, but delicious." icon_state = "butternoodles" food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("noodle" = 1, "butter" = 1) + tastes = list("noodles" = 1, "butter" = 1) foodtypes = GRAIN | DAIRY /obj/item/food/spaghetti/mac_n_cheese