Skip to content

Commit

Permalink
[BUTTER] You can now slice butter into 3 easier to handle slices. Mix…
Browse files Browse the repository at this point in the history
…ing butter now requires 25 milk. Butter resprite (tgstation#76338)

## About The Pull Request

On top of removing soul, this changes almost all recipes to use butter
slices instead of a whole stick of butter, said stick of butter now
takes 25 units of milk to be mixed. The whole equation results in
8.333... milk per butter slice, making butter in general more efficient.
Butter also has 3 times as much nutriment.


![image](https://github.com/tgstation/tgstation/assets/44149906/6ee730ee-c855-4483-9b89-50f63d67991b)
## Why It's Good For The Game

Butter takes a lot of milk for not a lot of results, and using a whole
stick of butter on certain recipes is just silly. Now, you will spend
MORE milk to make butter, but you will slice it to make butter slices,
which are what will be used on recipes instead. Except butter on a
stick, that still uses the OG butter.
## Changelog
:cl:
add: Added butter slices, which you can make by cutting butter into 3.
qol: Recipes that once required butter now only require a slice of it.
With the exception of the butter on a stick, of course.
balance: Butter now requires 25 milk to mix and has 3 times as much
nutriment.
image: Resprited butter and butter on a stick using bluespace
technology, managing to compress more butter into a smaller space
/:cl:
  • Loading branch information
DATA-xPUNGED authored Jun 29, 2023
1 parent 683450f commit e14eb32
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 26 deletions.
3 changes: 3 additions & 0 deletions code/__DEFINES/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,6 @@ DEFINE_BITFIELD(food_flags, list(
// Venues for the barbots.
#define VENUE_RESTAURANT "Restaurant Venue"
#define VENUE_BAR "Bar Venue"

/// How much milk is needed to make butter on a reagent grinder
#define MILK_TO_BUTTER_COEFF 25
14 changes: 13 additions & 1 deletion code/game/objects/items/food/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
name = "stick of butter"
desc = "A stick of delicious, golden, fatty goodness."
icon_state = "butter"
food_reagents = list(/datum/reagent/consumable/nutriment = 5)
food_reagents = list(/datum/reagent/consumable/nutriment = 15)
tastes = list("butter" = 1)
foodtypes = DAIRY
w_class = WEIGHT_CLASS_SMALL
Expand Down Expand Up @@ -265,6 +265,18 @@
trash_type = /obj/item/stack/rods
food_flags = FOOD_FINGER_FOOD

/obj/item/food/butter/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")

/obj/item/food/butterslice
name = "butter slice"
desc = "A slice of butter, for your buttering needs."
icon_state = "butterslice"
food_reagents = list(/datum/reagent/consumable/nutriment = 5)
tastes = list("butter" = 1)
foodtypes = DAIRY
w_class = WEIGHT_CLASS_SMALL

/obj/item/food/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
Expand Down
6 changes: 3 additions & 3 deletions code/modules/food_and_drinks/recipes/soup_mixtures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@
/obj/item/food/grown/onion = 2,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/garlic = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/obj/item/food/boiledrice = 1,
)
results = list(
Expand Down Expand Up @@ -1475,7 +1475,7 @@
)
required_ingredients = list(
/obj/item/food/cheese/wedge = 2,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/obj/item/food/grown/potato/sweet = 1,
)
results = list(
Expand Down Expand Up @@ -1686,7 +1686,7 @@
required_ingredients = list(
/obj/item/food/cheese/firm_cheese_slice = 1,
/obj/item/food/cheese/curd_cheese = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
)
results = list(
/datum/reagent/consumable/nutriment/soup/cheese_porridge = 30,
Expand Down
12 changes: 6 additions & 6 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
time = 40
reqs = list(/obj/item/food/grown/garlic = 1,
/obj/item/food/breadslice/plain = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/garlicbread
category = CAT_BREAD
Expand All @@ -98,7 +98,7 @@
name = "Butter Biscuit"
reqs = list(
/obj/item/food/bun = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/butterbiscuit
category = CAT_BREAD
Expand All @@ -107,7 +107,7 @@
name = "Butterdog"
reqs = list(
/obj/item/food/bun = 1,
/obj/item/food/butter = 3,
/obj/item/food/butter = 1,
)
result = /obj/item/food/butterdog
category = CAT_BREAD
Expand All @@ -127,7 +127,7 @@
reqs = list(
/obj/item/food/doughslice = 1,
/datum/reagent/consumable/salt = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/raw_breadstick
category = CAT_BREAD
Expand All @@ -137,7 +137,7 @@
reqs = list(
/obj/item/food/doughslice = 1,
/datum/reagent/consumable/sugar = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/raw_croissant
category = CAT_BREAD
Expand Down Expand Up @@ -189,7 +189,7 @@
name = "Buttered Toast"
reqs = list(
/obj/item/food/breadslice/plain = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/butteredtoast
category = CAT_BREAD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@
result = /obj/item/food/pastrybase
category = CAT_BREAD

/datum/crafting_recipe/food/knife/butterslice
reqs = list(/obj/item/food/butter = 1)
result = /obj/item/food/butterslice

/datum/crafting_recipe/food/knife/doughball
reqs = list(/obj/item/food/doughslice = 1)
result = /obj/item/food/bait/doughball
Expand Down Expand Up @@ -515,7 +519,7 @@
result = /datum/reagent/consumable/flour

/datum/crafting_recipe/food/grinder/butter
reqs = list(/datum/reagent/consumable/milk = 15)
reqs = list(/datum/reagent/consumable/milk = MILK_TO_BUTTER_COEFF)
result = /obj/item/food/butter
steps = list("Put into grinder and mix")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
name = "Korta brittle slab"
reqs = list(
/obj/item/food/grown/korta_nut = 2,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/datum/reagent/consumable/korta_nectar = 5,
/datum/reagent/consumable/sugar = 5,
/datum/reagent/consumable/salt = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
name = "Pig in a Blanket"
reqs = list(
/obj/item/food/bun = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/obj/item/food/meat/cutlet = 1
)
result = /obj/item/food/pigblanket
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
reqs = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
/obj/item/food/butter = 10,
/obj/item/food/butter = 4,
/obj/item/food/meat/slab = 5,
/datum/reagent/blood = 50,
/datum/reagent/teslium = 1 //To shock the whole thing into life
Expand Down Expand Up @@ -225,7 +225,7 @@
reqs = list(
/datum/reagent/consumable/milk = 10,
/datum/reagent/consumable/flour = 5,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/bechamel_sauce
category = CAT_MISCFOOD
Expand Down Expand Up @@ -276,7 +276,7 @@
reqs = list(
/obj/item/food/grown/potato = 2,
/obj/item/food/grown/garlic = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
)
result = /obj/item/food/mashed_potatoes
category = CAT_MISCFOOD
Expand Down Expand Up @@ -345,7 +345,7 @@
name = "Buttered baked potato"
reqs = list(
/obj/item/food/baked_potato = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
)
result = /obj/item/food/buttered_baked_potato
category = CAT_MISCFOOD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
name = "Buttered baked corn"
reqs = list(
/obj/item/food/oven_baked_corn = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/buttered_baked_corn
category = CAT_MOTH
Expand Down Expand Up @@ -317,7 +317,7 @@
/datum/crafting_recipe/food/raw_mothic_garlic
reqs = list(
/obj/item/food/mothic_pizza_dough = 1,
/obj/item/food/butter = 1,
/obj/item/food/butterslice = 1,
/obj/item/food/grown/garlic = 1,
/obj/item/food/grown/herbs = 1
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@
/datum/reagent/consumable/sugar = 5,
/obj/item/food/egg = 2,
/datum/reagent/consumable/coco = 5,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/raw_brownie_batter
category = CAT_PASTRY
Expand All @@ -616,7 +616,7 @@
/obj/item/food/egg = 2,
/datum/reagent/consumable/coco = 5,
/datum/reagent/consumable/peanut_butter = 5,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/peanut_butter_brownie_batter
category = CAT_PASTRY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
/datum/crafting_recipe/food/baklava
name = "Baklava pie"
reqs = list(
/obj/item/food/butter = 2,
/obj/item/food/butterslice = 2,
/obj/item/food/tortilla = 4, //Layers
/obj/item/seeds/wheat/oat = 4
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
name = "Butter Noodles"
reqs = list(
/obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/food/butter = 1
/obj/item/food/butterslice = 1
)
result = /obj/item/food/spaghetti/butternoodles
category = CAT_SPAGHETTI
Expand Down
3 changes: 0 additions & 3 deletions code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#define MILK_TO_BUTTER_COEFF 15

/obj/machinery/reagentgrinder
name = "\improper All-In-One Grinder"
Expand Down Expand Up @@ -371,5 +370,3 @@
var/amount = beaker.reagents.get_reagent_amount(/datum/reagent/consumable/cream)
beaker.reagents.remove_reagent(/datum/reagent/consumable/cream, amount)
beaker.reagents.add_reagent(/datum/reagent/consumable/whipped_cream, amount)

#undef MILK_TO_BUTTER_COEFF
Binary file modified icons/obj/food/food.dmi
Binary file not shown.

0 comments on commit e14eb32

Please sign in to comment.