-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
Muffins #29318
base: master
Are you sure you want to change the base?
Muffins #29318
Conversation
RSI Diff Bot; head commit 3eb0fc6 merging into d4da992 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
|
webedit ops is real |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Outdated
Show resolved
Hide resolved
…sc.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 I asked before, please avoid webedits and push changes to your remote branch using git instead for the following reasons:
Please refer to our documentation to learn how to use git and an IDE:
I will ask the art directors for approval. |
Some day… |
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
Breaking changes
Changelog
🆑