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	Ed <96445749+TheShuEd@users.noreply.github.com>
	Sun, 8 Sep 2024 06:22:27 +0000 (09:22 +0300)
committer	GitHub <noreply@github.com>
	Sun, 8 Sep 2024 06:22:27 +0000 (02:22 -0400)
commit	230ea9be46d927be19cc146c22f523d0b3f4abca
tree	a0fe4b3d0c01a33c6921dc60843c2fe34dc41bd9	tree \| snapshot
parent	680b9c9cfbb8cb1889da01a334125010c40791d5	commit \| diff

Metamorphosis - FoodSequence 3 (#31012)

* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx

49 files changed:

Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs		diff \| blob \| history
Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/FoodMetamorphableByAddingComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs		diff \| blob \| history
Content.Shared/Nutrition/Events.cs		diff \| blob \| history
Content.Shared/Nutrition/FoodMetamorphRules/FoodMetamorphRule.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/Prototypes/FoodSequenceElementPrototype.cs	[new file with mode: 0644]	blob
Content.Shared/Nutrition/Prototypes/MetamorphRecipePrototype.cs	[new file with mode: 0644]	blob
Resources/Locale/en-US/nutrition/components/food-sequence.ftl		diff \| blob \| history
Resources/Prototypes/Body/Organs/human.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/food_sequence_element.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Cooking/sequence_metamorph.yml	[new file with mode: 0644]	blob
Resources/Prototypes/tags.yml		diff \| blob \| history
Resources/Textures/Mobs/Species/Human/organs.rsi/brain.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/burger.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/burger.rsi/screwed.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_bottom.png	[moved from Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/bun_top.png	[moved from Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/cheese.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/burger_sequence.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tomato.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-watermelon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_back.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell_forward.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/cheese.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/rat.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_back.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/taco_sequence.rsi/tacoshell_forward.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Specific/Hydroponics/pineapple.rsi/slice.png		diff \| blob \| history

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

RSS Atom