From 1de23dc4d03cc4fdcb35750a46009d0c3ec5c0f8 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+ChilbroBaggins@users.noreply.github.com> Date: Wed, 6 Sep 2023 20:21:14 -0500 Subject: [PATCH] Adds Ganja Brownies (#19222) --- .../Random/Food_Drinks/food_baked_single.yml | 2 + .../Random/Food_Drinks/food_baked_whole.yml | 2 + .../Objects/Consumable/Food/Baked/misc.yml | 105 ++++++++++++++++++ .../Objects/Consumable/Food/ingredients.yml | 21 ++++ .../Objects/Consumable/Food/snacks.yml | 1 + .../Reagents/Consumable/Food/ingredients.yml | 18 +++ .../Recipes/Cooking/meal_recipes.yml | 36 ++++++ .../Food/Baked/brownie.rsi/brownie-batch.png | Bin 0 -> 950 bytes .../Food/Baked/brownie.rsi/meta.json | 14 +++ 9 files changed, 199 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/brownie-batch.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/meta.json 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 e5512e299e..995048c2dd 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 @@ -68,6 +68,7 @@ - FoodPieFrostySlice - FoodTartGrape - FoodTartCoco + - FoodBakedBrownie chance: 0.8 offset: 0.0 #rare @@ -80,4 +81,5 @@ - FoodTartGapple - FoodBreadMeatXenoSlice - FoodPieXenoSlice + - FoodBakedCannabisBrownie rareChance: 0.05 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 9091bd409d..7e580db980 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 @@ -44,6 +44,7 @@ - FoodPieCherry - FoodPieMeat - FoodPieFrosty + - FoodBakedBrownieBatch chance: 0.8 offset: 0.0 #rare @@ -58,4 +59,5 @@ - FoodPiePlump - FoodBreadMeatXeno - FoodPieXeno + - FoodBakedCannabisBrownieBatch rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index c1cf68430a..c4b8d75004 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -469,3 +469,108 @@ Quantity: 2 - ReagentId: Vitamin Quantity: 0.5 + +- type: entity + name: brownies + parent: FoodBakedBase + id: FoodBakedBrownieBatch + description: A pan of brownies. + components: + - type: FlavorProfile + flavors: + - sweet + - chocolate + - type: Sprite + sprite: Objects/Consumable/Food/Baked/brownie.rsi + state: brownie-batch + - type: SolutionContainerManager + solutions: + food: + maxVol: 78 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Theobromine + Quantity: 18 + - type: SliceableFood + count: 6 + slice: FoodBakedBrownie + +- type: entity + name: brownie + parent: FoodBakedBase + id: FoodBakedBrownie + suffix: Fresh + description: A fresh baked brownie. + components: + - type: FlavorProfile + flavors: + - sweet + - chocolate + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: mre-brownie-open + - type: SolutionContainerManager + solutions: + food: + maxVol: 13 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Theobromine + Quantity: 3 + +- type: entity + name: special brownies + parent: FoodBakedBase + id: FoodBakedCannabisBrownieBatch + description: A pan of "special" brownies. + components: + - type: FlavorProfile + flavors: + - sweet + - magical + - chocolate + - type: Sprite + sprite: Objects/Consumable/Food/Baked/brownie.rsi + state: brownie-batch + - type: SolutionContainerManager + solutions: + food: + maxVol: 228 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Theobromine + Quantity: 18 + - ReagentId: THC + Quantity: 150 + - type: SliceableFood + count: 6 + slice: FoodBakedCannabisBrownie + +- type: entity + name: special brownie + parent: FoodBakedBase + id: FoodBakedCannabisBrownie + description: A "special" brownie. + components: + - type: FlavorProfile + flavors: + - sweet + - magical + - chocolate + - type: Sprite + sprite: Objects/Consumable/Food/snacks.rsi + state: mre-brownie-open + - type: SolutionContainerManager + solutions: + food: + maxVol: 38 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: THC + Quantity: 25 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 0477816874..4d636e146f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -470,6 +470,27 @@ components: - type: Sprite state: butter + +- type: entity + name: stick of cannabis butter + parent: FoodBakingBase + id: FoodCannabisButter + description: Add this to your favorite baked goods for an irie time. + components: + - type: Sprite + state: butter + color: "#82C36E" + - type: SolutionContainerManager + solutions: + food: + maxVol: 100 + reagents: + - ReagentId: Butter + Quantity: 10 + - ReagentId: THC + Quantity: 82 + - type: Extractable + grindableSolutionName: food - type: entity name: cheese wheel diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 9c6d4a73fa..fc7f1bf8d1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -408,6 +408,7 @@ id: FoodSnackMREBrownieOpen parent: FoodSnackBase name: brownie + suffix: MRE description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit. components: - type: FlavorProfile diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index be61993e7d..c9dd15f816 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -223,3 +223,21 @@ amount: 2 - !type:PlantAdjustPests amount: 2 + +- type: reagent + id: Butter + name: reagent-name-butter + group: Foods + desc: reagent-desc-butter + physicalDesc: reagent-physical-desc-creamy + flavor: butter + color: yellow + meltingPoint: 32.0 + boilingPoint: 100.0 + recognizable: true + metabolisms: + Food: + effects: + - !type:AdjustReagent + reagent: Nutriment + amount: 0.75 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 80360203ac..fc0e97b5aa 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1223,6 +1223,19 @@ UncookedAnimalProteins: 6 solids: FoodDoughSlice: 3 + +- type: microwaveMealRecipe + id: RecipeBrownies + name: brownie recipe + result: FoodBakedBrownieBatch + time: 25 + reagents: + Flour: 15 + Sugar: 30 + solids: + FoodButter: 2 + FoodSnackChocolateBar: 2 + FoodEgg: 3 #Donks i guess - type: microwaveMealRecipe @@ -1639,3 +1652,26 @@ time: 5 solids: FoodSpaceshroom: 1 + +#cannabis +- type: microwaveMealRecipe + id: RecipeCannabisButter + name: cannabis butter recipe + result: FoodCannabisButter + time: 15 + solids: + FoodButter: 1 + LeavesCannabis: 6 + +- type: microwaveMealRecipe + id: RecipeCannabisBrownies + name: cannabis brownie recipe + result: FoodBakedCannabisBrownieBatch + time: 25 + reagents: + Flour: 15 + Sugar: 30 + solids: + FoodCannabisButter: 2 + FoodSnackChocolateBar: 2 + FoodEgg: 3 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/brownie-batch.png b/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/brownie-batch.png new file mode 100644 index 0000000000000000000000000000000000000000..2503a517352898fb884f81ab3926e728aefe2cf4 GIT binary patch literal 950 zcmV;n14;aeP)(=xq)g;FV?07>+6rZ>F`U5e-0*0W8M@ zU6cJgyuw}BDtR!TP@rzPpeYhKE&x*{;I;=lrVFWvjPE=MV-4l^Fd00oE!SLF-gB2u zB#<=J2Qw-8`G6t&n~SL8Mq%7&CGS8wD*2m=uo28dg#D@qhzaqq3~~z!k)YaB2}Bs1 zzB3|yNyi$SQ%9tL(%fwo!6&eD3hIay2oWO29)eSDTyG#(ag7uZQ9}|5ro!tj9;|?2 z7=yD(duKTIPtwC;+-wtNAG@RgDbdwI)crj2Sj2jW%z4>1n!P9?>JNCQCc03 zJRa&a6-~uP!9f5SbesSYb@UB2LCp|>dy^4=sZikXcAK}4A%feJ3B`96F{C14s(i%- zh8snNshUpqbMaZG+f2B;X|$tl!M@HcaKkC z_A<+C*DSx5R@3NI3$r({knX$$y1Ur4ek!DbigUJEwcs}rm`O7KH-(N$4In7x7A*%x z`$Ax#amq!@C-CxTJGhTW1m>?98MXDgYPONDIFKvbFqPEXIum~uR?2X{X{^8md})>~ z_?YFerq)BNt583h_g@KAQNhpH`Kzp&GEFlZL^6;-37txDfNn2&IJ+$hm?aC`rVr3i zZ3;LjJ)O6R?*$tcHr(rF&c7a~(BTx|_{NS)I`4b>9Oq2?#Yy$2evZ!ze%87!feTmQ YFHAqbsAnY`tpET307*qoM6N<$f>)-c&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/meta.json new file mode 100644 index 0000000000..c54970dca9 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, brownie-batch by Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brownie-batch" + } + ] +}