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.

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

Adds a salad yaml and texture #1440

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,35 @@
- ReagentId: Protein
Quantity: 5
# Tastes like eggs, butter and salt

- type: entity
name: ham and pineapple salad
parent: FoodBowlBase
id: FoodSaladHamPineapple
description: Hawaiian pizza rules apply.
components:
- type: FlavorProfile
flavors:
- meaty
- mayonnaise
- corn
- pineapple
- type: Sprite
sprite: DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi
layers:
- state: bowl
- state: hampineapplesalad
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Protein
Quantity: 5
- type: Tag
tags:
- Meat
- Fruit
- Soup
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,17 @@
FoodDoughPie: 1
FoodPumpkin: 1
FoodPlateTin: 1

- type: microwaveMealRecipe
id: RecipeHamPineappleSalad
name: pineapple and ham salad
result: FoodSaladHamPineapple
time: 10
reagents:
Mayo: 10
solids:
FoodBowlBig: 1
FoodCorn: 1
FoodMeatCutlet: 2
FoodPineappleSlice: 3
FoodEgg: 2
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Bowl taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Salad made by BashieAgain (Github)"
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "bowl"
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
},
{
"name": "hampineapplesalad"
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
Loading