Add inhand fill visuals (#24495)

* Add inhand fill visuals

* oops

* remove unused import

diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index 20693408ae626329478a0a5a8230e38afd5ee14b..b4486b8c0ee9859b8a3e20ef252d0660a065805a 100644 (file)
--- 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<SolutionContainerVisualsComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly ItemSystem _itemSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<SolutionContainerVisualsComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<SolutionContainerVisualsComponent, GetInhandVisualsEvent>(OnGetHeldVisuals);
     }
 
     private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args)
@@ -111,6 +115,35 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem<SolutionCo
             }
         }
 
+        // in-hand visuals
+        _itemSystem.VisualsChanged(uid);
+    }
+
+    private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent component, GetInhandVisualsEvent args)
+    {
+        if (component.InHandsFillBaseName == null)
+            return;
+
+        if (!TryComp(uid, out AppearanceComponent? appearance))
+            return;
+
+        if (!AppearanceSystem.TryGetData<float>(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<Color>(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 8ada8e28f4361e6fe384fdd4ebb474f785203ff4..100ee3975f95319b9f6fc73b8cea131a3cbd46ea 100644 (file)
--- 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;
+
+        /// <summary>
+        /// Optional in-hand visuals to to show someone is holding a filled beaker/jug/etc.
+        /// </summary>
+        [DataField]
+        public string? InHandsFillBaseName = null;
+
+        /// <summary>
+        /// A separate max fill levels for in-hands (to reduce number of sprites needed)
+        /// </summary>
+        [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 c8a204e11531a5bf7c2f0fa807f2df959b905bcd..31af4d206a05de999e2b5b099428faf2c11198a5 100644 (file)
--- 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 93881af7f96253575fe153a57aac20e5079f34b6..c5de88d690d133b6987b38453b15f4e1af6e9a75 100644 (file)
--- 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 f9a843c4d4de21014617b0a02b9438ff12e2ab71..a8acc5ff9c4d4bca1d15d1aa5aee570632d27ba5 100644 (file)
--- 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 (file)
index 0000000..d206c35
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 (file)
index 0000000..a4c8514
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 (file)
index 0000000..94103a8
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 (file)
index 0000000..d89683a
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 (file)
index 0000000..e6fe7b0
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 (file)
index 0000000..58e9d70
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 6403659e68d75f26098d149e76ba1277abe1e6a8..11326a1093617bfab67efa5cc02f96f8d1034462 100644 (file)
--- 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 (file)
index 0000000..462f2a6
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 (file)
index 0000000..aa4378f
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 (file)
index 0000000..256dd34
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 (file)
index 0000000..1e828c3
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 (file)
index 0000000..766d7e9
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 (file)
index 0000000..9aff5a3
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 (file)
index 0000000..2a5687a
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 (file)
index 0000000..c90be94
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 7e796830d1519050de7c9bd6dd343d7302dd4229..9c3c7d203de50bb788a0060eb0f896b0aa7685e1 100644 (file)
--- 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 (file)
index 0000000..b1d24f3
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 (file)
index 0000000..0198590
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 646becdd087d729e8f31da2d96ae68f50b0ccefb..d296ffbea162423c6a1b14525e336cfb77c75051 100644 (file)
--- 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 (file)
index 0000000..00affa4
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 (file)
index 0000000..b4014c7
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 (file)
index 0000000..dd62683
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 (file)
index 0000000..e99722a
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 (file)
index 0000000..11191e8
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 6ec4b0fc67c109189048e2fbb1355ea0ee631bb0..818612319afc7a1494a86a574cf95237b914443c 100644 (file)
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 (file)
index 0000000..3f822e0
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 (file)
index 0000000..9d6ceaf
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 (file)
index 0000000..55285cd
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 (file)
index 0000000..188bdaa
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 (file)
index 0000000..99b1326
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 9c73c968099e81561838c632a8160d38f131cbeb..472041f31ba3423bff40b41a59f51fabdd00c7be 100644 (file)
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 98c4ac810bfd292d605f5f4d0f707766f60dfeac..85c293d34dfa93ce19db9a3f04dbcf4244711c74 100644 (file)
--- 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 (file)
index 7ea530a..0000000
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 (file)
index 863a40a..0000000
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 (file)
index 0f1f047..0000000
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 (file)
index c55b8d6..0000000
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 (file)
index 0f1f047..0000000
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 (file)
index c55b8d6..0000000
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 (file)
index 3bbc9fe..0000000
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 (file)
index 71ecded..0000000
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 (file)
index 2d4447a..0000000
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 (file)
index fa55e86..0000000
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 (file)
index 0000000..93ff582
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 (file)
index 0000000..a8271c7
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 (file)
index 0000000..b8ce5e2
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 (file)
index 0000000..9b7b05b
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 (file)
index 0000000..9f489d4
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 (file)
index 0000000..ed4dc38
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 (file)
index 0000000..ffb2bd3
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 (file)
index 0000000..4fe1bca
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 8c15361569d6505f772048d399054204553f1292..1495eccd7a64bddc608d8d1119d357d28abd1083 100644 (file)
--- 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": "1-inhand-left",
-                       "directions": 4
+                 "name": "inhand-left",
+                 "directions": 4
                },
                {
-                       "name": "1-inhand-right",
-                       "directions": 4
+                 "name": "inhand-right",
+                 "directions": 4
                },
                {
-                       "name": "2-inhand-left",
+                       "name": "inhand-left-fill-1",
                        "directions": 4
                },
                {
-                       "name": "2-inhand-right",
+                       "name": "inhand-right-fill-1",
                        "directions": 4
                },
                {
-                       "name": "3-inhand-left",
+                       "name": "inhand-left-fill-2",
                        "directions": 4
                },
                {
-                       "name": "3-inhand-right",
+                       "name": "inhand-right-fill-2",
                        "directions": 4
                },
                {
-                       "name": "4-inhand-left",
+                       "name": "inhand-left-fill-3",
                        "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 (file)
index 0000000..8c46333
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 (file)
index 0000000..3b4a215
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 (file)
index 0000000..9652fb9
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 (file)
index 0000000..5973326
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 (file)
index 0000000..7891d4b
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 (file)
index 0000000..388c3cb
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 (file)
index 0000000..147ad5a
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 (file)
index 0000000..d0e991e
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 800cb2b5224595629d517951fd3b2407b946a33a..d7ccba364f6794d63ca0995a798b2ad4da1dccf5 100644 (file)
--- 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"