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

Spaghetti - I mean Spagheti - I mean Paghetty - I mean Spaget - I mean Spa #34902

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

Spaghetti - I mean Spagheti - I mean Paghetty - I mean Spaget - I mean Spa #34902

wants to merge 2 commits into from
+38 −1

Conversation

SG6732
Copy link
Contributor

@SG6732 SG6732 commented Feb 5, 2025

About the PR

  • Adds raw noodles, an item that can be turned into boiled noodles without needing to make it from scratch - just add water!
  • Adds raw noodles to chef closet and kitchen supplies crate obtainable from cargo

Why / Balance

Adding raw item for use in future PRs regarding stuff like the Food Processor.

Technical details

Adds raw spaghetti as an item, can be cooked in microwave
Adds it to chef closets and crates order-able from cargo

Media

spaghetti

Requirements

Changelog

🆑

  • add: Added raw spaghetti, a much easier way to make boiled spaghetti - just add 10 u of water for 15 seconds in the microwave.

@SG6732
> Adds raw noodles, an item that can be turned into boiled noodles wi…
f637ed7 
…thout needing to make it from scratch - just add water!

> Adds raw noodles to chef closet and kitchen supplies crate obtainable from cargo
@github-actions github-actions bot added size/S Denotes a PR that changes 10-99 lines. 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. labels Feb 5, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025 •
edited
Loading

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

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

State Old New Status
raw Added

Edit: diff updated after c50324c

@IamVelcroboy
Copy link
Contributor

Can you add these to the random ingredient spawner too, please?

@ArtisticRoomba ArtisticRoomba added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. 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 Feb 8, 2025
ArtisticRoomba
ArtisticRoomba suggested changes Feb 8, 2025
View reviewed changes
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Outdated
@@ -652,6 +652,16 @@
CottonBol: 4

#Italian
- type: microwaveMealRecipe
id: RecipeBoiledSpaghetti
Copy link
Contributor

Choose a reason for hiding this comment

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

RecipeBoiledSpaghetti is already a recipe and is causing linter errors.

If you want something that makes more sense, probably change this to make raw noodles instead of cooked:

- type: microwaveMealRecipe
  id: RecipeBoiledSpaghetti
  name: boiled spaghetti recipe
  result: FoodNoodlesBoiled
  time: 15
  reagents:
    Flour: 15
    Egg: 6
  solids:
    FoodButter: 1

And then keep your boiled spaghetti recipe. Make sure you change the ID of the weird one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Eh, that would add additional steps to the noodlemaking process and I only intended to add an alternative option.

I'll push a fix that renames the raw spaghetti recipe as RecipeRawSpaghetti or something.

Copy link
Contributor

Choose a reason for hiding this comment

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

Eh, that would add additional steps to the noodlemaking process and I only intended to add an alternative option.

I think it adds more character to the game! The chef has to do something that makes sense... make the noodles from scratch... boil the noodles... then add the sauce... etc.

@SG6732
> renamed recipe involving raw spaghetti into... RecipeRawSpaghetti
c50324c 
> added raw spaghetti to the randomized food ingredient spawner
@SG6732
Copy link
Contributor Author

SG6732 commented Feb 9, 2025

Can you add these to the random ingredient spawner too, please?

Got it!

@SG6732 SG6732 requested a review from ArtisticRoomba February 9, 2025 20:21
ArtisticRoomba
ArtisticRoomba approved these changes Feb 9, 2025
View reviewed changes
Copy link
Contributor

@ArtisticRoomba ArtisticRoomba left a comment

Choose a reason for hiding this comment

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

Tested, works ingame, everything looks good to me.

@ArtisticRoomba
Copy link
Contributor

tests run fine on my machine godo

beck-thompson
beck-thompson requested changes Feb 9, 2025
View reviewed changes
Copy link
Contributor

@beck-thompson beck-thompson left a comment

Choose a reason for hiding this comment

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

Looks good besides that. I think this also needs art approval
image

Resources/Textures/Objects/Consumable/Food/noodles.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa",
"copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Raw spaghetti from tgstation at https://github.com/tgstation/tgstation/commit/73613b84cf628e0f53482bd07eade6f2c5af10ed",
Copy link
Contributor

Choose a reason for hiding this comment

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

This commit is just splitting one file in two! Try to find the one where it was actually added

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I HATE COMMIT LINKS

Copy link
Contributor

Choose a reason for hiding this comment

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

yes they are very annoying 😭

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

@beck-thompson beck-thompson beck-thompson requested changes

@ArtisticRoomba ArtisticRoomba ArtisticRoomba approved these changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
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. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/S Denotes a PR that changes 10-99 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SG6732 @IamVelcroboy @ArtisticRoomba @beck-thompson