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, 27 Nov 2023 22:19:17 +0000 (16:19 -0600)
committer	GitHub <noreply@github.com>
	Mon, 27 Nov 2023 22:19:17 +0000 (15:19 -0700)
commit	e0dd5e1b52641c0380889efb949b827aadaaaea7
tree	3904c74baa84f762b677b2b4b75d382b73200667	tree \| snapshot
parent	45d191fa14c29a1bf8be92021bfeeae086c674ea	commit \| diff

Food/Bev updates and fixes (#21824)

* Food/Bev updates and fixes

* Remove some unnessesary

* Indentation oops

* No forensics on null item

* Missing whole ass file :)

* Oh, found it

* Remove redundant -type: drink

* Adds more hot cocoa

---------

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

33 files changed:

Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.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_produce.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.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/snacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Reactions/drinks.yml		diff \| blob \| history

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

RSS Atom