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	Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
	Mon, 18 Dec 2023 22:51:39 +0000 (16:51 -0600)
committer	GitHub <noreply@github.com>
	Mon, 18 Dec 2023 22:51:39 +0000 (15:51 -0700)
commit	a4ed13af4a6e9f80433c4b0bc27760f66d2269e5
tree	bf69578181b00fe3d80f30377b084f54005f7564	tree \| snapshot
parent	a9fa1f4a5242df5e9da5633adf445e404c042353	commit \| diff

Remove duplicate milks (#22721)

* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

13 files changed:

Resources/Prototypes/Catalog/Fills/Crates/food.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Lockers/service.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml		diff \| blob \| history
Resources/ServerInfo/Guidebook/Service/Chef.xml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon.png	[moved from Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png with 100% similarity]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png	[deleted file]	blob \| history
Resources/migration.yml		diff \| blob \| history

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

RSS Atom