Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seeds fix #213

Merged
merged 4 commits into from
Aug 14, 2023
Merged

Seeds fix #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0ac0be
seeds fix
dvir001 Aug 14, 2023
5024db7
Merge branch 'new-frontiers-14:master' into master
dvir001 Aug 14, 2023
338bfb6
Merge pull request #1 from dvir001/master
dvir001 Aug 14, 2023
34255ad
Update seeds.yml
dvir001 Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_NF/seeds/seeds.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 2 additions & 14 deletions Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/seeds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
Expand Down
30 changes: 6 additions & 24 deletions Resources/Prototypes/_NF/Hydroponics/seeds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
Loading