From ee4bfe057c15de55bc824adaa81282473340e496 Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 16:54:07 -0700
Subject: [PATCH 1/7] Adds beer and water brand variants
---
code/modules/food_and_drinks/drinks/drinks.dm | 53 ++++++++++++++++++-
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 32c4b1a9a09f..1d729acc3890 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -294,7 +294,7 @@
custom_price = 95
/obj/item/reagent_containers/food/drinks/waterbottle
- name = "Ryuunosuke Reserve" //we still have to find a way to make multiple variants as per the plan
+ name = "Ryuunosuke Reserve" //We'll be using Ryuunosuke as a backup, since it IS technically local...
desc = "Water bottled from a plant somewhere on Ryuunosuke. It has a mild, mineral-y flavor."
icon = 'icons/obj/drinks/drinks.dmi'
icon_state = "smallbottle"
@@ -341,6 +341,34 @@
list_reagents = list()
cap_on = FALSE
+/obj/item/reagent_containers/food/drinks/waterbottle/rehmil
+ name = "PG-Certified Mineral Water" //rehmil variant
+ desc = "Originating from the Reh'mihl Potables Guild, the label is strikingly wordy in touting this triple-distilled bottle of spring water being sufficiently mineral-infused enough to be attracted by a magnet."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/antechannel
+ name = "Channeler Freshwater" //Antechannel variant
+ desc = "Purified water, originating from the springs from the Antechannel League's territories. Notably cheaper as an imported water."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/shoal
+ name = "Crystaltrail Stellar-Glacial" //Shoal variant
+ desc = "A bottle of water originating from the Shoal. The label stretches very, very long in listing all of its benefits due to being harvested from the ice of comets and within the bodies of asteroids, which is beginning to make you wonder if this is even potable..."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/robustmore
+ name = "Robustmore Refresher" //Robustmore variant
+ desc = "A distinctly plastic-y scented bottle of water from Robustmore Drinkfoods. Reportedly harvested from Water-Vapor Adsorption Reactors (WAVAR)s, which makes it 'technically naturally sourced'."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/sol
+ name = "Asterslau Reserve" //Sol variant
+ desc = "A 'refreshing bottle' of Solarian mineral water. Harvested from the reserves in Terra, the label makes sure to remind you that Asterlaus is a medicinal company first, with a seal wearing a surgical cap recommending to always exercise and stay hydrated."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/nt
+ name = "Ceti Plus" //NT variant
+ desc = "Nanotrasen's entry on the bottling water market. The plastic shell feels cheap to the touch and smells off. This one is known for being made out of purified tap water with minerals added afterwards."
+
+/obj/item/reagent_containers/food/drinks/waterbottle/nt
+ name = "Little Misaka North" //Teceti variant
+ desc = "A fairly decorated water bottle. The contents inside were collected from the river basins in Solasika Tecei territory, which the label boasts openly about. A kepori named 'Little Sister Misaka' is shown hugging a river on the logo."
+
/obj/item/reagent_containers/food/drinks/waterbottle/large
desc = "A fresh commercial-sized bottle of water."
icon_state = "largebottle"
@@ -369,13 +397,34 @@
update_appearance()
/obj/item/reagent_containers/food/drinks/beer
- name = "Bizircan Brewery GDM" //ditto the plan for bottled water, need to find a way to make multiple variants
+ name = "Bizircan Brewery GDM" //base variant/fallback
desc = "A popular Gezenan drink made of fermented honey and spices, known as Gezenan Dark Mead, or GDM for short."
icon_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
foodtype = GRAIN | ALCOHOL
custom_price = 60
+/obj/item/reagent_containers/food/drinks/beer/clip
+ name = "Darkstar Finery Craft Beer" //CLIP variant
+ desc = "An amber lager made in a microbrewery on Clover in CLIP territory. Mild with a strong malt aroma, and perfect with a good burger."
+
+/obj/item/reagent_containers/food/drinks/beer/rehmil
+ name = "Crimson's Touch Dark Ale" // Reh'mil variant
+ desc = "Ale brewed from the rich greenhouses of Reh'himl, best taken with a cigarette in the other hand after a day's work. Rough on the edges, but known for being cheap in spacer's many galleys."
+
+/obj/item/reagent_containers/food/drinks/beer/syebanltch
+ name = "Lai'nuth Light" //Syebanltch variant
+ desc = "A fairly sweet-scented drink, with far less potency than the original it's known for. Spread around on frontier-facing establishments due to it's easier taste and mass-production."
+
+/obj/item/reagent_containers/food/drinks/beer/spacer
+ name = "Montzon Pale" //spacer variant
+ desc = "A savory and uniquely synthesized beer, designed from cereal rations to withstand atmosphere changes, giving its known for syrup-like consistency. The liquid sloshes notably slow when moved around in the bottle."
+
+/obj/item/reagent_containers/food/drinks/beer/shoal
+ name = "Hard Alko" //Shoal variant
+ desc = "A noticeably thicker glass bottle full of alcohol distilled from the Shoal. The little mascot moth on the label eagerly tells you about how the 'cereal grains' are chemically transformed from their origin; scrapyard ship fuselage. It should be safe enough to drink if its being sold... right?"
+
+
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
From eb5a7a912a0364d09e16874c251cf65669b7a2fa Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 17:16:47 -0700
Subject: [PATCH 2/7] fixed a typo
---
code/modules/food_and_drinks/drinks/drinks.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 1d729acc3890..888326e582f0 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -365,7 +365,7 @@
name = "Ceti Plus" //NT variant
desc = "Nanotrasen's entry on the bottling water market. The plastic shell feels cheap to the touch and smells off. This one is known for being made out of purified tap water with minerals added afterwards."
-/obj/item/reagent_containers/food/drinks/waterbottle/nt
+/obj/item/reagent_containers/food/drinks/waterbottle/teceti
name = "Little Misaka North" //Teceti variant
desc = "A fairly decorated water bottle. The contents inside were collected from the river basins in Solasika Tecei territory, which the label boasts openly about. A kepori named 'Little Sister Misaka' is shown hugging a river on the logo."
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/drinks/beer/syebanltch
name = "Lai'nuth Light" //Syebanltch variant
- desc = "A fairly sweet-scented drink, with far less potency than the original it's known for. Spread around on frontier-facing establishments due to it's easier taste and mass-production."
+ desc = "A fairly sweet-scented beer, with far less potency than the original it's known for. Spread around on frontier-facing establishments due to it's easier taste and mass-production."
/obj/item/reagent_containers/food/drinks/beer/spacer
name = "Montzon Pale" //spacer variant
From d5a6346bed6a62985c9939984c79c92381ef71c7 Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 17:20:20 -0700
Subject: [PATCH 3/7] one more beer variant for the road
---
code/modules/food_and_drinks/drinks/drinks.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 888326e582f0..86e331de782d 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -424,6 +424,11 @@
name = "Hard Alko" //Shoal variant
desc = "A noticeably thicker glass bottle full of alcohol distilled from the Shoal. The little mascot moth on the label eagerly tells you about how the 'cereal grains' are chemically transformed from their origin; scrapyard ship fuselage. It should be safe enough to drink if its being sold... right?"
+/obj/item/reagent_containers/food/drinks/beer/gezena
+
+ name = "Ken-Rai Spiced" //gezena variant (2, technically)
+ desc = "Marketed as 'Antechannel's traditional-style beer'. Given the distance from Kalixcis, the 'traditional' style is only in scent - the fresh herbal aroma caused by artificial sweeteners. Nostalgia-inducing all the same."
+
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
From 01b6c7275febf766577569902c307413e3d2a771 Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 17:26:32 -0700
Subject: [PATCH 4/7] touches up carp lite
---
code/modules/food_and_drinks/drinks/drinks.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 86e331de782d..45dd4294cefb 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -432,7 +432,7 @@
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
- desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
+ desc = "Brewed with 'Pure Ice Asteroid Spring Water' - a claim debated in courts a dozen times over. Sold under a shell company owned by Donk! Corporation."
list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
/obj/item/reagent_containers/food/drinks/ale
From d958d972f74921f1901ff98baf50cb1ca6a2c378 Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 23:11:27 -0700
Subject: [PATCH 5/7] works on burgers and condiments
---
.../modules/food_and_drinks/food/condiment.dm | 46 +++++-----
.../food_and_drinks/food/snacks_burgers.dm | 84 +++++++++----------
2 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 0adf98ba5666..1b4d2aed0e2e 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -130,14 +130,14 @@
/obj/item/reagent_containers/food/condiment/sugar
name = "sugar sack"
- desc = "Tasty spacey sugar!"
+ desc = "A bag of sugar. Used for sweetening, typically."
icon_state = "sugar"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/sugar = 50)
/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
- desc = "Salt. From space oceans, presumably."
+ desc = "A shaker full of salt. Make sure the cap is on tight!"
icon_state = "saltshakersmall"
icon_empty = "emptyshaker"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/food/condiment/peppermill
name = "pepper mill"
- desc = "Often used to flavor food or make people sneeze."
+ desc = "A handheld mill to grind down peppercorn. Often used to flavor food... or make people sneeze."
icon_state = "peppermillsmall"
icon_empty = "emptyshaker"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
@@ -170,7 +170,7 @@
/obj/item/reagent_containers/food/condiment/milk
name = "space milk"
- desc = "It's milk. White and nutritious goodness!"
+ desc = "A carton full of milk. Freshly supplied from a mammal, a biogenerator, or chemically reproduced in a lab."
icon_state = "milk"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -186,7 +186,7 @@
/obj/item/reagent_containers/food/condiment/soymilk
name = "soy milk"
- desc = "It's soy milk. White and nutritious goodness!"
+ desc = "A carton full of soy milk. Freshly supplied from the soybean."
icon_state = "soymilk"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -195,20 +195,20 @@
/obj/item/reagent_containers/food/condiment/rice
name = "rice sack"
- desc = "A big bag of rice. Good for cooking!"
+ desc = "A bag of dry, bleached rice. Better when properly cooked."
icon_state = "rice"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/rice = 30)
/obj/item/reagent_containers/food/condiment/soysauce
name = "soy sauce"
- desc = "A salty soy-based flavoring."
+ desc = "A glass bottle of soy sauce. Known for being salty and savory."
icon_state = "soysauce"
list_reagents = list(/datum/reagent/consumable/soysauce = 50)
/obj/item/reagent_containers/food/condiment/mayonnaise
name = "mayonnaise"
- desc = "An oily condiment made from egg yolks."
+ desc = "An oily condiment made from egg yolk."
icon_state = "mayonnaise"
list_reagents = list(/datum/reagent/consumable/mayonnaise = 50)
@@ -222,16 +222,16 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list()
possible_states = list(
- /datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."),
- /datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"),
- /datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"),
- /datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"),
- /datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"),
- /datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"),
- /datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
- /datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
- /datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
- /datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
+ /datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "A packet of ketchup. The old standby, given by the fistful."),
+ /datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "A packet of hotsauce. Good for spicing up food."),
+ /datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A packet of soy sauce. Good on rice."),
+ /datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "A packet of coldsauce. Good for... cooling down food?"),
+ /datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "A shaker full of salt. Make sure the cap is on tight!"),
+ /datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "A handheld mill to grind down peppercorn. Often used to flavor food... or make people sneeze."),
+ /datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A (presumably) corn-sourced oil. Good for cooking."),
+ /datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "A packet of sugar. Used for sweetening, typically."),
+ /datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "An artificial sweetener. Just be careful to not give yourself a headache with too much!"),
+ /datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "A sweet and savory packet of barbeque sauce. It's sticky!"),
)
/obj/item/reagent_containers/food/condiment/pack/update_icon()
@@ -295,30 +295,30 @@
/obj/item/reagent_containers/food/condiment/ketchup
name = "ketchup bottle"
- desc = "You feel more american already"
+ desc = "The old standby condiment."
icon_state = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 50)
/obj/item/reagent_containers/food/condiment/bbqsauce
name = "bbq sauce bottle"
- desc = "Hand wipes not included"
+ desc = "A sweet and savory barbeque sauce. It's sticky!"
icon_state = "bbqsauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)
/obj/item/reagent_containers/food/condiment/hotsauce
name = "hot sauce bottle"
- desc = "You can almost TASTE the stomach ulcers now!"
+ desc = "Good for spicing up food!"
icon_state = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 50)
/obj/item/reagent_containers/food/condiment/coldsauce
name = "cold sauce bottle"
- desc = "Leaves the tounge numb in it's passage"
+ desc = "Good for... cooling down food?"
icon_state = "coldsauce"
list_reagents = list(/datum/reagent/consumable/frostoil = 50)
/obj/item/reagent_containers/food/condiment/oliveoil
name = "olive oil bottle"
- desc = "A delicious oil used in cooking"
+ desc = "Oil made from pressed olives. Great for cooking."
icon_state = "oliveoil"
list_reagents = list(/datum/reagent/consumable/cornoil = 50)
diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm
index 44ee559641e3..f9ea85500a2c 100644
--- a/code/modules/food_and_drinks/food/snacks_burgers.dm
+++ b/code/modules/food_and_drinks/food/snacks_burgers.dm
@@ -9,7 +9,7 @@
/obj/item/reagent_containers/food/snacks/burger/plain
name = "burger"
- desc = "The cornerstone of every nutritious breakfast."
+ desc = "A Solarian culinary cornerstone - typically involving a beef patty between a sliced bun or roll, with additional condiments and add-ons included between it."
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
@@ -30,7 +30,7 @@
var/subjectname = ""
var/subjectjob = null
name = "human burger"
- desc = "A bloody burger."
+ desc = "A hamburger prepared with oddly lean cut of meat. Something feels off..."
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("bun" = 2, "long pig" = 4)
foodtype = MEAT | GRAIN | GORE
@@ -50,13 +50,13 @@
/obj/item/reagent_containers/food/snacks/burger/corgi
name = "corgi burger"
- desc = "You monster."
+ desc = "A hamburger prepared with dog meat. An aura of desperation hangs around it."
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/appendix
name = "appendix burger"
- desc = "Tastes like appendicitis."
+ desc = "A hamburger made with an appendix. Not a culinary delicacy."
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
icon_state = "appendixburger"
tastes = list("bun" = 4, "grass" = 2)
@@ -64,7 +64,7 @@
/obj/item/reagent_containers/food/snacks/burger/fish
name = "fillet -o- carp sandwich"
- desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
+ desc = "A breaded and fried square of space carp, usually with tartar sauce and cheese kept between a sliced steamed bun."
icon_state = "fishburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 4, "fish" = 4)
@@ -72,7 +72,7 @@
/obj/item/reagent_containers/food/snacks/burger/tofu
name = "tofu burger"
- desc = "What.. is that meat?"
+ desc = "The vegan alternative to a hamburger. It feels noticeably softer."
icon_state = "tofuburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("bun" = 4, "tofu" = 4)
@@ -80,7 +80,7 @@
/obj/item/reagent_containers/food/snacks/burger/roburger
name = "roburger"
- desc = "The lettuce is the only organic component. Beep."
+ desc = "A hamburger made from metal parts. You can't imagine how you'll manage to get a bite in..."
icon_state = "roburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/nanomachines = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -89,7 +89,7 @@
/obj/item/reagent_containers/food/snacks/burger/roburgerbig
name = "roburger"
- desc = "This massive patty looks like poison. Beep."
+ desc = "A hamburger made from a \"cut\" of some synthetic thing. Your mind struggles to understand how this came to be."
icon_state = "roburger"
volume = 120
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 10)
@@ -99,7 +99,7 @@
/obj/item/reagent_containers/food/snacks/burger/xeno
name = "xenoburger"
- desc = "Smells caustic. Tastes like heresy."
+ desc = "A hamburger made with a neon green patty of... something. You notice that the meat is starting to emulcify the rest of the burger."
icon_state = "xburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("bun" = 4, "acid" = 4)
@@ -107,28 +107,28 @@
/obj/item/reagent_containers/food/snacks/burger/bearger
name = "bearger"
- desc = "Best served rawr."
+ desc = "A hamburger made from a local variant of ursa stellaris. Its a challenge to tear a bite out of it."
icon_state = "bearger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 6)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/clown
name = "clown burger"
- desc = "This tastes funny..."
+ desc = "A hamburger made out of bananas shaped into a loose patty and garnished with... is this a prank?"
icon_state = "clownburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/banana = 6)
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/burger/mime
name = "mime burger"
- desc = "Its taste defies language."
+ desc = "A monotone hamburger."
icon_state = "mimeburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nothing = 6)
foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/burger/brain
name = "brainburger"
- desc = "A strange looking burger. It looks almost sentient."
+ desc = "A hamburger made out of a brain. A... delicacy, to say the least."
icon_state = "brainburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -137,7 +137,7 @@
/obj/item/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
- desc = "Too Spooky!"
+ desc = "This burger oozes a sickly green substance that causes your fingers to tingle. It seems to float supernaturally..."
icon_state = "ghostburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 12, /datum/reagent/consumable/sodiumchloride = 5)
tastes = list("bun" = 2, "ectoplasm" = 4)
@@ -184,7 +184,7 @@
/obj/item/reagent_containers/food/snacks/burger/red
name = "red burger"
- desc = "Perfect for hiding the fact it's burnt to a crisp."
+ desc = "A food color-dyed burger. Perfect for hiding the fact it's burnt to a crisp."
icon_state = "cburger"
color = "#DA0000FF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/red = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -192,7 +192,7 @@
/obj/item/reagent_containers/food/snacks/burger/orange
name = "orange burger"
- desc = "Contains 0% juice."
+ desc = "A food color-dyed burger. Despite the color, it contains no fruit juice."
icon_state = "cburger"
color = "#FF9300FF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/orange = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -200,7 +200,7 @@
/obj/item/reagent_containers/food/snacks/burger/yellow
name = "yellow burger"
- desc = "Bright to the last bite."
+ desc = "A food color-dyed burger. Bright to the last bite."
icon_state = "cburger"
color = "#FFF200FF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/yellow = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -208,7 +208,7 @@
/obj/item/reagent_containers/food/snacks/burger/green
name = "green burger"
- desc = "It's not tainted meat, it's painted meat!"
+ desc = "A food color-dyed burger. It's not tainted meat, it's painted meat!"
icon_state = "cburger"
color = "#A8E61DFF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/green = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -216,7 +216,7 @@
/obj/item/reagent_containers/food/snacks/burger/blue
name = "blue burger"
- desc = "Is this blue rare?"
+ desc = "A food color-dyed burger. Is this blue rare?"
icon_state = "cburger"
color = "#00B7EFFF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/blue = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -224,7 +224,7 @@
/obj/item/reagent_containers/food/snacks/burger/purple
name = "purple burger"
- desc = "Regal and low class at the same time."
+ desc = "A food color-dyed burger. A strikingly regal shade of purple."
icon_state = "cburger"
color = "#DA00FFFF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/purple = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -232,7 +232,7 @@
/obj/item/reagent_containers/food/snacks/burger/black
name = "black burger"
- desc = "This is overcooked."
+ desc = "A food color-dyed burger. It looks overcooked like this..."
icon_state = "cburger"
color = "#1C1C1C"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/black = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -240,15 +240,15 @@
/obj/item/reagent_containers/food/snacks/burger/white
name = "white burger"
- desc = "Delicous Titanium!"
+ desc = "A food color-dyed burger. Pale as a sheet..."
icon_state = "cburger"
color = "#FFFFFF"
bonus_reagents = list(/datum/reagent/colorful_reagent/powder/white = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/spell
- name = "spell burger"
- desc = "This is absolutely Ei Nath."
+ name = "mage burger"
+ desc = "A decorated hamburger in the style of a wizard. Usually found alongside a barbarianburger and a priestburger."
icon_state = "spellburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("bun" = 4, "magic" = 2)
@@ -256,7 +256,7 @@
/obj/item/reagent_containers/food/snacks/burger/bigbite
name = "big bite burger"
- desc = "Forget the Big Mac. THIS is the future!"
+ desc = "A hamburger biled high with tons of beef patties and add-ons. You steel yourself for the meal to come..."
icon_state = "bigbiteburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 6)
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -265,10 +265,10 @@
/obj/item/reagent_containers/food/snacks/burger/jelly
name = "jelly burger"
- desc = "Culinary delight..?"
+ desc = "A hamburger made from a shaped patty of some sort of fruit jelly. How very... sweet?"
icon_state = "jellyburger"
tastes = list("bun" = 4, "jelly" = 2)
- foodtype = GRAIN | MEAT
+ foodtype = GRAIN
/obj/item/reagent_containers/food/snacks/burger/jelly/slime
bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -282,19 +282,19 @@
/obj/item/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
- desc = "This is a mountain of a burger. FOOD!"
+ desc = "A true spire of a hamburger, stretching up and threatening the ceiling. You better hope this wasn't made just for you."
icon_state = "superbiteburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
list_reagents = list(/datum/reagent/consumable/nutriment = 40, /datum/reagent/consumable/nutriment/vitamin = 5)
w_class = WEIGHT_CLASS_NORMAL
bitesize = 7
volume = 100
- tastes = list("bun" = 4, "type two diabetes" = 10)
+ tastes = list("bun" = 4, "culinary landslide" = 10)
foodtype = GRAIN | MEAT | DAIRY
/obj/item/reagent_containers/food/snacks/burger/fivealarm
name = "five alarm burger"
- desc = "HOT! HOT!"
+ desc = "An extremely spicy hamburger, prepared typically for challenges to bear the heat. Remember to tap out before you can't breathe anymore!"
icon_state = "fivealarmburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -302,21 +302,21 @@
/obj/item/reagent_containers/food/snacks/burger/rat
name = "rat burger"
- desc = "Pretty much what you'd expect..."
+ desc = "A burger made with an entire rat in lieu of a bun. Any port in a storm...?"
icon_state = "ratburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT | GORE
/obj/item/reagent_containers/food/snacks/burger/baseball
name = "home run baseball burger"
- desc = "It's still warm. The steam coming off of it looks like baseball."
+ desc = "A hamburger with a crushed baseball instead of a beef patty. The leather is technically edible, but..."
icon_state = "baseball"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | GROSS
/obj/item/reagent_containers/food/snacks/burger/baconburger
name = "bacon burger"
- desc = "The perfect combination of all things American."
+ desc = "A commonly observed variation of the Solarian hamburger. The cuts of bacon add a pleasant crunch."
icon_state = "baconburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("bacon" = 4, "bun" = 2)
@@ -324,7 +324,7 @@
/obj/item/reagent_containers/food/snacks/burger/empoweredburger
name = "empowered burger"
- desc = "It's shockingly good, if you live off of electricity that is."
+ desc = "An experiment in attempting to adapt food for consumption by elzuose. While they still can't taste it, you shouldn't go eating it for them."
icon_state = "empoweredburger"
list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/liquidelectricity = 5)
tastes = list("bun" = 2, "pure electricity" = 4)
@@ -332,7 +332,7 @@
/obj/item/reagent_containers/food/snacks/burger/crab
name = "crab burger"
- desc = "A delicious patty of the crabby kind, slapped in between a bun."
+ desc = "A hamburger made with a compressed patty of crab meat. It's very savory, if a little too easy to come apart."
icon_state = "crabburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 2, "crab meat" = 4)
@@ -340,7 +340,7 @@
/obj/item/reagent_containers/food/snacks/burger/soylent
name = "soylent burger"
- desc = "A eco-friendly burger made using upcycled low value biomass."
+ desc = "A hamburger made out of recycled biomass. The origins of said biomass isn't known."
icon_state = "soylentburger"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 2, "assistant" = 4)
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/food/snacks/burger/rib
name = "mcrib"
- desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
+ desc = "A long hamburger with an imitiation of a shortrib, smothered in barbeque sauce and onions. No one's sure where the name originates beyond it's terran origins."
icon_state = "mcrib"
bonus_reagents = list(/datum/reagent/consumable/bbqsauce = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
tastes = list("bun" = 2, "pork patty" = 4)
@@ -356,23 +356,23 @@
/obj/item/reagent_containers/food/snacks/burger/mcguffin
name = "mcguffin"
- desc = "A cheap and greasy imitation of an eggs benedict."
+ desc = "A sliced intersolar muffin with a patty-shaped steamed and fried egg between. No one's sure where the name originates beyond it's terran origins."
icon_state = "mcguffin"
tastes = list("muffin" = 2, "bacon" = 3)
bonus_reagents = list(/datum/reagent/consumable/eggyolk = 3, /datum/reagent/consumable/nutriment = 1)
foodtype = GRAIN | MEAT | BREAKFAST
/obj/item/reagent_containers/food/snacks/burger/chicken
- name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us.
- desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier."
+ name = "chicken sandwich"
+ desc = "A breaded and fried chicken breast, usually with lettuce and mayo between a sliced bun. A popular alternative to the beef-based hamburger."
icon_state = "chickenburger"
- tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
+ tastes = list("bun" = 2, "chicken" = 4)
bonus_reagents = list(/datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/nutriment = 2)
foodtype = GRAIN | MEAT | FRIED
/obj/item/reagent_containers/food/snacks/burger/cheese
name = "cheese burger"
- desc = "This noble burger stands proudly clad in golden cheese."
+ desc = "A common enough variant of the hamburger with the inclusion of a slice of specifically made cheese. This type of cheese is not often used for any other cheese-based meals, interestingly enough."
icon_state = "cheeseburger"
tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 3)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1)
From 5ed2c8cf42a9c855a48e3ee85820e25779895c5b Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 23:34:37 -0700
Subject: [PATCH 6/7] rewrites cake descriptions
---
.../food_and_drinks/food/snacks_cake.dm | 88 +++++++++----------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index d6f6151d47ac..95c5376f9c2c 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -18,7 +18,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/plain
name = "plain cake"
- desc = "A plain cake, not a lie."
+ desc = "A plain, sweet cake."
icon_state = "plaincake"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/cake
bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -27,7 +27,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/plain
name = "plain cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
+ desc = "A slice of plain cake."
icon_state = "plaincake_slice"
filling_color = "#FFD700"
customfoodfilling = 1
@@ -36,7 +36,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/carrot
name = "carrot cake"
- desc = "A favorite desert of a certain wascally wabbit. Not a lie."
+ desc = "A frosted cake with carrots mixed into the batter before baking. The carrot brings a certain sweetness and texture... and have been modified over generations to actually benefit your eyes."
icon_state = "carrotcake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/carrot
slices_num = 5
@@ -47,7 +47,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/carrot
name = "carrot cake slice"
- desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
+ desc = "A slice of carrot cake."
icon_state = "carrotcake_slice"
filling_color = "#FFA500"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/oculine = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -56,7 +56,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/brain
name = "brain cake"
- desc = "A squishy cake-thing."
+ desc = "A cake with a brain mixed into the batter before baking. Oddly mushy and offputting to most before someone went through the effort of decorating it to look the part."
icon_state = "braincake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brain
slices_num = 5
@@ -67,7 +67,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/brain
name = "brain cake slice"
- desc = "Lemme tell you something about prions. THEY'RE DELICIOUS."
+ desc = "A slice of brain cake. Unpleasantly moist."
icon_state = "braincakeslice"
filling_color = "#FF69B4"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/mannitol = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -75,18 +75,18 @@
foodtype = GRAIN | DAIRY | MEAT | GROSS | SUGAR
/obj/item/reagent_containers/food/snacks/store/cake/cheese
- name = "cheese cake"
- desc = "DANGEROUSLY cheesy."
+ name = "cheesecake"
+ desc = "A cake made from sweetened cheese, usually with a crumb base. Technically a torte and not a cake, but don't let that stop you."
icon_state = "cheesecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/cheese
slices_num = 5
bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 10)
- tastes = list("cake" = 4, "cream cheese" = 3)
+ tastes = list("cake" = 4, "sweet cream cheese" = 3)
foodtype = GRAIN | DAIRY
/obj/item/reagent_containers/food/snacks/cakeslice/cheese
- name = "cheese cake slice"
- desc = "Slice of pure cheestisfaction."
+ name = "cheesecake slice"
+ desc = "Slice of cheesecake."
icon_state = "cheesecake_slice"
filling_color = "#FFFACD"
tastes = list("cake" = 4, "cream cheese" = 3)
@@ -94,7 +94,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/orange
name = "orange cake"
- desc = "A cake with added orange."
+ desc = "A cake prepared with orange zest. Citrusy and sweet."
icon_state = "orangecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/orange
slices_num = 5
@@ -104,7 +104,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/orange
name = "orange cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
+ desc = "A slice of orange cake."
icon_state = "orangecake_slice"
filling_color = "#FFA500"
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
@@ -112,7 +112,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/lime
name = "lime cake"
- desc = "A cake with added lime."
+ desc = "A cake prepared with lime zest. Citrusy and very sour."
icon_state = "limecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lime
slices_num = 5
@@ -122,7 +122,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/lime
name = "lime cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
+ desc = "A slice of lime cake."
icon_state = "limecake_slice"
filling_color = "#00FF00"
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
@@ -130,7 +130,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/lemon
name = "lemon cake"
- desc = "A cake with added lemon."
+ desc = "A cake prepared with lemon zest. Citrusy, sour, and sweet."
icon_state = "lemoncake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/lemon
slices_num = 5
@@ -140,7 +140,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/lemon
name = "lemon cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
+ desc = "A slice of lemon cake."
icon_state = "lemoncake_slice"
filling_color = "#FFEE00"
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
@@ -148,7 +148,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/chocolate
name = "chocolate cake"
- desc = "A cake with added chocolate."
+ desc = "A chocolate-flavored and frosted cake. A classic variant from the traditional vanilla cake."
icon_state = "chocolatecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/chocolate
slices_num = 5
@@ -158,7 +158,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/chocolate
name = "chocolate cake slice"
- desc = "Just a slice of cake, it is enough for everyone."
+ desc = "A slice of chocolate cake."
icon_state = "chocolatecake_slice"
filling_color = "#A0522D"
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/birthday
name = "birthday cake"
- desc = "Happy Birthday little clown..."
+ desc = "A cake typically made from an old Solarian tradition to celebrate someone's birthday with. Garnished with sprinkles and candles according to their new age."
icon_state = "birthdaycake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday
slices_num = 5
@@ -181,7 +181,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/birthday
name = "birthday cake slice"
- desc = "A slice of your birthday."
+ desc = "A slice of birthday cake."
icon_state = "birthdaycakeslice"
filling_color = "#DC143C"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -190,13 +190,13 @@
/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy
name = "energy cake"
- desc = "Just enough calories for a whole nuclear operative squad."
+ desc = "A cake prepared with a hardlight sword used by tactical boarding parties to quickly slice through body armor and fortifications. Wait, what?"
icon_state = "energycake"
force = 5
hitsound = 'sound/weapons/blade1.ogg'
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy
list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/pacfuel = 10, /datum/reagent/consumable/liquidelectricity = 10)
- tastes = list("cake" = 3, "a Vlad's Salad" = 1)
+ tastes = list("cake" = 3, "the sensation of your mouth being sliced open" = 1)
/obj/item/reagent_containers/food/snacks/store/cake/birthday/energy/proc/energy_bite(mob/living/user)
to_chat(user, "As you eat the cake, you accidentally hurt yourself on the embedded energy sword!")
@@ -215,7 +215,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/birthday/energy
name = "energy cake slice"
- desc = "For the traitor on the go."
+ desc = "A slice of sword-bearing cake. You could, technically, cut the rest of the slices with this."
icon_state = "energycakeslice"
force = 2
hitsound = 'sound/weapons/blade1.ogg'
@@ -236,7 +236,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/apple
name = "apple cake"
- desc = "A cake centred with Apple."
+ desc = "A cake prepared with chunks of sweet apples."
icon_state = "applecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/apple
slices_num = 5
@@ -246,7 +246,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/apple
name = "apple cake slice"
- desc = "A slice of heavenly cake."
+ desc = "A slice of apple cake."
icon_state = "applecakeslice"
filling_color = "#FF4500"
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
@@ -260,7 +260,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/slimecake
name = "Slime cake"
- desc = "A cake made of slimes. Probably not electrified."
+ desc = "A cake made out of a commonly domesticated and harvested xenofauna for industrial uses. Aren't they caustic to other living beings?"
icon_state = "slimecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/slimecake
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
@@ -269,7 +269,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/slimecake
name = "slime cake slice"
- desc = "A slice of slime cake."
+ desc = "A slice of slime cake. It quivers slightly."
icon_state = "slimecake_slice"
filling_color = "#00FFFF"
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
@@ -277,7 +277,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
name = "pumpkin spice cake"
- desc = "A hollow cake with real pumpkin."
+ desc = "A cake made with pumpkin spice, which... technically doesn't usually contain real pumpkins. Not to be confused with the pumpkin pie."
icon_state = "pumpkinspicecake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -286,7 +286,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/pumpkinspice
name = "pumpkin spice cake slice"
- desc = "A spicy slice of pumpkin goodness."
+ desc = "A slice of spiced pumpkin cake."
icon_state = "pumpkinspicecakeslice"
filling_color = "#FFD700"
tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
@@ -294,7 +294,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackberry strawberries vanilla cake
name = "blackberry and strawberry vanilla cake"
- desc = "A plain cake, filled with assortment of blackberries and strawberries!"
+ desc = "A vanilla-frosted cake, decorated with sliced blackberries and strawberries."
icon_state = "blackbarry_strawberries_cake_vanilla_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc
bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4)
@@ -303,7 +303,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/bsvc
name = "blackberry and strawberry vanilla cake slice"
- desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ desc = "A slice of vanilla cake, topped with blackberries and strawberries."
icon_state = "blackbarry_strawberries_cake_vanilla_slice"
filling_color = "#FFD700"
tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3)
@@ -311,7 +311,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake
name = "blackberry and strawberry chocolate cake"
- desc = "A chocolate cake, filled with assortment of blackberries and strawberries!"
+ desc = "A chocolate-frosted cake, decorated with sliced blackberries and strawberries."
icon_state = "blackbarry_strawberries_cake_coco_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc
bonus_reagents = list(/datum/reagent/consumable/nutriment = 14, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/coco = 5)
@@ -320,7 +320,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/bscc
name = "blackberry and strawberry chocolate cake slice"
- desc = "Just a slice of cake filled with assortment of blackberries and strawberries!"
+ desc = "A slice of chocolate cake, topped with blackberries and strawberries."
icon_state = "blackbarry_strawberries_cake_coco_slice"
filling_color = "#FFD700"
tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
@@ -328,7 +328,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/holy_cake
name = "angel food cake"
- desc = "A cake made for angels and chaplains alike! Contains holy water."
+ desc = "A very light sponge cake, usually topped with fruit. It is not particularly religious in that regard."
icon_state = "holy_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/water/holywater = 10)
@@ -337,7 +337,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
name = "angel food cake slice"
- desc = "A slice of heavenly cake."
+ desc = "A slice of angel food cake."
icon_state = "holy_cake_slice"
filling_color = "#00FFFF"
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
@@ -345,7 +345,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "pound cake"
- desc = "A condensed cake made for filling people up quickly."
+ desc = "A simple, sweet cake. Usually coated with icing or a glaze. It is very filling."
icon_state = "pound_cake"
slices_num = 7 //Its ment to feed the party
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
@@ -355,7 +355,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
name = "pound cake slice"
- desc = "A slice of condensed cake made for filling people up quickly."
+ desc = "A slice of pound cake."
icon_state = "pound_cake_slice"
filling_color = "#00FFFF"
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
@@ -363,7 +363,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
name = "hardware cake"
- desc = "A quote on quote cake that is made with electronic boards and leaks acid..."
+ desc = "A cake made out of PCB and sulfuric acid. An oddity, considering you can't feed IPCs this."
icon_state = "hardware_cake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
bonus_reagents = list(/datum/reagent/toxin/acid = 15, /datum/reagent/fuel/oil = 15)
@@ -372,7 +372,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
name = "hardware cake slice"
- desc = "A slice of electronic boards and some acid."
+ desc = "A slice of hardware cake. You still can't feed an IPC this."
icon_state = "hardware_cake_slice"
filling_color = "#00FFFF"
tastes = list("acid" = 3, "metal" = 4, "glass" = 5)
@@ -397,7 +397,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/clown_cake
name = "clown cake"
- desc = "A funny cake with a clown face on it."
+ desc = "A cake decorated in the shape of a clown. You don't find it all that funny."
icon_state = "clowncake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
bonus_reagents = list(/datum/reagent/consumable/sugar = 15)
@@ -406,7 +406,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
name = "clown cake slice"
- desc = "A slice of bad jokes, and silly props."
+ desc = "A slice of clown cake. It's still not that funny."
icon_state = "clowncake_slice"
filling_color = "#00FFFF"
tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
@@ -414,7 +414,7 @@
/obj/item/reagent_containers/food/snacks/store/cake/trumpet
name = "spaceman's cake"
- desc = "A spaceman's trumpet frosted cake."
+ desc = "A cake made out of a mutated flower, often found growing out on space installations. Uniquely purple and sweet."
icon_state = "trumpetcake"
slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
bonus_reagents = list(/datum/reagent/medicine/polypyr = 15, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/berryjuice = 5)
@@ -424,7 +424,7 @@
/obj/item/reagent_containers/food/snacks/cakeslice/trumpet
name = "spaceman's cake"
- desc = "A spaceman's trumpet frosted cake."
+ desc = "A slice of spaceman's trumpet cake."
icon_state = "trumpetcakeslice"
filling_color = "#7A3D80"
tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
From 76ba76f494341954cc264079c8215b03506cccc6 Mon Sep 17 00:00:00 2001
From: Stripes <756secret@gmail.com>
Date: Mon, 24 Jun 2024 23:35:37 -0700
Subject: [PATCH 7/7] edits one bit of bait and rewrites most breads
---
code/modules/food_and_drinks/food/bait.dm | 2 +-
.../food_and_drinks/food/snacks_bread.dm | 34 +++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/code/modules/food_and_drinks/food/bait.dm b/code/modules/food_and_drinks/food/bait.dm
index 9708c2f9ff56..7abd3894a6a8 100644
--- a/code/modules/food_and_drinks/food/bait.dm
+++ b/code/modules/food_and_drinks/food/bait.dm
@@ -13,7 +13,7 @@
/obj/item/reagent_containers/food/snacks/bait/worm
name = "worm"
- desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it are you ?"
+ desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it... are you?"
icon = 'icons/obj/fishing.dmi'
icon_state = "worm"
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 13342a968900..6b9bfcda5cc2 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -44,7 +44,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/moldy
name = "moldy bread slice"
- desc = "Entire stations have been ripped apart over arguing whether this is still good to eat."
+ desc = "Mold colonies have taken root on this humble piece of bread. Its a gamble to try and shave off the mold to make edible again..."
icon_state = "moldybreadslice"
customfoodfilling = 0
bonus_reagents = list(/datum/reagent/consumable/mold = 10)
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/meat
name = "meatbread loaf"
- desc = "The culinary base of every self-respecting eloquen/tg/entleman."
+ desc = "The culinary oddity, originating from an obscure spacer tradition. "
icon_state = "meatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/meat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
@@ -69,7 +69,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/xenomeat
name = "xenomeatbread loaf"
- desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
+ desc = "The culinary oddity, originating from an obscure spacer tradition. The meat in the roll is green and acrid..."
icon_state = "xenomeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/xenomeat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
@@ -79,7 +79,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/xenomeat
name = "xenomeatbread slice"
- desc = "A slice of delicious meatbread. Extra Heretical."
+ desc = "A slice of meatbread. Now sliced, the prepared meat oozes slightly..."
icon_state = "xenobreadslice"
filling_color = "#32CD32"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -87,7 +87,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/spidermeat
name = "spider meat loaf"
- desc = "Reassuringly green meatloaf made from spider meat."
+ desc = "A meatloaf made from giant arachnid. Sometimes prepared when culling the invasive species, the texture is questionable, and the health detriments are undeniable."
icon_state = "spidermeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/spidermeat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
@@ -97,7 +97,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/spidermeat
name = "spider meat bread slice"
- desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
+ desc = "A slice of meatloaf made from giant arachnid. The green meat threatens to fall apart from its already gelatinous state when cut."
icon_state = "spiderbreadslice"
filling_color = "#7CFC00"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -105,7 +105,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/banana
name = "banana-nut bread"
- desc = "A heavenly and filling treat."
+ desc = "Banana bread - a terran classic. The beloved savior of overripe bananas."
icon_state = "bananabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/banana
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 20)
@@ -124,7 +124,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/tofu
name = "Tofubread"
- desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
+ desc = "A tofu-based variant of the spacer delicacy that is meatbread."
icon_state = "tofubread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tofu
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
@@ -134,7 +134,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/tofu
name = "tofubread slice"
- desc = "A slice of delicious tofubread."
+ desc = "A slice of tofubread."
icon_state = "tofubreadslice"
filling_color = "#FF8C00"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -142,7 +142,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/creamcheese
name = "cream cheese bread"
- desc = "Yum yum yum!"
+ desc = "A cream cheese-filled loaf. Pleasantly filling."
icon_state = "creamcheesebread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/creamcheese
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -152,7 +152,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/creamcheese
name = "cream cheese bread slice"
- desc = "A slice of yum!"
+ desc = "A slice of cream cheese bread."
icon_state = "creamcheesebreadslice"
filling_color = "#FF8C00"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/mimana
name = "mimana bread"
- desc = "Best eaten in silence."
+ desc = "Banana bread, made with a mutant line of bananas. The flavor isn't muted, but you might be."
icon_state = "mimanabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -170,7 +170,7 @@
/obj/item/reagent_containers/food/snacks/breadslice/mimana
name = "mimana bread slice"
- desc = "A slice of silence!"
+ desc = "A slice of mutant-banana bread. The grey of the mimana is a little off-putting when viewed like this..."
icon_state = "mimanabreadslice"
filling_color = "#C0C0C0"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
@@ -184,7 +184,7 @@
/obj/item/reagent_containers/food/snacks/baguette
name = "baguette"
- desc = "Bon appetit!"
+ desc = "A long, thin loaf of crusty bread. A preserved terran classic. You can't help but wield it like a stick when you hold it."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "baguette"
item_state = "baguette"
@@ -199,7 +199,7 @@
/obj/item/reagent_containers/food/snacks/garlicbread
name = "garlic bread"
- desc = "Alas, it is limited."
+ desc = "Garlic and butter-topped bread. Widely enjoyed by every species that can eat grains."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "garlicbread"
item_state = "garlicbread"
@@ -276,7 +276,7 @@
/obj/item/reagent_containers/food/snacks/butterbiscuit
name = "butter biscuit"
- desc = "Well butter my biscuit!"
+ desc = "A type of \"quick bread\", topped with butter. Not to be confused with the pastry also referred to as a biscuit."
icon = 'icons/obj/food/food.dmi'
icon_state = "butterbiscuit"
filling_color = "#F0E68C"
@@ -287,7 +287,7 @@
/obj/item/reagent_containers/food/snacks/butterdog
name = "butterdog"
- desc = "Made from exotic butters."
+ desc = "A shaped stick of butter, placed in a long bun. Is this... going to be pleasant?"
icon = 'icons/obj/food/food.dmi'
icon_state = "butterdog"
bitesize = 1