From ed4ae1628c1fbea528dd4a320efc6fd402a7ccfd Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 2 Aug 2024 03:18:59 -0400 Subject: [PATCH] Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) * Add fill level sprite support for equipped items * Add fill sprites for held/equipped spears --- .../SolutionContainerVisualsSystem.cs | 40 ++++++++++++++++++ .../SolutionContainerVisualsComponent.cs | 12 ++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 5 +++ .../bone_spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../bone_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../bone_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/bone_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../plasma_spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../plasma_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../plasma_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/plasma_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../inhand-left-fill-1.png | Bin 0 -> 201 bytes .../inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Melee/reinforced_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../Melee/spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../spear.rsi/equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../Melee/spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../Melee/spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Objects/Weapons/Melee/spear.rsi/meta.json | 40 ++++++++++++++---- .../spear.rsi/wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../spear.rsi/wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../uranium_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../uranium_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/uranium_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes 38 files changed, 217 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs index 17b88fb5a8..010bfb3184 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -2,6 +2,8 @@ using Content.Client.Items.Systems; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Clothing; +using Content.Shared.Clothing.Components; using Content.Shared.Hands; using Content.Shared.Item; using Content.Shared.Rounding; @@ -20,6 +22,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem(OnMapInit); SubscribeLocalEvent(OnGetHeldVisuals); + SubscribeLocalEvent(OnGetClothingVisuals); } private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args) @@ -174,4 +177,41 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem ent, ref GetEquipmentVisualsEvent args) + { + if (ent.Comp.EquippedFillBaseName == null) + return; + + if (!TryComp(ent, out var appearance)) + return; + + if (!TryComp(ent, out var clothing)) + return; + + if (!AppearanceSystem.TryGetData(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance)) + return; + + var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1); + + if (closestFillSprite > 0) + { + var layer = new PrototypeLayerData(); + + var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}"; + var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite; + + // Make sure the sprite state is valid so we don't show a big red error message + // This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets). + if (!TryComp(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _)) + return; + + layer.State = key; + + if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData(ent, 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 100ee3975f..1e3c14bfd4 100644 --- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs @@ -53,5 +53,17 @@ namespace Content.Shared.Chemistry.Components /// [DataField] public int InHandsMaxFillLevels = 0; + + /// + /// Optional equipped visuals to show someone is wearing a something with a filled container. + /// + [DataField] + public string? EquippedFillBaseName = null; + + /// + /// A separate max fill levels for equipped items (to reduce number of sprites needed) + /// + [DataField] + public int EquippedMaxFillLevels = 0; } } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 608fb2544a..d6985c018d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -112,6 +112,11 @@ - type: SolutionContainerVisuals maxFillLevels: 1 fillBaseName: spear + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 1 + equippedFillBaseName: -fill- + equippedMaxFillLevels: 1 + - type: entity name: reinforced spear diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 -- 2.52.0