From bd100344a2f9f845e2dceb8351d36f8af913a5f1 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Sun, 28 Jan 2024 20:38:06 -0500 Subject: [PATCH] Add inhand fill visuals (#24495) * Add inhand fill visuals * oops * remove unused import --- .../SolutionContainerVisualsSystem.cs | 33 +++++++++++++++ .../SolutionContainerVisualsComponent.cs | 13 ++++++ .../Objects/Specific/chemical-containers.yml | 2 + .../Objects/Specific/chemistry-vials.yml | 2 + .../Entities/Objects/Specific/chemistry.yml | 12 +++++- .../beaker.rsi/inhand-left-fill-1.png | Bin 0 -> 126 bytes .../beaker.rsi/inhand-left-fill-2.png | Bin 0 -> 137 bytes .../beaker.rsi/inhand-left-fill-3.png | Bin 0 -> 158 bytes .../beaker.rsi/inhand-right-fill-1.png | Bin 0 -> 128 bytes .../beaker.rsi/inhand-right-fill-2.png | Bin 0 -> 140 bytes .../beaker.rsi/inhand-right-fill-3.png | Bin 0 -> 155 bytes .../Specific/Chemistry/beaker.rsi/meta.json | 24 +++++++++++ .../beaker_large.rsi/inhand-left-fill-1.png | Bin 0 -> 133 bytes .../beaker_large.rsi/inhand-left-fill-2.png | Bin 0 -> 144 bytes .../beaker_large.rsi/inhand-left-fill-3.png | Bin 0 -> 156 bytes .../beaker_large.rsi/inhand-left-fill-4.png | Bin 0 -> 198 bytes .../beaker_large.rsi/inhand-right-fill-1.png | Bin 0 -> 134 bytes .../beaker_large.rsi/inhand-right-fill-2.png | Bin 0 -> 147 bytes .../beaker_large.rsi/inhand-right-fill-3.png | Bin 0 -> 157 bytes .../beaker_large.rsi/inhand-right-fill-4.png | Bin 0 -> 191 bytes .../Chemistry/beaker_large.rsi/meta.json | 32 ++++++++++++++ .../dropper.rsi/inhand-left-fill-1.png | Bin 0 -> 253 bytes .../dropper.rsi/inhand-right-fill-1.png | Bin 0 -> 249 bytes .../Specific/Chemistry/dropper.rsi/meta.json | 8 ++++ .../Chemistry/jug.rsi/inhand-left-fill-1.png | Bin 0 -> 173 bytes .../Chemistry/jug.rsi/inhand-left-fill-2.png | Bin 0 -> 196 bytes .../Chemistry/jug.rsi/inhand-left-fill-3.png | Bin 0 -> 217 bytes .../Chemistry/jug.rsi/inhand-left-fill-4.png | Bin 0 -> 221 bytes .../Chemistry/jug.rsi/inhand-left-fill-5.png | Bin 0 -> 230 bytes .../Chemistry/jug.rsi/inhand-left.png | Bin 297 -> 411 bytes .../Chemistry/jug.rsi/inhand-right-fill-1.png | Bin 0 -> 173 bytes .../Chemistry/jug.rsi/inhand-right-fill-2.png | Bin 0 -> 192 bytes .../Chemistry/jug.rsi/inhand-right-fill-3.png | Bin 0 -> 233 bytes .../Chemistry/jug.rsi/inhand-right-fill-4.png | Bin 0 -> 220 bytes .../Chemistry/jug.rsi/inhand-right-fill-5.png | Bin 0 -> 232 bytes .../Chemistry/jug.rsi/inhand-right.png | Bin 277 -> 418 bytes .../Specific/Chemistry/jug.rsi/meta.json | 40 ++++++++++++++++++ .../Chemistry/syringe.rsi/0-inhand-left.png | Bin 298 -> 0 bytes .../Chemistry/syringe.rsi/0-inhand-right.png | Bin 300 -> 0 bytes .../Chemistry/syringe.rsi/1-inhand-left.png | Bin 316 -> 0 bytes .../Chemistry/syringe.rsi/1-inhand-right.png | Bin 320 -> 0 bytes .../Chemistry/syringe.rsi/2-inhand-left.png | Bin 316 -> 0 bytes .../Chemistry/syringe.rsi/2-inhand-right.png | Bin 320 -> 0 bytes .../Chemistry/syringe.rsi/3-inhand-left.png | Bin 322 -> 0 bytes .../Chemistry/syringe.rsi/3-inhand-right.png | Bin 315 -> 0 bytes .../Chemistry/syringe.rsi/4-inhand-left.png | Bin 321 -> 0 bytes .../Chemistry/syringe.rsi/4-inhand-right.png | Bin 321 -> 0 bytes .../syringe.rsi/inhand-left-fill-1.png | Bin 0 -> 121 bytes .../syringe.rsi/inhand-left-fill-2.png | Bin 0 -> 132 bytes .../syringe.rsi/inhand-left-fill-3.png | Bin 0 -> 137 bytes .../Chemistry/syringe.rsi/inhand-left.png | Bin 0 -> 177 bytes .../syringe.rsi/inhand-right-fill-1.png | Bin 0 -> 126 bytes .../syringe.rsi/inhand-right-fill-2.png | Bin 0 -> 135 bytes .../syringe.rsi/inhand-right-fill-3.png | Bin 0 -> 143 bytes .../Chemistry/syringe.rsi/inhand-right.png | Bin 0 -> 182 bytes .../Specific/Chemistry/syringe.rsi/meta.json | 28 +++++------- .../Chemistry/vial.rsi/inhand-left-fill-1.png | Bin 0 -> 122 bytes .../Chemistry/vial.rsi/inhand-left-fill-2.png | Bin 0 -> 130 bytes .../Chemistry/vial.rsi/inhand-left-fill-3.png | Bin 0 -> 138 bytes .../Chemistry/vial.rsi/inhand-left-fill-4.png | Bin 0 -> 142 bytes .../vial.rsi/inhand-right-fill-1.png | Bin 0 -> 126 bytes .../vial.rsi/inhand-right-fill-2.png | Bin 0 -> 134 bytes .../vial.rsi/inhand-right-fill-3.png | Bin 0 -> 142 bytes .../vial.rsi/inhand-right-fill-4.png | Bin 0 -> 144 bytes .../Specific/Chemistry/vial.rsi/meta.json | 32 ++++++++++++++ 65 files changed, 207 insertions(+), 19 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left-fill-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right-fill-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-left-fill-5.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/jug.rsi/inhand-right-fill-5.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/0-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/1-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/2-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/3-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/4-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-left-fill-4.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/vial.rsi/inhand-right-fill-4.png 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 0000000000000000000000000000000000000000..d206c35fbb356ef380c49380957d512461b068a5 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|EIeHtLn`LH zy}6MWsEXO}+kA7|{fCtull=?4W@`ZzFf=r()ZPU#K!7{uNp}w~14F#rvsc`cV)z*M PfkZuB{an^LB{Ts5gvTKt literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a4c851429dc98d44bedc4928d490fa80c8d84a71 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIPC}Ln`LH zy|s~-!GMF=;NSiU&Npt$M{%;f;a;@HlLe@R;e)dA`I5H4(5<^cJRoQ=^?A}OymQlE dK?a5gM_FI25L370UfTqc@^tlcS?83{1OTzRC}RKs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..94103a8320b70c7b79dfbe7fd228a206c0566ca6 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|B0OCjLn`LH zy|t0|fB^@K!?*bp9Pdn4l0L!}@#!wh9+s=Zj6hWk(buA;&NQ_>K4bM^_dU`Ew#*%{c*YpJL&w+lYo;kknWw9t%Q~loCIC0m BGn4=T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d89683a47bc606d5630f990c22a909fe47f81c72 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUO&DLn`LH zy}6K=!GMQl;~V?;pUWDXHn>f+J@|1o6Ho<1g-21HIfwxS2a1%x|2d(-z_8#klT`rs Tq@E0s;~;TQS3j3^P6_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e6fe7b070bc17b598489c86b2a90f65bd5f136b9 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+&oL4k+a@!NcZ<|XZ{8Y?Dw-0}TT^m;2$4MW51jvIG**BX6(&j{iIfri1SdFy+m gD$n=#FflO1$rQDUsi&Co9tO#Iy85}Sb4q9e0FO*6EdT%j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..58e9d70df6914d97b7e4ba336ac7ccbce6c4fdb9 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|LOop^Ln`LH zy|t0|fB^@K!+U$h<{JN1A(=rpJ@(Ch;8=1#3aE^)r^Ln`LH zy=5rKpdi5P_(!{E!k2#bw1%|sgI`ZZ0aY+Cv`_N6{qrs(n9abzzh$mU+Naxp1Q{3} Z++YivDW)#)M(`a-($m$?Wt~$(6962YCyM|8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aa4378fd7eeab5c59a7ddec9ddcd46d8d0fdaa76 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ygXeTLn`LH zy=5rKV93L~;gfrY!oANjRyFM&95wrLK3W3RFdSIBZE{N7^9r?-Tkb}K1c2ax*6aO8 k>ff@w5!@Cp#lUdqH^b^pI=+9niq$}}p00i_>zopr0B4&n1^@s6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..256dd348e8a9ac70ba471faeda48d971a8df28bf GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aQ9ZLn`LH zy|s~-!H|Q+;M@EOj+Z_^{XUUtVv>JB`wImopdyBCscCDsY8hu+o$gqE+Wn8T!CYpL zFayJb9nbxr2-b!_%5J|a`s&oDxqp-y7!GXXzi`}_qu9XD5v0b`)z4*}Q$iB}QtCA& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1e828c35205c6ea5765dfe5cf054eaa3ece9da5a GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|8a!PbLn`LH zy>*b2*^r0DVWQQ#|Fc3Gye{0Yl;wOPeCTM|2_MEJ)^7VS7NBZ|`LEwioVj?ndwKuW z%4OEm&!71pZTIM6!&S>^meL!n*g;Ad7(UdVkAJdy^Pb0LUk|M6dTg<1)jGMqNw=$8 sB6)9olS>R+p*wy4%jx%|7#MDxkzJcyXk}2hLI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..766d7e9e6b213e01c7242ab88e4701203027b05e GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%~c)B=-RLpsM z%TVxu0}r#~XLk*SSF%hmKhMAETCmrI8K{Ke!=krpH`iN(m_YDg`J|lNpO;n6XJla5 ZagF(izL*bc!GMSPz&rbe>>urQ8jf&Bb?)ZWc`mu06{w2gj;B#>dU;>&Ex$?s#Xtf;aNu;` nU!VG|k``sN3*MwMFf^!(xA^M#iXHrt0h0D~^>bP0l+XkK%KIOiMQ6vUGhH38&Rt3~Uuf+<`+h!1 x6bKGncboS-zfCIqPuc7Agg5zzZkz;)s`F=V^W{i9dwM2Fji;-h%Q~loCIH9SHjV%Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c90be94d07abf87e733e35f523164e220a73565a GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Dm`5sLn`LH zy|t0o*^q#*{j_~){q_dN%O911Y8if9xx0CHdfK^n^LD?! z`RHm*+Pz{1!S{-9)+Nuroexp~1RL(0`uykd{ibzictS#Z3>U2mv;VqV+nD)y+_Lqz k8j?429{nPj#@zrI$ zTf`I6Vw=+W_#wss$&!MVrSCcFJ#X^v+U<9FO5m@>{#BE8RZRc${&@Pae8JU?&eQVW r1gutxe9!y7G_pjF?bgTe~DWM4f6y9QH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0198590656b56083de56e526495c800c3c38ba2d GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Hha1_hE&XX zdut=#Ap@S4#P&_9$@l;7z41q2d76nZYhYjiXO{B6{JwSR>(@yF)q}u;b9a;9^F{Bd z-toI!agvgf&Z7OYJ9c|=dERDP7WMpLb&P|{43*hgvAXlGF+FpC`E;}M?z0=N{r{r3 zBEl_{`YMYHJK%L(bf oj$8lH=d%01yx@c?P>)_LW4l|vzWt)&DIjw^UHx3vIVCg!0O5;aB>(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..00affa433705c1cd50db396db3ed1f72e57a194d GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|(mh=qLn`LH zy=BdK*g$|epwyg&*`VHp{eZw8Yv<|f{w{I;B-b$cTQCz)Ef8$~VDUI3^sUOvz00?L zD?ApJecp1iN^(!|E~xwg-al`i$A$jBZF|5vZaeeI;_eAg@_!yMm9g*>V`iD<`VeG@ Mr>mdKI;Vst0I^p)kpKVy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b4014c71a7853bcb021ff1b25c816d941e67b80b GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>O5T>Ln`LH zy>*b&$xwjhf~d{1mM`&_#U==Slk=Cq(tJo=@Zxuc35Sg?A8-LG2Z9gsde%;>v*i9? zyY;d!)N*}Hc}t(6lG38@`*gS=Dj4=Tgq}S!=e_>*6K5hr`QQ8e-*nM2?cBZJ+Y}FP mUN!6c?Z)Kp4=d{)nBQU8-(%MQetDfQNTa8#pUXO@geCy(1WWn= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dd62683c7a3e4d0c8cd3ce8488fd846bbeb1f8d4 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVRR#hE&XX zdut=_VFdx!3*A#D3Fa}px94RxV6t7g#-&T-q}h^>)uLDJSxV+}05vc$G|aA8!?AX2 zUq{E8o}g1NCHH>67}ed;k$ZdEn^Mn=_qA_cuVyz;em?zq*M+~=jEbYgz`7V1#C=xJ z$zJ>TRegi9-G4rpJ+ogd{=EF^(e0Bg`Mj_Uu$Zy8Hk-cHq;z^`({qw&G_0}q_enB4Zw25MknI1m{V))IDg z$N&7>Wjm6?&Z%D)UAXuAwWw@CL)~mq@eN8}=IenKGB6}eUnMoua^L^{(apgzLgUjCk&8@S)RR4>c;oMuc3igTe~DWM4fHD_1a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..11191e8f93267358636111518869bbc4e1af8fb1 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|7I?ZihE&XX zdut=-VFLly3*H_t1@jo*+xN0x;CMIpR00#{jX6Ay??czUYc5^2PYI}lfgwSnU(We@ z>D_PdGiT|ghn)TS^k(u4`^v8px1zc`I?m|KzIysYc)|}}uwsS=$0?$H)e~>7KJsT; z`IV^d%6a}zr|;w6vH8TBQ(D$*QzN&X*;C5gXP=nA==`(kS0B%;{LNN#?S1&C_WKM8 ZIr&o^yo$8=1~U-AF| literal 0 HcmV?d00001 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 GIT binary patch delta 384 zcmV-`0e}9f0-FPnB!2;OQb$4nuFf3k00041NklJaE6}~3Q@d8yf=f3w+Ip;4m=|IN|lz(lXe18wa1Wym`!gHi@ zwlSmw{~Ij};94eJ%iO!HO^$Sg`f;|GS(_aE4iG<7fW-l}{9NVWlFA_>A|fIpA|fIp zA|etOCFy&Vr1Krj8AM4s0D!C8=X`m;OpPwqwm4p(I@f3D_J`VAoUd6Q-TttlYR0_N zJ~aTK_xJ{&Sb2*i)(zUNCPtH)RNPjh$*f_wnz+0;HpbH&<7tk&oAbgsa^Wixav3lIKOzlsE|(tV2`mi3}|!!0000=C?&jmcOLj6x-uRS55skPwR5oej`@BLM&a004ls*|=4TW}|1t#;^YD zMYCvTWnEje?*89f`l+mHU(J_wy{_h^?f{n9{MNHr6M~MXlYeK)Wyz}6vZ`Iw8vpVH` zGmtG3uJx6EP9SAaI_r6aep9Irz@vHhPe78+*C=VH`{j`I2gp1E^9TR{0GR9vjaY`z U0seHV00000Ne4wvM6N<$g6hnC&;S4c 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 0000000000000000000000000000000000000000..3f822e063152942e22c79d34a544b0d6bbf7fcdf GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|(mh=qLn`LH zy|t0|uz`rP3u0TnYa95CLqj;;9IT$R1w zw_MZvzCSFqdhJvd$>cwO$lyi0Nb5Cj4<*1^Yb4#-^z^n9P`f>KPaw_}>X@TqX7S zUR3n6`nNgve`^)UxVyM~xwl`dZ0Su&uo?!2A3kY)tEwz#T3*xtUVh`_^&*9jd3>t# j+&RMg)vMmS2^=FUQn%JsXP9`qM1muCcOVPN>veLEu| za+;}v8OnKJbL8%}I z071j@!{7hy+P{C^g7td-A)HD6j7cds_-|ybbxqs%m37^|xY! bGz8l)l<4^|2!?rARla_!c;DM7#fJp09? zeb035@%Y|Ze|9$6?Y269CROyuL-~O0-ZOV5a8sG#IYe1(Xs1>eV^bdczfy+a3w4uW7HTcL$k+r~jsi=gS5^HS;e0~rFz-S3X$ zmj7P_000000002+$q%C}eo8VwjIye;tilhY?CSP$<-E0`!GAn&XYn4#iQL~D|M*Xp zev{Yw^HgiDa03F@k-&9KWYIB-6Vb0IhRuDC|~^9$*zcqbfTAeEt^~Cr+aUm zyJy=(DasF{On>Km%KZV?7yB}r%w#l~$>G7a7cw2W1*LBgtw zSasvo(<3-arD^k(P$Blutmu@OE#oc&a!7x;A~|Pk{0* m`d#~($!3H+0}T*BY47XOjget*b3_0D002ovPDHLkU;%=1U&53C delta 249 zcmVNhT*a4hVy9T zrk;SqfY5yp(`LG8s_9Q+W0VklpN)wD8OG%|A^-pY007`V_ zv)37`<(L^TF3!^_rO7olQfxF|Y+(QZ0KlRL0A7UA$+e?E00000NkvXXu0mjfzI!mlZ#Y_(3{?lw0P(An}@@Lj`%;3V%W*%u#Ry;HUk;C*Rk3(Spl@EzpB}xb0>}^nFVdQ&MBb@0Ijcc AmjD0& 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 863a40a4932e2c99de5896ae8ff3802dd5b9d66f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G6o zi(^Q|oVT|w@--1 zbs4w){eH}9*6|wAgyh`RKUX={Za?4^zF*^U?yich4AZ~X-7)<3%H|x?8oQtA$FnM| z=Wk~CZ}ju#tGgGPlOnDvN-7BU|RLZf4to&zBufFxmob?Ig8C5KHL3KIIP?g z!RY(@!`x+mzn^GND3#xL_{#0T#M6YPpy*z|LRw-bFta+QK?Sx9HYQ2|h}X+qrK4 zftp7e^R6%YEL&jnW&du4-PL-LABAkn4$nQR6ZvP$E0G<$XQ+11ui;U`Z3o=yd2$N1 zfW zmNDwwL-rX(z4zP~{F14g@KDh04P)r@4|A9O{eHrCLj~Xc#8;0^f9V<|Usze)9p4Of c=?6x;Mm@PQ#fx=0K;JWXy85}Sb4q9e0K>C<)&Kwi 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 0f1f04747227f06e5c0c56f604645d6041d860c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G3n zi(^Q|oVT|exegofuwFF$;T#M6YPpy*z|LRw-bFta+QK?Sx9HYQ2|h}X+qrK4 zftp7e^R6%YEL&jnW&du4-PL-LABAkn4$nQR6ZvP$E0G<$XQ+11ui;U`Z3o=yd2$N1 zfW zmNDwwL-rX(z4zP~{F14g@KDh04P)r@4|A9O{eHrCLj~Xc#8;0^f9V<|Usze)9p4Of c=?6x;Mm@PQ#fx=0K;JWXy85}Sb4q9e0K>C<)&Kwi 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 3bbc9fe6839a6bb11a5086fae0cb79bd543437f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FYV zi(^Q|oVT+axegofupGZ2|MkEBi`iEsgfzBXST>0#vE0v+^ZkMd_SbC|VhuQvF4H@~ zj}pmseN9ChuO_b!4}9G##%TPf?uCN-Lk@rO*!>4?9A2*ZW=Vg^J;vh;|G#a@`Tplf zmv=#%g>;(dkCUr33(U?;`XJozcw{33VYG8s!CtJp0aj!(wKy?6_L4C2)f)nV#L#a#^>xHW}!D22WQ%mvv4F FO#oNkfnfju 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 71ecded6f6b4872f9268f8097ba3ffc3c1e8a308..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gp% zi(^Q|oVPcl`I-zw*d8hty1%RET(dH(<%qb(l3b>9|Mzx3_t|0dr7?y{VLHPJRfZzY z22^IbibLhJLpHv`<{#&6KXbouwefYPHK&W!=T}bO$vu_hs`Z16lif3?Jzf2cDdctR z9jo8(HIjldXKMi00o}rh;L632QH^UPlhMhQ=89zVHEdH@Ni>u(7 z%)VyD{}+F8$k?^NUsBy7_rAgT`G?-N*xk>)3%<+jJ9y#v>hIwRM;18W*Zs+(1abE- a27RSMO%X-GvyniLGkCiCxvX^=NXpx$-rBA;!HwY+ok%916723UOcX^^yBz`@j0e3-&PIn)hdaY{05* z_M0CGy>Y!W)u5_GZ*vyc9o;m~k8^t*&vY^nMwPo79^Pe~+929LJGhKpgsF@5%q`gf z4hx~6vV&XhGQMnLk>U(aUZwBo%I?$q^NXf|4@-g{7@ZUU-()B(bKw65p!XR(UHx3v IIVCg!06Cm`J^%m! 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 fa55e86eb97cf04d88a24bb2698eef0dec06b57c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G*- zi(^Q|oVPc<`3@;axIT1#)OY8<&@MHdjlMD`v>lZ0{XQG|Pk9ToTt_j(5leBN!qC??TmK*SObxAxa|5H9Y&n z8;kd5{+MRJUPR&Dmbd#ku75ZhJApgku9dWBamw?PtUsnd%)e{x(1v6x4$CYLoM^9p z_pttIK*PN1ADq+v9D5;{v9Eo8N>z*G`G#fHKO9f*tA6IZp@QE&;pN9!f5jp;URaub gdc7mm^`98y*nb*ts=m*j4D>#Or>mdKI;Vst0ITVNC;$Ke 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 0000000000000000000000000000000000000000..93ff582233b78320bc09e9299ba7b136aed58467 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|j6Gc(Ln`LH zy>*b2fq~z$T4)m$)e8UK0F)%dT-^0wnaK@zeE%(>hhI9Wx NVxF#kF6*2UngB|{BXR%$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a8271c771cdcda9aa7693f780088bf6096d4643f GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>^xl@Ln`LH zy?KzA!GMFw;d}fnzQD=XD$E%g%|n6mKyxNNSw2TS?{vQ$KbX(JU>kP-`Re1$3>O|S XtO*i-`AXyN6_AXltDnm{r-UW|sIVrd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b8ce5e2519db1c89e1aa95b048ca703162dceba6 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIPC}Ln`LH zy?KzAL4kwC@mIc7yqUrgk2#tRclLDx6#%sv8OQG{cfI~%;>YOHKQAi4f(#5&wSOJO c_!$_Ei=EC_zU#&Gwg4pI>FVdQ&MBb@0LKt0#Q*>R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9b7b05b437d7a498c3bbef74224f5e44739d3c65 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|vOQfKLn`LH zy|q!a!GOcT@!R~fb2n^Ua8<>trkwf14^M9vpdto?S0~PNobY`7Y1a0sbG~qFepZw8 z<9S)%`gv?Q@^N>2e}>wCQ~}kkdHeQ&wD;D%vK6T-*L}Qt>S5immvv4FO#mQHMV0^n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9f489d4e645a778ed95973482171f7400f052ade GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|EIeHtLn`LH zy}6N>!GMFs@LT+^U;`#r$4%-x{;dMaGcaU$Zn|qwxK|#`VPL3xbeNf;;5@UBHTPG~ REq*#6VNX{-mvv4FO#re2B4q#o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed4dc38dda63a8ddc35a2125d55d9a15357f6664 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|96eneLn`LH zy?Kz6L4k+m;FtSfehSre3osjt=DeG&1ysS%;5@0s{7%Is+pj-ztL#A{Kyd#~%m0Ev3K`njxgN@xNAw?8Qs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ffb2bd374c539ac85039dd78a231248e54cf2743 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUv|;Ln`LH zy=lnBpuod&@b~}a$y1N{378msZaTZw6R3irAvW~t>o(!=>gBTc*OmC&?(==m4iaZz l_|g16yJx}?4h9CFEeunCD&Ku>m}m%+@O1TaS?83{1OR53E(QPq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4fe1bcafb532259a082a64c1b4d109a969cc14c6 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|3OrpLLn`LH zz2(T)puof8@bACb{}BC25_wt*s>b{ZyM6Pwhyax_ED&^e`6K(NQ#*h9nTww{cK&+e z7q#!#o}H21+vC38SX#3+S{|f~fnkQ$&-aDm#_!pu$$nYGJ?ZK8+>{+lyYKgM%vxr{ aFyS<3jg!Uio)ePnAhn*ZelF{r5}E*-r$P1r literal 0 HcmV?d00001 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": "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 index 0000000000000000000000000000000000000000..8c4633339101734b2db29e85660724da26e80f2b GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Ogvp2Ln`LH zz2(Tuz`$|D;7_;R2L}B~VFyIkfDB=Hpy64c!31Iff&CAlF$t**Y8SZQq(-K01&MjO L`njxgN@xNA;~O7h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3b4a2159245e7105274dd9d1c3f9ee59336eec64 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&=~YLn`LH zz2zv#puoejQTk7|UWZ1lfeKUDK{cQ}gF|@eTk%<*o75J8ctCI<^lttEc_5?Ss_#Dc UhZ(E)d;I$Ld%`fCe4vwIC+geNB{^LICt%D{QCLF eFD3?tgq7^SK5>8HKQUPyB<1Pq=d#Wzp$P!L=qY;u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5973326b8897781716fcd42c18abcc5a294abb44 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUm?-Ln`LH zy>*b2L4k+)z=MCr;o$-!GMFs@LT+^%?zxvj+@kX{96T-XJC->+;rEVbfqYm!@yAY{4g`afk^(C%iLcd SRYyJq346NwxvXmVYEcJUu^{85kb; Y^PYXp{Zoal_zXzG)78&qol`;+0P>S2asU7T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..147ad5acc5143b79afcaaf7694d1a66ff57d5507 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUm?-Ln`LH zy>*b2L4k+GapV7a$;@591UP4|OxT%!NeZZh!N=9*Po72TDFJmL5fCUd`pdIs fihcidc_61t%2|y2ulw!vCm<*b2L4k+GapV7a$;@28CP>U#nXohek`z!0L$RRXP2SypQNPbl;NqDe3lai?4|}}q hnYHi7xATI9mPqU|<6%6!>skUx($m$?Wt~$(69ByNDRck; literal 0 HcmV?d00001 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" -- 2.52.0