]> git.smokeofanarchy.ru Git - space-station-14.git/commit
New crops: Berries and Bungo (#19800)
authorDoru991 <75124791+Doru991@users.noreply.github.com>
Tue, 19 Sep 2023 03:29:27 +0000 (06:29 +0300)
committerGitHub <noreply@github.com>
Tue, 19 Sep 2023 03:29:27 +0000 (23:29 -0400)
commitfcfe75a308bd11a2333bbf996926de1d910e0a8d
tree132e910726c9cf1177fe941af9977520813ec040
parent88ec2aa77cebba685f85b8ca79ea01d251a00208
New crops: Berries and Bungo (#19800)

* Add berries

* Berry recipes

* Add bungo fruit

* yml tweaks

* yummy poisonous pits

* Technically it's a seed

* Revert "Technically it's a seed"

This reverts commit be892cf119c1e733ac2922b878aaa476f435152a.

Slapping the seed component onto it led to unforeseen consequences, and I don't want to mess with the seed system for a mostly useless gimmick.

* Revert 2 Electric Boogaloo

This reverts commit 2c4fb34250e9369085d49e730de3dab0e077b687.

* Small rewording

* Cocoa balancing

* Oops
35 files changed:
Resources/Locale/en-US/botany/components/seed-component.ftl
Resources/Locale/en-US/flavors/flavor-profiles.ftl
Resources/Locale/en-US/reagents/meta/toxins.ftl
Resources/Locale/en-US/seeds/seeds.ftl
Resources/Prototypes/Catalog/Fills/Crates/botany.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Resources/Prototypes/Flavors/flavors.yml
Resources/Prototypes/Hydroponics/seeds.yml
Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
Resources/Prototypes/Reagents/toxins.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-4.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-5.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/stage-6.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/dead.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/harvest.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/pit.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/produce.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/seed.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-1.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-3.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Hydroponics/bungo.rsi/stage-4.png [new file with mode: 0644]