From a32fbb37ce727875e67ee5ae4f8bcca8be6fe1aa Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 11 Jul 2023 23:00:30 -0400 Subject: [PATCH] Chevre and chevre accessories - Adds chevre, crostini, and chevre chaud to the game (#17968) --- .../Objects/Consumable/Food/Baked/bread.yml | 25 ++++++++++ .../Objects/Consumable/Food/Baked/misc.yml | 23 +++++++++ .../Objects/Consumable/Food/ingredients.yml | 47 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 9 ++++ .../Prototypes/Recipes/Reactions/food.yml | 15 ++++++ .../Food/Baked/bread.rsi/crostini.png | Bin 0 -> 712 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 5 +- .../Food/Baked/misc.rsi/chevrechaud.png | Bin 0 -> 808 bytes .../Consumable/Food/Baked/misc.rsi/meta.json | 5 +- .../Food/ingredients.rsi/chevredisk.png | Bin 0 -> 634 bytes .../Food/ingredients.rsi/chevrelog.png | Bin 0 -> 667 bytes .../Consumable/Food/ingredients.rsi/meta.json | 8 ++- 12 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevredisk.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/chevrelog.png 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 0000000000000000000000000000000000000000..3b5e1b265a7e04d0c884b47411e0322f603c59c5 GIT binary patch literal 712 zcmV;(0yq7MP)e5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPAIE1{g4sqv=|c z@qd0*P86|^x4$!J)tx2TJQh+d2GQz?NeoOZEDZnt{9$-??KXp$mMVjk0}I17hFM^F zQXE3G!Y%Py|Ba*Ez?Pv~4&#I9=jX04oLjY*!Drz$MyiECtiCXYjT#D>8CKYzhKMz#za4GIB97G~-uLQn{R=+3q%u;C!b;G;iX+XvQ1 zOb8I22(=}+85T|2$e<&^gIAq|1SC*-C5Q`LqNCvIi?3kIue|tz*YX!H{t<0CNx7iI uT@D-##D;)L=M~1$Vs;daf>AIEhyeiB25$<*gcjcb0000e5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPAIO!GlZN{{Q@R z6^@^6&HaC-T<1SIW-*bf;rQkm|0NaV;rzFUXD~cFw4XuB&XED+7*fq+B-wI#IWQaD z5yG|^a6UVqHX}_!;K}7949_1v0$UEU6b6tjzqI!RZK7aHyw-nJTNj4ccP=tKfAA2+ zQe?{wyraQtsTu{b`ojOax?&mb{*qwe5s+Z`aQ7(#2agbgp_?68{`{^(U|QcZf`NsV zli~I5QijjB4l<}0ULt5d3$ZT!|K~4*GTRG=mkbgN=Al^(zrKG4ihgGJ$1KI5>EO-4 z#>oq}oRNi@`cY6`wG8YC@oyIxKE8Pfwh&}F$RQv$2*51=bZsBe4j?)Nv?aJ17ERj7 zpd-NpW0A87hl1aUwQEbujMaZ{3F_OlFES&cR6s%hJ*kE!4NR% myu!#Z3P!;w7zLw%2mk=Rpo1py3enX70000e5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPAKi0V6q@?%lid z|L5nM7~<@_>I_OsDvUIB0LXG_k)I4de|=|QXXC`6pT1!y$q`JXI^fi)Ghj<_SuQ81 zK$3YZq&h%INQmLioqIr*5-8ANfe$80wVW&mynFW!>b{_O(;Czk-2|LfNe z1~xVh+Na!IyLSEm_U+66w{M=H(0~5?`A@g(14@j@mV@wUp)v|a!6+C7qhLq^0By!y URIV4mP5=M^07*qoM6N<$f*LF#jQ{`u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ec10ffca6a5aae0d5c4ac4e5cd5d74272b14ea57 GIT binary patch literal 667 zcmV;M0%ZM(P)e5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPAIE1{g5nll=4N z&wolSc=YH2gOZX8PJ5VeNqqbE1#J1RUq2YgrC+>w!5}U2li~WstvEfxg3tBHhJF9` z0mu>{D2`1XKEOn5P;zn!Kn+I#5Fc3_#wP_3?Eq|s!z_o1V{;@`9DwdqT#ll82!Ik1 z%x56*@zW0!aYB5G8~`#zLP7#=7&4z&nxb-G*REX@mjNm&O5kjG@BRY@O?_`hl0v}E z%?+&K-Me=TAIi001{=w)I^X^zZ-x002ovPDHLkV1kJN BDaHT* literal 0 HcmV?d00001 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" },