-
Notifications
You must be signed in to change notification settings - Fork 66
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.
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
Botany - Plant Additions #284
Merged
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
5f4be71
Botany - Initial commit
Memeji d94e7d8
A few changes, meat weat can be used. Seeds added to vendor.
Memeji 190001c
Merge branch 'Nikko-Master-Unstable' into Nikko-Botany
Memeji 36e59b1
Floof Botany update, last changes. Adding to inventories.
Memeji 0eea1ef
Merge branch 'master' into Nikko-Botany
Memeji 61aebf0
Fixing some test fail issues
Memeji 83d0ded
Frontier modifications
Memeji 73c9f89
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds…
Memeji f5556a4
Meat wheat fix
Memeji 8e813be
Merge branch 'Nikko-Botany' of https://github.com/Memeji/floofstation…
Memeji 23d6a90
Increase cost of seed crates and refill due to selling for more now.
Memeji 9975faa
Merge branch 'Fansana:master' into Nikko-Botany
Memeji 9562871
fix test
Fansana 36d3983
enable cherry pie
Fansana d801507
Update cargo_botany.yml
Memeji 63d4a63
Update cargo_vending.yml
Memeji File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/drinks.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
reagent-name-tea-powder = tea powder | ||
reagent-desc-tea-powder = Finely ground tea leaves, used for making tea. |
5 changes: 5 additions & 0 deletions
5
Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/juice.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
reagent-name-juice-cherry = cherry juice | ||
reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy. | ||
|
||
reagent-name-juice-blue-pumpkin = blue pumpkin juice | ||
reagent-desc-juice-blue-pumpkin = The juice of a blue pumpkin. Smells like pool water. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
seeds-meatwheat-name = meatwheat | ||
seeds-meatwheat-display-name = meatwheat stalks | ||
seeds-extradimensionalorange-name = extradimensional orange | ||
seeds-extradimensionalorange-display-name = extradimensional orange trees | ||
seeds-teaplant-name = tea plant | ||
seeds-teaplant-display-name = tea plants | ||
seeds-papercane-name = papercane | ||
seeds-papercane-display-name = papercanes | ||
seeds-goldenapple-name = golden apple | ||
seeds-goldenapple-display-name = golden apple tree | ||
seeds-worldpea-name = world peas | ||
seeds-worldpea-display-name = world pea vines | ||
seeds-holymelon-name = holymelon | ||
seeds-holymelon-display-name = holymelon vines | ||
seeds-capfruit-name = capfruit | ||
seeds-capfruit-display-name = capfruit tree | ||
seeds-cherry-name = cherry | ||
seeds-cherry-display-name = cherry tree | ||
seeds-anomaly-berry-name = anomaly berry | ||
seeds-anomaly-berry-display-name = anomaly berries | ||
seeds-blue-pumpkin-name = blue pumpkin | ||
seeds-blue-pumpkin-display-name = blue pumpkins |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
flavor-complex-pear = like pears |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/_NF/reagents/meta/consumable/food/ingredients.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
reagent-name-coffeegrounds = coffee grounds | ||
reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Seeds | ||
seeds-spesos-name = spesos | ||
seeds-spesos-display-name = spesos | ||
seeds-pear-name = pear | ||
seeds-pear-display-name = pear | ||
seeds-coffee-name = coffee | ||
seeds-coffee-display-name = coffee plant |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
reagent-name-Quartzite = Quartzite | ||
reagent-desc-Quartzite = Millions of microscopic crystaline shards. Will cause internal bleeding, do not drink. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# Seeds | ||
seeds-CrystalThistle-name = CrystalThistle | ||
seeds-CrystalThistle-display-name = CrystalThistle | ||
seeds-GhostPepper-name = Ghost Pepper | ||
seeds-GhostPepper-display-name = Ghost Pepper | ||
seeds-CosmicRevenant-name = Cosmic Revenant | ||
seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/produce.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
- type: entity | ||
name: CrystalThistle | ||
parent: FoodProduceBase | ||
id: FoodCrystalThistle | ||
description: A variant of galaxythistle that has sprouted sharp quartz shards. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- sharp | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 25 | ||
reagents: | ||
- ReagentId: Quartzite | ||
Quantity: 10 | ||
- ReagentId: Ethyloxyephedrine | ||
Quantity: 15 | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi | ||
- type: Produce | ||
seedId: CrystalThistle | ||
- type: Extractable | ||
grindableSolutionName: food | ||
|
||
- type: entity | ||
name: Ghost Pepper | ||
parent: FoodProduceBase | ||
id: FoodGhostPepper | ||
description: So hot, you'll have one foot in the grave. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- spicy | ||
- sweet | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 39 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 6 | ||
- ReagentId: CapsaicinOil | ||
Quantity: 15 | ||
- ReagentId: Vitamin | ||
Quantity: 6 | ||
- ReagentId: Thermite | ||
Quantity: 10 | ||
- type: TileFrictionModifier | ||
modifier: 0.05 | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi | ||
- type: Produce | ||
seedId: GhostPepper | ||
- type: Tag | ||
tags: | ||
- Vegetable | ||
|
||
- type: entity | ||
name: Cosmic Revenant | ||
parent: FoodProduceBase | ||
id: FoodCosmicRevenant | ||
description: Is this even a pepper? Looks... Haunted. | ||
components: | ||
- type: FlavorProfile | ||
flavors: | ||
- spicy | ||
- spooky | ||
- type: SolutionContainerManager | ||
solutions: | ||
food: | ||
maxVol: 41 | ||
reagents: | ||
- ReagentId: Nutriment | ||
Quantity: 8 | ||
- ReagentId: CapsaicinOil | ||
Quantity: 20 | ||
- ReagentId: Vitamin | ||
Quantity: 8 | ||
- ReagentId: Ectoplasm | ||
Quantity: 5 | ||
- type: TileFrictionModifier | ||
modifier: 0.0001 | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi | ||
- type: Produce | ||
seedId: CosmicRevenant | ||
- type: Tag | ||
tags: | ||
- Vegetable |
32 changes: 32 additions & 0 deletions
32
Resources/Prototypes/DeltaV/Entities/Objects/Specific/Hydroponics/seeds.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
- type: entity | ||
parent: SeedBase | ||
name: packet of CrystalThistle seeds | ||
description: "Like a bag of needles" | ||
id: CrystalThistleSeeds | ||
components: | ||
- type: Seed | ||
seedId: CrystalThistle | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi | ||
|
||
- type: entity | ||
parent: SeedBase | ||
name: packet of Ghost Pepper seeds | ||
description: "Be sure to plant these six feet under." | ||
id: GhostPepperSeeds | ||
components: | ||
- type: Seed | ||
seedId: GhostPepper | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi | ||
|
||
- type: entity | ||
parent: SeedBase | ||
name: packet of Cosmic Revenant Pepper seeds | ||
description: "Harvest dark spirits for the good of the station." | ||
id: CosmicRevenantSeeds | ||
components: | ||
- type: Seed | ||
seedId: CosmicRevenant | ||
- type: Sprite | ||
sprite: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
- type: seed | ||
id: CrystalThistle | ||
name: seeds-CrystalThistle-name | ||
noun: seeds-noun-seeds | ||
displayName: seeds-CrystalThistle-display-name | ||
plantRsi: DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi | ||
packetPrototype: CrystalThistleSeeds | ||
productPrototypes: | ||
- FoodCrystalThistle | ||
lifespan: 25 | ||
maturation: 10 | ||
production: 3 | ||
yield: 3 | ||
potency: 10 | ||
growthStages: 3 | ||
waterConsumption: 0.60 | ||
chemicals: | ||
Ethyloxyephedrine: | ||
Min: 1 | ||
Max: 25 | ||
potencyDivisor: 4 | ||
Quartzite: | ||
Min: 1 | ||
Max: 25 | ||
potencyDivisor: 4 | ||
|
||
- type: seed | ||
id: GhostPepper | ||
name: seeds-GhostPepper-name | ||
noun: seeds-noun-seeds | ||
displayName: seeds-GhostPepper-display-name | ||
plantRsi: DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi | ||
packetPrototype: GhostPepperSeeds | ||
productPrototypes: | ||
- FoodGhostPepper | ||
mutationPrototypes: | ||
- CosmicRevenant | ||
harvestRepeat: Repeat | ||
lifespan: 25 | ||
maturation: 6 | ||
production: 6 | ||
yield: 2 | ||
potency: 20 | ||
idealLight: 9 | ||
idealHeat: 298 | ||
chemicals: | ||
CapsaicinOil: | ||
Min: 2 | ||
Max: 20 | ||
potencyDivisor: 10 | ||
Nutriment: | ||
Min: 2 | ||
Max: 8 | ||
potencyDivisor: 25 | ||
Vitamin: | ||
Min: 2 | ||
Max: 8 | ||
potencyDivisor: 25 | ||
Thermite: | ||
Min: 5 | ||
Max: 20 | ||
potencyDivisor: 10 | ||
|
||
- type: seed | ||
id: CosmicRevenant | ||
name: seeds-CosmicRevenant-name | ||
noun: seeds-noun-seeds | ||
displayName: seeds-CosmicRevenant-display-name | ||
plantRsi: DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi | ||
packetPrototype: CosmicRevenantSeeds | ||
productPrototypes: | ||
- FoodCosmicRevenant | ||
harvestRepeat: Repeat | ||
lifespan: 25 | ||
maturation: 6 | ||
production: 6 | ||
yield: 2 | ||
potency: 20 | ||
idealLight: 9 | ||
idealHeat: 298 | ||
chemicals: | ||
CapsaicinOil: | ||
Min: 3 | ||
Max: 30 | ||
potencyDivisor: 10 | ||
Nutriment: | ||
Min: 4 | ||
Max: 10 | ||
potencyDivisor: 25 | ||
Vitamin: | ||
Min: 4 | ||
Max: 10 | ||
potencyDivisor: 25 | ||
Ectoplasm: | ||
Min: 1 | ||
Max: 5 | ||
potencyDivisor: 10 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I love this