Pea Plants (#20504)

* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 1f4ac7e5f8244a87b912ebd2a862a0f3b4d4c8c8..890d2926603323d103aa03854c4741fc5f577b43 100644 (file)
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -97,5 +97,7 @@ seeds-berries-name = berries
 seeds-berries-display-name = berry bush
 seeds-bungo-name = bungo
 seeds-bungo-display-name = bungo plant
+seeds-pea-name = pea
+seeds-pea-display-name = pea vines
 seeds-pumpkin-name = pumpkin
-seeds-pumpkin-display-name = pumpkins
\ No newline at end of file
+seeds-pumpkin-display-name = pumpkins

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index f56b729217bdcf3cde0ff179859df31e0d6de163..4a80b76a3fa8f649da2b65fa3c1f4f00a790c108 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -34,10 +34,10 @@
     sprite: Objects/Specific/Hydroponics/apple.rsi
     state: seed
   product: CrateHydroponicsSeeds
-  cost: 500
+  cost: 550
   category: Hydroponics
   group: market
-  
+
 - type: cargoProduct
   id: BulkPlantBGone
   icon:

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index fb635ae8b5f1b1e6332888ccb4c11473700029d6..0d38d1088ea640967087ac8e2ba7e090e39b3895 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -164,7 +164,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 3125
+  cost: 3250
   category: Hydroponics
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 5d2798a667b41876d3ca8fd0563507149e68e68d..e4297fe62ee47b589e323088d513bfe2a3995d8b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -82,3 +82,4 @@
       - id: SoybeanSeeds
       - id: GrapeSeeds
       - id: WatermelonSeeds
+      - id: PeaSeeds

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index 28972e4913e0cdb14d145189aa7bb8d3bc6cb935..c48100f4ec0bf6ce054f5e9fa5637644157a0afd 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -34,5 +34,6 @@
     WatermelonSeeds: 5
     CocoaSeeds: 3
     BerrySeeds: 5
+    PeaSeeds: 5
   emaggedInventory:
     FlyAmanitaSeeds: 1

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index f0da095bbd9e7e39a1827abb43d949e88a71a1fd..6a19f801a6a760591449fa7e7a857f58fa4913cf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1566,6 +1566,29 @@
   - type: SpaceGarbage
   - type: BadFood
 
+- type: entity
+  parent: FoodProduceBase
+  id: FoodPeaPod
+  name: pea pod
+  description: A duck's favorite treat!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - peas
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/pea.rsi
+  - type: Produce
+    seedId: pea
+
 - type: entity
   name: pumpkin
   parent: FoodProduceBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 92946f6f7a2de5cef066e070fbe245ca6f6a96b7..fa87c5a5a02b3a0f7c0412cfbee2a3f0da1af6c0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -79,7 +79,7 @@
         maxVol: 15
         reagents:
         - ReagentId: Nutriment
-          Quantity: 8
+          Quantity: 10
         - ReagentId: Vitamin
           Quantity: 5
 

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index a851ce2626cf41bf8400257dc218d303f7e57dc0..a731a12997ca087cb107ccffbe1fc67622efeb57 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -499,6 +499,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/bungo.rsi
 
+- type: entity
+  parent: SeedBase
+  id: PeaSeeds
+  name: packet of pea pods
+  description: "These humble plants were once a vital part in the study of genetics."
+  components:
+    - type: Seed
+      seedId: pea
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/pea.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of pumpkin seeds

diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 894f0f020234f0bb4144b5260f8c3ea8a312941d..20d3f2d8537f6fc64acb25fcd72e048ed366fce2 100644 (file)
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -1137,7 +1137,7 @@
     Nutriment:
       Min: 1
       Max: 3
-      PotencyDivisor: 25  
+      PotencyDivisor: 25
 
 - type: seed
   id: koibean
@@ -1303,6 +1303,35 @@
       Max: 10
       PotencyDivisor: 20
 
+- type: seed
+  id: pea
+  name: seeds-pea-name
+  noun: seeds-noun-seeds
+  displayName: seeds-pea-display-name
+  plantRsi: Objects/Specific/Hydroponics/pea.rsi
+  packetPrototype: PeaSeeds
+  productPrototypes:
+    - FoodPeaPod
+  lifespan: 25
+  growthStages: 3
+  maturation: 8
+  production: 6
+  yield: 3
+  potency: 25
+  idealLight: 8
+  harvestRepeat: Repeat
+  nutrientConsumption: 0.5
+  waterConsumption: 0.5
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 33
+    Vitamin:
+      Min: 1
+      Max: 2
+      PotencyDivisor: 50
+
 - type: seed
   id: pumpkin
   name: seeds-pumpkin-name
@@ -1327,4 +1356,4 @@
     Vitamin:
       Min: 1
       Max: 5
-      PotencyDivisor: 20
\ No newline at end of file
+      PotencyDivisor: 20

diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 0ebf88e892ec814d4c254f02845e0e61d9194163..92ec105246769bd2d4e7b66505bfa4deb79f7316 100644 (file)
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1743,6 +1743,17 @@
     FoodPlate: 1
     FoodButter: 1
 
+- type: microwaveMealRecipe
+  id: RecipePeaSoup
+  name: pea soup recipe
+  result: FoodSoupPea
+  time: 10
+  solids:
+    FoodPeaPod: 2
+    FoodBowlBig: 1
+  reagents:
+    Water: 10
+
 - type: microwaveMealRecipe
   id: RecipeTacoShell
   name: taco shell recipe

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

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

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
new file mode 100644 (file)
index 0000000..c78dcee
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5e6db8f99b436b643bd3b76fa131ac074dfd856",
+  "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/pea.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce.png
new file mode 100644 (file)
index 0000000..d5881c2
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/pea.rsi/produce.png differ

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

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

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

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