git.smokeofanarchy.ru Git - space-station-14.git/commit

author	RumiTiger <154005209+RumiTiger@users.noreply.github.com>
	Thu, 29 Aug 2024 01:30:58 +0000 (04:30 +0300)
committer	GitHub <noreply@github.com>
	Thu, 29 Aug 2024 01:30:58 +0000 (11:30 +1000)
commit	d9b1369dae0b24d010f33f8fe05567b5f1cf0bd4
tree	570ae7721764947268cc1e15d12e38b091bc8b2f	tree \| snapshot
parent	26ba9918f340bcdddf91caae060b7f9bc8f3604c	commit \| diff

Cherry (#28962)

* Add files via upload

* Update produce.yml

* Update produce.yml

* Update seeds.yml

* Update flavor-profiles.ftl

* Update flavors.yml

* Update meal_recipes.yml

* Update food_produce.yml

* Update meta.json

* Update seeds.yml

* Update botany.yml

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Update produce.yml

* Update produce.yml

* Update produce.yml

* Update food_produce.yml

* Update food_produce.yml

* Update produce.yml

* Apply suggestions from code review

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update seeds.yml

* Update juice.yml

* Update juice.ftl

* Update seeds.ftl

* Update seeds.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_vending.yml

* Update cargo_vending.yml

* Update seeds.yml

* Update seeds.yml

* Update meta.json

* Update produce.yml

* Cherry Tree

* Alphabetical order

* Update food_produce.yml

* Update food-sequence.ftl

* Update food-sequence.ftl

* Update produce.yml

* Update produce.yml

* Update food-sequence.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

Resources/Locale/en-US/flavors/flavor-profiles.ftl		diff \| blob \| history
Resources/Locale/en-US/nutrition/components/food-sequence.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl		diff \| blob \| history
Resources/Locale/en-US/seeds/seeds.ftl		diff \| blob \| history
Resources/Prototypes/Catalog/Cargo/cargo_botany.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Crates/botany.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml		diff \| blob \| history
Resources/Prototypes/Flavors/flavors.yml		diff \| blob \| history
Resources/Prototypes/Hydroponics/seeds.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/juice.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml		diff \| blob \| history
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png	[new file with mode: 0644]	blob