Garlic and vinaigrette (#14221)

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index ad8ab001f5c196ac00f7a611a7e7a8cc1fb7196f..c1dddd1a20e40c27c4feff5c587091fc905e1814 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -95,6 +95,7 @@ flavor-complex-bungo = like bungo
 flavor-complex-raisins = like dried grapes
 flavor-complex-orange = like oranges
 flavor-complex-watermelon = like watermelon
+flavor-complex-garlic = like garlic
 
 ## Complex foodstuffs (cooked foods, joke flavors, etc)
 

diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index ed82997b6602a3a59a4bd9b1dad737ef961809d0..44c9c031d737fd04aae408e99f9795a3778429ab 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -25,6 +25,9 @@ reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Ameri
 reagent-name-mayo = mayonnaise
 reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid.
 
+reagent-name-vinaigrette = vinaigrette
+reagent-desc-vinaigrette = A basic salad dressing made with oil, vinegar and seasoning.
+
 reagent-name-soysauce = soy sauce
 reagent-desc-soysauce = A salty soy-based flavoring.
 

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index deb21906094185a8c5b971b366bb5fed90bd44ce..d72bd20d77b1ebf138ee5fd9297b17d4e7c3b8f6 100644 (file)
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -13,6 +13,8 @@ seeds-carrots-name = carrot
 seeds-carrots-display-name = carrots
 seeds-cabbage-name = cabbage
 seeds-cabbage-display-name = cabbages
+seeds-garlic-name = garlic head
+seeds-garlic-display-name = garlic heads
 seeds-lemon-name = lemon
 seeds-lemon-display-name = lemon trees
 seeds-pineapple-name = pineapple

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 5fa2b6043b7021f3aeacc601e540e228c91f70f3..ac7ffccbe804b47830d04423acf5496bb2584ee0 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -132,7 +132,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 2200
+  cost: 2300
   category: Hydroponics
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 6d4d4ae08e44238153618fcd620855d24898a376..0a3a8686ff7618d726b575ef34648b656a823cf8 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -81,6 +81,8 @@
         amount: 1
       - id: CabbageSeeds
         amount: 1
+      - id: GarlicSeeds
+        amount: 1
       - id: ChanterelleSeeds
         amount: 1
       - id: PotatoSeeds

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index 2557190510933bdefb991b9a424f84f30bb474bb..1c8449b2da07b98b5aaa70aa712034214a8e1e5f 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -13,6 +13,7 @@
     EggplantSeeds: 5
     EggySeeds: 5
     GalaxythistleSeeds: 3
+    GarlicSeeds: 3
     LemonSeeds: 5
     LingzhiSeeds: 3
     OatSeeds: 5

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 8de9a456b9ea49dd35cdef1c011abe0c69110822..c14f426a7fd3593c46da8a4b826a104279c71683 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -477,6 +477,10 @@
   id: FoodBreadGarlicSlice
   description: Alas, it is limited.
   components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - garlic
   - type: Sprite
     layers:
     - state: garlic-slice

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index fb94ade21c238bcc0f55c0d181bf7e073ea15308..63e56b547150522399e3d394d1fcc6de8d57e106 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -270,6 +270,31 @@
   - type: Produce
     seedId: cabbage
 
+- type: entity
+  name: garlic
+  parent: FoodProduceBase
+  id: FoodGarlic
+  description: Delicious, but with a potentially overwhelming odor.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - garlic
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Vitamin
+          Quantity: 4
+        - ReagentId: Allicin
+          Quantity: 4
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/garlic.rsi
+  - type: Produce
+    seedId: garlic
+
 - type: entity
   name: lemon
   parent: FoodProduceBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 652a0ddcad7d02845af5b0e6b293a9d3548ad7cf..b759f58504770774e5a84422d3a126a7ee1ed1d3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -235,6 +235,8 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 2
+        - ReagentId: Allicin
+          Quantity: 2
 # Tastes like spicy cabbage, carrots.
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 91831999404a822bae11cd527072898cf8903b78..b643b10c62ba4b0735f682c715cc4b40c1d88565 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -63,6 +63,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/cabbage.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of garlic seeds
+  id: GarlicSeeds
+  components:
+    - type: Seed
+      seedId: garlic
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/garlic.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lemon seeds

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 89dbd3105c28fa6b201614b635a9ed26b0400304..493db8fc807cea4bdd3f7731d958474371ec306e 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -653,3 +653,8 @@
   id: watermelon
   flavorType: Complex
   description: flavor-complex-watermelon
+
+- type: flavor
+  id: garlic
+  flavorType: Complex
+  description: flavor-complex-garlic
\ No newline at end of file

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 7e7b6b339fbcd499a364a8586496e909be5d3b75..abaf5875572fbcff21f6978e865cff33cf0b7e5d 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -300,6 +300,34 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: garlic
+  name: seeds-garlic-name
+  noun: seeds-noun-seeds
+  displayName: seeds-garlic-display-name
+  plantRsi: Objects/Specific/Hydroponics/garlic.rsi
+  productPrototypes:
+    - FoodGarlic
+  lifespan: 25
+  maturation: 3
+  production: 5
+  yield: 6
+  potency: 25
+  growthStages: 3
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+    Allicin:
+      Min: 1
+      Max: 8
+      PotencyDivisor: 25
+
 - type: seed
   id: apple
   name: seeds-apple-name

diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 9c0f75786034b82fdebe2091649d0d30e72f9aa5..ac349c9d0510211f508a26a96e80eab4ddbd3c38 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -79,6 +79,15 @@
   flavor: sour
   color: "#f9f5e5"
 
+- type: reagent
+  id: Vinaigrette
+  name: reagent-name-vinaigrette
+  group: Foods
+  desc: reagent-desc-vinaigrette
+  physicalDesc: reagent-physical-desc-sour
+  flavor: sour
+  color: "#efdaae"
+
 - type: reagent
   id: Soysauce
   name: reagent-name-soysauce

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 09ef121dcd4b0860f7de4afb6c378aafc72e52fc..51e771f31318dba794b6e31a473d9e2e342b70d6 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -232,6 +232,15 @@
     FoodBreadPlainSlice: 1
     FoodFlyAmanita: 1
 
+- type: microwaveMealRecipe
+  id: RecipeGarlicBread
+  name: garlic bread slice recipe
+  result: FoodBreadGarlicSlice
+  time: 5
+  solids:
+    FoodBreadPlainSlice: 1
+    FoodGarlic: 1
+
 #Pizzas
 - type: microwaveMealRecipe
   id: RecipeMargheritaPizza
@@ -988,8 +997,7 @@
   result: FoodSaladColeslaw
   time: 5
   reagents:
-    Vinegar: 5
-    OilOlive: 5
+    Vinaigrette: 5
   solids:
     FoodBowlBig: 1
     FoodOnionRed: 1
@@ -1020,6 +1028,7 @@
     FoodBowlBig: 1
     FoodCarrot: 1
     FoodCabbage: 1
+    FoodGarlic: 1
 
 # NOT ACTUAL FOOD
 

diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index c03ac57b2a27824384ef8410e7fd306ec9f105a4..38e8410e3816c0afa725cae2af64a84c49e25e86 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -167,6 +167,18 @@
   products:
     Vinegar: 10
 
+- type: reaction
+  id: CookingVinaigrette
+  reactants:
+    Vinegar:
+      amount: 5
+    OilOlive:
+      amount: 5
+    Blackpepper:
+      amount: 5
+  products:
+    Vinaigrette: 15
+
 - type: reaction
   id: CreateMeatball
   impact: Low

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/dead.png
new file mode 100644 (file)
index 0000000..5b43dde
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/dead.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/harvest.png
new file mode 100644 (file)
index 0000000..df34553
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/harvest.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
new file mode 100644 (file)
index 0000000..12f12bb
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/9f2e55e83cb93e7124d06c705d1942dfec63c93a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
new file mode 100644 (file)
index 0000000..8a2b50f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/seed.png
new file mode 100644 (file)
index 0000000..91196d9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/seed.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-1.png
new file mode 100644 (file)
index 0000000..e7c908f
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-1.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-2.png
new file mode 100644 (file)
index 0000000..b78cae4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-2.png differ

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-3.png
new file mode 100644 (file)
index 0000000..e11008a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/stage-3.png differ