From a0ac0be88cb0139c33a68c157898c8d2d0668625 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Mon, 14 Aug 2023 22:24:51 +0300
Subject: [PATCH 1/2] seeds fix

Fixing issues reported on discord
---
 Resources/Locale/en-US/_NF/seeds/seeds.ftl    |  5 ++++
 .../Objects/Specific/Hydroponics/seeds.yml    | 14 +--------
 .../Prototypes/_NF/Hydroponics/seeds.yml      | 30 ++++---------------
 3 files changed, 12 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Locale/en-US/_NF/seeds/seeds.ftl

diff --git a/Resources/Locale/en-US/_NF/seeds/seeds.ftl b/Resources/Locale/en-US/_NF/seeds/seeds.ftl
new file mode 100644
index 00000000000..5b79ddc1730
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/seeds/seeds.ftl
@@ -0,0 +1,5 @@
+# Seeds
+seeds-moneytree-name = moneytree
+seeds-moneytree-display-name = money tree
+seeds-pear-name = pear
+seeds-pear-display-name = pear tree
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
index 11f7152544d..e038865c831 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -2,24 +2,12 @@
   parent: SeedBase
   name: packet of money tree seeds
   description: "these seeds seem like a miracle, but expert farmers get rich from the kitchen"
-  id: MoneytreeSeeds
+  id: MoneyTreeSeeds
   components:
     - type: Seed
       seedId: moneytree
     - type: Sprite
       sprite: _NF/Objects/Specific/Hydroponics/moneytree.rsi
-#Description Is Sneaky KitchenFarms Tribute, LLKF, CentCom Owes Us a Million! =)
-
-# - type: entity
-#   parent: MoneytreeSeeds
-#   name: packet of money tree seeds
-#   suffix: "1000"
-#   description: "these seeds really are a miracle!"
-#   id: MoneytreeSeeds1000
-#   components:
-#     - type: Seed
-#       seedId: moneytree1000
-# commented out at present, intended to be admin spawn item? can be changed easily.
 
 - type: entity
   parent: SeedBase
diff --git a/Resources/Prototypes/_NF/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Hydroponics/seeds.yml
index 6e852c3bf2e..cb234b94a4c 100644
--- a/Resources/Prototypes/_NF/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/_NF/Hydroponics/seeds.yml
@@ -1,10 +1,10 @@
 - type: seed
-  id: moneytree
-  name: money tree
+  id: moneyTree
+  name: seeds-moneytree-name
   noun: seeds-noun-seeds
-  displayName: money
+  displayName: seeds-moneytree-display-name
   plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi
-  packetPrototype: MoneytreeSeeds
+  packetPrototype: MoneyTreeSeeds
   productPrototypes:
     - SpaceCash
   harvestRepeat: Repeat
@@ -16,29 +16,11 @@
   growthStages: 2
   idealLight: 6
 
-# - type: seed
-#   id: moneytree1000
-#   name: money tree
-#   noun: seeds-noun-seeds
-#   displayName: money
-#   plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi
-#   packetPrototype: MoneytreeSeeds1000
-#   productPrototypes:
-#     - SpaceCash1000
-#   harvestRepeat: Repeat
-#   lifespan: 45
-#   maturation: 15
-#   production: 8
-#   yield: 3
-#   potency: 10
-#   growthStages: 2
-#   idealLight: 6
-
 - type: seed
   id: pear
-  name: pear
+  name: seeds-pear-name
   noun: seeds-noun-seeds
-  displayName: pear tree
+  displayName: seeds-pear-display-name
   plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi
   packetPrototype: PearSeeds
   productPrototypes:

From 34255added43020514cf3fb7b0beb4a5e110fe3e Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Mon, 14 Aug 2023 23:23:25 +0300
Subject: [PATCH 2/2] Update seeds.yml

---
 .../_NF/Entities/Objects/Specific/Hydroponics/seeds.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
index e038865c831..8041efdd6e4 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -5,7 +5,7 @@
   id: MoneyTreeSeeds
   components:
     - type: Seed
-      seedId: moneytree
+      seedId: moneyTree
     - type: Sprite
       sprite: _NF/Objects/Specific/Hydroponics/moneytree.rsi