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

Small refactor of food_and_drink/plants.dm and addition of chems to baseline-produce #18318

Merged
merged 4 commits into from Apr 19, 2024

Conversation

M-Earthfire
Copy link
Contributor

@M-Earthfire M-Earthfire commented Mar 26, 2024

[hydroponics][catering][code quality][balance]

About the PR

This PR does two things:

firstly, a small cleanup of food_and_drink/plants.dm. Mostly making mutated produce be inherited from thier respectable baseline produce, like blackberries being a child of raspberries. Also, moving the pumpkin hats to /clothing/plants.dm. Above that, on occasions where food was manipulated (synthoranges, popcorn popping or spooning pumpkins) it was made sure that the chems of the baseline item were transferred properly.

Secondly, this overhauls make_reagents and its use within food_and_drink/plants.dm. The variable made_reagents was removed. Secondly, this PR adds the respectable botany chems to their corresponding baseline-produce via the use of make_reagents. As a baseline 10u was chosen, although many old exceptions were kept where appropriate, although most were adjusted to slightly lower values than they were before.

Why's this needed?

There were multiple people talking about botany produce having no chems at all and some produce in general being spawned dry through cargo or chef vendor. For the botany side of things, a PR was made that i personally didn't thought would solve the issue without other problems (#17886). This PR is the alternative i suggested in the discussion of that particular PR. In general, this will make it so botanists actually need to have really bad-quality produce to make them remove all chems (and add yuck to rub it in for good measure).

This method also affects chef or cargo-produce. This fixes #16487.

Make_reagents was used instead of initial_reagents because it can be made to respect inheritence (e.g. pumpkin spice gaining the pumpkin juice from baseline-pumpkins).

Made_reagents was removed since it wasn't used and actually didn't do anything when set to true outside of new() or the object's definition.

Changelog

(u)Lord_Earthfire
(+)Top NT Scientists found plant-based produce from chef vendors, low quality plants and cargo crates to be more juicy than previously assumed.

@keywordlabeler keywordlabeler bot added A-Catering Deals with food, the chef, the bar or otherwise edible/drinkable stuff A-Hydroponics Deals with plants, hydro, etc. C-Balance Balance changes, buffs and nerfs C-Bug A bug that impacts usage of a feature C-Code-Quality Cleans up code, refactors things to be more readable or intuitive labels Mar 26, 2024
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 26, 2024
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 Apr 10, 2024
@github-actions github-actions bot removed the S-Stale An inactive PR that has had no updates in the past two weeks label Apr 16, 2024
@goonstation-issuebot goonstation-issuebot added S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) and removed S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) labels Apr 19, 2024
@ZeWaka ZeWaka merged commit 616eade into goonstation:master Apr 19, 2024
22 checks passed
github-actions bot pushed a commit that referenced this pull request Apr 19, 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-Hydroponics Deals with plants, hydro, etc. C-Balance Balance changes, buffs and nerfs C-Bug A bug that impacts usage of a feature C-Code-Quality Cleans up code, refactors things to be more readable or intuitive 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.

Produce crate fruit have no reagents
3 participants