From cc0c516e02ea6a0958a9c51b28f04bc159142c5b Mon Sep 17 00:00:00 2001 From: Moony Date: Sat, 18 Feb 2023 19:00:31 -0600 Subject: [PATCH] Improves bartending with some tweaks. (#14169) * Improves bartending with some tweaks. - Glasses got resprited and now support fill levels. - * New glass type and improve shotglass visuals. * oobsy * fixes * get flasked * flask * flask --------- Co-authored-by: moonheart08 --- .../SolutionContainerVisualsComponent.cs | 16 +- .../SolutionContainerVisualsSystem.cs | 58 +- .../TransformableContainerComponent.cs | 43 -- .../EntitySystems/SolutionContainerSystem.cs | 9 + .../TransformableContainerSystem.cs | 79 --- .../Chemistry/Reagent/ReagentPrototype.cs | 5 +- Content.Shared/Chemistry/SolutionVisuals.cs | 4 +- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../VendingMachines/Inventories/boozeomat.yml | 6 +- .../Objects/Consumable/Drinks/drinks.yml | 510 ++++++++++-------- .../Consumable/Drinks/drinks_flasks.yml | 10 + .../Consumable/Drinks/drinks_special.yml | 27 +- .../Entities/Structures/Dispensers/booze.yml | 4 +- .../Entities/Structures/Dispensers/soda.yml | 4 +- .../Reagents/Consumable/Drink/alcohol.yml | 311 ++++++++--- .../Reagents/Consumable/Drink/drinks.yml | 56 +- .../Reagents/Consumable/Drink/soda.yml | 16 +- .../Consumable/Drinks/carafe.rsi/icon-0.png | Bin 2535 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-1.png | Bin 2591 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-10.png | Bin 2412 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-2.png | Bin 2554 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-3.png | Bin 2590 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-4.png | Bin 2553 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-5.png | Bin 2580 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-6.png | Bin 2503 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-7.png | Bin 2493 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-8.png | Bin 2451 -> 0 bytes .../Consumable/Drinks/carafe.rsi/icon-9.png | Bin 2402 -> 0 bytes .../Consumable/Drinks/carafe.rsi/meta.json | 44 -- .../Drinks/glass_clear.rsi/fill1.png | Bin 0 -> 125 bytes .../Drinks/glass_clear.rsi/fill2.png | Bin 0 -> 147 bytes .../Drinks/glass_clear.rsi/fill3.png | Bin 0 -> 155 bytes .../Drinks/glass_clear.rsi/fill4.png | Bin 0 -> 158 bytes .../Drinks/glass_clear.rsi/fill5.png | Bin 0 -> 162 bytes .../Drinks/glass_clear.rsi/fill6.png | Bin 0 -> 159 bytes .../Drinks/glass_clear.rsi/fill7.png | Bin 0 -> 163 bytes .../Drinks/glass_clear.rsi/fill8.png | Bin 0 -> 160 bytes .../Drinks/glass_clear.rsi/fill9.png | Bin 0 -> 164 bytes .../Drinks/glass_clear.rsi/icon-front.png | Bin 0 -> 178 bytes .../Drinks/glass_clear.rsi/icon.png | Bin 240 -> 271 bytes .../Drinks/glass_clear.rsi/meta.json | 45 +- .../Drinks/glass_coupe_shape.rsi/fill1.png | Bin 0 -> 123 bytes .../Drinks/glass_coupe_shape.rsi/fill2.png | Bin 0 -> 127 bytes .../Drinks/glass_coupe_shape.rsi/fill3.png | Bin 0 -> 145 bytes .../Drinks/glass_coupe_shape.rsi/fill4.png | Bin 0 -> 156 bytes .../Drinks/glass_coupe_shape.rsi/fill5.png | Bin 0 -> 179 bytes .../glass_coupe_shape.rsi/icon-front.png | Bin 0 -> 196 bytes .../Drinks/glass_coupe_shape.rsi/icon.png | Bin 0 -> 281 bytes .../Drinks/glass_coupe_shape.rsi/meta.json | 32 ++ .../Consumable/Drinks/shotglass.rsi/fill1.png | Bin 0 -> 143 bytes .../Consumable/Drinks/shotglass.rsi/fill2.png | Bin 0 -> 151 bytes .../Drinks/shotglass.rsi/icon-front.png | Bin 0 -> 183 bytes .../Consumable/Drinks/shotglass.rsi/icon.png | Bin 291 -> 208 bytes .../Consumable/Drinks/shotglass.rsi/meta.json | 24 +- .../Drinks/vacuumflask.rsi/icon.png | Bin 307 -> 378 bytes .../Structures/dispensers.rsi/booze.png | Bin 1398 -> 0 bytes .../Structures/dispensers.rsi/meta.json | 8 - .../Structures/dispensers.rsi/soda.png | Bin 960 -> 0 bytes .../Structures/smalldispensers.rsi/booze.png | Bin 0 -> 2589 bytes .../Structures/smalldispensers.rsi/meta.json | 19 + .../Structures/smalldispensers.rsi/soda.png | Bin 0 -> 1899 bytes 61 files changed, 799 insertions(+), 533 deletions(-) delete mode 100644 Content.Server/Chemistry/Components/TransformableContainerComponent.cs delete mode 100644 Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png delete mode 100644 Resources/Textures/Structures/dispensers.rsi/booze.png delete mode 100644 Resources/Textures/Structures/dispensers.rsi/soda.png create mode 100644 Resources/Textures/Structures/smalldispensers.rsi/booze.png create mode 100644 Resources/Textures/Structures/smalldispensers.rsi/meta.json create mode 100644 Resources/Textures/Structures/smalldispensers.rsi/soda.png diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs index d0301e3dea..da21106476 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsComponent.cs @@ -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; } } diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs index bf8d4a5cc2..5686c9c363 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -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 { + [Dependency] private readonly IPrototypeManager _prototype = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(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(uid, SolutionContainerVisuals.FillFraction, out var fraction, args.Component)) @@ -13,7 +30,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem(uid, SolutionContainerVisuals.BaseOverride, + out var baseOverride, + args.Component)) + { + _prototype.TryIndex(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(Owner).EntityName; - InitialDescription = _entMan.GetComponent(Owner).EntityDescription; - } - - protected override void Startup() - { - base.Startup(); - - Owner.EnsureComponentWarn(); - Owner.EnsureComponentWarn(); - } - } -} diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs index 5846783e8d..13ee95be14 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerSystem.cs @@ -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); + } } /// diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs deleted file mode 100644 index 7a1792b598..0000000000 --- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs +++ /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(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(owner).EntityName = val; - EntityManager.GetComponent(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(component.Owner).EntityName = component.InitialName; - EntityManager.GetComponent(component.Owner).EntityDescription = component.InitialDescription; - } - } -} diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index 06aa788d9b..829b9ba310 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -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))] public Dictionary? Metabolisms = null; diff --git a/Content.Shared/Chemistry/SolutionVisuals.cs b/Content.Shared/Chemistry/SolutionVisuals.cs index 62a75a63cc..a0ac0ea403 100644 --- a/Content.Shared/Chemistry/SolutionVisuals.cs +++ b/Content.Shared/Chemistry/SolutionVisuals.cs @@ -7,11 +7,13 @@ namespace Content.Shared.Chemistry { Color, FillFraction, + BaseOverride, } public enum SolutionContainerLayers : byte { Fill, - Base + Base, + Overlay } } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index de0057d9bd..5fa2b6043b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -12,7 +12,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockBoozeFilled - cost: 3200 + cost: 3500 category: Service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index ca24ad8c9c..6f2e7db5b2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index d6fe7fe7fb..2cc7ceb86f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -8,7 +8,7 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 - type: SolutionTransfer canChangeTransferAmount: true - type: Drink @@ -68,18 +68,58 @@ # 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 @@ -90,10 +130,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Absinthe - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/absintheglass.rsi @@ -106,10 +146,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: AcidSpit - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/acidspitglass.rsi @@ -122,10 +162,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Ale - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/aleglass.rsi @@ -138,10 +178,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: AlliesCocktail - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/alliescocktail.rsi @@ -154,10 +194,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Aloe - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/aloe.rsi @@ -170,10 +210,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Amasec - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/amasecglass.rsi @@ -186,10 +226,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Andalusia - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/andalusia.rsi @@ -202,10 +242,10 @@ - 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 @@ -219,10 +259,10 @@ - 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 @@ -236,10 +276,10 @@ - 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 @@ -253,10 +293,10 @@ - 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 @@ -270,10 +310,10 @@ - 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 @@ -287,10 +327,10 @@ - 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 @@ -304,10 +344,10 @@ - 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 @@ -321,10 +361,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Beer - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/beerglass.rsi @@ -338,10 +378,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceBerry - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/berryjuice.rsi @@ -354,10 +394,10 @@ - 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 @@ -371,10 +411,10 @@ - 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 @@ -389,10 +429,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: BlueCuracao - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/curacaoglass.rsi @@ -405,10 +445,10 @@ - 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 @@ -422,10 +462,10 @@ - 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 @@ -439,10 +479,10 @@ - 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 @@ -457,10 +497,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceCarrot - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/carrotjuice.rsi @@ -483,10 +523,10 @@ - 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 @@ -500,10 +540,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Coffee - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/coffee.rsi @@ -516,10 +556,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Cognac - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/cognacglass.rsi @@ -532,10 +572,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Cream - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/cream.rsi @@ -548,10 +588,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: CubaLibre - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/cubalibreglass.rsi @@ -564,10 +604,10 @@ - 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 @@ -581,10 +621,10 @@ - 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 @@ -598,10 +638,10 @@ - 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 @@ -615,10 +655,10 @@ - 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 @@ -632,10 +672,10 @@ - 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 @@ -649,10 +689,10 @@ - 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 @@ -666,10 +706,10 @@ - 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 @@ -683,10 +723,10 @@ - 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 @@ -700,10 +740,10 @@ - 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 @@ -717,10 +757,10 @@ - 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 @@ -734,10 +774,10 @@ - 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 @@ -751,10 +791,10 @@ - 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 @@ -768,10 +808,10 @@ - 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 @@ -786,10 +826,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceGrape - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/grapejuice.rsi @@ -812,10 +852,10 @@ - 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 @@ -829,10 +869,10 @@ - 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 @@ -846,10 +886,10 @@ - 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 @@ -873,10 +913,10 @@ - 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 @@ -890,10 +930,10 @@ - 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 @@ -907,10 +947,10 @@ - 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 @@ -924,10 +964,10 @@ - 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 @@ -951,10 +991,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Ice - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/iceglass.rsi @@ -967,10 +1007,10 @@ - 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 @@ -985,10 +1025,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: IrishCarBomb - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/irishcarbomb.rsi @@ -1001,10 +1041,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: IrishCoffee - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi @@ -1017,10 +1057,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: IrishCream - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/irishcreamglass.rsi @@ -1033,10 +1073,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: CoffeeLiqueur - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi @@ -1049,10 +1089,10 @@ - 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 @@ -1066,10 +1106,10 @@ - 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 @@ -1084,10 +1124,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceLemon - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/lemonjuice.rsi @@ -1101,10 +1141,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: LemonLime - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/lemonlime.rsi @@ -1118,10 +1158,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceLime - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/limejuice.rsi @@ -1134,10 +1174,10 @@ - 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 @@ -1151,10 +1191,10 @@ - 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 @@ -1168,10 +1208,10 @@ - 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 @@ -1185,10 +1225,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: ManlyDorf - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/manlydorfglass.rsi @@ -1201,10 +1241,10 @@ - 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 @@ -1218,10 +1258,10 @@ - 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 @@ -1235,10 +1275,10 @@ - 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 @@ -1262,10 +1302,10 @@ - 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 @@ -1279,10 +1319,10 @@ - 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 @@ -1296,10 +1336,10 @@ - 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 @@ -1313,10 +1353,10 @@ - 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 @@ -1330,10 +1370,10 @@ - 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 @@ -1348,10 +1388,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceOrange - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/orangejuice.rsi @@ -1364,10 +1404,10 @@ - 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 @@ -1382,10 +1422,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceBerryPoison - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi @@ -1398,10 +1438,10 @@ - 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 @@ -1415,10 +1455,10 @@ - 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 @@ -1432,10 +1472,10 @@ - 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 @@ -1449,10 +1489,10 @@ - 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 @@ -1466,10 +1506,10 @@ - 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 @@ -1484,10 +1524,10 @@ - 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 @@ -1502,10 +1542,10 @@ - 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 @@ -1519,10 +1559,10 @@ - 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 @@ -1536,10 +1576,10 @@ - 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 @@ -1553,10 +1593,10 @@ - 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 @@ -1570,10 +1610,10 @@ - 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 @@ -1587,10 +1627,10 @@ - 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 @@ -1604,10 +1644,10 @@ - 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 @@ -1621,10 +1661,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Milk - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/glass_white.rsi @@ -1637,10 +1677,10 @@ - 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 @@ -1654,10 +1694,10 @@ - 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 @@ -1671,10 +1711,10 @@ - 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 @@ -1688,10 +1728,10 @@ - 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 @@ -1705,10 +1745,10 @@ - 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 @@ -1722,10 +1762,10 @@ - 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 @@ -1739,10 +1779,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: SyndicateBomb - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/syndicatebomb.rsi @@ -1755,10 +1795,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Tea - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/teaglass.rsi @@ -1787,10 +1827,10 @@ - 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 @@ -1804,10 +1844,10 @@ - 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 @@ -1821,10 +1861,10 @@ - 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 @@ -1839,10 +1879,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceTomato - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/tomatojuice.rsi @@ -1855,10 +1895,10 @@ - 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 @@ -1872,10 +1912,10 @@ - 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 @@ -1889,10 +1929,10 @@ - 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 @@ -1906,10 +1946,10 @@ - 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 @@ -1923,10 +1963,10 @@ - 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 @@ -1940,10 +1980,10 @@ - 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 @@ -1958,10 +1998,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: JuiceWatermelon - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/watermelon.rsi @@ -1974,10 +2014,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: WhiskeyCola - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi @@ -1990,10 +2030,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Whiskey - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/whiskeyglass.rsi @@ -2006,10 +2046,10 @@ - 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 @@ -2023,10 +2063,10 @@ - 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 @@ -2040,10 +2080,10 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Wine - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/wineglass.rsi @@ -2108,7 +2148,7 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: DryRamen Quantity: 30 @@ -2129,7 +2169,7 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: DryRamen Quantity: 30 @@ -2145,9 +2185,9 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 30 reagents: - ReagentId: Kvass - Quantity: 50 + Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/kvass.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 11ece212d4..d2a5a52f3c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -46,6 +46,16 @@ - 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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 4bb6636682..2fbc947041 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -34,29 +34,30 @@ 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 diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml index 993b0a0d93..ea1d8268b5 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml index 79d65ccf1f..e4890256b9 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 3dcb0748ce..1422af0a8a 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -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: @@ -132,7 +144,9 @@ 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: @@ -150,7 +164,9 @@ 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 @@ -160,7 +176,9 @@ 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 @@ -170,7 +188,9 @@ 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 @@ -180,7 +200,9 @@ 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: @@ -204,7 +226,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: @@ -248,7 +272,9 @@ 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 @@ -258,7 +284,9 @@ 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: @@ -276,7 +304,9 @@ 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: @@ -294,7 +324,9 @@ physicalDesc: reagent-physical-desc-translucent flavor: shittywine color: "#7E4043" - spritePath: wineglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/wineglass.rsi + state: icon # Mixed Alcohol @@ -306,17 +338,21 @@ 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 @@ -326,7 +362,9 @@ 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 @@ -336,7 +374,9 @@ 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 @@ -346,7 +386,9 @@ 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 @@ -356,7 +398,10 @@ physicalDesc: reagent-physical-desc-translucent flavor: alcohol color: "#ff7d63" - spritePath: antifreeze.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/antifreeze.rsi + state: icon + metabolisms: Drink: effects: @@ -374,7 +419,9 @@ physicalDesc: reagent-physical-desc-cloudy flavor: atomicbomb color: "#666300" - spritePath: atomicbombglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/atomicbombglass.rsi + state: icon metabolisms: Drink: effects: @@ -395,7 +442,9 @@ physicalDesc: reagent-physical-desc-bubbly flavor: alcohol color: "#664300" - spritePath: b52glass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/b52glass.rsi + state: icon metabolisms: Drink: effects: @@ -413,7 +462,9 @@ 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 @@ -423,7 +474,9 @@ 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 @@ -433,7 +486,9 @@ 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 @@ -443,7 +498,9 @@ 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: @@ -461,7 +518,9 @@ 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 @@ -471,7 +530,9 @@ 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: @@ -489,7 +550,9 @@ 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 @@ -499,7 +562,9 @@ 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 @@ -509,7 +574,9 @@ 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: @@ -527,7 +594,9 @@ physicalDesc: reagent-physical-desc-bubbly flavor: cubalibre color: "#3E1B00" - spritePath: cubalibreglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/cubalibreglass.rsi + state: icon metabolisms: Drink: effects: @@ -545,7 +614,9 @@ 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 @@ -555,7 +626,9 @@ 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 @@ -565,7 +638,9 @@ 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: @@ -594,7 +669,9 @@ 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: @@ -612,7 +689,9 @@ 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 @@ -622,7 +701,9 @@ physicalDesc: reagent-physical-desc-volatile flavor: gargleblaster color: "#9cc8b4" - spritePath: gargleblasterglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + state: icon metabolisms: Drink: effects: @@ -640,7 +721,9 @@ 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: @@ -658,7 +741,9 @@ 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: @@ -676,7 +761,9 @@ 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: @@ -694,7 +781,9 @@ 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 @@ -704,7 +793,9 @@ 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 @@ -714,7 +805,9 @@ 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 @@ -724,7 +817,9 @@ 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 @@ -734,7 +829,9 @@ physicalDesc: reagent-physical-desc-bubbly flavor: alcohol color: "#2E6671" - spritePath: irishcarbomb.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/irishcarbomb.rsi + state: icon metabolisms: Drink: effects: @@ -752,7 +849,9 @@ physicalDesc: reagent-physical-desc-creamy flavor: creamy color: "#664300" - spritePath: irishcreamglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/irishcreamglass.rsi + state: icon metabolisms: Drink: effects: @@ -770,7 +869,9 @@ physicalDesc: reagent-physical-desc-cloudy flavor: irishcoffee color: "#664300" - spritePath: irishcoffeeglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi + state: icon metabolisms: Drink: effects: @@ -788,7 +889,9 @@ 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: @@ -806,7 +909,9 @@ 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 @@ -816,7 +921,9 @@ 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 @@ -826,7 +933,9 @@ 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 @@ -836,7 +945,9 @@ 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 @@ -846,7 +957,9 @@ 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: @@ -864,7 +977,9 @@ 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 @@ -874,7 +989,9 @@ 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 @@ -901,7 +1018,9 @@ 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: @@ -925,7 +1044,9 @@ physicalDesc: reagent-physical-desc-metallic flavor: alcohol color: "#585840" - spritePath: patronglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/patronglass.rsi + state: icon metabolisms: Drink: effects: @@ -943,7 +1064,9 @@ 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 @@ -953,7 +1076,9 @@ 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 @@ -963,7 +1088,9 @@ 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: @@ -981,7 +1108,9 @@ 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: @@ -999,7 +1128,9 @@ 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 @@ -1009,7 +1140,9 @@ 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 @@ -1019,7 +1152,9 @@ 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 @@ -1029,7 +1164,9 @@ 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 @@ -1039,7 +1176,9 @@ 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: @@ -1057,7 +1196,9 @@ 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: @@ -1078,7 +1219,9 @@ 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 @@ -1088,7 +1231,9 @@ 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: @@ -1106,7 +1251,9 @@ 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: @@ -1124,7 +1271,9 @@ physicalDesc: reagent-physical-desc-bubbly flavor: whiskeycola color: "#3E1B00" - spritePath: whiskeycolaglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi + state: icon metabolisms: Drink: effects: @@ -1142,7 +1291,9 @@ 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: @@ -1160,7 +1311,9 @@ 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: diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index b7ae8a59fd..4357599094 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -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: @@ -105,7 +117,9 @@ physicalDesc: reagent-physical-desc-tart flavor: sweet color: "#FFFF00" - spritePath: lemonadeglass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/lemonadeglass.rsi + state: icon metabolisms: Drink: effects: @@ -177,7 +191,9 @@ 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: @@ -193,7 +209,9 @@ 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: @@ -223,7 +241,9 @@ 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 @@ -330,7 +350,9 @@ 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 @@ -340,7 +362,9 @@ physicalDesc: strong-smelling flavor: sweet color: "#CCCC99" - spritePath: kiraspecial.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/kiraspecial.rsi + state: icon - type: reagent id: Rewriter @@ -350,7 +374,9 @@ physicalDesc: strong-smelling flavor: sweet color: "#485000" - spritePath: rewriter.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/rewriter.rsi + state: icon - type: reagent id: Kvass @@ -360,4 +386,6 @@ physicalDesc: reagent-physical-desc-bubbly flavor: bread color: "#381600" - spritePath: kvass.rsi + metamorphicSprite: + sprite: Objects/Consumable/Drinks/kvass.rsi + state: icon diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index ef4369eba7..87c872de0e 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -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 @@ -98,7 +104,9 @@ 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 index 4231eca703ca69dc70af6b0edc550cf6e124ed5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2535 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 B#MuA< 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 index 7b9d66fe5bce6b71b2fd693166d28595c44a8d09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2412 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 A6#xJL 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 index 9ab44b2132d299f4197b4c1b3bbfbbbd48fc7ab4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2553 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 P00000NkvXXu0mjf66UI4 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 index a307e2fd031f6ef9ffa6405de75f241a72b584bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2580 zcmV+v3hVWWP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOi8{AU%j1SAkb%RxNOnH|jXCuBQsJ}RrH ztET&}uQQE}F%pVU2&es@f1mU({J2(5RkSy2E#p_M8V_9beE;s2a=p&ikDo`l|J0ve z4;WnqZMkpTe#Q^<%livjpML+`pL9O+^k*W}%(DZPmBL;TKJ{hWQTZq$|#uJ$bIZ7J6k z20Fr7uGbn4#lPTMufuTkJn{r;3rqEs9XCddh##u7Xwad3wUZ`Xth`y#GEXj7UoXnW z^8%&DL5DQ~nN>Q_m_V)sE-zo`vTI=v#yTu7!bm1eMi-7Bj`X$TcaKjKof9;t2=QC2 z;1>tK;6@-9XN&?Mbe@>X6<{uXYwz9q zFt!32lVr`*x|xjuqoWSYH86gl!`X{h7jLfK-F!^YXVxjRO`Uz(9E(?3kbtz>($$x( zv1x-!yKdQS>+ak3IN;hTrye=&=;_DKc%k;7`Wdya$o(;D^q|HUP%%#5QA4-t+Y}UX zB7qqY<4QnW0|5}41GC%-f*;5QX4$x;QiS291UQQVF(6nsu^f6~_m138aZ8Bquj0nv zA(sNWzXG`w(0xGeN8G+aZH-HA%LPzmAz})JEJ(jo^WcuZ{JU-Xe<%27qF&Uy zTwb>wP+H0y=mN~*m3grH9&GCMFdYXWN~fo{pJuz#PSfYyx%IIR7+BU&%lbBU8+#j$ zE3>NcOuF|Pwb9nZ({N^NDU1G&7)==qIpTGw6yr0fOB-c__joW-X9>EjIEQOUUW-NJ z5!B#tvT5h(;2ciVQ-7lL)Dk75eT3Gn+3#eKm!D1Kn;`1 zXI02U9}}D*L{9UraG^u|K?GFB8_79WzprxswKlzX0JS~0_jxtWLu;7^YSrKh7!{({ z5CmI-Win8#z^Ot?^O3Z>$yTj^2~V*B0=V*$i7L-R;<8bi&eoiE{IkHvQp%#;aK*U|BGdk$=7n`R8k1 zFb}Y9`-mu{f-(apL-BX?-HmOt1)#>`61IUm0s)_OI2gSeiqBR++DeVGK*=|<+WdqY zf(p2u5X|KgOO8eaXsdZu@IW;tyTVYNXl0)nB7q>JCkhiq>wiSy=Pe>YNfsPws|=l> z69i{C0Bqh+tT14OpD2AD#jcfs%@)=e%MZ?Uls0^A0B)i5PytSrrAi{ff6O==O5^Gm z{7(u?4Qmb5-h)E+7S<;n97nDsMUkIN5 zbSAtL{|IbDi{X1eMe~aMOaQu);hweGaB z516~Po{&YiRzs;{+{7jWBNt&bj6jbk1Tkzv(=UpEVTgI86EcJ&og4)}Aq;$p0_XyQ zbz~hjNf4Mb)}=2&@P;qh-%SzfF58Q2>{g=1X9%JW^~wG*>{|T3Oy7hR#cS-{ytk`% z2?3=ECV{`~x-Z@4*9vgKT|Key*g@R{M~3BlHThTD^y&bObfxazm}a>vOrcqJB!>z=8aQ9o|Ul86jVHf@DQpC z*m{N^v#v}1xSwv@Be4zNkEs80<}Bzr3-XJ-CH4^>+)Jp*s7sB|b)d@lenkpgZ-wUQ z$%?4Z*?10b?2TGM$Ne$h={ErSw*6p_>8ce(|-Zbz^2s`rNR{e00D(*LqkwW zLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#r79H%JBT=BsN!Hjtcasju?QAQTcK44lS{v# zNkfw2;wZQl9Q;_UI=DFN>fkB}f*&9*u1<v=j{EWM-sA2aAT%mWHM=GO zRkMs#JSJvyt7704y$B(QaYQ9%>WTDX2A<>V9zMR_MR=C?xj#q0k~bOP6N%@TZdk+{ z#50?g&Uv3W#7dGvd`>)J&;^Mfxh}i>#<}RQz%xTeCN)nSA{L7sEO#&~87lEKaad6` z$``UOE1b7DtCbpS-IKpCnAcX)T&FpLIF^t=5+Y>OP(}q7BD89xm`Krn%)>wI_><(4 z$yEj;#{#NQAvu2VKlt6PS%^-#Nx>M<{bJi6qd;I6Xx44}``EUdCxHJMxYFAGY6F=4 zB)#6&!biZsHgIv>*5p0lat9cC(j`N3BtK1|PypV~=$mrD;4RR%=JwXw$LRx*p{|y1 zfP+I|tVr4G9`Eky?Csw(t^R%h(Oq)QRsIU{00006VoOIv0RI600RN!9r;`8x010qN zS#tmYE+YT{E+YYWr9XB6000McNliru;|UZDDl=EkHE#d_0gXvSK~z}7V?1!+0K-56 zCWZk9qYfB#01GLKx4ioM44=G@7_$`39I)dX$N#?^f1U>zs!HNgv-$XyXQVoUk(6>^ z$2X4uKmYuBj!WL3?~fEsqrijf2jh-!9RGFHG`i8{&R)9`L-RBM12XJC7h^bpfgy&0 zfq`M;CzfXn3=9ln+?)&y3=9mG%%7#G?f_h1<0qD9NmkmMVSGMTrVq=`+!?EzvfrFZqtEfFDcXGWIjN-~BdHyeweK09u`n|aOoN1h qfq@}d@V^uT!=KS+`KSYij{^YLgpb|F#==|x0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmfa`}{AU%j1cVTR;+I=)$#7BQ^}8g+e9q^W?nk(PGajA~ z5{4L(uiG;3`G#?Mc|r3%?r+C~_FGTA6;XV%H1C!7^|+0^6>+-8>Anx`e!`1mVPZ}*DP&4L@foYEsil5E z$@`#{Gys{w6_|7&#~4meTj;FY_Ig;XV&y@YnFz}0;P~nY?+1SNc%x{oO>?4HpRs~n zY4ZzaY~=PCvj7OKJEn5tOW_jn{ci)yKu}JYD;%`wmkJkp;T9j9IZD9P9It#K9k&96 z2x|+BAqE1m5DOKGnvxPBjurSAEKi)10|AmCX~4<^@)v+p(_S0zD4n@U(lw0o0w9D7 zE1*H@0IZxP7vx(7g)9h57Lg(TQsA|=wR=MUXwN$OOwrVXk zMj4aPO4C+bYi3x~vO$+&zG1+Vvu77Cu3o*lbW^wYP2~4IU@~VU(exjy7!4 z1eIoe$)YEAFUWn0TR?Qbid*^! zxv-)89ms_Z-7Dn2#q9&shMjWD2cVsWh$$*0BmGv6mMZ?@&&u$t3jQeik|IEDV{>wN zo^65B!rd?gn8kBSmfWYMrk+=#NW4)*ha_GZH!IfLH|dLy4XODcs3PoX&F^1#uL29gN{B+sLP7;HVw(!w$pfo zYOqphz3oS3p!cGI;;yWLmvB~|*vrs>Ys+P&YfW!;u5axMzsE7AP~6!jrz5(x5mzd8 z$-O+9%X4y78_PQGU99ER=CD>VbK%9XOy(r)ZP9ut`*3Xp0_cXVZHSAZ1_;Q29ws@h zkx?G1b#R6dIgK;Jgo@%1BA_!~NcKMJbrs{+WOx|>YO_zT{RmH{nR^4Z^5zN{wToIo z5ZVy9nSf#jP8p>%E(xkbge< zf!V;i>9(T~7;OejM#Z0d>=JFZHUN~}CSe;mcOYQ1nuF1!p!rM%q=oZt3lw}JtDCQF zhM)sZCj@i2Y?rqX0ovL;D|n!~m7OqTCmPXvM3F!c!X1T#Q=P&VjyqSF*z1-w{0g za3+BGOBy$5 zAmV5SoU@k;TSTsnY^|>XkE>xT3o3$1qd(Gn*4I@je64&HAEh`_`AB>Nf=UxxEgivr zD5D5PM@AnSH(THwgL%~>y4QgepX-85f4H!+q2MiSxlpC_StIR7013Z>)N7!^caVB% zC;7A!d}@8(PQowu$BVZqyy}O23G)1G7mL$C2xYQMlHyl4h}ie(QeA{}LW9RnU^jpB z)oRe8zT8)B(>EfAe2QAsJ7Z)GR9S2x=k=CjXNfQ3-T8Tq>DY*Zmi-R)N2&8=8Gcp4 zA4OkKgb#ui{sm#WuKD=PGC}|V0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mU zDisGih&W`Z;$T6nh@(`o2o_3Pp;ZTyOTVB=Lz3d+D7Y3J{8+3yxH#+T;3^1$A0RHS zPKqv4;{TFDix>}%`|Xc$W9MKS#fkHyPj)iRYMZSi~E|Gnw3Vu9k0rgF|4fNZIQi@9ydB?cX!4{(b<_U2@G; z{tEH{000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Re z2^0(~3uf26umAu7jY&j7R9M4fJaFIu!$1Nih5-hn4j6R+3n_}Xy!!hLpS+J4vlPu7 zu;UxY|Gyl6o(CAJO5#$p`S_J*q&k9;lyYFlH;(^5|NME5OWvRFj}%R#z=P`t+fy3ys%Ub_-Q^E3bhGVDJWV>p0;A%=m0fnnn(mS+qM3=Cr2oD2*M3=EdcpQWho z09;_>CzfYPR@$3kd_GpD56jNnd4|ssRCPd-mG7w<7KFfcIiadLXwsY!08Svg=M zEqWMTY~Hb}zLw0NQ!SZ4r+)hWeJcY41H-GY-|1Hnk&_EZasaLzz`(%3V63IH1eO44 zS`=f;0r5NkQj96(BWFm#$^9$Y^di#8v9 zj!#X|=A+L^Ee#n-?U<~6&-jdmnR#FuBn%7;48el`r5G6gj5f zaB^>EX>4U6ba`-PAZ2)IW&i+q+U;0dcI7w-{MRaG2@(h)mZRr6vx8aw6t?5!-Xz_f ze*E=y$JkgFh$=wtu>SjZhkx*+981WewOA<;ziip4;iAU#cghs=aXx-@J;MEiKHLuo zDu(3qwybM>gI-==(0u9pqdw@k=Bd|2DL$BHx9r#Ra`Kvp>C~s|KG^j_D{q!_{n5Cl zeOcDieO3fx3g%-9v^a4*&U9L0c)`XE($Bc}fjAmxW}KNnh+nuv_dx*ftEc$I7ti=L z9OpzY%PLQCy7Wn&^n9D42aginmg%iWdEG>K7r(t{-Fuy@YZ*MUT&_jEEakYuz>cZ- zc&*@2{0Xl0I1ERPEe@bIvD6-7$BiXI#COVRrj~YEha73Z#Y~G7l4uYgy2?sM;{YZ5 zkv3@nGLtJX89`c%X-bG=1wIX)6KCo`AW0CK@RC6O0&pt1ZM>uD7)wH@8s!B*2p3jB zgVX_7IZH0cw+afiAS_u#il|gEX@yHJQcBU{b*d?AR?(uWRZUyvnyb`Owbp9285yID zNw8vS)y!Ih(Uu$LY8c<3=+wFAF1>W^wOelk^ci``C__gbHrk}g6D1(bGIiEzv#qp1 zrInYgvUJsDt8H*?^Uhm#*}Cht-EPz_R3A}$M(*3Fr3*DWfbwzriW=0aFH1Ux;^55WhylU863I?CcCW~Nid#T*zls}ugj{gw zeg|^Fp?ibed)z)iZMLJ_@&S-%A!3RO$wcD)d~Ji^reXab(_w~+4Hgu zN(+w$6=0U0i5m638kzRIDeVqIa7~xC?qVya6-FOp#ZueaU?9(?7WHN9GU}yuT$yF{ zXHt93-WzQWJauQ<5}xT##AryH$dR6#3LEW~s+7hHyvKuqKATXN6=!!1$!or7JVG_t z6l|D3DiggI4HS1}PrQV)^1@ywO)PD9*>u|MR@Z*-SNJ^(;}lBo+!oUzMza|=mAd6J zkLGd@uG;2q1NU8;N@?5@RyA3w88G1~Hb9_vQ_vf$z%cYzDQV3;>H=kfyG7JwlaZ&Ei4qN5 z>jbl#qOYT<*CZXe0V0fI*h=Xt+b*L6md;DGn@?o;=72)8m?t1l7>UTgJ`MTT=Qv<) zVBPA?qYxNv224i9U#>faEwc%r+T{|qfy)B{pS5)`dKNUFrGT_>_O_5hU&w0f+uaa! zz||9iIlK6hU5Ef}wVo9`Q1!`_ay8z%Fb&^oZ;S^a@XrOGrT<0p~ z!&?jpl|!yNun|H!M(ig#`o>8-MiV$LgZO8u>s}@L$W&z+>_vE^<1n_DgRqG?@kDs+ zUcsb>o%aleD(0zkm7`UEvf74ULF%mx7gBc$2|l_iDC)b}HL;qj2^Q|-Tk#HGDyk=M zEB1QkrMtr*Pi-iCB^=F9b^Cv9tceX}+o&I73|@WiiPD(Qv>MoaqFth8lmyL2!NjL! z^D^q(10j!=5wSPajR}*RINw6=;a%CIvavnHOYmphfkB}f*&9*u1<v= zj{EWM-sA2aAT%mWHM=GORkMs#JSJvyt7704y$B(QaYQ9%>WTDX2A<>V9zMR_MR=C? zxj#q0k~bOP6N%@TZdk+{#50?g&Uv3W#7dGvd`>)J&;^Mfxh}i>#<}RQz%xTeCN)nS zA{L7sEO#&~87lEKaad6`$``UOE1b7DtCbpS-IKpCnAcX)T&FpLIF^t=5+Y>OP(}q7 zBD89xm`Krn%)>wI_><(4$yEj;#{#NQAvu2VKlt6PS%^-#Nx>M<{bJi6qd;I6Xx44} z``EUdCxHJMxYFAGY6F=4B)#6&!biZsHgIv>*5p0lat9cC(j`N3BtK1|PypV~=$mrD z;4RR%=JwXw$LRx*p{|y1fP+I|tVr4G9`Eky?Csw(t^R%h(Oq)QRsIU{00006VoOIv z0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|UZDD<6CfXw3is z0gg#TK~z}7V?1!+0K-56CWZk9qYfB#01GLKx4ioM44=G@7_$`39I)dX$N#?^f1U>z zs!HNgv-$XyXQVoUk(6>^$2X4uKmYuBj!WL3?~fEsqrijf2jh-!9RGFHG`i8{&R)9` zL-RBM12XJC7h^bpfgy&0fq`M;CzfXn3=9ln+?)&y3=9mG%%7#G?f_h1<0qD9NmkmM zVSGMTrVq=`+P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|aw(KSh{AU$e0!Rp<>$fef!%%QmpA^! zzSm$3XsD7zhxO0j9{$2bImVDhYq3%yu58(;p;O~^U2Tf_JkLeLkl);X!jHEdm`?}nfW~JqyNIwb)Pu!*?Z@|_|S}B+;MI6 zFsr=t(>M{sJtfm?jdFbw;e-F&XLVnfbuE_wca__yhbgCri5*+ z{snzKx8bg_#R1eNOzk0dyjUW5+*3|7wd84?cBBCnGc8iIM1%N@RaP<@2b8?;FW06E4mJ#|S(u5Eb`Rv~#N%%p_P(!uf79o`T8?EPjV_f7MZVtx7wdeP<=)Y!=F zCuRYV)E zYG$oLXv+W^wOelk^ci``C__gbHrk}g6Dc6fGIiEzv#qp1rInYg zvUJsDt2wyl?AgVOt5-K~Pt{?4k&PJ;qnv=a zZUjJR+L*1UwvcZ{YBL)QXN+h11*u5b4C2j%U{ZZWLGvvaC?sp&; zHgvC$`-s~osLgiLEgyh(6vC&-kc{y292-^q#h-1%uWs=FMnAL>pl)+>a`wE;L22R9 zFa(&TXQD>EuSTXlJ0fH+hRJ+Xf~r$sV=v86qo1Z zs%?53c<<6IyRF%*Vy0tZ@Fr^|oNZBhQtq>>B@jS2Y_=gT4LLwS2GlUgUEr^Q`5}DK&`yF0!HnmR^SAi0y7CH zX5f^ON~23y)nut=z=W?j0D<03L2p=rX{fJK(waW%0%d`_MdW0Yk*Ai46b)SK1hbo> zt|O_}BptBQL1UHuwye?n7Zbsz8@*>25>- zvRcmy_*J*v$NJn;nz4_F-0))i(4h4{jQ_fY;Yn79;N&AD=Wc_2L3JsQa2jiUj0Pm5 zhFNdodSIX`${s?bz~CL(m*#>=!^$QP=#8p~>R0d!WK(=m*$r|8C}um57!td#9x0%) zvV&Z|C&s^S!`m1x8`KUypSJOK>;gji+OwasDqNieX!oSe^XZJtZ3_h*R=S=Lp}vj4 z&pw8#?Qn-sxp&&yd{GGqDMr?3Xe7~bBmrymnM2xlhi-U3fY5a@AXHAf>cII2Q5bQI z=qMM5r^?9v56WI`cyulftFjE7^liXIJ;bU!aXJr3nn!jxDhZeJ7A8pk%dSXsi_+-G|sUVa;9p3it6{{tn-hOF>-lw&I9qJ7aeUtGwuoyL zN)CJF?G<+{fi~kwtuG@d{D$iI|3-gcBgUEE!oR7#q|F3@{|o>C0flKpLr_UWLm+T+ zZ)Rz1WdHzpoPCi!NW(xJ#a~mUDisGih&W`Z;$T6nh@(`o2o_3Pp;ZTyOTVB=Lz3d+ zD7Y3J{8+3yxH#+T;3^1$A0RHSPKqv4;{TFDix>}%`|Xc$W9MKS#fkHyPj)iRYMZSi~E|Gnw3Vu9k0rgF|4f zNZIQi@9ydB?cX!4{(b<_U2@G;{tEH{000JJOGiWi{{a60|De66lK=n!32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Re2^0(~Gfve6E&u=lc}YY;R9M4fJaFIu!$1Nih5-hn z4j6R+3n_}Xy!!hLpS+J4vlPu7u;UxY|Gyl6o(CAJO5#$p`S_J*q&k9;lyYFlH;(^5 z|NME5OWvRFj}%R#z=P`t+fy3ys%Ub_-Q^E3bhGVDJWV>p0;A%=m0fnnn( zmS+qM3=Cr2oD2*M3=EdcpQWho09;_>CzfYPR@$3kd_GpD56jNnd4|ssRCPd-mG z7w<7KFfcIiadLXwsY!08Svg=MEqWMTY~Hb}zLw0NQ!SZ4r+)hWeJcY41H-GY->IJl z>}A9*A=3;D3=A93-+oR`E+8occ6{Ub-|lISRj$w1S`wB3hi6@Y&-XY&!F#|$VB;s2 zXFmE$n+MDRu(Dv@v8%p>5+(~R9PsY@ue1$B<_emGzy=bsBuyMZN_jAJvY`jp55}U+ zN1x+UQ?&Ug$)zD9sU4HG?-`%5Ff$KKgM@*BfgxD%zZ3(*pV4Odr~`(N0{~FJgy~t$ RkRkv8002ovPDHLkV1j}fj)edK 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 index 44fd1c7910c38ade4fd2615e318081f77c1eac34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2402 zcmV-o37z(dP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|alI1uE{MRYw2$B#&Iu2Thm>bOTCz1VLt<%xf z%Y3z6W!Y#0G6B7?|M}a(U$}CKF%*_od#w>y>7{4ION-ZawJDbKJXgNE@cl*}o*fw? zLQB_Y-S>EfoL?qLx#i=nJjlG)Y4<`YzS)|5XMbO}lJ`QCFL}DZL%%0zePz!5pXa^o z!>o7TMc|CZSdVhZn-azI%-2o?EvS>C^(Vf4Aa13CThW_7`Y$|P_lX0aZ}0pUADYpN zJFbNuX4Q9oy5))A$?3UGexp&!&zKz=5Uc zOslvB|BQDzcgNkL#tGCGOdTN(eDsvzaZ4qwq{-4g?MxFYmb|l|&3R@zvPP17o(B|n ze@T`l0GUM%m`or?5a*{Z>FnEmKWx^p^GX<*6BbJc$5(fFFZj{>%|d2Q^ORzH`U-kw z=NHs)qU~x&YCgN06l$<3c_^|;Wh31(`9zY;*;Jlz^E<_dJwCsChj-)d-bH2n#F93q6 zk^mZn4!|mfOGUgjP)Gw47iO+3+_RYaO}(MGK_Zna5ktvBtt z6Ve!mUc2c6}S8u za>1ed703mL?iF$$ar*?dr6=9e0m!2eK1GHkgrAkDx#2JVXd8ZZfjfj)^*(ke3BdR}I12-Dq?n z8(0o~cJHbSwHE~xU)2^S;VHCnmPrey*ZTp23kWh2&d6(7|9t;%x8d^+L;|BKs7#YpCSZaqxvp#ykKyhQg;FvqDidH1NbcLy zI-mKy-)|)*puxjn`8vKRX8yxr>ckn+h9cT*!-`>-M)1zs)yvId80*bq=#noz>7e#foAaWYlf$=|f@G~hXcrvY$e zzHk5l0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mUDisGih&W`Z;$T6nh@(`o z2o_3Pp;ZTyOTVB=Lz3d+D7Y3J{8+3yxH#+T;3^1$A0RHSPKqv4;{TFDix>}%`|Xc$W9MKS#fk zHyPj)iRYMZSi~E|Gnw3Vu9k0rgF|4fNZIQi@9ydB?cX!4{(b<_U2@G;{tEH{000JJOGiWi{{a60 z|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Re2^0)04Z!t}LI3~(Y)M2x zR9M4fJaFIu!$1Nih5-hn4j6R+3n_}Xy!!hLpS+J4vlPu7u;UxY|Gyl6o(CAJO5#$p z`S_J*q&k9;lyYFlH;(^5|NME5OWvRFj}%R#z=P`t+fy3ys%Ub_-Q^E3bh zGVDJWV>p0;A%=m0fnnn(mS+qM3=Cr2oD2*M3=EdcpQWho09;_>CzfYPR@$3kd_GpD z56jNnd4|ssWI4cIM(h%X<>zldPqNb9yyfCOCI$uu20l(sZ#y-~%`}MuTwva@tG=*= zc>FuVYz77fhF4#|GcfScsURXJ7m(zD9p5`zS*XytzIo!HT}Pg;Xg(OzVGZj VEY?~%O+X_UJYD@<);T3K0RYcABz^z@ literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..b22cec9ec1dc0d3a4d2f8bf7472d89713aaebb9a GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY-_ zFIw|4C~~+4&YiV^;oE+*Fo*SP{Zi*G{a!NR1Lqc?<`28piKRV@c-%3e%G34#Lv!z% tQ%vvbrdTWPU$APM_KcZ#xEb!5F@EFbi3&Mx&I2@|ArY-_ zFB$S3P~d1yyj`Lq)9`zKukeQJTT6}3A3XT~wnC-DqP2_+3^`>h51y&nU+UtqdC7$x zHBURDEf3sXUS%w&xphN<%KyeyzigXlp4`mvAV=0bk*8x;_IX911q`09elF{r5}E)% Cf;vqA literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..dde5737f5a50e7a3f8f41da14b2925c08b024ab9 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}5uPrNArY-_ zFB$S3P~d1yyj`Lq)9`zKukeP~x2$HSoBz+h{De_)3sAdX`O1T5-n=h&@z}cL!kwD* zj%djPcc=dgvkA&t{Ltstf%#9A*Q`1(J7Z=HH^VtIhJI_FE}Jz|*8}Zf@O1TaS?83{ F1OVZ2J5vAv literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..388c5e040693a41559e30ebf5fbe77b101ab7408 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}F`h1tArY-_ zFB@_lP~d4zjJ9f%QTT2j?Kfd>Y_xhM7vJCgzKSQ6GqM>N5;i;Qo;mZowvS`w^pGq3 z^EnH(81K}+$UCAM>dW)SQ#vBEn&GE-$kpeHvu57mX88A(@r5`~k3iODYoI+0p00i_ I>zopr01(DDNdN!< literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..4fb40ea6e26662e2fe129244f75532af75c6a5bf GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}k)AG&ArY-_ zFB|e5P~d1yyj`Lq)9`zKukeP~x2$HSoBz+h%u=Da(3F9}uY6_e%$xV$cTA}Abp8Bc zuE2Jo19zwY3$qEjdhEc=Esgeq4t9rE{fcRtd2%nqgB)fj7M{MyjhDQDmN0m_`njxg HN@xNA3l2NO literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..8587c5ef83c916c9ce0201353104c1f1e784d52c GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}v7RoDArY-_ zuNZP2P~d4zjJ9f%QTT2j?Kfd>Y_xhM7vJCgzKSQ67p!Gu*l=^9SlY9{cJ3`#ytQ7n zpKr04%J9yv#Qf2uRcdVCmhi4|X?V-{q<+CFJO7Jkp2RVH$mgH)gl7WJ#6u=Pix@mz L{an^LB{Ts5{XjaB literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..573d2fad30cff6604427f6a50abc69436a8d2991 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}QJyZ2ArY-_ zuNd+jP~d1yyj`Lq)9`zKukeP~x2$HSoBz+h%uD~uAo31f1%$ChcOuP5K+{I(>l0|ht zd^&wp)F!hvrLpH$bZI&WxXyi=Uv&u!+=ojg;rnXGDnHZgd* L`njxgN@xNAQ|>vV literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..676ed62841f63b30e7ca2d36c1b76936226eee10 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ii4<#ArY;~ z2@s z^E*5(n8`7Rg;Wg(4jf?E@txzZld4n{ip2I4e?2&VFgrLnkYpYcsSeok>hE6<9mObg zaSt8Es4cJl{>7$;st#b`<;E$;Ccr~-l#=WKYJ*V+j5=Vz9c(~yK?DN_?mhQF=DTSs z?4X+ic3pqq;h-eB16_<9v&f19Y`!Ho1W0y(2j>sw9aruzLl@t5{lRiKw(lgHM|N#k twd>?RWPY2Q`G6;M*CZiX$#ukhiLV_^6}nt7x;fPsO5 z!N*dk3Y++jEBD(-HH%~i{AKvZd+hC_U|e!EcK|ChGlPbxBu!SiGq0YKYTUqQ!%+u} zI$+cRWR--Uf3b@Um;>C{zVq(7eeW|aIhs3wT#Iml0Z#*?4j6U7r~?4XgeqG7{i3}9 O0000n9If${NEf`xxSFIjbLCo97n--UMU VcQcBVDu4zsc)I$ztaD0e0su4EDAxc0 literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..2ea19233e7a743a75363801893ed45f4b6fca10b GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKpxms$y}7ZT_2{%)8cS&Bg^E)-C$kZotOyCoimd=FW36f=}lKeTe&4g~tcvI_oD2*Twlebk6@H+^u517_mci52&t;ucLK6UcHZmyy literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..a59fe9b61cf8df3f9788bbd96114fc2f3bed6059 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}VV*9IArY-_ zFB)3H`kHBy*?VZkd_J{b|S3bl%PKpPl5UHx3vIVCg! E0JR`H3;+NC literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..00c6f0eb4f1db19fc3e47f77b50649f9bb92ced7 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}xt=bLArY-_ zFBx(*81S%O&?@7$ba+?4ZO(#dwz*L*yPs(5{bP@1+Rv%DR6y|W-KLg1wfnD~;rXR4 z`|7N6(v_^W9|W?^7OYyFS^vE1T3gG7G~<`Ndw8wpT)Xv_!}ZB*RYqITr mXERAcpxgbR2Gp)ZR)(%P`Ik=d3pjx;VeoYIb6Mw<&;$TD7)ELU literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..5684656dc7b20fc9bc56a6a9891bba54257688dd GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mpxq^Ln2y} z6C_v{Cy4YkF|zeM$yjxx?vdma&2tA1e3;bO*tqcUWv4Eg%@H1fH4hFjw#nYNoM*Yx zOEk$N&;H|?=Fja@nwyzD`4W^|KTZp;-xv+l_F#!t=#HmX@2B5*vf>$oSX|zoPdQ9B zdrV3hbPqIGH#~_6*!Y*_T1ml!d!H?H^PZ`=Gv2%@a8r=|oo)QRXK8--FRTH&;O08( z{zI$F=KgUH@1DqLsw4lw#o`siCRv8H6C@^Tsr|BKIC<%RM$II~$fpdumOcqP3if~_ aBg2)uE<0!EY~=@fkHOQ`&t;ucLK6VXDR@x; literal 0 HcmV?d00001 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 index 0000000000..b42841a32d --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json @@ -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 index 0000000000000000000000000000000000000000..7ac78739e53b264d4f1c44d6bc4118e30584ce13 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}o}Mm_ArY-_ zFKpxms&WZ5y~cCk-{y^NVQL|2^VH1#hX%+9crh|C%nvn{5KO-MPVfB0rpljh1${YZ n-rQz?@#=%KmwbK!&C&Orv67?nD2JUDki+2V>gTe~DWM4fE=(>) literal 0 HcmV?d00001 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 index 0000000000000000000000000000000000000000..81449ee35d0d452640122712a01aea592babe243 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}fu1goArY-_ zFBoz$7;?B=Ov(PpaPNQ4yaRQY)f-)fZ#>%{Br!FUm!V<)SFaOy?^mX!EscG7;oXmu x!v1CpR;~OwJt$Xj;}!)apeS43V@3uBwj2qb1h$WgMnJ259%WrR(eR8zRachn>Hqm5FCH~C z`^V|#6`CgAsQvyiX~%>9>pVPf-aNT+{(#FWHulJm;!8S$?=oItbH2=|@zI{k?VtwO cf&dPN=O<-!roQE|0b0)B>FVdQ&MBb@0BZq4+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png index 559c48f1dd75555a273915085810056a433b436d..b606fc214107537b645325b95d5bc91d169d3e66 100644 GIT binary patch delta 167 zcmV;Y09gN{0?+}FF@K6lL_t(og=1hC1*2dTjDnF47|GEz_sRD!=wit-oIG@Kz}zR_ zzsUZ0os2Gi@ZQV0t!}0yJA#Q6#nrn`W3`-tfq}tZNj$lF*J+H9p{fID0Y)7_aw4qW zb^43FlK8+RLRx^K=YYR||9+yT1IQ`~OV{lCi!Rn3;>1k3b09{+C>RB!U=$1h001<+ VCnCtzss8`~002ovPDHLkV1lVHPFMf{ delta 250 zcmV^`G|>;NS#9R{U;pL6!ycyl;~<_>Vtkk4_D70o#C z`1K6*P@uU3Ko)}10Vo>K9YBudAoECyf>8&6LZD*%iD&NGN>$W|f3l(gq^WexzQ5=W z=nipWrb|gkjwSf?kemod9WWXKqaiRF0>dr@0DeVnAzacM0{{R307*qoM6N<$g3fDh AE&u=k diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json index db0ac608ed..389f1b8b96 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png index e97ccde11471ef4ed432b23eb83f54a04dfed1a4..51fa19386ef0383e444976e7ce18c8a396475ef0 100644 GIT binary patch delta 351 zcmV-l0igb~0{Q}wB!2;OQb$4nuFf3k0003rNkl)&v& zn<(^OICkh#sQm*WgPY*uF0KxO{R456ZbdQ_9NbHxgNrxaafc^dzPq!O`fT~a_wta0 zBpQft&b!ZJ&+{}&4ylQA-Wi7Rr6zd^Ka*hqJO|{w^Pb|Q5E=WNCHBL zUhQx=kOW>SO{>)kaU4TRiOb~zUDx5dE{@0JI067*nkKH-E84cj(3$uN%3DyD<=|Wt zMgK1V0Nd@hS7VI9vMl8+(iZr>kM(+urfG1y-Ecac5Cj3zG#y6(0QUPmvMfVg*H|nT z)EK$|0OWc8u~-6*DsrecrWbh+xc-ga5k+d3cQ)GSF0<40w};=0DMFblx2Bt+Xl`# z)^&wxns6Kkp66*Y0HF>n%W?)m07@wcA<%UlmSurbimIy4$A1A&L;-|`u&!&wag5_Q zFwZmgeMi@IXqpDoG{JS+9>W zSOAM*IjC764Gj&bsHi*_0F_AqyJiv5e=BuSFMC)wdssD%Nf?%7#O;ilc;7QehLJY4G65Psx~bI zZ%r+xiW0=67cogEid!|HkaxbTj-ULrW&i*H0d!JMQvg8b*k%9#0Caj(Sad{Xb7OL8 zaCB*JZU6vyoKseCa&`CgQ*iP1YDR z005K&9$6!o+3WxS1BXdOK~z|U?Uwsj(=ZgryR^%wIy?62c(uS#N?Dl#ooGdwFdoBg z4pheT|Nk@0P5N%y&0jo6kKdl%(jdLGKhC ziiV*$WUfP}Qmb`60Kjy}j0F?ukSz=H763>%&X*$qkPux!wdw(m)7HVU2fzi{ahwxG zOi>}GbVy94i@h8)=qgZywV<+l90K%uy%R)CQ6Z*uNK6Faj`N1Qt0@4Sp7qYp69&)z z2T_9#9%fB{Dl0QX}F1BRnv>=y=1 z`Pu+5ieJMBAp3h~fMN6(1*mG)jzb?Ic0~X)yoLDuQGoC*McxFqJ&31pI2@2>VP*}+ zgYhu(8xLk5{YMq5CMlvdh$B{MLe(Tiv<5}X5*yEUn3b!mDS(CRYnkm(Q38hTM#bMH z=|?u;Cqma)g}o^P7|}Kr)2f&$s0ps~C^Y`kjbQoaW(r_&GC^(xmjM9)u7D_0BRCI8Zndw%*io`wNnq6EDoUiK3;lwQ2KRHf`DmrA3R*=1b{rkBSKG_Wm%e< z1gNy*QIei8_$B}}iI8I*!~@U{cu%f#EC;j=a-1CjyeIx!pn&^aZjv3rZ9ad;1<=}w zVWnqB0ACBHr8bd7XoFKjb_De7#b)EJ12{F%i5f{jgLcrf7jGS~at)^~IuQ>*JLuVq zIVU0@j{v8wDG`vf7hMNw5p>aT1^xSODqkK(BQ541jie2J@t^L<>B!BJjl95B$yy0JWJLO5nx? zBr1ELa9;u-j9DADeZ|MqBJT<_z?jpU9LCdcIsXOv1(Ui-%a5Hmc>n+a07*qoM6N<$ Eg5;h{CIA2c diff --git a/Resources/Textures/Structures/dispensers.rsi/meta.json b/Resources/Textures/Structures/dispensers.rsi/meta.json index 7a1f9fbc6d..55b0da939f 100644 --- a/Resources/Textures/Structures/dispensers.rsi/meta.json +++ b/Resources/Textures/Structures/dispensers.rsi/meta.json @@ -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 index 16b3ebcef6bc4a6456d97dc8956027dbcef90c66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 960 zcmV;x13&zUP)+9L~n0z7#J8@6&1`gGg<&GnE*2o5D)=5 z3jk&S|7J7fp2D{{S<XG#5D-WJBmkrUx-|d*EeLmacVn17uK)l50d!JMQvg8b*k%9#0CRd&Sad{Xb7OL8 zaCB*JZU6vyoKseCa&`CgQ*iP1%v|jO0B5eI z0ngN_=iWh3&XSZfnQ;cdSzdHwDtZ9;HVOLYlqb7gD$6p1au508P{^vz8VUozt7Q|c z1QGD#1;n%yv22fS0GR>g1*i~j<0O3ypw^_;rT}WKYR!)U>Iwm`9iXZZP#S>1DUE>F zx{m+>r2$y7iN{lRJe~^daO}qEQ3C>}qyS-r+?9)(&X^p}cXmVV4o$ zir)e_FN+CiNjvE#AaL6h;I6e6VE(>$fY$CdU_RsAmN01+pz$43V*>210K+LE!K2}r zg@EZ6wk@D}wOAlPv{n}oe(QTR?Aup8$@Gf*-yf2L?MeDnL&E^tyIP(^1JY#fb(v{^ zK_F`l*zINrm^w9JO-w+4$0<4goCEy25IUp-8!$$Y$=~kNP}XZ+_#zkqWhtXbS8na2 zteE+OfXhY3Jl@;`HfYY@-h%*uD`U(R0h&KBk%a*J68sTh*$4tY&wx|80BDBuXYd${ zocSYQ>O%?~FT*CWXj#F*#0b4Z7%OwcN!dWGv7kJ28I*?38LxX#hPx;*GWV{RCt{2oNH_p*A;-jT|d^|*jwYru5nCZam~x?fa;Pq;54a707D3(EjCe# znlx4mN}{|-LZnJyMf4$Js#c{hi9&y*aUW^~ZIaTsj#APZQlKK31P90x9D^4>vUo8z z-nFMc#xvfX-6fvc9Y2!$N!Fb?JCAekx#!NE>p2Gm0)apv5C{Z^);5fuzw^P{B!H*)HmkCR`({Z18(uoE%CfVwC4fL6FnU}=gM8eE z4W@R8N*B_MY{&gK%R`jU?xB2kk1DIOrEt0NAeS2tsxmz~8NuapnNk`dRqqM? zbH2eXYY%{Qly|m!SWpV5feYzY1_uXOMJfwQA!pH7S?n%W&-=&QO>Ewn%N%#QDtqFw zHkzM%h8d}0YNTU2wY9a>*4DCP#|{8|J|7l~g(F9fsQUo51!t*Ulh2M8pDN$Bz8vV| z@Zr(p9?fs$(R-lbsD52^c>sWQeoe%_uTw6+<_$txqzqv1LoY|w%uI-z{)RJ z@%Ino?+>wUeK{_diyz;96}w{^cE>cf-e0C$A6*{M6@uaS{=o3uxvJ$_yI{39ge5Bt z%gE5z+9m&{G`=D`^Kcr2HXELougkLKqt`x=lEb}2e!4=s>!3@2WylMsdU=TU%RLdY zvZZ%$wWl*e=C@m!lWrxv->%wJNAK}JM%+UWx`!a^{2HueFg$!1fYw>ybf>bq6Rar~ z2+A^m2ls4I&ug6p-+s57uD9|5Snzc#7iIzP!@Wa(y=oXHYRJRNvy?X%HCD8IR% zRw9R5h#r#lqT2xftU5*ME5Qia^2E`?Y8r zSJ@8)Ke^%czOda0Lmr@Di7|OeL}oT04FGN9a1R|AGQi`FX?Qx)Ar}~Vo!|4?`*=K_ z2-()xy76>;93cyZLgeP=(#D6Q$8Ft;$Kye>GGGdN8^~;Qz4p(`L&{Hu|9lzLr_r>L zaxih(k`{Ryce>l0MZ$S`NS`;^$`|_d>2GWZ>I>WcIL7aZ$i@lV!Zk^~-t`lIHFTaK z11xDVbgxOpp+kp~dc9j6#?I5V6p^0_b{k}r-^KZ~;-r^$n|zP)qM)FFl9Cb%3JMb1 zPXyg-K?;7q-;{DZaX1{DJ9iFciQLG3Z*OlxI_Ne)o{6iKW?uV7Xd6-Qej*t10A(3A z+2wdMkqxh4XvAG?J;~w{fXFgC?Ig^T_s3EOf}`hq3KOl0aU2c@ot>SA_Y*<)ax{UF zKa((XIU3}7x|ZJFUP?+z)E=&PKi+l6f-VD`?#5D_ZSKDeKMI)lrAGJ*Qcez1ARzao zL`&_p1pqOX-b+^QHo;Hq~+DmEQs2M6P?RKtDh-Vg$n;pbctM6l!>8 z3qMK81mH)+2`8LF91G5;EjW@3;*$IgYj~X#4cOEDac)ILg`_AEi=9%M8utIPXDBi4 zCILrY+@Yo?Pz|9$X$z%o^q|WC6%`dyQIQ-Q9MAIA%R|g`b~Dr2tyh;xiQjJJYTq@k z_Qj9xQ`(}as7SXF5{gHOaOC0~m@|_tV%sF`u3%i=#c)cs57QZPDBn{d=Or zP{IL0+9>l&Z={ozArC#N$IGa6`C|46qq7FHh?l2m9ap$AAh+=Cr3D;&Tb65|eMT{C zfOt19TY3lYy!QbBdB`zku_9k84bB?OK*^+~rF$^CKCwu|2uTTv3-1XXS+lUDUjQKY zwtKkrdMCqS8KrzaAB(LgO^q=yLgr2I-{JCz>{mXYkB+QaJb&O-0QUd34qlYgE+i{m zK|%(IH5EJc=HF5B#~pk1Pk6mvyk2j_d5aSZEHsT+x^8~%XKGO14|Y8p@mn&6p@iQ9 zwD|2-?7i0j$jQvY?RH1?DmZEMwx$wG*DuaK&3hjxGrHI#=7c_kwH)oa#`e#(0?^b| zKIJ{&xsBOW-S-OsibIdF^{M2}>JoYghrbOg)Y6KwcJiIM!!(_r+8%Hz1e`3koGyCO=~&TXF;5o zClujE(AImxJs^Bro7VEv-~rmSniK8;T_HFYBllWYC_1g>RQCY?0}n)`)$CffC~n=S zMT?Dcw~IBYwtR0vGM_kch!z6U6H zyu`zDrq&{Za2Y;$<^Hy53t#6oH=tw-Pbaa zxq;%*-v{1~*d7pGpGoflOLDb|uqQ4RnO@cuM(W-@7=4V0tx&f|TADhhV#7ufn z6H!e7x(v|K(P06kcxj*WQ^(%0lPST`>256Z^2YY*;f>O2wzsz{Z8T;KHNuUQolFgD z2A}1+3j_jzKp+qZ1OkCTAP@)y0)apvFvkA@{p*l|K<5#a00000NkvXXu0mjfxkuyR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/smalldispensers.rsi/meta.json b/Resources/Textures/Structures/smalldispensers.rsi/meta.json new file mode 100644 index 0000000000..479de5bd46 --- /dev/null +++ b/Resources/Textures/Structures/smalldispensers.rsi/meta.json @@ -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 index 0000000000000000000000000000000000000000..6ad3551997cfd1f04a197abbaaa7e97d94c0109a GIT binary patch literal 1899 zcmV-x2bB1UP)Px+B}qg!kn-c+!!m2x)%eBO7|{%v$b_aH*kZRLP?;O5f0RAa#-ut>QKA&_9EUH z6Qg-9d1A8uJ|LIp?z!jpd+vA7pELJ-0}up35ClOGMBdrA*AC7`UytzrNE{TY>$E^kFe1;AJVI}8mCK~WTVz22N|J3Bj>eJSBkzk;W#s*20j4$o8o zR8_^o!h)54@y;ELH#BUf$21HqZ>FcFrcheC*-8Am@&}gNm(%87SXh9ns!TpHj{$-p zY`cG>`^boNdDE4hD-!$cW98)-K2Zk%_%gVNua>>IIQMh>VC`{C38e^!!w3WdID7Ui zR+5~O2Ods`H+W61cJd}#y&BP0S<=)KA+E;u1S)F`uck7ShnfJvY!>Q8iZ?q zTg3afo&t#XeZM~m;?^s-tn|pp2u_|nX{D3%*WSI0@18!*#)YDXxeGFROMl54gf95I zaq9JHYmm~RL-pa{=IZ>V6*NWBg*ZkyQYaiS+=}=f;5%|F*}~xxkhnsOJK?G@lWLHi@tu zfDwdHIXa4a0J;za{s7K*b>Z@e9~g{xLw$XHxO(*}bX~^?bX4~B;Z-yLJW$!!hYzNv z@LDhkQ517lsdP9T4%F1taJ9kxLCi!HMM#o_^I`xZ;ulYnB#3@=d`^0_wU;}kLiI&6h(vQ9aK_Mg4x+w#9}cn4`PY_=ejF0AMjLFW%8eC z8d_6RgQlh?xLhu1nwIlzV`C%tE+P@P+YO)32e;duRXQ7NKL_Z#&SjfVoK7bqkqDel zr|tC8(o$AFFbCk^!Gl>D+^e#8BKab+rnA9T3(z!;%QoNa<%Kt~H4EzK=-~O4Ufyv! zotU4Wx1BaADPg~#nF63`8YU(tn2oU7;K_FL^rfXG_oCE0x&l>w+{f< zFXcCEa3OJeC6pgV2sNi3_e2F4v0c2KZR&u&dIGH1J0UQC)Q+pVVt*yz23ucyN zN|`0{b=hTW`(MLs5aOH3hT2ThX zCqY?FH`Bp&8j4Q9zzSB*R6q$8R|`0nAmTT;A*WMx)6naufj2*je@?u+3Q?BK;c#qi zrJ;mboctU&yIcdH+>+7$?m9-A|0=pMpavoa+>h`{T^(1OTm#TBK7dYtHxQ~vs2N2y z20R~&S(0kVTm+FB+X2`~W6jh~YxQ?yVtfGbpDDT)&|F>)U{g|!m#D0*0H~^p_4V}~ z^Te0(Z%WS;+bjsNm?f#Esw!^Yyt(7K^YinzM4*@hU@AkEm6h$9cM!ns(NX+#KmimK zRSQtCDX9izR$n`+Sxf;?Rh3Cl=~DALPDv6bCnqh1aZS^h^_BC%>guZ10)V)mk|g21 z$w{Vi@}?P=35$!1=nV4CG5j~wq^Mg!TU#4|y^|tiCHW^v%pZHWcI_HBn_L4B4u{hoE2OR{A3{{= zU<$y7C{ae=`n%ok9WOFZVJ22~6QVL@DtCibGZe7-YN9BL8NYf_>`GG4Qe6pxAP9mW l2!bF8f*=TjAP9os!+)XY_RJt