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

Simple PR - Cheese Sandwich #2650

Closed
wants to merge 3 commits into from
+43 −1
Closed

Simple PR - Cheese Sandwich #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13ef19a
A simple cheese sandwich
dustylens Jan 3, 2025
aa17694
max vol adjustment. Haha we all make mistakes.
dustylens Jan 3, 2025
982707a
Merge branch 'master' into Simple-Food-PR-Cheese-Sandwich
dvir001 Jan 4, 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
26 changes: 26 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,29 @@
- type: Tag
tags:
- Fruit

- type: entity
name: cheese sandwich
parent: FoodBagelBase
id: FoodMealCheeseSandwich
description: The slice of cheese is the thin line between you and just eating bread.
components:
- type: FlavorProfile
flavors:
- bread
- cheesy
- type: Sprite
sprite: _NF/Objects/Consumable/Food/Baked/bread.rsi
state: cheesesandwich
- type: SolutionContainerManager
solutions:
food:
maxVol: 12
reagents:
- ReagentId: Nutriment
Quantity: 5
- ReagentId: Vitamin
Quantity: 5
- type: Tag
tags:
- Meat
13 changes: 13 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,19 @@
recipeType:
- Assembler

- type: microwaveMealRecipe
id: RecipeCheeseSandwich
name: cheese sandwich recipe
result: FoodMealCheeseSandwich
time: 5
solids:
FoodBreadPlainSlice: 2
FoodCheeseSlice: 1
reagents:
Mayo: 5
Copy link
Contributor

Choose a reason for hiding this comment

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

Mayo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There were some issues with trying to add a reagent as a normal ingredient.

Plus, you know, dress your sandwich.

Copy link
Contributor

@arimah arimah Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I would suggest removing mayo from the ingredients and instead leaving 5u of "empty space" in the food solution for people to add their own dressing :> Maybe someone wants ketchup, or hot sauce, or mustard!

Copy link
Contributor Author

@dustylens dustylens Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

There is currently 2u of empty space for the addition of condiments.

The mayo reagent in the recipe, other than striking me as being fine, was to help illustrate how you add a reagent ingredient in a recipe for the person who was asking about it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Mayo in cheese sandwich is a sin

recipeType:
- Assembler

# Sushi

- type: microwaveMealRecipe
Expand Down
Binary file added Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi/cheesesandwich.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.
5 changes: 4 additions & 1 deletion Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.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": "Avocado toast by gentlebutter (Discord). Bagel and BagelPoppy were created by DrEnzyme,challah and apple_strudel made by GhostPrince, edited by Dusty Lens and RichardRahl123 (Github)",
"copyright": "Avocado toast by gentlebutter (Discord). Bagel and BagelPoppy were created by DrEnzyme,challah and apple_strudel made by GhostPrince, edited by Dusty Lens and RichardRahl123 (Github), cheese sandwich by Dusty Lens",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -44,6 +44,9 @@
},
{
"name": "apple_strudel_3"
},
{
"name": "cheesesandwich"
}
]
}
Loading