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

[MDB Ignore] Rkz's Newfood: Part 1 of 4 #3148

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

Tsar-Salat
Copy link
Contributor

@Tsar-Salat Tsar-Salat commented Jun 24, 2024

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:

  1. convert bread to newfood
  2. convert spaghetti to newfood
  3. convert cake to newfood
  4. Cleaned up the edible component. It should be a lot more consistent going forward, and will basically be completely functional as of part 2's merge.
  5. Adds Food Storage component, which lets you hide small items in large food. (Stick a shard of glass inside a cake to fuck over someone.)
  6. Adds FOOD_FINGER_FOOD food flag, which lets you eat food whilst moving. It applies to small food that really shouldnt take your full concentration to consume whilst walking, like lollipops!
  7. Sets PRAGMATIC weights for as many foods as I could. Seriously this sucked really bad. candycorn and cakes are not the same ducking size.
  8. food trash is sane, stuff thats clearly eaten on a plate and has a plate underneath it, will spawn a plate rubbish when completely eaten. (you dont eat the plate on cake any more smh)
  9. Begins the framework of something called Accidental Consumption. Its basically if you end up eating non-food related it will cause you differing effects. This is again very early stages, and will require wounds, full newfood implementation, and bringing over tg's stomach metabolism. The proc exists, but its not getting called until part 2 or 3 is merged.
  10. Adjusts some nutritional values. Minor, but I will note that I did so

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:

@github-actions github-actions bot added Config Watch us shake head admins violently until this gets merged. Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Jun 24, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 13, 2024
code/__DEFINES/food.dm Outdated Show resolved Hide resolved
@thgvr
Copy link
Member

thgvr commented Jul 13, 2024

Might have to run updatepaths again for that map error

thgvr and others added 4 commits July 13, 2024 14:58
Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
Signed-off-by: thgvr <81882910+thgvr@users.noreply.github.com>
@Tsar-Salat Tsar-Salat changed the title Rkz's Newfood: Part 1 of 4 [MDB Ignore] Rkz's Newfood: Part 1 of 4 Jul 26, 2024
@Tsar-Salat Tsar-Salat marked this pull request as ready for review July 26, 2024 04:15
@Tsar-Salat Tsar-Salat requested review from a team as code owners July 26, 2024 04:15
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants