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

Add croissant recipe #30825

Merged
merged 5 commits into from
Aug 17, 2024
Merged

Add croissant recipe #30825

merged 5 commits into from
Aug 17, 2024

Conversation

themias
Copy link
Contributor

@themias themias commented Aug 9, 2024

About the PR

This adds a recipe for making croissants.

Why / Balance

I plan on adding the Combat Bakery Kit (from tgstation) for chefs and mimes, which includes a baguette sword and throwing star croissants! Adding regular versions of croissants allows the combat ones to appear mundane.

Media

croissant_demo.mp4

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

  • add: Added a recipe for croissants

@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 Aug 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 218e978 merging into 890c0ee
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
croissant Added

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

State Old New Status
croissant-raw Added

Edit: diff updated after 218e978

@Moomoobeef
Copy link
Contributor

ew french
in all seriousness, awesome addition. I like the sprites, and chefs need more snacks that are easy to prepare so definitely gets a 👍 from me

@Everturning
Copy link

Needs more butter

UbaserB
UbaserB approved these changes Aug 10, 2024
View reviewed changes
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.

I would just say fix the description so that it's 'flaky' not 'flakey' and make the description consistent with the raw version by making it "Buttery, flaky goodness.", but otherwise it looks fine to me.

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 14, 2024
@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 removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 14, 2024
@UbaserB UbaserB merged commit ef3de39 into space-wizards:master Aug 17, 2024
13 checks passed
@themias themias deleted the add-croissant-recipe branch August 17, 2024 14:14
Erisfiregamer1 pushed a commit to The-Arcadis-Team/arc-station-14 that referenced this pull request Jan 9, 2025
@themias @sleepyyapril
Add croissant recipe (space-wizards#30825)
1e57b68 
* Add croissant recipe

* comma

* fix description

* fix merge error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UbaserB UbaserB UbaserB approved these changes

Assignees
No one assigned
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@themias @Moomoobeef @Everturning @UbaserB