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 Part 1: The Prequel #2834

Closed
wants to merge 14 commits into from
Closed

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Mar 11, 2024

About The Pull Request

Ports BeeStation/BeeStation-Hornet#8748

I forgot this one

Changelog

🆑
RKz, Ghommie, tralezab, cacogen, Krysonism, qustinnus
add: Added Pizza and Burgers to Newfood.
delete: Temporarily removes custom burgers and pizza
tweak: processable element uses the correct grammar and references
code: split pizzaspaghetti.dmi into pizza.dmi and spaghetti.dmi
/:cl:

* tgstation/tgstation#49192

* https://github.com/tgstation/tgstation/pull/53047/files

* fixerino

* food_storage component

* tgstation/tgstation#53316

* tgstation/tgstation#53225

* tgstation/tgstation#53574

* 515 compat

* fix maps

* tgstation/tgstation#69095

* bread slicing

* tgstation/tgstation#71449

* fixes

* finger food & edible fixes

* tgstation/tgstation#66257

* FIX THIS SHIT

* accidental_consumption

* fix trash runtime

* fixes some runtimes

* microwavable

* tgstation/tgstation#55150

* 515 compat

* Revert "515 compat"

This reverts commit 5681ca6cf6f8bcc187ceb4c263407631b461659b.

* Revert "tgstation/tgstation#55150"

This reverts commit aadbe1c392ade3caa4f1bcaf56abd8ea51dbd12d.

* Revert "microwavable"

This reverts commit 3b2f465d2cb79675e49dde08f45dcc694be29595.

* fix exploit with pasta
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Mar 11, 2024
@thgvr thgvr added the Test Merge Required They'll have to do it for free. label Mar 12, 2024
@thgvr
Copy link
Member Author

thgvr commented Mar 22, 2024

todo: fix multitools. this pr is fucked up

@@ -24,7 +24,7 @@ handles linking back and forth.
src.allow_standalone = allow_standalone

RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, PROC_REF(OnMultitool))
//RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, PROC_REF(OnMultitool)) todo: port component rework of multitool buffers (bee)
Copy link
Contributor

Choose a reason for hiding this comment

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

Buffer component came after my newfood part 1, I dont think it will be necessary.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 1, 2024
Copy link
Contributor

github-actions bot commented Apr 1, 2024

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

@thgvr
Copy link
Member Author

thgvr commented Jun 17, 2024

Kill me with hammers if I don't come back to this

@thgvr thgvr closed this Jun 23, 2024
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. DME Edit Map Change Tile placing is hard. Thank you for your service. Merge Conflict Use Git Hooks, you're welcome. Test Merge Required They'll have to do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants