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

TG Station Burgers #15217

Merged
merged 3 commits into from
May 6, 2023
Merged

TG Station Burgers #15217

merged 3 commits into from
May 6, 2023

Conversation

potato1234x
Copy link
Contributor

@potato1234x potato1234x commented Apr 8, 2023 •
edited
Loading

About the PR

  • Made some burgers craftable:
    • Ghost burger
    • McRib (Also made bbq ribs craftable due to recipe)
    • Spell burger
    • Crab burger (Added crab crate to cargo for ingredients)
    • Crazy burger
    • Roburger
    • Baseball burger
    • Rat burger
  • Added burgers from TG
    • Cat burger (buy cat ears from uplink)
    • Human burger (Humans, dwarves and lizards now drop their own meats when butchered)
    • Plain burger
  • Updated the recipes and tastes of most burgers

Media

Not needed?

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

Changelog

🆑 Potato1234_x

  • add: Added 3 new burgers and made 8 unused burgers craftable.
  • add: Cargo can now purchase a crate of crabs.

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted 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. labels Apr 8, 2023
@potato1234x potato1234x changed the title Burgers TG Station Burgers Apr 8, 2023
@github-actions
Copy link
Contributor

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

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

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

State Old New Status
cat Added
human Added

Edit: diff updated after ebbef8e

@Kirillcas
Copy link
Contributor

is nice

hamburger.mp4

@Jackal298
Copy link
Contributor

Jackal298 commented Apr 8, 2023 •
edited
Loading

cool PR, but can you add the ability to make xenobread and spider bread? (this food is in the game but it cannot be cooked)

@potato1234x
Copy link
Contributor Author

potato1234x commented Apr 8, 2023 •
edited
Loading

xenobread and spider bread?

Ive ported over all the food and recipes from tg and im splitting them into their own prs, bread is next.

@Jackal298
Copy link
Contributor

xenobread and spider bread?

Ive ported over all the food and recipes from tg and im splitting them into their own prs, bread is next.

Thank you

@LedinecMing
Copy link

Please, revert "cat ears from cat butchering" this is horrible idea.

@EmoGarbage404
Copy link
Member

Please, revert "cat ears from cat butchering" this is horrible idea.

You seem to be in the wrong place and repo.

@potato1234x
Copy link
Contributor Author

Please, revert "cat ears from cat butchering" this is horrible idea.

Having to butcher a cat for them would probably deter people from wearing them. Probably.

@EmoGarbage404
Copy link
Member

Wait actually thats in this pr? That feels goofy.

@deltanedas
Copy link
Contributor

doesnt that completely negate the N tc for buying them

@DogZeroX
Copy link
Contributor

DogZeroX commented Apr 8, 2023

Yeah don't include that.

@potato1234x
Copy link
Contributor Author

I dont see how else i could make the cat burger work. Should i just remove it entirely?

@DogZeroX
Copy link
Contributor

DogZeroX commented Apr 8, 2023

Leave it, they'll either get it in salvage or with tc.

@potato1234x
Copy link
Contributor Author

reverted.

@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

Currently frozen due to a freeze on food recipes: #8524

@metalgearsloth
Copy link
Contributor

Re-open when chef rework is done.

@metalgearsloth metalgearsloth mentioned this pull request Apr 29, 2023
Open
@metalgearsloth metalgearsloth reopened this May 6, 2023
@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
@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 metalgearsloth merged commit c2a5ca9 into space-wizards:master May 6, 2023
@potato1234x potato1234x deleted the cooking-update-burgers branch May 11, 2023 03:50
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Aug 14, 2023
@potato1234x @Vordenburg
TG Station Burgers (space-wizards#15217)
0da8fe3 
Co-authored-by: metalgearsloth <[email protected]>
(cherry picked from commit c2a5ca9)
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 21, 2023
@potato1234x @DebugOk
TG Station Burgers (space-wizards#15217)
205c4b8 
Co-authored-by: metalgearsloth <[email protected]>
(cherry picked from commit c2a5ca9)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RemieRichards RemieRichards Awaiting requested review from RemieRichards

@moonheart08 moonheart08 Awaiting requested review from moonheart08

@mirrorcult mirrorcult Awaiting requested review from mirrorcult

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

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.
9 participants
@potato1234x @Kirillcas @Jackal298 @LedinecMing @EmoGarbage404 @deltanedas @DogZeroX @keronshb @metalgearsloth