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

Microwaved snacks #371

Merged
merged 12 commits into from
Sep 10, 2024
Merged

Microwaved snacks #371

merged 12 commits into from
Sep 10, 2024

Conversation

Meatstuff882
Copy link
Contributor

@Meatstuff882 Meatstuff882 commented Aug 11, 2024

About the pull request

Lets you microwave snacks. Updates the inspect text on these snacks to suggest microwaving them. Microwaving snacks adds 2 points of nutrition. All snacks (including donk pockets) now provide the same amount of nutrition.

Explain why it's good for the game

The food said that it didn't have a time to microwave them for. Marines should be allowed to microwave them anyways without ruining the microwave. Also adds cheese to packaged cheeseburgers because they didn't have it before.

Testing Photographs and Procedure

image
This is what losing looks like.

Changelog

🆑
add: Added Microwaved Burritos, Cheeseburgers, and Hot Dogs, and recipes for these items.
balance: Packaged food has more nutrition.
🆑

Lets you microwave snacks. Also adds cheese to cheeseburgers.
changes microwaved food from it's own item to a subtype of it's original item for orginization purposes.
fixed a fatal error mistake. New issue: The amount of nutrition in microwaved snacks more than doubles.
@Meatstuff882 Meatstuff882 marked this pull request as draft August 14, 2024 20:26
went from microwaving being a subtype of a packed item it uses the donk pocket code
@Meatstuff882 Meatstuff882 marked this pull request as ready for review August 19, 2024 00:03
Doubleumc
Doubleumc previously approved these changes Aug 21, 2024
code/datums/recipe.dm Outdated Show resolved Hide resolved
code/datums/recipe.dm Outdated Show resolved Hide resolved
@AndroBetel AndroBetel marked this pull request as draft August 23, 2024 11:51
donk pockets are now double wrapped for your comfort
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

does this even matter anymore
are you happy now
@Meatstuff882 Meatstuff882 marked this pull request as ready for review August 25, 2024 00:39
@cm13-github
Copy link
Contributor

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

AndroBetel
AndroBetel previously approved these changes Sep 4, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Doubleumc Doubleumc merged commit 6bfa112 into cmss13-devs:master Sep 10, 2024
35 checks passed
cm13-github added a commit that referenced this pull request Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants