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

Cream & Yoghurt additions/reworks #16288

Merged
merged 14 commits into from Dec 21, 2023

Conversation

CrystalClover
Copy link
Contributor

@CrystalClover CrystalClover commented Oct 5, 2023

[CATERING] [CHEMISTRY] [REWORK] [QoL]

About the PR

Additions:

Cream reagent: Taken from cream (condiment), breaks down into milk and cholesterol
Yoghurt reagent: Made from combining Milk and ????, heals damage to the intestine

Reworks:

Food Processor:
Now converts every 10 units of milk or yoghurt in a drinks container into cream and yoghurt (food) respectively, and dispenses the remaining container with any milk/yoghurt that wasn't used.

Frozen Yoghurt & Yoghurt:
Both contain 10 units of Yoghurt, and give you a Disease Resist buff, Frozen Yoghurt also gives you the Cold Food buff

Condiments:
You cannot apply a condiment to a food if the condiment contains no reagents
(does not affect things such as adding maple syrup to pancakes)
You cannot add a condiment to another condiment

Cream of Mushroom:
Now requires Cream instead of Milk, is cooked for 8 seconds on low in an oven (or 4 seconds on high)

The following foods have had their reagents changed:
Icecream - Starts with 10 units of Cream
Cream Pie - Starts with 10 units of Cream
Cream of Mushroom - Starts with 10 units of Cream
Creamy Sponge Cake - Starts with 20 units of Sugar & 10 units of Cream
All Cookies - Now contain chems that come from the constituant parts
All Moon Pies - Inherit the chems from the cookies used and also start with 10 units of Cream
Rancid Milk - Now contains 25 units of yoghurt and 25 units of ????

Why's this needed?

Makes cream and yoghurt much easier to obtain and gives them more uses, the items with changed reagents now make more sense than having none at all

Changelog

(u)CrystalClover
(*)Added Cream reagent to the game, which comes from dollops of cream. Can be used for filling donuts or icing cakes!
(*)Added Yoghurt reagent to the game, which is made from mixing Milk and ????. Improves gut health! (Heals intestinal damage)
(*)Food processors no longer destroy the bottle they use to make Cream or Yoghurt! They also accept any drink container, and convert every 10 units of Milk/Yoghurt into dollops of Cream or Yoghurt pots respectively.
(+)Almost all foods made with Cream now have 10 units of the Cream reagent in them by default. (This also includes icecreams)
(+)Cookies  and Moon Pies have had their reagents changed to better reflect what they are made of.
(+)Cream of Mushroom Soup is now made with 1 Mushroom and 1 Cream, and is cooked in an over for 8 seconds on Low.
(+)Condiments can no longer be applied to eachother, and cannot be applied to a food if they do not contain anything.

@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 5, 2023
@keywordlabeler keywordlabeler bot added A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff A-Chemistry Deals with the chemistry system in some way C-QoL A quality of life improvement that makes the game easier to play C-Rework Reworks a feature labels Oct 5, 2023
Copy link
Contributor

@MylieDaniels MylieDaniels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks really good, though a bit broad! I've made suggestions, mostly about keeping some empty space in the food proportional to it's reagent volume - this helps people make more customized food as well as allowing poisonings to occur.

code/modules/chemistry/Chemistry-Recipes.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-FoodDrink.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ice_cream.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/ice_cream.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/snacks.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/snacks.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/snacks.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/snacks.dm Outdated Show resolved Hide resolved
code/modules/food_and_drink/snacks.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@MylieDaniels MylieDaniels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks solid to me!

@github-actions
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Oct 24, 2023
Copy link
Contributor

@kbsmilk kbsmilk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine code-wise. In the future I'd suggest atomizing some more. The cream obj and its addition to existing foods, changing a bunch of cookie reagents, and making condiments unusable on other condiments: all three of these could be separated by scope, into 3 different PRs.

@github-actions github-actions bot added the S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) label Oct 26, 2023
@kbsmilk
Copy link
Contributor

kbsmilk commented Oct 26, 2023

I forgot to mention, the changelog is way too big IMO. At most, I'd suggest 1 major and 1 minor, or just 2 minor, explaining cream and yoghurt's additions and a brief line about their recipe.

@github-actions github-actions bot removed the S-Stale An inactive PR that has had no updates in the past two weeks label Oct 27, 2023
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Nov 10, 2023
@pali6 pali6 removed the S-Stale An inactive PR that has had no updates in the past two weeks label Nov 15, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Nov 30, 2023
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Dec 15, 2023
@TobleroneSwordfish TobleroneSwordfish added the E-Add-To-Wiki A PR that will require changes to the wiki label Dec 21, 2023
@TobleroneSwordfish TobleroneSwordfish merged commit eb1490c into goonstation:master Dec 21, 2023
20 of 21 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 21, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Jan 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff A-Chemistry Deals with the chemistry system in some way C-QoL A quality of life improvement that makes the game easier to play C-Rework Reworks a feature S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) S-Stale An inactive PR that has had no updates in the past two weeks size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants