]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Muffins (#29318)
authorRumiTiger <154005209+RumiTiger@users.noreply.github.com>
Fri, 1 Nov 2024 02:06:46 +0000 (05:06 +0300)
committerGitHub <noreply@github.com>
Fri, 1 Nov 2024 02:06:46 +0000 (22:06 -0400)
commit6ce80d914d34807683fcf0118a2c86024ade7eef
treea79828b53133ccaea57cd36827cd12bc90610b0a
parent25b3898b287bcfbb3cc44ef62a4e8a3de3c0d1dd
Muffins (#29318)

* Update meta.json

* Add files via upload

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Add files via upload

* Update plate.yml

* Update food_baked_single.yml

* Update dinnerware.yml

* Update cooking.yml

* Update misc.yml

* Add files via upload

* Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png

* Add files via upload

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update meta.json

* Fix meta.json

* Fix meta.json again

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update misc.yml

* Update meta.json

* Update meta.json

* Update misc.yml

* Update meal_recipes.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

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

* Delete cherry

* Add files via upload

* Delete banana

* Add banana

* Delete chocolate

* Add chocolate

* lathe recipe fix

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
14 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Recipes/Lathes/cooking.yml
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png [new file with mode: 0644]