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

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
+38 −1
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f637ed7
> Adds raw noodles, an item that can be turned into boiled noodles wi…
SG6732 Feb 5, 2025
c50324c
> renamed recipe involving raw spaghetti into... RecipeRawSpaghetti
SG6732 Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/food.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
amount: 2
- id: FoodContainerEgg
amount: 2
- id: FoodNoodlesRaw
amount: 4

- type: entity
id: CrateFoodDinnerware
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
- id: DrinkMilkCarton
amount: 2
- id: DrinkSoyMilkCarton
- id: FoodNoodlesRaw
amount: 2

- type: entity
id: ClosetJanitorFilled
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
- id: ReagentContainerCornmeal
- id: ReagentContainerRice
- id: ReagentContainerSugar
- id: FoodNoodlesRaw
- !type:GroupSelector
children:
- id: ReagentContainerFlourSmall
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,25 @@

# Noodles

- type: entity
name: raw spaghetti
parent: FoodNoodlesBase
id: FoodNoodlesRaw
description: A raw bundle of noodles, this needs to be cooked first.
components:
- type: FlavorProfile
flavors:
- pasta
- type: Sprite
state: raw
- type: SolutionContainerManager
solutions:
food:
maxVol: 10
reagents:
- ReagentId: Nutriment
Quantity: 5

- type: entity
name: boiled spaghetti
parent: FoodNoodlesBase
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,16 @@
CottonBol: 4

#Italian
- type: microwaveMealRecipe
id: RecipeRawSpaghetti
name: raw spaghetti recipe
result: FoodNoodlesBoiled
time: 15
reagents:
Water: 10
solids:
FoodNoodlesRaw: 1

- type: microwaveMealRecipe
id: RecipeBoiledSpaghetti
name: boiled spaghetti recipe
Expand Down
5 changes: 4 additions & 1 deletion Resources/Textures/Objects/Consumable/Food/noodles.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 😭

"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -49,6 +49,9 @@
},
{
"name": "plate"
},
{
"name": "raw"
}
]
}
Binary file added Resources/Textures/Objects/Consumable/Food/noodles.rsi/raw.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading