diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs index 20693408ae..b4486b8c0e 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -1,6 +1,8 @@ +using Content.Client.Items.Systems; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Hands; using Content.Shared.Rounding; using Robust.Client.GameObjects; using Robust.Shared.Prototypes; @@ -10,11 +12,13 @@ namespace Content.Client.Chemistry.Visualizers; public sealed class SolutionContainerVisualsSystem : VisualizerSystem { [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly ItemSystem _itemSystem = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnGetHeldVisuals); } private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args) @@ -111,6 +115,35 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem(uid, SolutionContainerVisuals.FillFraction, out var fraction, appearance)) + return; + + int closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.InHandsMaxFillLevels + 1); + + if (closestFillSprite > 0) + { + var layer = new PrototypeLayerData(); + + var key = "inhand-" + args.Location.ToString().ToLowerInvariant() + component.InHandsFillBaseName + closestFillSprite; + + layer.State = key; + + if (component.ChangeColor && AppearanceSystem.TryGetData(uid, SolutionContainerVisuals.Color, out var color, appearance)) + layer.Color = color; + + args.Layers.Add((key, layer)); + } } } diff --git a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs index 8ada8e28f4..100ee3975f 100644 --- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Hands.Components; using Robust.Shared.Utility; namespace Content.Shared.Chemistry.Components @@ -40,5 +41,17 @@ namespace Content.Shared.Chemistry.Components [DataField] public string InitialDescription = string.Empty; + + /// + /// Optional in-hand visuals to to show someone is holding a filled beaker/jug/etc. + /// + [DataField] + public string? InHandsFillBaseName = null; + + /// + /// A separate max fill levels for in-hands (to reduce number of sprites needed) + /// + [DataField] + public int InHandsMaxFillLevels = 0; } } diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index c8a204e115..31af4d206a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -43,6 +43,8 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: jug + inHandsMaxFillLevels: 5 + inHandsFillBaseName: -fill- - type: StaticPrice price: 60 - type: Label diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml index 93881af7f9..c5de88d690 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml @@ -27,6 +27,8 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: vial-1- + inHandsMaxFillLevels: 4 + inHandsFillBaseName: -fill- - type: Drink solution: beaker - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index f9a843c4d4..a8acc5ff9c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -158,6 +158,11 @@ solution: beaker - type: StaticPrice price: 10 + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: beaker + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: entity name: cryoxadone beaker @@ -200,6 +205,8 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: beakerlarge + inHandsMaxFillLevels: 4 + inHandsFillBaseName: -fill- - type: StaticPrice price: 20 @@ -277,6 +284,8 @@ - type: SolutionContainerVisuals maxFillLevels: 1 fillBaseName: dropper + inHandsMaxFillLevels: 1 + inHandsFillBaseName: -fill- - type: StaticPrice price: 40 @@ -321,7 +330,6 @@ - type: Item size: Tiny sprite: Objects/Specific/Chemistry/syringe.rsi - heldPrefix: 0 - type: SolutionContainerManager solutions: injector: @@ -338,6 +346,8 @@ - type: SolutionContainerVisuals maxFillLevels: 2 fillBaseName: syringe + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: Tag tags: - Syringe diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..d206c35fbb Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..a4c851429d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..94103a8320 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..d89683a47b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..e6fe7b070b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..58e9d70df6 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index 6403659e68..11326a1093 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -16,10 +16,34 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 }, { "name": "beaker1" diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..462f2a608c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..aa4378fd7e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..256dd348e8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-4.png new file mode 100644 index 0000000000..1e828c3520 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..766d7e9e6b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..9aff5a35af Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..2a5687ab2c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-4.png new file mode 100644 index 0000000000..c90be94d07 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index 7e796830d1..9c3c7d203d 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -16,10 +16,42 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-left-fill-4", + "directions": 4 }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 + }, + { + "name": "inhand-right-fill-4", + "directions": 4 }, { "name": "beakerlarge1" diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..b1d24f3294 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..0198590656 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json index 646becdd08..d296ffbea1 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json @@ -20,9 +20,17 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..00affa4337 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..b4014c71a7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..dd62683c7a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-4.png new file mode 100644 index 0000000000..e99722a58a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-5.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-5.png new file mode 100644 index 0000000000..11191e8f93 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left.png index 6ec4b0fc67..818612319a 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..3f822e0631 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..9d6ceaf538 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..55285cd19a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-4.png new file mode 100644 index 0000000000..188bdaa86d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-5.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-5.png new file mode 100644 index 0000000000..99b1326262 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-5.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right.png index 9c73c96809..472041f31b 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json index 98c4ac810b..85c293d34d 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json @@ -13,10 +13,50 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-left-fill-4", + "directions": 4 + }, + { + "name": "inhand-left-fill-5", + "directions": 4 }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 + }, + { + "name": "inhand-right-fill-4", + "directions": 4 + }, + { + "name": "inhand-right-fill-5", + "directions": 4 }, { "name": "jug1" diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png deleted file mode 100644 index 7ea530abbe..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png deleted file mode 100644 index 863a40a493..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png deleted file mode 100644 index 0f1f047472..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png deleted file mode 100644 index c55b8d6fd6..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png deleted file mode 100644 index 0f1f047472..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png deleted file mode 100644 index c55b8d6fd6..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png deleted file mode 100644 index 3bbc9fe683..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png deleted file mode 100644 index 71ecded6f6..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png deleted file mode 100644 index 2d4447acb7..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png deleted file mode 100644 index fa55e86eb9..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..93ff582233 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..a8271c771c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..b8ce5e2519 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png new file mode 100644 index 0000000000..9b7b05b437 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..9f489d4e64 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..ed4dc38dda Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..ffb2bd374c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png new file mode 100644 index 0000000000..4fe1bcafb5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json index 8c15361569..1495eccd7a 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -58,43 +58,35 @@ "name": "syringe2" }, { - "name": "0-inhand-left", - "directions": 4 - }, - { - "name": "0-inhand-right", - "directions": 4 - }, + "name": "inhand-left", + "directions": 4 + }, { - "name": "1-inhand-left", + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", "directions": 4 }, { - "name": "1-inhand-right", + "name": "inhand-right-fill-1", "directions": 4 }, { - "name": "2-inhand-left", + "name": "inhand-left-fill-2", "directions": 4 }, { - "name": "2-inhand-right", + "name": "inhand-right-fill-2", "directions": 4 }, { - "name": "3-inhand-left", + "name": "inhand-left-fill-3", "directions": 4 }, { - "name": "3-inhand-right", - "directions": 4 - }, - { - "name": "4-inhand-left", - "directions": 4 - }, - { - "name": "4-inhand-right", + "name": "inhand-right-fill-3", "directions": 4 } ] diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..8c46333391 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3b4a215924 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..9652fb9fcc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-4.png new file mode 100644 index 0000000000..5973326b88 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..7891d4ba53 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..388c3cb820 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..147ad5acc5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-4.png b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-4.png new file mode 100644 index 0000000000..d0e991ee77 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json index 800cb2b522..d7ccba364f 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json @@ -13,10 +13,42 @@ { "name": "inhand-left", "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-left-fill-4", + "directions": 4 }, { "name": "inhand-right", "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 + }, + { + "name": "inhand-right-fill-4", + "directions": 4 }, { "name": "vial-1"