fixes and tweaks (#21172)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 9b8411b80328771f72ebef2a91c647e60fee12ba..59cfc0ba16d6bc5bd64ab90419ffedf2f080f405 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -618,6 +618,8 @@
   id: FoodBurgerMcrib
   description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it.
   components:
+  - type: Food
+    trash: FoodKebabSkewer
   - type: FlavorProfile
     flavors:
       - bun

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 71008ac89a34b8710834bbb637377d55923f814e..166a73e43e326dea10854a3d78df2ed4e791f2c2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -427,19 +427,6 @@
     graph: Tortilla
     node: flat
 
-- type: entity
-  name: bun
-  parent: FoodBakingBase
-  id: FoodDoughBun
-  description: A base for any self-respecting burger.
-  components:
-  - type: FlavorProfile
-    flavors:
-      - bun
-  - type: Sprite
-    sprite: Objects/Consumable/Food/burger.rsi
-    state: bun
-
 - type: entity
   name: raw pastry base
   parent: FoodBakingBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index f4b52217cdf6d85b67f0ac73dfac464e79059896..cb79f9b3a385e3777f66f616c302c5eb855e8882 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -326,6 +326,8 @@
   id: FoodMealRibs
   description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist.
   components:
+  - type: Food
+    trash: FoodKebabSkewer
   - type: FlavorProfile
     flavors:
       - meaty

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index a9ea6b0876bce80eabd3e1e7438b541eac959dad..4ec4118177826ca3bdd037e0e0b07f5ecaf50e6c 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -24,7 +24,7 @@
   time: 10
   solids:
     FoodBreadBun: 1
-    FoodMeatCutlet: 3 #replace with bacon
+    FoodMeatBacon: 1
     FoodCheeseSlice: 2
 
 - type: microwaveMealRecipe
@@ -186,7 +186,7 @@
   time: 10
   solids:
     FoodBreadBun: 1
-    ClothingOuterGhostSheet: 1 #replace with ectoplasm once added
+    Ectoplasm: 1
 
 - type: microwaveMealRecipe
   id: RecipeHumanBurger

diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index 3ca69b379d31cb222eb400f4d870798b0fffb231..c7f4038db0943d92181629b5f31ce7ad10907565 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -148,6 +148,7 @@
       amount: 30
     Enzyme:
       amount: 5
+      catalyst: true
   effects:
     - !type:CreateEntityReactionEffect
       entity: FoodTofu
@@ -158,11 +159,11 @@
   id: CookingKetchup
   reactants:
     JuiceTomato:
-      amount: 10
+      amount: 2
     Sugar:
-      amount: 5
+      amount: 1
   products:
-    Ketchup: 15
+    Ketchup: 3
 
 - type: reaction
   id: CookingMayoVinegar
@@ -203,67 +204,67 @@
   id: CookingKetchunaise
   reactants:
     Ketchup:
-      amount: 5
+      amount: 1
     Mayo:
-      amount: 5
+      amount: 1
   products:
-    Ketchunaise: 10
+    Ketchunaise: 2
 
 - type: reaction
   id: CookingBbqSauce
   reactants:
     Ketchup:
-      amount: 5
+      amount: 1
     Vinegar:
-      amount: 5
+      amount: 1
     Sugar:
-      amount: 5
+      amount: 1
   products:
-    BbqSauce: 15
+    BbqSauce: 3
 
 - type: reaction
   id: CookingHotsauce
   reactants:
     JuiceTomato:
-      amount: 5
+      amount: 1
     TableSalt:
-      amount: 5
+      amount: 1
     CapsaicinOil:
-      amount: 5
+      amount: 1
   products:
-    Hotsauce: 15
+    Hotsauce: 3
 
 - type: reaction
   id: CookingVinegar
   reactants:
     Ethanol:
-      amount: 5
+      amount: 1
     Oxygen:
-      amount: 5
+      amount: 1
   products:
-    Vinegar: 10
+    Vinegar: 2
 
 - type: reaction
   id: CookingSoysauce
   reactants:
     MilkSoy:
-      amount: 10
+      amount: 2
     SulfuricAcid:
-      amount: 5
+      amount: 1
   products:
-    Soysauce: 15
+    Soysauce: 3
 
 - type: reaction
   id: CookingVinaigrette
   reactants:
     Vinegar:
-      amount: 5
+      amount: 1
     OilOlive:
-      amount: 5
+      amount: 1
     Blackpepper:
-      amount: 5
+      amount: 1
   products:
-    Vinaigrette: 15
+    Vinaigrette: 3
 
 - type: reaction
   id: CreateMeatball