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.

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

Good gravy, it's a new food (and drinks) update! #20280

Merged
merged 17 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
46dd5a3
made everything lol
tomixcomics Dec 20, 2024
dcba610
updated changelog
tomixcomics Dec 20, 2024
cc2d064
Update code/modules/cooking/plates.dm
tomixcomics Dec 21, 2024
5b11326
Update code/modules/cooking/plates.dm
tomixcomics Dec 21, 2024
f24448b
Update code/modules/cooking/plates.dm
tomixcomics Dec 21, 2024
a7417da
Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Fo…
tomixcomics Dec 21, 2024
2834425
Update code/modules/reagents/reagent_containers/food/snacks/breads.dm
tomixcomics Dec 21, 2024
ed52cef
Update code/modules/reagents/reagent_containers/food/snacks/cultural/…
tomixcomics Dec 21, 2024
5e1f4ad
Update code/modules/reagents/reagent_containers/food/snacks/cultural/…
tomixcomics Dec 21, 2024
a18720a
Update html/changelogs/Tomixcomics-PR-cheesyfoods.yml
tomixcomics Dec 21, 2024
b3891ce
Update code/modules/cooking/plates.dm
tomixcomics Dec 21, 2024
e311f1e
shortened description of steak tartare and reverted coffee jar sprite
tomixcomics Dec 21, 2024
9d51510
Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Fo…
tomixcomics Dec 21, 2024
7eb5e34
Update code/modules/reagents/reagent_containers/food/snacks/breads.dm
tomixcomics Dec 21, 2024
393119f
Update code/modules/reagents/reagent_containers/food/snacks/breads.dm
tomixcomics Dec 21, 2024
38b3d9c
Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Fo…
tomixcomics Dec 21, 2024
17077aa
Update code/modules/reagents/Chemistry-Recipes.dm
tomixcomics Dec 21, 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
1 change: 1 addition & 0 deletions code/game/machinery/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,7 @@
/obj/item/tray/plate = 10,
/obj/item/reagent_containers/bowl = 10,
/obj/item/reagent_containers/bowl/plate = 10,
/obj/item/reagent_containers/bowl/gravy_boat = 8,
/obj/item/reagent_containers/glass/bottle/syrup = 4,
)
contraband = list(
Expand Down
39 changes: 39 additions & 0 deletions code/modules/cooking/plates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,42 @@ Plates that can hold your cooking stuff
desc = "A small ornamental cauldron used as an altar by the worshippers of Zhukamir, the Ma'ta'ke deity of agriculture and cooking."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "zhukamir"

/obj/item/reagent_containers/bowl/gravy_boat
name = "gravy boat"
desc = "Let's sail the seas of deliciousness!"
icon_state = "gravy"
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5, 10, 30)
w_class = WEIGHT_CLASS_SMALL
volume = 40
force = 14
atom_flags = ATOM_FLAG_OPEN_CONTAINER
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'

/obj/item/reagent_containers/bowl/gravy_boat/afterattack(var/obj/target, var/mob/user, var/flag)
if(!target.is_open_container() || !flag)
return ..(target, user, flag)
if(reagents.total_volume)
if(!target.reagents || !REAGENTS_FREE_SPACE(target.reagents))
to_chat(user, SPAN_NOTICE("\The [target] is full."))
return TRUE
var/trans = reagents.trans_to(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
user.visible_message(
"[SPAN_BOLD("[user]")] pours onto \the [target] from \the [src].",
SPAN_NOTICE("You transfer [trans] units of the solution.")
)
playsound(get_turf(user), /singleton/sound_category/generic_pour_sound, 10, TRUE)
return TRUE

/obj/item/reagent_containers/bowl/gravy_boat/on_reagent_change()
update_icon()

/obj/item/reagent_containers/bowl/gravy_boat/update_icon()
ClearOverlays()
if(!reagents.total_volume)
return
var/image/over = image(icon, "gravy_over")
over.color = reagents.get_color()
AddOverlays(over)
21 changes: 21 additions & 0 deletions code/modules/cooking/recipes/cultural/recipes_human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,27 @@
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/bowl/alfajores

/singleton/recipe/biscuits_and_gravy
appliance = SAUCEPAN
reagents = list(/singleton/reagent/condiment/gravy = 10)
items = list(
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/reagent_containers/food/snacks/sausage
)
result = /obj/item/reagent_containers/food/snacks/biscuits_and_gravy
reagent_mix = RECIPE_REAGENT_REPLACE

/singleton/recipe/elotes
appliance = OVEN | GRILL
reagents = list(/singleton/reagent/nutriment/mayonnaise = 5, /singleton/reagent/spacespice = 2)
fruit = list("corn" = 2, "lime" = 1)
items = list(
/obj/item/reagent_containers/food/snacks/cheesewedge
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/elotes

// Konyang

/singleton/recipe/mossbowl
Expand Down
31 changes: 31 additions & 0 deletions code/modules/cooking/recipes/recipes_breads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,37 @@
)
result = /obj/item/reagent_containers/food/snacks/grilledcheese

/singleton/recipe/grilled_mac_and_cheese_sandwich
appliance = SKILLET
items = list(
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/macandcheese
)
result = /obj/item/reagent_containers/food/snacks/grilled_mac_and_cheese

/singleton/recipe/grilled_triple_cheese_crunch_sandwich
appliance = SKILLET
items = list(
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/nakarka_wedge,
/obj/item/reagent_containers/food/snacks/cheesiehonkers
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/reagent_containers/food/snacks/grilled_triple_cheese_crunch_sandwich

/singleton/recipe/crab_leg_grilled_cheese_sandwich
appliance = SKILLET
items = list(
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/breadslice,
/obj/item/reagent_containers/food/snacks/cheesewedge,
/obj/item/reagent_containers/food/snacks/crabmeat
)
result = /obj/item/reagent_containers/food/snacks/crab_leg_grilled_cheese_sandwich

/singleton/recipe/reubensandwich
reagents = list(/singleton/reagent/nutriment/mayonnaise = 5, /singleton/reagent/nutriment/ketchup = 5)
items = list(
Expand Down
8 changes: 8 additions & 0 deletions code/modules/cooking/recipes/recipes_meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,11 @@
)
result = /obj/item/reagent_containers/food/snacks/cozmo_cubes
reagent_mix = RECIPE_REAGENT_REPLACE

/singleton/recipe/steak_tartare
fruit = list("onion" = 1)
appliance = MIX
reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1, /singleton/reagent/nutriment/protein/egg = 3)
items = list(/obj/item/reagent_containers/food/snacks/meat)
result = /obj/item/reagent_containers/food/snacks/steak_tartare
reagent_mix = RECIPE_REAGENT_REPLACE
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@
taste_description = "chalky starch"
color = "#DFDEA1"
condiment_name = "Adhomian flour sack"
condiment_desc = "Flour ground from pure Adhomian blizzard ears!"
condiment_icon_state = "flour_blizzard"

/singleton/reagent/nutriment/coco
name = "Coco Powder"
Expand Down Expand Up @@ -6986,6 +6988,17 @@
glass_desc = "Ancient boba-tea marketing teams believed this cherry-strawberry flavored drink holds magical powers of love! What does that mean? Nobody knows!"
glass_center_of_mass = list("x"=15, "y"=10)

/singleton/reagent/drink/dyn_boba
name = "Dyn Boba Tea"
description = "Dyn ice tea with boba pearls."
nutrition = 3
color = "#00ecec"
taste_description = "fizzy mint tapioca tea"
glass_icon_state = "boba_dyn"
glass_name = "dyn boba"
glass_desc = "A dyn boba drink, sometimes referred to as 'boba dyn', combining both skrell and human cultures of putting tasty, soft, chewy things in drinks."
glass_center_of_mass = list("x"=15, "y"=10)

/singleton/reagent/drink/zobo
name = "Zobo"
description = "A roselle juice popular across Eridani, often drunk cold."
Expand All @@ -6995,3 +7008,22 @@
glass_icon_state = "zobo_glass"
glass_name = "glass of zobo"
glass_desc = "A roselle juice popular across Eridani, often drunk cold."

/singleton/reagent/condiment/gravy
name = "Gravy"
description = "A thick sauce made from the juice of meat that occurs naturally during cooking."
taste_description = "gravy"
color = "#a36a35"
condiment_desc = "A thick meaty sauce for your dishes."
taste_mult = 3

/singleton/reagent/drink/chocolate_soda
name = "Chocolate Soda"
description = "Chocolate flavored soda made with real cocoa, popular in Mictlan under the name Mojoka."
color = "#3b1e10"
taste_description = "fizzy chocolate"
carbonated = TRUE

glass_icon_state = "chocolate_soda"
glass_name = "glass of chocolate soda"
glass_desc = "Mostly popular in Mictlan under the local name 'mojoka', this drink, mostly popular in friendly gatherings and celebrations, is in essence, a chocolate flavored soda made with real cocoa."
22 changes: 22 additions & 0 deletions code/modules/reagents/Chemistry-Recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4528,3 +4528,25 @@
result = /singleton/reagent/drink/lovebug_boba
required_reagents = list(/singleton/reagent/drink/icetea = 3, /singleton/reagent/nutriment/cherryjelly = 1, /singleton/reagent/drink/strawberryjuice = 1, /singleton/reagent/drink/boba = 1)
result_amount = 6

/datum/chemical_reaction/drink/dyn_boba
name = "dyn boba"
id = "boba_dyn"
result = /singleton/reagent/drink/dyn_boba
required_reagents = list(/singleton/reagent/drink/dynjuice/cold = 5, /singleton/reagent/drink/boba = 1)
result_amount = 6

// Other
/datum/chemical_reaction/gravy
name = "gravy"
id = "gravy"
result = /singleton/reagent/condiment/gravy
required_reagents = list(/singleton/reagent/nutriment/triglyceride = 2, /singleton/reagent/water = 5, /singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1, /singleton/reagent/nutriment/flour = 5)
result_amount = 10

/datum/chemical_reaction/drink/chocolate_soda
name = "Chocolate Soda"
id = "chocolate_soda"
result = /singleton/reagent/drink/chocolate_soda
required_reagents = list(/singleton/reagent/nutriment/coco = 1, /singleton/reagent/drink/space_cola = 1, /singleton/reagent/drink/sodawater = 3)
result_amount = 5
33 changes: 33 additions & 0 deletions code/modules/reagents/reagent_containers/food/snacks/breads.dm
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,39 @@
reagent_data = list(/singleton/reagent/nutriment = list("toasted bread" = 3, "cheese" = 3))
bitesize = 2

/obj/item/reagent_containers/food/snacks/grilled_mac_and_cheese
name = "grilled mac and cheese sandwich"
desc = "You know what would make these carbs better? MORE CARBS! Gooey macaroni and cheese between two careful slices of crunchy, toasted bread. This was either invented by a hipster, a broke college student, or both."
icon = 'icons/obj/item/reagent_containers/food/bread.dmi'
icon_state = "maccheesesandwich"
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
reagents_to_add = list(/singleton/reagent/nutriment/protein = 1)
reagent_data = list(/singleton/reagent/nutriment/protein = list("cheese" = 5))
bitesize = 3

/obj/item/reagent_containers/food/snacks/grilled_triple_cheese_crunch_sandwich
name = "grilled triple cheese crunch sandwich"
desc = "Who needs a four cheese medley when you have the classy and playful variety of cheddar, nakarka, and uh... whatever that glowy orange crud they put in cheesie honkers is, all in one sandwich?"
icon = 'icons/obj/item/reagent_containers/food/bread.dmi'
icon_state = "triplecheesecrunch"
trash = /obj/item/trash/plate
filling_color = "#b9d929"
reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 5)
reagent_data = list(/singleton/reagent/nutriment = list("toasted bread" = 2, "tangy cheese" = 3), /singleton/reagent/nutriment/protein = list("sharp cheese" = 3, "crunchy cheese" = 3))
bitesize = 2

/obj/item/reagent_containers/food/snacks/crab_leg_grilled_cheese_sandwich
name = "crab leg grilled cheese sandwich"
desc = "The fancier cousin of your boring, run-of-the-mill grilled cheese sandwich, adding a buttery crab leg to the mix for a unique upgrade."
icon = 'icons/obj/item/reagent_containers/food/bread.dmi'
icon_state = "crableggrilledcheese"
trash = /obj/item/trash/plate
filling_color = "#d99b29"
reagents_to_add = list(/singleton/reagent/nutriment/protein = 2)
reagent_data = list(/singleton/reagent/nutriment/protein = list("crab meat" = 5, "cheese" = 5))
bitesize = 2

/obj/item/reagent_containers/food/snacks/reubensandwich
name = "reuben sandwich"
desc = "A toasted sandwich packed with savory, meat and sour goodness!"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,43 @@
bitesize = 2
filling_color = "#bb8432"

/obj/item/reagent_containers/food/snacks/biscuits_and_gravy
name = "biscuits and gravy"
gender = PLURAL
desc = "Plump biscuits in a thick, rich sausage gravy. A meal traditionally popular in the southern United States, and it's not hard to see why."
icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi'
icon_state = "gravybiscuits"
trash = /obj/item/trash/plate

reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 3, /singleton/reagent/condiment/gravy =3)
reagent_data = list(/singleton/reagent/nutriment = list("flaky biscuits" = 10), /singleton/reagent/nutriment/protein = list("sausage gravy" = 5))
bitesize = 3
filling_color = "#bb8432"

/obj/item/reagent_containers/food/snacks/biscuits_and_gravy/update_icon()
var/expected_initial_reagent_volume
for(var/k in src.reagents_to_add)
expected_initial_reagent_volume += reagents_to_add[k]
var/percent_biscuits_and_gravy = round((reagents.total_volume / expected_initial_reagent_volume) * 100)
switch(percent_biscuits_and_gravy)
if(0 to 49)
icon_state = "gravybiscuits_half"
if(50 to INFINITY)
icon_state = "gravybiscuits"

/obj/item/reagent_containers/food/snacks/elotes
name = "elotes"
gender = PLURAL
desc = "Grilled mexican sweet corn with chili powder, mayonnaise, cheese, sour cream, and seasonings."
icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi'
icon_state = "elotes"
trash = /obj/item/trash/plate

reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 3)
reagent_data = list(/singleton/reagent/nutriment = list("corn" = 5, "zesty seasoning" = 3, "lime" = 3), /singleton/reagent/nutriment/protein = list("cheese" = 5))
bitesize = 2
filling_color = "#d8ab18"

// Konyang

/obj/item/reagent_containers/food/snacks/mossbowl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@
reagent_data = list(/singleton/reagent/nutriment = list("mashed potatoes" = 4))
bitesize = 2

/obj/item/reagent_containers/food/snacks/mashedpotato/on_reagent_change()
if(reagents.has_reagent(/singleton/reagent/condiment/gravy))
name = "mashed potato and gravy"
desc = "Pillowy mounds of mashed potato covered in thick gravy."
icon_state = "mashedpotatogravy"

/obj/item/reagent_containers/food/snacks/sauerkraut
name = "sauerkraut"
desc = "Finely cut and fermented cabbage. A light pickled delight!"
Expand Down
30 changes: 28 additions & 2 deletions code/modules/reagents/reagent_containers/food/snacks/meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,15 @@
var/percent = round((reagents.total_volume / 8) * 100)
switch(percent)
if(0 to 59)
icon_state = "schnitzel_half"
if(reagents.has_reagent(/singleton/reagent/condiment/gravy))
icon_state = "schnitzel_half_gravy"
else
icon_state = "schnitzel_half"
if(60 to INFINITY)
icon_state = "schnitzel"
if(reagents.has_reagent(/singleton/reagent/condiment/gravy))
icon_state = "schnitzel_gravy"
else
icon_state = "schnitzel"

/obj/item/reagent_containers/food/snacks/cozmo_cubes
name = "cozmo cubes"
Expand All @@ -448,3 +454,23 @@
icon_state = "cozmo_cubes_half"
if(70 to INFINITY)
icon_state = "cozmo_cubes"

/obj/item/reagent_containers/food/snacks/steak_tartare
name = "steak tartare"
desc = "Waiter! Is this a joke?! You just SLAPPED some raw beef onto a plate and sprinkled with condiments! Even the EGG isn't cooked! Are you trying to poison me?! No, don't give me that 'it's supposed to be like this' nonsense! Take this back and cook it until it stops mooing at me!"
icon = 'icons/obj/item/reagent_containers/food/meat.dmi'
icon_state = "tartare"
trash = /obj/item/trash/plate/steak
filling_color = "#b34d3b"
reagents_to_add = list(/singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment = 1)
reagent_data = list(/singleton/reagent/nutriment/protein = list("raw beef" = 5, "egg yolk" = 4), /singleton/reagent/nutriment = list("seasoning" = 5))
center_of_mass = list("x"=16, "y"=13)
bitesize = 2

/obj/item/reagent_containers/food/snacks/steak_tartare/update_icon()
var/percent = round((reagents.total_volume / 9) * 100)
switch(percent)
if(0 to 49)
icon_state = "tartare_half"
if(50 to INFINITY)
icon_state = "tartare"
Loading
Loading