Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Foodening #3153

Closed
wants to merge 9 commits into from
Closed

The Foodening #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee4bfe0
Adds beer and water brand variants
thestripes Jun 24, 2024
eb5a7a9
fixed a typo
thestripes Jun 25, 2024
d5a6346
one more beer variant for the road
thestripes Jun 25, 2024
01b6c72
touches up carp lite
thestripes Jun 25, 2024
60bbb43
Merge branch 'shiptest-ss13:master' into Food-Drink-Stuff
thestripes Jun 25, 2024
d958d97
works on burgers and condiments
thestripes Jun 25, 2024
6ef72ee
Merge branch 'Food-Drink-Stuff' of https://github.com/thestripes/Ship…
thestripes Jun 25, 2024
5ed2c8c
rewrites cake descriptions
thestripes Jun 25, 2024
76ba76f
edits one bit of bait and rewrites most breads
thestripes Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 57 additions & 3 deletions code/modules/food_and_drinks/drinks/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/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."

/obj/item/reagent_containers/food/drinks/waterbottle/large
desc = "A fresh commercial-sized bottle of water."
icon_state = "largebottle"
Expand Down Expand Up @@ -369,16 +397,42 @@
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 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
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/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"
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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/food/bait.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
46 changes: 23 additions & 23 deletions code/modules/food_and_drinks/food/condiment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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)

Expand All @@ -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()
Expand Down Expand Up @@ -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)
Loading
Loading