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>
This commit is contained in:
Moony
2023-02-18 19:00:31 -06:00
committed by GitHub
parent e29a3874b8
commit cc0c516e02
61 changed files with 799 additions and 533 deletions

View File

@@ -11,6 +11,7 @@ using Robust.Shared.Random;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
using Robust.Shared.Utility;
namespace Content.Shared.Chemistry.Reagent
{
@@ -69,8 +70,8 @@ namespace Content.Shared.Chemistry.Reagent
[DataField("meltingPoint")]
public float? MeltingPoint { get; }
[DataField("spritePath")]
public string SpriteReplacementPath { get; } = string.Empty;
[DataField("metamorphicSprite")]
public SpriteSpecifier? MetamorphicSprite { get; } = null;
[DataField("metabolisms", serverOnly: true, customTypeSerializer: typeof(PrototypeIdDictionarySerializer<ReagentEffectsEntry, MetabolismGroupPrototype>))]
public Dictionary<string, ReagentEffectsEntry>? Metabolisms = null;

View File

@@ -7,11 +7,13 @@ namespace Content.Shared.Chemistry
{
Color,
FillFraction,
BaseOverride,
}
public enum SolutionContainerLayers : byte
{
Fill,
Base
Base,
Overlay
}
}