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

Newfood atomization: Meats #9951

Merged
merged 22 commits into from
Dec 17, 2023
Merged

Newfood atomization: Meats #9951

merged 22 commits into from
Dec 17, 2023

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Oct 3, 2023

About The Pull Request

Splits the meat file into three and converts them to newfood. (Meatslab, Meatdish, & Monkeycube)

Relocates Meatbuns to meat category as opposed to bread

Makes a few minor repaths (fish mostly)

Adds protein values to all applicable food

EDIT: Fixes psyphoza meat

Why It's Good For The Game

newfood atomization

I only made a few minor repaths for a few extraneous foods, I think they are rather reasonable. They really shouldnt be noticeable to players, probably more likely the foods will do what players thought was always their behavior.

Protein values follow standard implementation as the previous prs.

Testing Photographs and Procedure

Screenshots&Videos

image

Changelog

🆑 rkz
add: converted meat, monkeycubes to newfood
tweak: moved meatbun from Bread recipes to Meat recipes
add: Adjusted meatdish & meatslab values to account for protein reagent
tweak: converted a few extraneous meats to follow proper subtyping. Dolphin meat is now a meatslab instead of snowflake. Carp meat is now a subtype of fishmeat, rather than regular fishmeat being a subtype of carp meat
fix: fixes psyphoza meat using the wrong typepath and stats

/:cl:

@github-actions
Copy link

github-actions bot commented Oct 5, 2023

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

@Tsar-Salat
Copy link
Contributor Author

Sorry if I seem slow on this. This PR and the dough conversion pr do some of the same things, so I'll fix the merge conflicts after that one is merged

@github-actions
Copy link

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

Copy link

github-actions bot commented Nov 2, 2023

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

Copy link

github-actions bot commented Nov 6, 2023

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.

@Tsar-Salat
Copy link
Contributor Author

bump

Copy link

github-actions bot commented Dec 7, 2023

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
Copy link
Member

Fails checks

Copy link

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

@Tsar-Salat
Copy link
Contributor Author

Fixes for psyphoza meat are in

@itsmeow itsmeow added this pull request to the merge queue Dec 17, 2023
Merged via the queue into BeeStation:master with commit 8290569 Dec 17, 2023
8 checks passed
@Tsar-Salat Tsar-Salat deleted the newfood-meat branch December 17, 2023 09:50
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.

3 participants