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 Bread #15234

Merged
merged 3 commits into from
May 6, 2023
Merged

TG Station Bread #15234

merged 3 commits into from
May 6, 2023

Conversation

potato1234x
Copy link
Contributor

About the PR

  • Made all bread craftable
  • Added some bread
    • Two slice
    • Jelly toast
    • French toast
    • Cornbread (Added cornmeal from grinding corn)
    • Sausage bread
  • Updated bread and dough sprites from tg
  • Updated spider and xeno cutlet sprites

Media

prthumb10

  • 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 5 new bread loaves
  • add: Added a recipe for all bread loaves
  • tweak: Changed all bread sprites

@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 9, 2023
@github-actions
Copy link
Contributor

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

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

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

State Old New Status
alpha-filling Modified
alpha-filling2 Modified
alpha-slice-filling Modified
alpha-slice Modified
alpha-slice2-filling Modified
alpha-slice2 Modified
alpha Modified
alpha2 Modified
banana-slice Modified
banana Modified
buttered-toast Modified
creamcheese-slice Modified
creamcheese Modified
garlic-slice Modified
jelly-toast Modified
meat-slice Modified
meat Modified
mimana-slice Modified
mimana Modified
moldy-slice Modified
plain-slice Modified
plain Modified
spidermeat-slice Modified
spidermeat Modified
tofu-slice Modified
tofu Modified
two-slice Modified
xenomeat-slice Modified
xenomeat Modified
cornbread-slice Added
cornbread Added
french-toast Added
sausage-slice Added
sausage Added

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

State Old New Status
cakebatter Modified
dough-flat Modified
dough-pastry-baked Modified
dough-pastry Modified
dough-pie Modified
dough-slice Modified
dough Modified
pizzabread Modified
cornmeal-big Added
cornmeal Added
cornmealdough-slice Added
cornmealdough Added

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

State Old New Status
spidercutlet-cooked Added
spidercutlet Added
xenocutlet-cooked Added
xenocutlet Added

Edit: diff updated after 218ef96

@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

@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 aded6ef into space-wizards:master May 6, 2023
@potato1234x potato1234x deleted the cooking-update-bread branch May 11, 2023 03:52
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Aug 14, 2023
@potato1234x @Vordenburg
TG Station Bread (space-wizards#15234)
3e85648 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit aded6ef)
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request Oct 21, 2023
@potato1234x @DebugOk
TG Station Bread (space-wizards#15234)
553fbcd 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit aded6ef)
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

@mirrorcult mirrorcult Awaiting requested review from mirrorcult

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.
3 participants
@potato1234x @keronshb @metalgearsloth