From: lapatison <100279397+lapatison@users.noreply.github.com>
Date: Mon, 6 Mar 2023 18:45:39 +0000 (+0300)
Subject: Lime and orange plants, citrus salad recipe (#14298)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5c43253d67ba2ea958efff4f257401986a58ffc2;p=space-station-14.git

Lime and orange plants, citrus salad recipe (#14298)
---

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 64dee28c24..e3e2369461 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -17,6 +17,10 @@ seeds-garlic-name = garlic head
 seeds-garlic-display-name = garlic heads
 seeds-lemon-name = lemon
 seeds-lemon-display-name = lemon trees
+seeds-lime-name = lime
+seeds-lime-display-name = lime trees
+seeds-orange-name = orange
+seeds-orange-display-name = orange trees
 seeds-pineapple-name = pineapple
 seeds-pineapple-display-name = pineapple plant
 seeds-potato-name = potato
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index d69e75c451..00f618796c 100644
--- 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: 2500
+  cost: 2700
   category: Hydroponics
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 72281e24e6..6b3f29ff17 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -91,6 +91,10 @@
         amount: 1
       - id: LemonSeeds
         amount: 1
+      - id: LimeSeeds
+        amount: 1
+      - id: OrangeSeeds
+        amount: 1
       - id: OatSeeds
         amount: 1
       - id: OnionSeeds
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index 90b2ac0d04..b18b3ddfb8 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -15,10 +15,12 @@
     GalaxythistleSeeds: 3
     GarlicSeeds: 3
     LemonSeeds: 5
+    LimeSeeds: 5
     LingzhiSeeds: 3
     OatSeeds: 5
     OnionSeeds: 5
     OnionRedSeeds: 5
+    OrangeSeeds: 5
     PoppySeeds: 3
     PotatoSeeds: 5
     RiceSeeds: 5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index a562db3787..baa1350196 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -323,6 +323,44 @@
       - ReagentId: JuiceLemon
         Quantity: 10
 
+- type: entity
+  name: lime
+  parent: FoodLemon
+  id: FoodLime
+  description: Cures Space Scurvy, allows you to act like a Space Pirate.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sour
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/lime.rsi
+  - type: Produce
+    seedId: lime
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceLime
+        Quantity: 10
+
+- type: entity
+  name: orange
+  parent: FoodLemon
+  id: FoodOrange
+  description: Healthy, very orange.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - orange
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/orange.rsi
+  - type: Produce
+    seedId: orange
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceOrange
+        Quantity: 10
+
 - type: entity
   name: pineapple
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index b759f58504..91f3dac564 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -304,12 +304,12 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxvol: 15
+        maxvol: 38
         reagents:
         - ReagentId: Nutriment
-          Quantity: 7
+          Quantity: 18
         - ReagentId: Vitamin
-          Quantity: 5
+          Quantity: 15
 # Tastes like sourness, leaves.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 75bd73fd60..c4b0e26476 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -83,6 +83,26 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/lemon.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of lime seeds
+  id: LimeSeeds
+  components:
+    - type: Seed
+      seedId: lime
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/lime.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of orange seeds
+  id: OrangeSeeds
+  components:
+    - type: Seed
+      seedId: orange
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/orange.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pineapple seeds
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 2b3317c9fb..bf54b9ca06 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -124,6 +124,56 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: lime
+  name: seeds-lime-name
+  noun: seeds-noun-seeds
+  displayName: seeds-lime-display-name
+  plantRsi: Objects/Specific/Hydroponics/lime.rsi
+  productPrototypes:
+    - FoodLime
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 4
+  potency: 10
+  idealLight: 8
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+
+- type: seed
+  id: orange
+  name: seeds-orange-name
+  noun: seeds-noun-seeds
+  displayName: seeds-orange-display-name
+  plantRsi: Objects/Specific/Hydroponics/orange.rsi
+  productPrototypes:
+    - FoodOrange
+  harvestRepeat: Repeat
+  lifespan: 55
+  maturation: 6
+  production: 6
+  yield: 4
+  potency: 10
+  idealLight: 8
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Vitamin:
+      Min: 1
+      Max: 4
+      PotencyDivisor: 25
+
 - type: seed
   id: pineapple
   name: seeds-pineapple-name
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 899ef6bc68..6c2b8d8a1f 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -743,20 +743,18 @@
   name: orange cake recipe
   result: FoodCakeOrange
   time: 5
-  reagents:
-    JuiceOrange: 30
   solids:
     FoodCakePlain: 1
+    FoodOrange: 3
 
 - type: microwaveMealRecipe
   id: RecipeLimeCake
   name: lime cake recipe
   result: FoodCakeLime
   time: 5
-  reagents:
-    JuiceLime: 30
   solids:
     FoodCakePlain: 1
+    FoodLime: 3
 
 - type: microwaveMealRecipe
   id: RecipeCheeseCake
@@ -1025,6 +1023,17 @@
     FoodCheeseSlice: 1
     FoodCabbage: 1
 
+- type: microwaveMealRecipe
+  id: RecipeCitrusSalad
+  name: citrus salad recipe
+  result: FoodSaladCitrus
+  time: 5
+  solids:
+    FoodBowlBig: 1
+    FoodOrange: 1
+    FoodLemon: 1
+    FoodLime: 1
+
 - type: microwaveMealRecipe
   id: RecipeKimchiSalad
   name: kimchi salad recipe
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/dead.png
new file mode 100644
index 0000000000..b79722cbe5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/harvest.png
new file mode 100644
index 0000000000..ada52d81fb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
new file mode 100644
index 0000000000..775f8df408
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
new file mode 100644
index 0000000000..cc2b538c21
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/seed.png
new file mode 100644
index 0000000000..89666e6bcd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-1.png
new file mode 100644
index 0000000000..484b472660
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-2.png
new file mode 100644
index 0000000000..cfae403829
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-3.png
new file mode 100644
index 0000000000..e4e2ac9a39
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-4.png
new file mode 100644
index 0000000000..31054ca2c5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-5.png
new file mode 100644
index 0000000000..91014722a8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-6.png
new file mode 100644
index 0000000000..96853e9790
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/stage-6.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/dead.png
new file mode 100644
index 0000000000..b79722cbe5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/harvest.png
new file mode 100644
index 0000000000..8bbddd83d8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
new file mode 100644
index 0000000000..775f8df408
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    },
+    {
+      "name": "stage-5"
+    },
+    {
+      "name": "stage-6"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
new file mode 100644
index 0000000000..92d3022c0e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/seed.png
new file mode 100644
index 0000000000..8006bed973
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-1.png
new file mode 100644
index 0000000000..484b472660
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-2.png
new file mode 100644
index 0000000000..cfae403829
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-3.png
new file mode 100644
index 0000000000..e4e2ac9a39
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-4.png
new file mode 100644
index 0000000000..31054ca2c5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-5.png
new file mode 100644
index 0000000000..91014722a8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-5.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-6.png
new file mode 100644
index 0000000000..96853e9790
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/stage-6.png differ