diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 51fc0bfd21..d79b8ba70f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -567,6 +567,9 @@ - Baguette - type: Sprite state: baguette + - type: SliceableFood + count: 12 + slice: FoodBreadBaguetteSlice - type: SolutionContainerManager solutions: food: @@ -582,6 +585,28 @@ Quantity: 1 # Tastes like France. +- type: entity + name: crostini + parent: FoodBreadSliceBase + id: FoodBreadBaguetteSlice + description: Bon ap-petite! + components: + - type: Sprite + state: crostini + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Nutriment + Quantity: 0.5 + - ReagentId: Vitamin + Quantity: 0.1 + - ReagentId: TableSalt + Quantity: 0.1 + - ReagentId: Blackpepper + Quantity: 0.1 + - type: entity name: buttered toast parent: FoodBreadSliceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 652efa4f5b..b8243c9d7c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -452,3 +452,26 @@ - ReagentId: Protein Quantity: 2 +- type: entity + name: chèvre chaud + parent: FoodBakedBase + id: FoodBakedChevreChaud + description: A disk of slightly melted chèvre flopped on top of a crostini, and toasted all-round. + components: + - type: FlavorProfile + flavors: + - bread + - nutty + - creamy + - smokey + - type: Sprite + state: chevrechaud + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 0.5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 5e39dda1b0..b307510a4e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -505,6 +505,53 @@ - ReagentId: Nutriment Quantity: 5 +- type: entity + name: chèvre log + parent: FoodBakingBase + id: FoodChevre + description: A soft log of creamy Chèvre. + components: + - type: FlavorProfile + flavors: + - nutty + - creamy + - type: Sprite + state: chevrelog + - type: SliceableFood + count: 3 + slice: FoodChevreSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 0.6 + +- type: entity + name: chèvre disk + parent: FoodBakingBase + id: FoodChevreSlice + description: A small disk of creamy Chèvre. An ideal adornment for French side dishes. + components: + - type: FlavorProfile + flavors: + - nutty + - creamy + - type: Sprite + state: chevredisk + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Vitamin + Quantity: 0.2 + - type: entity name: tofu parent: FoodBakingBase diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 3c2f549f40..2cb601ccd7 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1623,3 +1623,12 @@ FoodOnionSlice: 2 FoodCheeseSlice: 1 FoodMeatCutlet: 1 + +- type: microwaveMealRecipe + id: RecipeFoodBakedChevreChaud + name: chevre chaud recipe + result: FoodBakedChevreChaud + time: 5 + solids: + FoodChevreSlice: 1 + FoodBreadBaguetteSlice: 1 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 2aaf62c88b..365edcdb34 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -13,6 +13,21 @@ - !type:CreateEntityReactionEffect entity: FoodCheese +- type: reaction + id: ChevreCurdling + impact: low + quantized: true + conserveEnergy: false + reactants: + MilkGoat: + amount: 10 #Batches of chevre are traditionally made in far lower quantities than that of milk + Enzyme: + amount: 5 + catalyst: true + effects: + - !type:CreateEntityReactionEffect + entity: FoodChevre + - type: reaction id: CreateDough impact: Low diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini.png new file mode 100644 index 0000000000..3b5e1b265a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 8a816d868b..29bd53c9f0 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58", "size": { "x": 32, "y": 32 @@ -55,6 +55,9 @@ { "name": "creamcheese-slice" }, + { + "name": "crostini" + }, { "name": "french-toast" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud.png new file mode 100644 index 0000000000..c8138313a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json index 8b5a61c2be..7f887863aa 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.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", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58", "size": { "x": 32, "y": 32 @@ -120,6 +120,9 @@ }, { "name": "tray" + }, + { + "name": "chevrechaud" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevredisk.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevredisk.png new file mode 100644 index 0000000000..7e4c07b840 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevredisk.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevrelog.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevrelog.png new file mode 100644 index 0000000000..ec10ffca6a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevrelog.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 4752daf3ea..bf656ff00c 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58", "size": { "x": 32, "y": 32 @@ -22,6 +22,12 @@ { "name": "cheesewheel" }, + { + "name": "chevredisk" + }, + { + "name": "chevrelog" + }, { "name": "cornmeal" },