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

Fixes Juicing (rkz edition) #12170

Merged
merged 6 commits into from
Jan 26, 2025
Merged

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Jan 19, 2025

About The Pull Request

Some serious shit was missed in the foodening pr, which broke juicing.
Pro-tip? If you are porting something always check the description of the pr for fixes. (also don't merge features before fixes)

Lets just fix it yea?

Ports:

Why It's Good For The Game

You can juice stuff again

Testing Photographs and Procedure

Screenshots&Videos
dreamseeker_3pGehqxOgi.mp4

Changelog

🆑 rkz, lizardqueenlexi, SyncIt21
fix: fixes juicing not giving juice (I promise <3)
fix: fixes food trash not appearing
fix: grinding stacks now grinds as many pieces/sheets from the stack as possible that can fit in a beaker/container without wasting the whole stack
fix: All in 1 grinder now mixes faster with upgraded parts
code: reagent holder code will no longer accept non-typepaths in procs (it expects reagent typepaths)
/:cl:

@PowerfulBacon
Copy link
Member

I swear this is like the third fix for juicing

@Tsar-Salat
Copy link
Contributor Author

Tsar-Salat commented Jan 19, 2025

I swear this is like the third fix for juicing

  1. [Port] Food Buffs from the chef #11770 Juicing was changed in this pr, but not correctly matching the TG's author changes. The author porting erroneously kept the juicing redefines as lists, when they were supposed to be typepaths. They also missed several base proc changes.
  2. Fixes reagent grinder juicing #11994 This pr did not fix the issue, only made surface level changes that were not included in the first pr
  3. Fixes reagent grinder juicing. Again. #12034 The author fixes the lists issue, and converts them into paths, but does not fix the base procs.

And that brings us to now. Where the procs are now changed to exactly what they should be, all of the holder procs now only accept typepaths, and the issue is finally resolved.

@Liver-1
Copy link
Contributor

Liver-1 commented Jan 19, 2025

Will test when this is merged.
Please god speedmerge this, I need to make donuts.

(Thank you for doing this)

@XeonMations
Copy link
Contributor

Does the unit test for reagent grinders actually function now?

Copy link
Contributor

@Liver-1 Liver-1 left a comment

Choose a reason for hiding this comment

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

Adds various juice types as juice_item results of juice_typepath. Maintains brains not being blendable, sets watermelon and watermelon slices to create watermelon juice. nymphs create chlorophyll. swaps out some juice_results to Juice_typepath for coherence.

Was testmerged with no complaints.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Jan 26, 2025
Merged via the queue into BeeStation:master with commit 947493e Jan 26, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants