diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml index 01b5be7af0c..00c1476d886 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml index 2533bff44bb..4d192f5d0cc 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml @@ -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 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/bowl.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/bowl.png new file mode 100644 index 00000000000..9f91f21ff45 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/bowl.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/hampineapplesalad.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/hampineapplesalad.png new file mode 100644 index 00000000000..bbe65653240 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/hampineapplesalad.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json new file mode 100644 index 00000000000..5bcbb570ddd --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Food/hamandpineapplesalad.rsi/meta.json @@ -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" + }, + { + "name":"hampineapplesalad" + } + ] +}