-
-
Notifications
You must be signed in to change notification settings - Fork 460
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
[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148
Open
Tsar-Salat
wants to merge
12
commits into
shiptest-ss13:master
Choose a base branch
from
Tsar-Salat:newfood-rkz
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
thgvr
reviewed
Jul 13, 2024
Might have to run updatepaths again for that map error |
thgvr
reviewed
Jul 13, 2024
Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code change
Watch something violently break.
Config
Watch us shake head admins violently until this gets merged.
DME Edit
Map Change
Tile placing is hard. Thank you for your service.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
This is a port of my beestation newfood pr. It's the culmination of many months of effort during my free time in university, and my first large-scale project on bee.
Due to interest from a few shiptest people, I have ported the PR mostly-as-is from Bee, additional alterations where needed.
Ports from TG:
Ports from Bee, from yours truly:
A rundown of the plan:
This is Part 1 of newfood. This is basically the foundational newfood shit that's needed for the rest of the system we want to work.
Part 2 will complete all the foundational shit (killing oldfood), with some minor refactors to ready cooking for the upcoming features. This will conclude the development of the edible component and things left in limbo from part 1. It will remove the temporary vars and procs, and customizable food will be fully reenabled.
Part 3 will contain the cooking features (Griddle).
Now for the changes:
Why It's Good For The Game
Newfood seems to be a heavily requested feature here. This is but the framework. Really, players wont notice the difference besides the incompatiblity between oldfood & newfood, but once the griddle is implemented in part 3, it will be glorious.
When discussing with shiptest, I floated my plan and I received overall agreement. This should hopefully be less painful for me and for you than a bulk merge.
Changelog
🆑 rkz, benbot(benjamin), Time-Green, SteelSlayer, floyd, Qustinuus, ArcaneDefence, FlowerCuco
add: Food storage! Hide some glass in the captains cake! Begone digestive tract!
add: Bread, Cake and Spaghetti to Newfood
add: some smaller foods can now be eaten whilst on the run! (This ONLY applies to newfood items thus far!)
add: converted edible component to work with newfood
del: oldfood for Bread, Cake and Spaghetti
del: Temporarily removes customfood bread, cake, pasta, and sandwiches
tweak: edited a few messed up values
tweak: food trash is sensible now. Finishing stuff like cake will actually spawn a plate rubbish. Instead of you eating the plate, biggun, perhaps properly dispose of it!
fix: Wildly STUPID item weights. Candycorn and cakes are no longer the SAME size
code: provides some semblance of sorting for signal defines
/:cl: