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

New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs #33508

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

ArtisticRoomba
Copy link
Contributor

About the PR

Adds new foods, all made from new cotton dough slices and cotton dough rolls.
The cotton baguette, cotton crostini, cotton chevre-chaud, cotton bagel, and cotton croissant.

You can make them by following the recipes for regular dough, but use cotton dough instead.

Why / Balance

Was marked as a TODO. Poor moffs need more foods and I think this will give chefs a lot of opportunity to have fun and make some fine dishes for the fellow moffs.

Technical details

Just YAML changes.

Media

Content Client_L7qo0AxgR5

Requirements

Changelog

🆑 ArtisticRoomba, JuneSzalkowska

  • add: New cotton dough slices and cotton dough rolls.
  • add: New cotton baguette, cotton crostini, cotton chevre-chaud, cotton bagel, and cotton croissant recipes. You can make them by following the recipes for regular baguettes, bagels, etc., but use cotton dough instead.

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate 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. size/L Denotes a PR that changes 100-1000 lines. labels Nov 24, 2024
Copy link
Contributor

github-actions bot commented Nov 24, 2024

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

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

State Old New Status
bagel-cottondough Added

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

State Old New Status
baguette-cotton-equipped-BELT Added
baguette-cotton-inhand-left Added
baguette-cotton-inhand-right Added
baguette-cotton Added
crostini-cotton Added

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

State Old New Status
chevrechaud-cotton Added
croissant-cotton Added

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

State Old New Status
cotton-dough-rope Added
cotton-dough-slice Added
croissant-raw-cotton Added

Edit: diff updated after 4bd2fc4

@beck-thompson beck-thompson added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D3: Low Difficulty: Some codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: Service Area: Service department, including cooking, botany, etc and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 24, 2024
@Pumkin69
Copy link

yeah this is fire

@onesch
Copy link
Contributor

onesch commented Nov 24, 2024

lethimcook

@Blackern5000
Copy link
Contributor

I'm gonna be honest, it looks moldy. Good addition regardless, always happy to see more moth food variety.

Copy link
Member

@SlamBamActionman SlamBamActionman left a comment

Choose a reason for hiding this comment

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

Requires some changes to make the entities contain fiber. The sprites will also require art maintainer approval; there is a concern it may look moldy, but at the same time we already have moldy bread and that is a very noticeable green, so this might be fine.

@SlamBamActionman SlamBamActionman 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 Nov 29, 2024
@ArtisticRoomba
Copy link
Contributor Author

I've addressed your review (lol good job me) as well as pushed some alternative sprites in commit 3eecac7 for the art directors to see if they don't like the 3 original sprites.

Let me know if the sprites are not up to par.

@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 Nov 29, 2024
Copy link
Member

@SlamBamActionman SlamBamActionman left a comment

Choose a reason for hiding this comment

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

Approving the code side, looks good! Sprites will need art maintainer approval.

@SlamBamActionman SlamBamActionman 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 Nov 29, 2024
Copy link
Member

@UbaserB UbaserB left a comment

Choose a reason for hiding this comment

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

The raw croissant and chevre-chaud sprites need to look more unique since they're really close to their counterpart sprites right now, and the bagel/cooked croissant sprites shouldn't look moldly. You can probably fix it by giving a layer of cotton in the middle (like a bagel sandwich) or almost like icing on the top... and for the croissant you could probably add cotton underneath the slits(?), like where the flaps/layers of the croissant are. The other sprites look fine.

@UbaserB UbaserB added the S: Awaiting Changes Status: Changes are required before another review can happen label Dec 3, 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 Dec 10, 2024
Copy link
Member

@UbaserB UbaserB left a comment

Choose a reason for hiding this comment

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

Just make the raw croissant sprite and the cooked cotton croissant sprites line have the cotton part line up. You can go either direction here, with it being spotted or just on the inner parts... or both. Doesn't matter too much.

Sorry for not mentioning this earlier, but the rest of the sprites look fine to me.

@UbaserB UbaserB added Issue: Awaiting Response Issue needs clarification, confirmation it is still relevant or some other response. and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Dec 11, 2024
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 Dec 16, 2024
# Conflicts:
#	Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Service Area: Service department, including cooking, botany, etc 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. D3: Low Difficulty: Some codebase knowledge required. Issue: Awaiting Response Issue needs clarification, confirmation it is still relevant or some other response. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. size/L Denotes a PR that changes 100-1000 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants