diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index bdc0ea858a..f012d83d7e 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -53,6 +53,7 @@ flavor-base-terrible = terrible flavor-base-mindful = mindful flavor-base-chewy = chewy flavor-base-trashy = trashy +flavor-base-motivating = motivating # Complex flavors. Put a flavor here when you want something that's more # specific. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 5d559fa132..7d0f734acc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -42,6 +42,7 @@ - FoodCakeChristmasSlice - FoodCakeVanillaSlice - FoodCakeBirthdaySlice + - FoodCakeBerryDelightSlice - FoodCakeCottonSlice - FoodBakedMuffin - FoodBakedMuffinBerry diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml index 719f2bd912..7683f19884 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml @@ -37,6 +37,7 @@ - FoodCakeChristmas - FoodCakeBirthday - FoodCakeVanilla + - FoodCakeBerryDelight - FoodCakeCotton - FoodPieApple - FoodPieBaklava diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index 5c0a4eb7cf..a1b69a0966 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -1245,3 +1245,88 @@ Quantity: 2 - type: Item heldPrefix: cotton-slice + +# Motivating + +- type: entity + name: berry delight + parent: FoodCakeBase + id: FoodCakeBerryDelight + description: This is a cake that is approaching. + components: + - type: Sprite + state: berry_delight + - type: FlavorProfile + flavors: + - sweet + - berry + - motivating + - type: SolutionContainerManager + solutions: + food: + maxVol: 55 + reagents: + - ReagentId: Nutriment + Quantity: 40 + - ReagentId: Vitamin + Quantity: 10 + - ReagentId: Milk + Quantity: 10 + - type: SliceableFood + slice: FoodCakeBerryDelightSlice + - type: Tag + tags: + - Cake + - Fruit + - type: Item + inhandVisuals: + left: + - state: plain-inhand-left + - state: alpha-filling-inhand-left + color: red + right: + - state: plain-inhand-right + - state: alpha-filling-inhand-right + color: red + +- type: entity + name: berry delight slice + parent: FoodCakeSliceBase + id: FoodCakeBerryDelightSlice + description: Put a fork in, your hunger in isolation. + components: + - type: Sprite + state: berry_delight_slice + - type: FlavorProfile + flavors: + - sweet + - berry + - motivating + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Milk + Quantity: 2 + - type: Tag + tags: + - Cake + - Fruit + - Slice + - type: Item + inhandVisuals: + left: + - state: alpha-slice-inhand-left + color: white + - state: alpha-slice-filling-inhand-left + color: red + right: + - state: alpha-slice-inhand-right + color: white + - state: alpha-slice-filling-inhand-right + color: red diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index e4348b4efb..8eef7e1cb5 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1483,3 +1483,8 @@ id: artifactglue flavorType: Complex description: flavor-complex-artifact-glue + +- type: flavor + id: motivating + flavorType: Base + description: flavor-base-motivating diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index baf3e7011c..7e3cca3fa4 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1700,6 +1700,18 @@ FoodSnackRaisins: 1 OrganAnimalHeart: 1 +- type: microwaveMealRecipe + id: RecipeBerryDelight + name: berry delight recipe + result: FoodCakeBerryDelight + time: 5 + group: Cake + solids: + FoodCakePlain: 1 + FoodBerries: 5 + reagents: + Milk: 10 + - type: microwaveMealRecipe id: RecipeBreadDog name: bread dog recipe diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png new file mode 100644 index 0000000000..765507a014 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png new file mode 100644 index 0000000000..51dd6aa1e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json index e00bbdeeea..c8d773339d 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.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, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp, berry delighht sprites by FairlySadPanda (Github)", "size": { "x": 32, "y": 32 @@ -330,6 +330,12 @@ { "name": "cotton-slice-inhand-right", "directions": 4 + }, + { + "name": "berry_delight" + }, + { + "name": "berry_delight_slice" } ] }