]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Improves bartending with some tweaks. (#14169)
authorMoony <moony@hellomouse.net>
Sun, 19 Feb 2023 01:00:31 +0000 (19:00 -0600)
committerGitHub <noreply@github.com>
Sun, 19 Feb 2023 01:00:31 +0000 (19:00 -0600)
* 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
Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
Content.Server/Chemistry/Components/TransformableContainerComponent.cs [deleted file]
Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs
Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs [deleted file]
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
Content.Shared/Chemistry/SolutionVisuals.cs
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png [deleted file]
Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json [deleted file]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png
Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png
Resources/Textures/Structures/dispensers.rsi/booze.png [deleted file]
Resources/Textures/Structures/dispensers.rsi/meta.json
Resources/Textures/Structures/dispensers.rsi/soda.png [deleted file]
Resources/Textures/Structures/smalldispensers.rsi/booze.png [new file with mode: 0644]
Resources/Textures/Structures/smalldispensers.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/smalldispensers.rsi/soda.png [new file with mode: 0644]

index d0301e3deafb9fcca6959161fe0ecbc7d4232f33..da2110647693ed0f808a599f3e44c8f90344400e 100644 (file)
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Chemistry.Visualizers
 {
@@ -17,12 +18,25 @@ namespace Content.Client.Chemistry.Visualizers
         [DataField("fillBaseName")]
         public string? FillBaseName = null;
         [DataField("layer")]
-        public SolutionContainerLayers Layer = SolutionContainerLayers.Fill;
+        public SolutionContainerLayers FillLayer = SolutionContainerLayers.Fill;
+        [DataField("baseLayer")]
+        public SolutionContainerLayers BaseLayer = SolutionContainerLayers.Base;
+        [DataField("overlayLayer")]
+        public SolutionContainerLayers OverlayLayer = SolutionContainerLayers.Overlay;
         [DataField("changeColor")]
         public bool ChangeColor = true;
         [DataField("emptySpriteName")]
         public string? EmptySpriteName = null;
         [DataField("emptySpriteColor")]
         public Color EmptySpriteColor = Color.White;
+        [DataField("metamorphic")]
+        public bool Metamorphic = false;
+        [DataField("metamorphicDefaultSprite")]
+        public SpriteSpecifier MetamorphicDefaultSprite = SpriteSpecifier.Invalid;
+        [DataField("metamorphicNameFull")]
+        public string MetamorphicNameFull = "transformable-container-component-glass";
+
+        public string InitialName = string.Empty;
+        public string InitialDescription = string.Empty;
     }
 }
index bf8d4a5cc23ec8ffea2571afa5ea0dc7f8591043..5686c9c36350703848bb9631937f29d3f5b27e8a 100644 (file)
@@ -1,10 +1,27 @@
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Chemistry.Visualizers;
 
 public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionContainerVisualsComponent>
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
+    {
+        var meta = MetaData(uid);
+        component.InitialName = meta.EntityName;
+        component.InitialDescription = meta.EntityDescription;
+    }
+
     protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisualsComponent component, ref AppearanceChangeEvent args)
     {
         if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, args.Component))
@@ -13,7 +30,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
         if (args.Sprite == null)
             return;
 
-        if (!args.Sprite.LayerMapTryGet(component.Layer, out var fillLayer))
+        if (!args.Sprite.LayerMapTryGet(component.FillLayer, out var fillLayer))
             return;
 
         // Currently some solution methods such as overflowing will try to update appearance with a
@@ -25,6 +42,43 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
             fraction = 1f;
         }
 
+        if (component.Metamorphic)
+        {
+            if (args.Sprite.LayerMapTryGet(component.BaseLayer, out var baseLayer))
+            {
+                var hasOverlay = args.Sprite.LayerMapTryGet(component.OverlayLayer, out var overlayLayer);
+
+                if (AppearanceSystem.TryGetData<string>(uid, SolutionContainerVisuals.BaseOverride,
+                        out var baseOverride,
+                        args.Component))
+                {
+                    _prototype.TryIndex<ReagentPrototype>(baseOverride, out var reagentProto);
+
+                    var metadata = MetaData(uid);
+
+                    if (reagentProto?.MetamorphicSprite is { } sprite)
+                    {
+                        args.Sprite.LayerSetSprite(baseLayer, sprite);
+                        args.Sprite.LayerSetVisible(fillLayer, false);
+                        if (hasOverlay)
+                            args.Sprite.LayerSetVisible(overlayLayer, false);
+                        metadata.EntityName = Loc.GetString(component.MetamorphicNameFull,
+                            ("name", reagentProto.LocalizedName));
+                        metadata.EntityDescription = reagentProto.LocalizedDescription;
+                        return;
+                    }
+                    else
+                    {
+                        if (hasOverlay)
+                            args.Sprite.LayerSetVisible(overlayLayer, true);
+                        args.Sprite.LayerSetSprite(baseLayer, component.MetamorphicDefaultSprite);
+                        metadata.EntityName = component.InitialName;
+                        metadata.EntityDescription = component.InitialDescription;
+                    }
+                }
+            }
+        }
+
         var closestFillSprite = (int) Math.Round(fraction * component.MaxFillLevels);
 
         if (closestFillSprite > 0)
@@ -51,5 +105,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
                     args.Sprite.LayerSetColor(fillLayer, component.EmptySpriteColor);
             }
         }
+
+
     }
 }
diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
deleted file mode 100644 (file)
index 47b04e3..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Server.GameObjects;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Chemistry.Components
-{
-    [RegisterComponent]
-    public sealed class TransformableContainerComponent : Component
-    {
-        [Dependency] private readonly IEntityManager _entMan = default!;
-
-        public SpriteSpecifier? InitialSprite;
-        public string InitialName = default!;
-        public string InitialDescription = default!;
-        public ReagentPrototype? CurrentReagent;
-
-        public bool Transformed { get; internal set; }
-
-        protected override void Initialize()
-        {
-            base.Initialize();
-
-            if (_entMan.TryGetComponent(Owner, out SpriteComponent? sprite) &&
-                sprite.BaseRSIPath != null)
-            {
-                InitialSprite = new SpriteSpecifier.Rsi(new ResourcePath(sprite.BaseRSIPath), "icon");
-            }
-
-            InitialName = _entMan.GetComponent<MetaDataComponent>(Owner).EntityName;
-            InitialDescription = _entMan.GetComponent<MetaDataComponent>(Owner).EntityDescription;
-        }
-
-        protected override void Startup()
-        {
-            base.Startup();
-
-            Owner.EnsureComponentWarn<SolutionContainerManagerComponent>();
-            Owner.EnsureComponentWarn<FitsInDispenserComponent>();
-        }
-    }
-}
index 5846783e8d8dc9304ce374186afcfad198250836..13ee95be14614d0b7d170b26076711c6b52e881a 100644 (file)
@@ -102,6 +102,15 @@ public sealed partial class SolutionContainerSystem : EntitySystem
 
         _appearance.SetData(uid, SolutionContainerVisuals.FillFraction, solution.FillFraction, appearanceComponent);
         _appearance.SetData(uid, SolutionContainerVisuals.Color, solution.GetColor(_prototypeManager), appearanceComponent);
+
+        if (solution.GetPrimaryReagentId() is { } reagent)
+        {
+            _appearance.SetData(uid, SolutionContainerVisuals.BaseOverride, reagent, appearanceComponent);
+        }
+        else
+        {
+            _appearance.SetData(uid, SolutionContainerVisuals.BaseOverride, string.Empty, appearanceComponent);
+        }
     }
 
     /// <summary>
diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs
deleted file mode 100644 (file)
index 7a1792b..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Chemistry.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed class TransformableContainerSystem : EntitySystem
-    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<TransformableContainerComponent, SolutionChangedEvent>(OnSolutionChange);
-        }
-
-        private void OnSolutionChange(EntityUid owner, TransformableContainerComponent component,
-            SolutionChangedEvent args)
-        {
-            if (!_solutionsSystem.TryGetFitsInDispenser(owner, out var solution))
-                return;
-            //Transform container into initial state when emptied
-            if (component.CurrentReagent != null && solution.Contents.Count == 0)
-            {
-                CancelTransformation(component);
-            }
-
-            //the biggest reagent in the solution decides the appearance
-            var reagentId = solution.GetPrimaryReagentId();
-
-            //If biggest reagent didn't changed - don't change anything at all
-            if (component.CurrentReagent != null && component.CurrentReagent.ID == reagentId)
-            {
-                return;
-            }
-
-            //Only reagents with spritePath property can change appearance of transformable containers!
-            if (!string.IsNullOrWhiteSpace(reagentId)
-                && _prototypeManager.TryIndex(reagentId, out ReagentPrototype? proto)
-                && !string.IsNullOrWhiteSpace(proto.SpriteReplacementPath))
-            {
-                var spriteSpec =
-                    new SpriteSpecifier.Rsi(
-                        new ResourcePath("Objects/Consumable/Drinks/" + proto.SpriteReplacementPath), "icon");
-                if (EntityManager.TryGetComponent(owner, out SpriteComponent? sprite))
-                {
-                    sprite?.LayerSetSprite(0, spriteSpec);
-                }
-
-                string val = Loc.GetString("transformable-container-component-glass", ("name", proto.LocalizedName));
-                EntityManager.GetComponent<MetaDataComponent>(owner).EntityName = val;
-                EntityManager.GetComponent<MetaDataComponent>(owner).EntityDescription = proto.LocalizedDescription;
-                component.CurrentReagent = proto;
-                component.Transformed = true;
-            }
-        }
-
-        private void CancelTransformation(TransformableContainerComponent component)
-        {
-            component.CurrentReagent = null;
-            component.Transformed = false;
-
-            if (EntityManager.TryGetComponent(component.Owner, out SpriteComponent? sprite) &&
-                component.InitialSprite != null)
-            {
-                sprite.LayerSetSprite(0, component.InitialSprite);
-            }
-
-            EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityName = component.InitialName;
-            EntityManager.GetComponent<MetaDataComponent>(component.Owner).EntityDescription = component.InitialDescription;
-        }
-    }
-}
index 06aa788d9b0edab978c627b005cb706f23e6454e..829b9ba31006b00657beea0502622c3d3fee3260 100644 (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;
index 62a75a63cc73d3c35c62cbda86a973e5e664bec1..a0ac0ea4036a277db5e65478723ba40d086c5728 100644 (file)
@@ -7,11 +7,13 @@ namespace Content.Shared.Chemistry
     {
         Color,
         FillFraction,
+        BaseOverride,
     }
 
     public enum SolutionContainerLayers : byte
     {
         Fill,
-        Base
+        Base,
+        Overlay
     }
 }
index de0057d9bd255c7b376c30f932d1be6718ccdece..5fa2b6043b7021f3aeacc601e540e228c91f70f3 100644 (file)
@@ -12,7 +12,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockBoozeFilled
-  cost: 3200
+  cost: 3500
   category: Service
   group: market
 
index ca24ad8c9c22bfd07c8275c43ce0296f21dffcae..6f2e7db5b2fb2bc59c8b2a62d7429e9d5ac52622 100644 (file)
@@ -1,9 +1,11 @@
 - type: vendingMachineInventory
   id: BoozeOMatInventory
   startingInventory:
-
-    DrinkGlass: 30 #Kept glasses at top for ease to differentiate from booze.
+    DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze.
     DrinkShotGlass: 10
+    DrinkGlassCoupeShaped: 10
+    DrinkVacuumFlask: 5
+    DrinkFlaskBar: 5
     DrinkShaker: 5
     DrinkAbsintheBottleFull: 2
     DrinkAleBottleFull: 5
index d6fe7fe7fb0266169ed3071caa92bd9d2a3d7dd8..2cc7ceb86f8bfd8201a424ec103d28bec7b37552 100644 (file)
@@ -8,7 +8,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
   - type: SolutionTransfer
     canChangeTransferAmount: true
   - type: Drink
 
 # Transformable container - normal glass
 - type: entity
-  name: Drinking glass
-  description: A drinking glass.
+  name: metamorphic glass
+  description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom.
   parent: DrinkGlassBase
   id: DrinkGlass
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
+    layers:
+      - state: icon
+        map: [ "enum.SolutionContainerLayers.Base" ]
+      - state: fill1
+        map: [ "enum.SolutionContainerLayers.Fill" ]
+        visible: false
+      - state: icon-front
+        map: [ "enum.SolutionContainerLayers.Overlay" ]
+  - type: Appearance
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
-  - type: TransformableContainer
+        maxVol: 30
+  - type: SolutionContainerVisuals
+    maxFillLevels: 9
+    fillBaseName: fill
+    metamorphic: true
+    metamorphicDefaultSprite:
+      sprite: Objects/Consumable/Drinks/glass_clear.rsi
+      state: icon
+
+- type: entity
+  name: Coupe glass
+  description: A classic thin neck coupe glass, the icon of fragile labels on crates around the galaxy.
+  parent: DrinkGlassBase
+  id: DrinkGlassCoupeShaped
+  components:
+    - type: Sprite
+      sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi
+      layers:
+        - state: icon
+          map: [ "enum.SolutionContainerLayers.Base" ]
+        - state: fill1
+          map: [ "enum.SolutionContainerLayers.Fill" ]
+          visible: false
+        - state: icon-front
+          map: [ "enum.SolutionContainerLayers.Overlay" ]
+    - type: Appearance
+    - type: SolutionContainerManager
+      solutions:
+        drink:
+          maxVol: 30
+    - type: SolutionContainerVisuals
+      maxFillLevels: 5
+      fillBaseName: fill
 
 - type: entity
   parent: DrinkGlassBase
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Absinthe
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: AcidSpit
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/acidspitglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Ale
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/aleglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: AlliesCocktail
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alliescocktail.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Aloe
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/aloe.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Amasec
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/amasecglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Andalusia
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/andalusia.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Antifreeze
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/antifreeze.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: AtomicBomb
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: B52
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/b52glass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BahamaMama
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bahama_mama.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BananaHonk
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Barefoot
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/b&p.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BeepskySmash
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Beer
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beerglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceBerry
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/berryjuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Bilk
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_brown.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BlackRussian
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BlueCuracao
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/curacaoglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BloodyMary
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Booger
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/booger.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: BraveBull
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceCarrot
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/carrotjuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: CafeLatte
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Coffee
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffee.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Cognac
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Cream
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cream.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: CubaLibre
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DeadRum
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DemonsBlood
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DevilsKiss
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DoctorsDelight
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DriestMartini
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DrGibb
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ErikaSurprise
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/erikasurprise.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: FourteenLoko
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: GargleBlaster
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Gin
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: GinFizz
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: GinTonic
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Goldschlager
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceGrape
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grapejuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: GreenTea
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Grenadine
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grenadineglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Grog
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grogglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Hooch
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_brown2.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IcedCoffee
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IcedGreenTea
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IcedTea
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Ice
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/iceglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IceCream
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/icecreamglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IrishCarBomb
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IrishCoffee
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: IrishCream
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: CoffeeLiqueur
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: KiraSpecial
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/kiraspecial.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Lemonade
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceLemon
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: LemonLime
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonlime.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceLime
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/limejuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: LongIslandIcedTea
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Manhattan
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ManhattanProject
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ManlyDorf
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Margarita
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Martini
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Mead
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/meadglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Mojito
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/mojito.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Neurotoxin
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Nothing
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/nothing.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: NTCahors
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ntcahors.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: NuclearCola
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceOrange
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Patron
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/patronglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceBerryPoison
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: PoisonWine
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Posca
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: RedMead
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/red_meadglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Rewriter
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rewriter.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: RootBeer
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: RootBeerFloat
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Rum
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Sake
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Sbiten
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ScrewdriverCocktail
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SuiDream
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: MelonLiquor
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/emeraldglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Moonshine
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Milk
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_white.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Silencer
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/silencerglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Singulo
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/singulo.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SnowWhite
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SoyLatte
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soy_latte.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SpaceUp
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_glass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SpaceMountainWind
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: SyndicateBomb
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Tea
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teaglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Tequila
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: TequilaSunrise
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ThreeMileIsland
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceTomato
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: ToxinsSpecial
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Vermouth
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Vodka
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: VodkaMartini
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: VodkaTonic
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Water
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/water.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: JuiceWatermelon
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/watermelon.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: WhiskeyCola
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Whiskey
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: WhiskeySoda
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: WhiteRussian
-          Quantity: 50
+          Quantity: 30
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Wine
-          Quantity: 50
+          Quantity: 30
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wineglass.rsi
 
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DryRamen
           Quantity: 30
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: DryRamen
           Quantity: 30
     - type: SolutionContainerManager
       solutions:
         drink:
-          maxVol: 50
+          maxVol: 30
           reagents:
             - ReagentId: Kvass
-              Quantity: 50
+              Quantity: 30
     - type: Sprite
       sprite: Objects/Consumable/Drinks/kvass.rsi
index 11ece212d47ba8a8785796a4dfd5475ee41e4255..d2a5a52f3c4fcc3a2982eec3554377c27de6c7f5 100644 (file)
   - type: Sprite
     sprite: Objects/Consumable/Drinks/flask.rsi
 
+- type: entity
+  parent: DrinkBase
+  id: DrinkFlaskBar
+  name: bar flask
+  description: A metal flask often given out by the bartender on loan. Don't forget to return it!
+  components:
+    - type: Drink
+    - type: Sprite
+      sprite: Objects/Consumable/Drinks/barflask.rsi
+
 - type: entity
   parent: DrinkBase
   id: DrinkFlaskOld
index 4bb663668272974b53b549240eaeb0e9e1aa154e..2fbc947041739ef35642003889f9ae1022feefb7 100644 (file)
   parent: DrinkGlassBase
   id: DrinkShotGlass
   name: shot glass
-  description: Perfect for slamming down onto the table angrily. 
+  description: Perfect for slamming down onto the table angrily.
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 10
+        maxVol: 7
   - type: SolutionTransfer
     transferAmount: 10
     minTransferAmount: 10
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shotglass.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkCarafe
-  name: pitcher
-  description: A handled glass pitcher.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/carafe.rsi
-    state: icon-10
+    layers:
+      - state: icon
+        map: [ "enum.SolutionContainerLayers.Base" ]
+      - state: fill1
+        map: [ "enum.SolutionContainerLayers.Fill" ]
+        visible: false
+      - state: icon-front
+        map: [ "enum.SolutionContainerLayers.Overlay" ]
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: fill
 
 - type: entity
   parent: DrinkGlassBase
index 993b0a0d931fd014092e3f21dd04939af7f69dc1..ea1d8268b58daf98516091eeb3ea904c2f6589d0 100644 (file)
@@ -6,7 +6,7 @@
   components:
   - type: Rotatable
   - type: Sprite
-    sprite: Structures/dispensers.rsi
+    sprite: Structures/smalldispensers.rsi
     drawdepth: SmallObjects
     state: booze
     netsync: false
@@ -14,7 +14,7 @@
     pack: BoozeDispenserInventory
     emagPack: BoozeDispenserEmagInventory
   - type: Transform
-    noRot: false 
+    noRot: false
   - type: Machine
     board: BoozeDispenserMachineCircuitboard
   - type: Wires
index 79d65ccf1ff456de71528eb283a891e3c6d7916e..e4890256b97ebc1e2eede8a9588d96d61dc45ab9 100644 (file)
@@ -6,7 +6,7 @@
   components:
   - type: Rotatable
   - type: Sprite
-    sprite: Structures/dispensers.rsi
+    sprite: Structures/smalldispensers.rsi
     drawdepth: SmallObjects
     state: soda
     netsync: false
@@ -14,7 +14,7 @@
     pack: SodaDispenserInventory
     emagPack: SodaDispenserEmagInventory
   - type: Transform
-    noRot: false  
+    noRot: false
   - type: Machine
     board: SodaDispenserMachineCircuitboard
   - type: Wires
index 3dcb0748cebbfc7d807ad69442594fbb5aa034d8..1422af0a8a0bf97730027546a337e0a2e32f6d51 100644 (file)
@@ -9,7 +9,9 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#33EE00"
-  spritePath: absintheglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/absintheglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
@@ -27,7 +29,9 @@
   physicalDesc: reagent-physical-desc-bubbly
   flavor: ale
   color: "#663100"
-  spritePath: aleglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/aleglass.rsi
+    state: icon
 
 - type: reagent
   id: Beer
@@ -37,7 +41,9 @@
   physicalDesc: reagent-physical-desc-bubbly
   flavor: beer
   color: "#cfa85f"
-  spritePath: beerglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
 
 - type: reagent
   id: BlueCuracao
@@ -47,7 +53,9 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#0000CD"
-  spritePath: curacaoglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/curacaoglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
@@ -65,7 +73,9 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#AB3C05"
-  spritePath: cognacglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/cognacglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
@@ -83,7 +93,9 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: rum
   color: "#664300"
-  spritePath: rumglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: ginvodkaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-cloudy
   flavor: coffeeliquor
   color: "#664300"
-  spritePath: coffeeliqueurglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
+    state: icon
 
 - type: reagent
   id: MelonLiquor
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: watermelon
   color: "#138808"
-  spritePath: emeraldglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/emeraldglass.rsi
+    state: icon
 
 - type: reagent
   id: NTCahors
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bitter
   color: "#7E4043"
-  spritePath: wineglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 - type: reagent
   id: PoisonWine
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bitter
   color: "#000000"
-  spritePath: pwineglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/pwineglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: rum
   color: "#664300"
-  spritePath: rumglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#91FF91"
-  spritePath: vermouthglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/vermouthglass.rsi
+    state: icon
 
 - type: reagent
   id: Vodka
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: vodka
   color: "#d1d1d155"
-  spritePath: ginvodkaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: whiskey
   color: "#664300"
-  spritePath: whiskeyglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-translucent
   flavor: shittywine
   color: "#7E4043"
-  spritePath: wineglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 # Mixed Alcohol
 
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#365000"
-  spritePath: acidspitglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/acidspitglass.rsi
+    state: icon
 
 - type: reagent
-  id: AlliesCocktail #haha, cock. that's hot
-  name: reagent-name-allies-cocktail #haha, cock. that's hot
+  id: AlliesCocktail
+  name: reagent-name-allies-cocktail
   parent: BaseAlcohol
-  desc: reagent-desc-allies-cocktail #haha, cock. that's hot
+  desc: reagent-desc-allies-cocktail
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#00664d"
-  spritePath: alliescocktail.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/alliescocktail.rsi
+    state: icon
 
 - type: reagent
   id: Aloe
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#192c00"
-  spritePath: aloe.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/aloe.rsi
+    state: icon
 
 - type: reagent
   id: Amasec
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#124da7"
-  spritePath: amasecglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/amasecglass.rsi
+    state: icon
 
 - type: reagent
   id: Andalusia
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#665700"
-  spritePath: andalusia.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/andalusia.rsi
+    state: icon
 
 - type: reagent
   id: Antifreeze
   physicalDesc: reagent-physical-desc-translucent
   flavor: alcohol
   color: "#ff7d63"
-  spritePath: antifreeze.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/antifreeze.rsi
+    state: icon
+
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-cloudy
   flavor: atomicbomb
   color: "#666300"
-  spritePath: atomicbombglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-bubbly
   flavor: alcohol
   color: "#664300"
-  spritePath: b52glass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/b52glass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#FF7F3B"
-  spritePath: bahama_mama.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bahama_mama.rsi
+    state: icon
 
 - type: reagent
   id: BananaHonk
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bananahonk
   color: "#ffff91"
-  spritePath: bananahonkglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
+    state: icon
 
 - type: reagent
   id: Barefoot
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: b&p.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/b&p.rsi
+    state: icon
 
 - type: reagent
   id: BeepskySmash
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: beepsky
   color: "#664300"
-  spritePath: beepskysmashglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-bilky
   flavor: alcohol
   color: "#895C4C"
-  spritePath: glass_brown.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/glass_brown.rsi
+    state: icon
 
 - type: reagent
   id: BlackRussian
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#360000"
-  spritePath: blackrussianglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bloodymary
   color: "#660000"
-  spritePath: bloodymaryglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
+    state: icon
 
 - type: reagent
   id:  Booger
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#8CFF8C"
-  spritePath: booger.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/booger.rsi
+    state: icon
 
 - type: reagent
   id: BraveBull
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: bravebullglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bravebullglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-bubbly
   flavor: cubalibre
   color: "#3E1B00"
-  spritePath: cubalibreglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#a70000"
-  spritePath: demonsblood.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/demonsblood.rsi
+    state: icon
 
 - type: reagent
   id: DevilsKiss
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#A68310"
-  spritePath: devilskiss.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/devilskiss.rsi
+    state: icon
 
 - type: reagent
   id: DoctorsDelight
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: medicine
   color: "#FF8CFF"
-  spritePath: doctorsdelightglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#2E6671"
-  spritePath: driestmartiniglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#2E6671"
-  spritePath: erikasurprise.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/erikasurprise.rsi
+    state: icon
 
 - type: reagent
   id: GargleBlaster
   physicalDesc: reagent-physical-desc-volatile
   flavor: gargleblaster
   color: "#9cc8b4"
-  spritePath: gargleblasterglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: ginfizzglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: gintonic
   color: "#004166"
-  spritePath: gintonicglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/gintonicglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#FFFF91"
-  spritePath: goldschlagerglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/goldschlagerglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: grogglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/grogglass.rsi
+    state: icon
 
 - type: reagent
   id: HippiesDelight
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#6eaa0c"
-  spritePath: hippiesdelightglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
+    state: icon
 
 - type: reagent
   id: Hooch
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664e00"
-  spritePath: glass_brown2.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/glass_brown2.rsi
+    state: icon
 
 - type: reagent
   id: IcedBeer
   physicalDesc: reagent-physical-desc-bubbly
   flavor: icedbeer
   color: "#664300"
-  spritePath: iced_beerglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
+    state: icon
 
 - type: reagent
   id: IrishCarBomb
   physicalDesc: reagent-physical-desc-bubbly
   flavor: alcohol
   color: "#2E6671"
-  spritePath: irishcarbomb.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-creamy
   flavor: creamy
   color: "#664300"
-  spritePath: irishcreamglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-cloudy
   flavor: irishcoffee
   color: "#664300"
-  spritePath: irishcoffeeglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: longisland
   color: "#664300"
-  spritePath: longislandicedteaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: manhattanglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/manhattanglass.rsi
+    state: icon
 
 - type: reagent
   id: ManhattanProject
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: proj_manhattanglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
+    state: icon
 
 - type: reagent
   id: ManlyDorf
   physicalDesc: reagent-physical-desc-bubbly
   flavor: alcohol
   color: "#664300"
-  spritePath: manlydorfglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
+    state: icon
 
 - type: reagent
   id: Margarita
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#8CFF8C"
-  spritePath: margaritaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/margaritaglass.rsi
+    state: icon
 
 - type: reagent
   id: Martini
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: martiniglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: meadglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/meadglass.rsi
+    state: icon
 
 - type: reagent
   id: Mojito
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664300"
-  spritePath: mojito.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mojito.rsi
+    state: icon
 
 - type: reagent
   id: Moonshine
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#2E2E61"
-  spritePath: neurotoxinglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-metallic
   flavor: alcohol
   color: "#585840"
-  spritePath: patronglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/patronglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#C73C00"
-  spritePath: red_meadglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/red_meadglass.rsi
+    state: icon
 
 - type: reagent
   id: Sbiten
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#004166"
-  spritePath: sbitenglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sbitenglass.rsi
+    state: icon
 
 - type: reagent
   id: ScrewdriverCocktail
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: screwdriver
   color: "#A68310"
-  spritePath: screwdriverglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: nothing
   color: "#004666"
-  spritePath: silencerglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/silencerglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: singulo
   color: "#3b0c0c"
-  spritePath: singulo.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/singulo.rsi
+    state: icon
 
 - type: reagent
   id: SnowWhite
   physicalDesc: reagent-physical-desc-bubbly
   flavor: alcohol
   color: "#FFFFFF"
-  spritePath: snowwhite.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/snowwhite.rsi
+    state: icon
 
 - type: reagent
   id: SuiDream
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#00A86B"
-  spritePath: sdreamglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sdreamglass.rsi
+    state: icon
 
 - type: reagent
   id: SyndicateBomb
   physicalDesc: reagent-physical-desc-opaque
   flavor: syndiebomb
   color: "#2E6660"
-  spritePath: syndicatebomb.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
+    state: icon
 
 - type: reagent
   id: TequilaSunrise
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: tequilasunrise
   color: "#FFE48C"
-  spritePath: tequillasunriseglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: threemileisland
   color: "#666340"
-  spritePath: threemileislandglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#665c00"
-  spritePath: toxinsspecialglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
+    state: icon
 
 - type: reagent
   id: VodkaMartini
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#004666"
-  spritePath: martiniglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#0064C8"
-  spritePath: vodkatonicglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-bubbly
   flavor: whiskeycola
   color: "#3E1B00"
-  spritePath: whiskeycolaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: whiskeycola
   color: "#533600"
-  spritePath: whiskeysodaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#A68340"
-  spritePath: whiterussianglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
index b7ae8a59fddae04d76a5542018fbc9e58bd80fac..435759909481f425e4a1204a9f5767286938f61e 100644 (file)
@@ -37,7 +37,9 @@
   physicalDesc: reagent-physical-desc-creamy
   flavor: creamy
   color: "#664300"
-  spritePath: cafe_latte.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+    state: icon
 
 - type: reagent
   id: GreenTea
@@ -47,7 +49,9 @@
   physicalDesc: reagent-physical-desc-aromatic
   flavor: tea
   color: "#C33F00"
-  spritePath: glass_green.rsi #Placeholder
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/glass_green.rsi
+    state: icon
 
 - type: reagent
   id: Grenadine
@@ -57,7 +61,9 @@
   physicalDesc: reagent-physical-desc-dark-red
   flavor: bitter
   color: "#EA1D26"
-  spritePath: grenadineglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/grenadineglass.rsi
+    state: icon
 
 - type: reagent
   id: IcedCoffee
@@ -67,7 +73,9 @@
   physicalDesc: reagent-physical-desc-aromatic
   flavor: coffee
   color: "#102838"
-  spritePath: icedcoffeeglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
+    state: icon
 
 - type: reagent
   id: IcedGreenTea
@@ -77,7 +85,9 @@
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
   color: "#CE4200"
-  spritePath: glass_green.rsi #Placeholder
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/glass_green.rsi
+    state: icon
 
 - type: reagent
   id: IcedTea
@@ -87,7 +97,9 @@
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
   color: "#104038"
-  spritePath: icedteaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/icedteaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-tart
   flavor: sweet
   color: "#FFFF00"
-  spritePath: lemonadeglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   desc: reagent-desc-nothing
   group: Drinks
   physicalDesc: reagent-physical-desc-nothing
-  spritePath: nothing.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/nothing.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-fizzy
   flavor: atomiccola
   color: "#100800"
-  spritePath: nuclear_colaglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
+    state: icon
   metabolisms:
     Drink:
       effects:
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: soy
   color: "#664300"
-  spritePath: soy_latte.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/soy_latte.rsi
+    state: icon
 
 - type: reagent
   id: Tea
   physicalDesc: reagent-physical-desc-sour
   flavor: bitter
   color: "#B3B599"
-  spritePath: glass_light_yellow.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
+    state: icon
 
 - type: reagent
   id: KiraSpecial
   physicalDesc: strong-smelling
   flavor: sweet
   color: "#CCCC99"
-  spritePath: kiraspecial.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/kiraspecial.rsi
+    state: icon
 
 - type: reagent
   id: Rewriter
   physicalDesc: strong-smelling
   flavor: sweet
   color: "#485000"
-  spritePath: rewriter.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rewriter.rsi
+    state: icon
 
 - type: reagent
   id: Kvass
   physicalDesc: reagent-physical-desc-bubbly
   flavor: bread
   color: "#381600"
-  spritePath: kvass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/kvass.rsi
+    state: icon
index ef4369eba7089e60ebac0986d3f78268d727be97..87c872de0e46f97c4044484c24da7780b2c6b40b 100644 (file)
@@ -59,7 +59,9 @@
   physicalDesc: reagent-physical-desc-creamy
   flavor: soda
   color: "#fffbd6"
-  spritePath: icecreamglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/icecreamglass.rsi
+    state: icon
 
 - type: reagent
   id: LemonLime
@@ -69,7 +71,9 @@
   physicalDesc: reagent-physical-desc-fizzy
   flavor: soda
   color: "#878F00"
-  spritePath: lemonlime.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/lemonlime.rsi
+    state: icon
 
 - type: reagent
   id: PwrGame
@@ -88,7 +92,9 @@
   physicalDesc: reagent-physical-desc-fizzy
   flavor: soda
   color: "#381c07"
-  spritePath: rootbeerglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
+    state: icon
 
 - type: reagent
   id: RootBeerFloat
   physicalDesc: reagent-physical-desc-fizzy and creamy
   flavor: soda
   color: "#4f361f"
-  spritePath: rootbeerfloatglass.rsi
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
+    state: icon
 
 - type: reagent
   id: SpaceMountainWind
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png
deleted file mode 100644 (file)
index 4231eca..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png
deleted file mode 100644 (file)
index 5a5efd5..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png
deleted file mode 100644 (file)
index 7b9d66f..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png
deleted file mode 100644 (file)
index 31ce9df..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png
deleted file mode 100644 (file)
index 3a46851..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png
deleted file mode 100644 (file)
index 9ab44b2..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png
deleted file mode 100644 (file)
index a307e2f..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png
deleted file mode 100644 (file)
index db37112..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png
deleted file mode 100644 (file)
index b4719e1..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png
deleted file mode 100644 (file)
index e37b1ba..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png
deleted file mode 100644 (file)
index 44fd1c7..0000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json
deleted file mode 100644 (file)
index a1f2ae6..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
-    "states": [
-        {
-            "name": "icon-0"
-        },
-        {
-            "name": "icon-1"
-        },
-        {
-            "name": "icon-2"
-        },
-        {
-            "name": "icon-3"
-        },
-        {
-            "name": "icon-4"
-        },
-        {
-            "name": "icon-5"
-        },
-        {
-            "name": "icon-6"
-        },
-        {
-            "name": "icon-7"
-        },
-        {
-            "name": "icon-8"
-        },
-        {
-            "name": "icon-9"
-        },
-        {
-            "name": "icon-10"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png
new file mode 100644 (file)
index 0000000..704980e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png
new file mode 100644 (file)
index 0000000..b22cec9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png
new file mode 100644 (file)
index 0000000..921cb19
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png
new file mode 100644 (file)
index 0000000..dde5737
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png
new file mode 100644 (file)
index 0000000..388c5e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png
new file mode 100644 (file)
index 0000000..4fb40ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png
new file mode 100644 (file)
index 0000000..8587c5e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png
new file mode 100644 (file)
index 0000000..573d2fa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png
new file mode 100644 (file)
index 0000000..b809e6e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png
new file mode 100644 (file)
index 0000000..676ed62
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png differ
index 7eaeb2668c7d3edf3f42c69d501bd62ba2a5f8dc..d7d7e3075e57ae67f2da17d97edf96d0c538e28e 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..1573c7154ea20cfaa99dfec06618cf760a84811d 100644 (file)
@@ -1 +1,44 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by github user moonheart08.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-front"
+        },
+        {
+            "name": "fill1"
+        },
+        {
+            "name": "fill2"
+        },
+        {
+            "name": "fill3"
+        },
+        {
+            "name": "fill4"
+        },
+        {
+            "name": "fill5"
+        },
+        {
+            "name": "fill6"
+        },
+        {
+            "name": "fill7"
+        },
+        {
+            "name": "fill8"
+        },
+        {
+            "name": "fill9"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png
new file mode 100644 (file)
index 0000000..42d5f9c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png
new file mode 100644 (file)
index 0000000..2ea1923
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png
new file mode 100644 (file)
index 0000000..4c7df65
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png
new file mode 100644 (file)
index 0000000..a59fe9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png
new file mode 100644 (file)
index 0000000..00c6f0e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png
new file mode 100644 (file)
index 0000000..cbfeac6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png
new file mode 100644 (file)
index 0000000..5684656
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json
new file mode 100644 (file)
index 0000000..b42841a
--- /dev/null
@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by github user moonheart08.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-front"
+        },
+        {
+            "name": "fill1"
+        },
+        {
+            "name": "fill2"
+        },
+        {
+            "name": "fill3"
+        },
+        {
+            "name": "fill4"
+        },
+        {
+            "name": "fill5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png
new file mode 100644 (file)
index 0000000..7ac7873
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png
new file mode 100644 (file)
index 0000000..81449ee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png
new file mode 100644 (file)
index 0000000..3a1f171
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png differ
index 559c48f1dd75555a273915085810056a433b436d..b606fc214107537b645325b95d5bc91d169d3e66 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..389f1b8b96eae27c44ba706df82fe121c0cbc255 100644 (file)
@@ -1 +1,23 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, modified heavily by github user moonheart08.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-front"
+        },
+        {
+            "name": "fill1"
+        },
+        {
+            "name": "fill2"
+        }
+    ]
+}
index e97ccde11471ef4ed432b23eb83f54a04dfed1a4..51fa19386ef0383e444976e7ce18c8a396475ef0 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/dispensers.rsi/booze.png b/Resources/Textures/Structures/dispensers.rsi/booze.png
deleted file mode 100644 (file)
index b33527e..0000000
Binary files a/Resources/Textures/Structures/dispensers.rsi/booze.png and /dev/null differ
index 7a1f9fbc6d8860eaf66bdcff920e943881ae1acc..55b0da939f94ebc8fe1621457b4517c4ca7b876c 100644 (file)
@@ -7,14 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "booze",
-      "directions": 4
-    },
-    {
-      "name": "soda",
-      "directions": 4
-    },
     {
       "name": "industrial"
     },
diff --git a/Resources/Textures/Structures/dispensers.rsi/soda.png b/Resources/Textures/Structures/dispensers.rsi/soda.png
deleted file mode 100644 (file)
index 16b3ebc..0000000
Binary files a/Resources/Textures/Structures/dispensers.rsi/soda.png and /dev/null differ
diff --git a/Resources/Textures/Structures/smalldispensers.rsi/booze.png b/Resources/Textures/Structures/smalldispensers.rsi/booze.png
new file mode 100644 (file)
index 0000000..f846533
Binary files /dev/null and b/Resources/Textures/Structures/smalldispensers.rsi/booze.png differ
diff --git a/Resources/Textures/Structures/smalldispensers.rsi/meta.json b/Resources/Textures/Structures/smalldispensers.rsi/meta.json
new file mode 100644 (file)
index 0000000..479de5b
--- /dev/null
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278 and visually offset.",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "booze",
+      "directions": 4
+    },
+    {
+      "name": "soda",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/smalldispensers.rsi/soda.png b/Resources/Textures/Structures/smalldispensers.rsi/soda.png
new file mode 100644 (file)
index 0000000..6ad3551
Binary files /dev/null and b/Resources/Textures/Structures/smalldispensers.rsi/soda.png differ