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

[Frozen] Soups tweaks #15110

Merged
merged 15 commits into from
May 6, 2023
Merged

[Frozen] Soups tweaks #15110

merged 15 commits into from
May 6, 2023

Conversation

lapatison
Copy link
Contributor

@lapatison lapatison commented Apr 3, 2023 •
edited
Loading

About the PR

Media

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

Changelog

🆑

  • add: Added several soup recipes
  • add: Added soup flavors

@lapatison lapatison requested a review from RemieRichards as a code owner April 3, 2023 16:09
@github-actions github-actions bot added Changes: Sprites Changes: Might require knowledge of spriting or visual design. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. S: Needs Review Status: Requires additional reviews before being fully accepted labels Apr 3, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 3, 2023 •
edited
Loading

RSI Diff Bot; head commit 6d3e253 merging into 68eb28a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 6d3e253

@deltanedas
Copy link
Contributor

add; -> add:

@lapatison
Copy link
Contributor Author

add; -> add:

Done

@keronshb keronshb added the S: Frozen Status: Affects a game area that's frozen. Check "Current Freezes" in the Issues tab. label Apr 23, 2023
@keronshb
Copy link
Contributor

Frozen due to a freeze on recipes: #8524

@lapatison lapatison changed the title Soups tweaks [Frozen] Soups tweaks Apr 25, 2023
@metalgearsloth
Copy link
Contributor

As per the others when they use cgraphs re-open.

@metalgearsloth metalgearsloth mentioned this pull request Apr 29, 2023
Open
@lapatison lapatison deleted the fewrec branch April 29, 2023 11:38
@keronshb
Copy link
Contributor

@lapatison you didn't have to delete the branch since you could reopen this once the chef rework is in

@lapatison
Copy link
Contributor Author

@lapatison you didn't have to delete the branch since you could reopen this once the chef rework is in

Crap, I forgot that renaming branch deletes it.
Ill restore it back and will wait for cooking update

@lapatison lapatison restored the fewrec branch April 29, 2023 14:36
@metalgearsloth metalgearsloth reopened this May 6, 2023
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label May 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

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

@metalgearsloth
Copy link
Contributor

Under #8524
As food doesn't really have a purpose it's subject to removal at any time pending chef work.

@metalgearsloth metalgearsloth added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Frozen Status: Affects a game area that's frozen. Check "Current Freezes" in the Issues tab. labels May 6, 2023
@metalgearsloth metalgearsloth merged commit 1a46638 into space-wizards:master May 6, 2023
@lapatison lapatison deleted the fewrec branch May 6, 2023 07:48
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request May 19, 2023
@lapatison @moonheart08
@metalgearsloth @Vordenburg
[Frozen] Soups tweaks (space-wizards#15110)
6e461d7 
Co-authored-by: Moony <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moonheart08 moonheart08 moonheart08 left review comments

@RemieRichards RemieRichards Awaiting requested review from RemieRichards

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. S: Awaiting Changes Status: Changes are required before another review can happen S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted S: Needs Review Status: Requires additional reviews before being fully accepted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lapatison @deltanedas @keronshb @metalgearsloth @moonheart08