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	Moony <moony@hellomouse.net>
	Sun, 19 Feb 2023 01:00:31 +0000 (19:00 -0600)
committer	GitHub <noreply@github.com>
	Sun, 19 Feb 2023 01:00:31 +0000 (19:00 -0600)
commit	cc0c516e02ea6a0958a9c51b28f04bc159142c5b
tree	09cb99b3e2bf985b946b85b1edb27b96766f4159	tree \| snapshot
parent	e29a3874b82960a0ab21a444e95432aa6b3136ff	commit \| diff

Improves bartending with some tweaks. (#14169)

* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

61 files changed:

Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs		diff \| blob \| history
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs		diff \| blob \| history
Content.Server/Chemistry/Components/TransformableContainerComponent.cs	[deleted file]	blob \| history
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs		diff \| blob \| history
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs	[deleted file]	blob \| history
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs		diff \| blob \| history
Content.Shared/Chemistry/SolutionVisuals.cs		diff \| blob \| history
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml		diff \| blob \| history
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Dispensers/booze.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Dispensers/soda.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/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json	[deleted file]	blob \| history
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png		diff \| blob \| history
Resources/Textures/Structures/dispensers.rsi/booze.png	[deleted file]	blob \| history
Resources/Textures/Structures/dispensers.rsi/meta.json		diff \| blob \| history
Resources/Textures/Structures/dispensers.rsi/soda.png	[deleted file]	blob \| history
Resources/Textures/Structures/smalldispensers.rsi/booze.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/smalldispensers.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Structures/smalldispensers.rsi/soda.png	[new file with mode: 0644]	blob

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

RSS Atom