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

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

projects / space-station-14.git / commit

author	slarticodefast <161409025+slarticodefast@users.noreply.github.com>
	Fri, 13 Sep 2024 14:02:54 +0000 (16:02 +0200)
committer	GitHub <noreply@github.com>
	Fri, 13 Sep 2024 14:02:54 +0000 (00:02 +1000)
commit	0d40b0b3e05c3e50445d0aed030d69a6d34270f3
tree	6c648ee00009a1d1399664bf95e34cf3742b39b4	tree \| snapshot
parent	a151d4ed01fbb73fe2943f91692992b141638d47	commit \| diff

Add extradimensional orange, holymelon, meatwheat, worldpeas mutations (#27624)

* new mutations

* translation string fix

* add haloperidol to plant

* fix

* add FoodSequence

* food sequence fixes

57 files changed:

Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs		diff \| blob \| history
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/seeds/seeds.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.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/Recipes/Cooking/food_sequence_element.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-holymelon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/extradimensional_orange.rsi/stage-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/slice.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/meatwheat.rsi/stage-6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png		diff \| blob \| history
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/dead.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/harvest.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/produce.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/seed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/world_pea.rsi/stage-3.png	[new file with mode: 0644]	blob

Форк Space Station 14 с переводами на русский

RSS Atom