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.

Sign up for GitHub

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

Jump to bottom

Muffins #29318

Merged
merged 46 commits into from
Nov 1, 2024
Merged

Muffins #29318

merged 46 commits into from
Nov 1, 2024

Conversation

RumiTiger
Copy link
Contributor

@RumiTiger RumiTiger commented Jun 21, 2024 •
edited
Loading

About the PR

I added a chocolate and banana muffin to the game. I also resprited the cherry and berry muffins.
I added recipes for almost all the muffins.
I added muffin tins to the game, they are used in muffin recipes. You can print them on the autolathe.

Why / Balance

I really don't understand why there were muffins in the game, but no way to make them.

Media

Muffins
{A2D855CE-3C70-4A52-879F-0DA6D98C7CB4}

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑

  • add: A chocolate and banana muffin has been added to the game. The berry and cherry muffins have also been resprited!
  • tweak: Now you can make a regular, chocolate, banana, and berry muffin!
  • add: Muffin tins have been added to the game. They are needed for making muffins!

@github-actions github-actions bot added Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Jun 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 21, 2024 •
edited
Loading

RSI Diff Bot; head commit 9cc9d08 merging into fdd713a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
muffin-berry Modified
muffin-cherry Modified
muffin-banana Added
muffin-chocolate Added

Resources/Textures/Objects/Consumable/Food/plates.rsi

State Old New Status
muffin-tin Added

Edit: diff updated after 9cc9d08

@TheShuEd
Copy link
Member

webedit ops is real

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 17, 2024
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 23, 2024
@slarticodefast
Copy link
Member

slarticodefast commented Aug 25, 2024 •
edited
Loading

The test fail seems to be real. One of the problem is that the meta.json has the state cherry-muffin twice. If you get it fixed I can have a look at the PR. Also in the future, please avoid web edits so we can make sure all changes have been properly tested.

@RumiTiger
Copy link
Contributor Author

Could you make the cherry and chocolate cupcakes match the shading of the normal muffin, (with minor hue-shifting not just pure black/white) alongside making them more desaturated? If you wanted to, you could alternatively take aspects from the original cherry muffin sprite and put it onto the normal muffin for consistency.

Like this?
Muffins

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Sep 16, 2024
@RumiTiger RumiTiger requested a review from UbaserB September 16, 2024 13:43
@slarticodefast
Copy link
Member

slarticodefast commented Sep 16, 2024 •
edited
Loading

Also in the future, please avoid web edits so we can make sure all changes have been properly tested.

Like I asked before, please avoid webedits and push changes to your remote branch using git instead for the following reasons:

  • webedits are more susceptible to errors since you may forget to upload a file or submit a wrong one
  • webedits frequently cause issues with wrong whitespace in text files
  • we cannot ensure the changes have been locally tested by the author like they should be
  • each single commit causes the integration tests to be re-run and there is a total computation limit

Please refer to our documentation to learn how to use git and an IDE:
Git for the SS14 Developer
Setting up a Development Environment

Like this?

I will ask the art directors for approval.

@RumiTiger
Copy link
Contributor Author

Some day…

@slarticodefast slarticodefast added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Oct 26, 2024
@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Oct 30, 2024
slarticodefast
slarticodefast approved these changes Oct 30, 2024
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

Looks good to me.
The sprites have been art director approved.

@slarticodefast slarticodefast added S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Oct 30, 2024
@slarticodefast slarticodefast self-assigned this Oct 30, 2024
@deathride58
Copy link
Member

Can confirm that the reviewing art director has given their approval, but did not state such in the PR. Dismissing their requested changes and merging

@deathride58 deathride58 dismissed UbaserB’s stale review November 1, 2024 02:06

Approved by change requestor in PR discussion

@deathride58 deathride58 merged commit 6ce80d9 into space-wizards:master Nov 1, 2024
14 checks passed
@RumiTiger RumiTiger deleted the Muffins branch November 1, 2024 14:57
iaada pushed a commit to iaada/space-station-14 that referenced this pull request Nov 9, 2024
@RumiTiger @slarticodefast @iaada
Muffins (space-wizards#29318)
a919f23 
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

Co-authored-by: slarticodefast <[email protected]>

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <[email protected]>
@AgentSmithRadio AgentSmithRadio mentioned this pull request Jan 4, 2025
Merged
2 tasks
Doctor-Cpu pushed a commit to Doctor-Cpu/space-station-14 that referenced this pull request Jan 24, 2025
@RumiTiger @slarticodefast @Doctor-Cpu
Muffins (space-wizards#29318)
78e116e 
* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

Co-authored-by: slarticodefast <[email protected]>

* Update dinnerware.yml

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deathride58 deathride58 deathride58 approved these changes

@slarticodefast slarticodefast slarticodefast approved these changes

@UbaserB UbaserB Awaiting requested review from UbaserB

Assignees

@slarticodefast slarticodefast

Labels
Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. S: Undergoing Maintainer Discussion Status: Currently going through an extended discussion amongst maintainers, as per procedure.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RumiTiger @TheShuEd @slarticodefast @deathride58 @UbaserB