Adds Ganja Brownies (#19222)

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 e5512e299ef23ad8106af3894c98c790cdff6f4d..995048c2dd10ae36e74e6a3f93882ab44ad3d943 100644 (file)
--- 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 9091bd409d83d2d322baf017d7d5bcc2ffe0edda..7e580db98051e6ff739328448c0964a26eb9c9a0 100644 (file)
--- 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 c1cf68430adb3e372150d680a2ef8b0f0e6b0c97..c4b8d75004ca163ae3e9e35482473a6efacec4fe 100644 (file)
--- 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 047781687416e2cfe96a3258b60e6948acef1760..4d636e146fef2f22ae67d01be81b264fa86599aa 100644 (file)
--- 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 9c6d4a73fa4b52c32bce6f150c866deaffd3f3ff..fc7f1bf8d16f7e332d3640668088aae79908ac63 100644 (file)
--- 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 be61993e7d22712ac357123bf4c44a42c4ed1183..c9dd15f816562fc4407595b8f18d17fe58e3de36 100644 (file)
--- 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 80360203ac57a2add79e604bffcf723b42f11ec2..fc0e97b5aaf864e6ae95a50f1260f3639b68bf74 100644 (file)
--- 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 (file)
index 0000000..2503a51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/brownie.rsi/brownie-batch.png differ

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 (file)
index 0000000..c54970d
--- /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"
+    }
+  ]
+}