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

author	Ed <96445749+TheShuEd@users.noreply.github.com>
	Wed, 14 Aug 2024 13:04:00 +0000 (16:04 +0300)
committer	GitHub <noreply@github.com>
	Wed, 14 Aug 2024 13:04:00 +0000 (15:04 +0200)
commit	e659eb992f119fcdf3cf5a4d88f47dd10134ff07
tree	4e1c610790aeb85e2dd9a5b19ce9efbdf31b8a88	tree \| snapshot
parent	8ac0246998dd8261aa47123e2277c41dc59cb310	commit \| diff

Custom Taco & Kebabs - FoodSequence 2 (#30905)

* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs		diff \| blob \| history
Resources/Locale/en-US/nutrition/components/food-sequence.ftl		diff \| blob \| history
Resources/Prototypes/Body/Organs/human.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml		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/Consumable/Food/skewer.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml		diff \| blob \| history
Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		diff \| blob \| history
Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png		diff \| blob \| history
Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-bluepepper.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-corn2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-pepper4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-rat2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png	[new file with mode: 0644]	blob
Resources/migration.yml		diff \| blob \| history