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	Firewatch <54725557+musicmanvr@users.noreply.github.com>
	Mon, 1 Apr 2024 06:41:14 +0000 (02:41 -0400)
committer	GitHub <noreply@github.com>
	Mon, 1 Apr 2024 06:41:14 +0000 (17:41 +1100)
commit	ea3e98e1208f21aa2a52b0a9938ee22e07b74ccd
tree	c29e989115bb078bbc833835e0640ab9e42d0afa	tree \| snapshot
parent	5613c3d3ddc64c1fccb1bc591308a19fa2276e9d	commit \| diff

Bartender "Essentials" (#25367)

* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst

50 files changed:

Resources/Locale/en-US/flavors/flavor-profiles.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl		diff \| blob \| history
Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl		diff \| blob \| history
Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.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		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml		diff \| blob \| history
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/Flavors/flavors.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/Reagents/Consumable/Drink/soda.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Reactions/drinks.yml		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/icon_open.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi/meta.json	[new file with mode: 0644]	blob

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

RSS Atom