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 4231eca703..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png deleted file mode 100644 index 5a5efd5339..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png deleted file mode 100644 index 7b9d66fe5b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-10.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png deleted file mode 100644 index 31ce9dfbc1..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png deleted file mode 100644 index 3a468518ef..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png deleted file mode 100644 index 9ab44b2132..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png deleted file mode 100644 index a307e2fd03..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png deleted file mode 100644 index db37112755..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png deleted file mode 100644 index b4719e1915..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png deleted file mode 100644 index e37b1ba599..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-8.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png deleted file mode 100644 index 44fd1c7910..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/icon-9.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json deleted file mode 100644 index a1f2ae6048..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/carafe.rsi/meta.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [ - { - "name": "icon-0" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - }, - { - "name": "icon-4" - }, - { - "name": "icon-5" - }, - { - "name": "icon-6" - }, - { - "name": "icon-7" - }, - { - "name": "icon-8" - }, - { - "name": "icon-9" - }, - { - "name": "icon-10" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png new file mode 100644 index 0000000000..704980e67a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png new file mode 100644 index 0000000000..b22cec9ec1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png new file mode 100644 index 0000000000..921cb19466 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png new file mode 100644 index 0000000000..dde5737f5a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png new file mode 100644 index 0000000000..388c5e0406 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png new file mode 100644 index 0000000000..4fb40ea6e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png new file mode 100644 index 0000000000..8587c5ef83 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill7.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png new file mode 100644 index 0000000000..573d2fad30 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill8.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png new file mode 100644 index 0000000000..b809e6eee1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/fill9.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png new file mode 100644 index 0000000000..676ed62841 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon-front.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png index 7eaeb2668c..d7d7e3075e 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json index db0ac608ed..1573c7154e 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json @@ -1 +1,44 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by github user moonheart08.", + "states": [ + { + "name": "icon" + }, + { + "name": "icon-front" + }, + { + "name": "fill1" + }, + { + "name": "fill2" + }, + { + "name": "fill3" + }, + { + "name": "fill4" + }, + { + "name": "fill5" + }, + { + "name": "fill6" + }, + { + "name": "fill7" + }, + { + "name": "fill8" + }, + { + "name": "fill9" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png new file mode 100644 index 0000000000..42d5f9cd16 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png new file mode 100644 index 0000000000..2ea19233e7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png new file mode 100644 index 0000000000..4c7df65dd2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png new file mode 100644 index 0000000000..a59fe9b61c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png new file mode 100644 index 0000000000..00c6f0eb4f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/fill5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png new file mode 100644 index 0000000000..cbfeac63f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon-front.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png new file mode 100644 index 0000000000..5684656dc7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json new file mode 100644 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 0000000000..7ac78739e5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png new file mode 100644 index 0000000000..81449ee35d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/fill2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png new file mode 100644 index 0000000000..3a1f171f2f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon-front.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png index 559c48f1dd..b606fc2141 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/icon.png differ 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 e97ccde114..51fa19386e 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/icon.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/booze.png b/Resources/Textures/Structures/dispensers.rsi/booze.png deleted file mode 100644 index b33527ea79..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/booze.png and /dev/null differ 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 16b3ebcef6..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/soda.png and /dev/null differ diff --git a/Resources/Textures/Structures/smalldispensers.rsi/booze.png b/Resources/Textures/Structures/smalldispensers.rsi/booze.png new file mode 100644 index 0000000000..f846533ee2 Binary files /dev/null and b/Resources/Textures/Structures/smalldispensers.rsi/booze.png differ diff --git a/Resources/Textures/Structures/smalldispensers.rsi/meta.json b/Resources/Textures/Structures/smalldispensers.rsi/meta.json new file mode 100644 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 0000000000..6ad3551997 Binary files /dev/null and b/Resources/Textures/Structures/smalldispensers.rsi/soda.png differ