]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Custom burgers - FoodSequence system (#30755)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Sat, 10 Aug 2024 19:31:32 +0000 (22:31 +0300)
committerGitHub <noreply@github.com>
Sat, 10 Aug 2024 19:31:32 +0000 (22:31 +0300)
commit4d75cb54c85606f34a4aea26339040c23d836a99
treecff2f8f4fef1774fc6978c61a4a6ba16916152b9
parent707daa1a5e110b904847f6abcbe1470d891abf01
Custom burgers - FoodSequence system (#30755)

* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
34 files changed:
Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs [new file with mode: 0644]
Content.Server/Nutrition/Components/FoodComponent.cs
Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs [new file with mode: 0644]
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs [new file with mode: 0644]
Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs [new file with mode: 0644]
Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/nutrition/components/food-sequence.ftl [new file with mode: 0644]
Resources/Prototypes/Body/Organs/human.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
Resources/Prototypes/Entities/Objects/Materials/materials.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/meat.rsi/tomato.png
Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png