Muffins

[RumiTiger]

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

• 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]

RSI Diff Bot; head commit 3eb0fc6 merging into d4da992
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 3eb0fc6

[TheShuEd]

webedit ops is real

[github-actions]

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

[slarticodefast]

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.

[slarticodefast]

Ok, tested it in-game and everything works great. Found two more minor things that need to be adjusted. I will ask the art directors for approval of the sprites next.

[UbaserB]

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.

[RumiTiger]

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?

[slarticodefast]

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]

Some day…