From fb6dd4a4901359f5fe87f86686eda82288b73d55 Mon Sep 17 00:00:00 2001 From: Alex Evgrashin Date: Mon, 23 Nov 2020 06:17:38 +0300 Subject: [PATCH] Working flashlight for hard hats (#2599) * Add verb to toggle flashlight * Playing with hand-held light for hard hat * ClothingEquippedPrefix will update players sprite when changed * Make abstract prototype for hardhat and fixed hardhat orange sprites * Fixed all other hard hats * Fixed requested changes * Restore prototype and sprites changes * Nullables * That's actually nullable Co-authored-by: Metal Gear Sloth --- .../Components/Clothing/ClothingComponent.cs | 31 +++++++++++++-- .../HUD/Inventory/ClientInventoryComponent.cs | 36 ++++++++++++++---- .../Interactable/HandheldLightComponent.cs | 24 +++++++++++- .../Entities/Clothing/Head/hardhats.yml | 32 ++++++++++++++-- .../Head/Hardhats/blue.rsi/light-icon.png | Bin 0 -> 256 bytes .../Clothing/Head/Hardhats/blue.rsi/meta.json | 22 +++++++++-- ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../{inhand-left.png => off-inhand-left.png} | Bin ...{inhand-right.png => off-inhand-right.png} | Bin .../Head/Hardhats/blue.rsi/on-icon.png | Bin 196 -> 0 bytes .../Head/Hardhats/blue.rsi/on-inhand-left.png | Bin 548 -> 691 bytes .../Hardhats/blue.rsi/on-inhand-right.png | Bin 555 -> 719 bytes .../Head/Hardhats/orange.rsi/light-icon.png | Bin 0 -> 256 bytes .../Head/Hardhats/orange.rsi/meta.json | 22 +++++++++-- ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../{inhand-left.png => off-inhand-left.png} | Bin ...{inhand-right.png => off-inhand-right.png} | Bin .../Head/Hardhats/orange.rsi/on-icon.png | Bin 229 -> 0 bytes .../Hardhats/orange.rsi/on-inhand-left.png | Bin 558 -> 702 bytes .../Hardhats/orange.rsi/on-inhand-right.png | Bin 551 -> 728 bytes .../Head/Hardhats/red.rsi/light-icon.png | Bin 0 -> 256 bytes .../Clothing/Head/Hardhats/red.rsi/meta.json | 22 +++++++++-- ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../{inhand-left.png => off-inhand-left.png} | Bin ...{inhand-right.png => off-inhand-right.png} | Bin .../Head/Hardhats/red.rsi/on-icon.png | Bin 204 -> 0 bytes .../Head/Hardhats/red.rsi/on-inhand-left.png | Bin 543 -> 703 bytes .../Head/Hardhats/red.rsi/on-inhand-right.png | Bin 542 -> 728 bytes .../Head/Hardhats/white.rsi/light-icon.png | Bin 0 -> 256 bytes .../Head/Hardhats/white.rsi/meta.json | 22 +++++++++-- ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../{inhand-left.png => off-inhand-left.png} | Bin ...{inhand-right.png => off-inhand-right.png} | Bin .../Head/Hardhats/white.rsi/on-icon.png | Bin 207 -> 0 bytes .../Hardhats/white.rsi/on-inhand-left.png | Bin 544 -> 701 bytes .../Hardhats/white.rsi/on-inhand-right.png | Bin 548 -> 713 bytes .../Head/Hardhats/yellow.rsi/light-icon.png | Bin 0 -> 256 bytes .../Head/Hardhats/yellow.rsi/meta.json | 22 +++++++++-- ...ped-HELMET.png => off-equipped-HELMET.png} | Bin .../{inhand-left.png => off-inhand-left.png} | Bin ...{inhand-right.png => off-inhand-right.png} | Bin .../Head/Hardhats/yellow.rsi/on-icon.png | Bin 202 -> 0 bytes .../Hardhats/yellow.rsi/on-inhand-left.png | Bin 549 -> 715 bytes .../Hardhats/yellow.rsi/on-inhand-right.png | Bin 550 -> 725 bytes 44 files changed, 202 insertions(+), 31 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png rename Resources/Textures/Clothing/Head/Hardhats/blue.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/blue.rsi/{inhand-left.png => off-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/blue.rsi/{inhand-right.png => off-inhand-right.png} (100%) delete mode 100644 Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png rename Resources/Textures/Clothing/Head/Hardhats/orange.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/orange.rsi/{inhand-left.png => off-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/orange.rsi/{inhand-right.png => off-inhand-right.png} (100%) delete mode 100644 Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png rename Resources/Textures/Clothing/Head/Hardhats/red.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/red.rsi/{inhand-left.png => off-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/red.rsi/{inhand-right.png => off-inhand-right.png} (100%) delete mode 100644 Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png rename Resources/Textures/Clothing/Head/Hardhats/white.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/white.rsi/{inhand-left.png => off-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/white.rsi/{inhand-right.png => off-inhand-right.png} (100%) delete mode 100644 Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png rename Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/{equipped-HELMET.png => off-equipped-HELMET.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/{inhand-left.png => off-inhand-left.png} (100%) rename Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/{inhand-right.png => off-inhand-right.png} (100%) delete mode 100644 Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs index be2d6957e0..37fa84f161 100644 --- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs +++ b/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs @@ -1,9 +1,13 @@ -using Content.Client.GameObjects.Components.Items; +#nullable enable +using Content.Client.GameObjects.Components.HUD.Inventory; +using Content.Client.GameObjects.Components.Items; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.Items; using Robust.Client.Graphics; +using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects.Components; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -18,8 +22,29 @@ namespace Content.Client.GameObjects.Components.Clothing public override string Name => "Clothing"; public override uint? NetID => ContentNetIDs.CLOTHING; + private string? _clothingEquippedPrefix; + [ViewVariables(VVAccess.ReadWrite)] - public string ClothingEquippedPrefix { get; set; } + public string? ClothingEquippedPrefix + { + get => _clothingEquippedPrefix; + set + { + if (_clothingEquippedPrefix == value) + return; + + _clothingEquippedPrefix = value; + + if (!Owner.TryGetContainer(out IContainer? container)) + return; + if (!container.Owner.TryGetComponent(out ClientInventoryComponent? inventory)) + return; + if (!inventory.TryFindItemSlots(Owner, out EquipmentSlotDefines.Slots? slots)) + return; + + inventory.SetSlotVisuals(slots.Value, Owner); + } + } [ViewVariables(VVAccess.ReadWrite)] public FemaleClothingMask FemaleMask @@ -54,7 +79,7 @@ namespace Content.Client.GameObjects.Components.Clothing return null; } - public override void HandleComponentState(ComponentState curState, ComponentState nextState) + public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) { if (curState == null) return; diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index d74f8d30e7..a543b709f2 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs @@ -1,4 +1,6 @@ -using System.Collections.Generic; +#nullable enable +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Client.GameObjects.Components.Clothing; using Content.Shared.GameObjects.Components.Inventory; @@ -22,10 +24,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory { private readonly Dictionary _slots = new Dictionary(); - [ViewVariables] - public InventoryInterfaceController InterfaceController { get; private set; } + [ViewVariables] public InventoryInterfaceController InterfaceController { get; private set; } = default!; - private ISpriteComponent _sprite; + private ISpriteComponent? _sprite; private bool _playerAttached = false; @@ -69,7 +70,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory } } - public override void HandleComponentState(ComponentState curState, ComponentState nextState) + public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) { base.HandleComponentState(curState, nextState); @@ -126,7 +127,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory return; } - if (entity != null && entity.TryGetComponent(out ClothingComponent clothing)) + if (entity.TryGetComponent(out ClothingComponent? clothing)) { var flag = SlotMasks[slot]; var data = clothing.GetEquippedStateInfo(flag); @@ -155,6 +156,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory internal void ClearAllSlotVisuals() { + if (_sprite == null) + return; + foreach (var slot in InventoryInstance.SlotMasks) { if (slot != Slots.NONE) @@ -192,7 +196,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory SendNetworkMessage(new OpenSlotStorageUIMessage(slot)); } - public override void HandleMessage(ComponentMessage message, IComponent component) + public override void HandleMessage(ComponentMessage message, IComponent? component) { base.HandleMessage(message, component); @@ -210,9 +214,25 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory } } - public bool TryGetSlot(Slots slot, out IEntity item) + public bool TryGetSlot(Slots slot, out IEntity? item) { return _slots.TryGetValue(slot, out item); } + + public bool TryFindItemSlots(IEntity item, [NotNullWhen(true)] out Slots? slots) + { + slots = null; + + foreach (var (slot, entity) in _slots) + { + if (entity == item) + { + slots = slot; + return true; + } + } + + return false; + } } } diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 3774218410..25f3314fc5 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -3,8 +3,10 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Items.Clothing; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; @@ -164,7 +166,7 @@ namespace Content.Server.GameObjects.Components.Interactable if (Owner.TryGetComponent(out ClothingComponent? clothing)) { - clothing.ClothingEquippedPrefix = on ? "On" : "Off"; + clothing.ClothingEquippedPrefix = on ? "on" : "off"; } if (Owner.TryGetComponent(out ItemComponent? item)) @@ -226,5 +228,25 @@ namespace Content.Server.GameObjects.Components.Interactable { return new HandheldLightComponentState(GetLevel()); } + + [Verb] + public sealed class ToggleLightVerb : Verb + { + protected override void GetData(IEntity user, HandheldLightComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Toggle light"); + } + + protected override void Activate(IEntity user, HandheldLightComponent component) + { + component.ToggleStatus(user); + } + } } } diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml index 11b8830005..236cfac568 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml @@ -1,5 +1,29 @@ - type: entity parent: ClothingHeadBase + id: ClothingHeadHatHardhatBase + abstract: true + components: + - type: Sprite + layers: + - state: icon + - state: light-icon + shader: unshaded + visible: false + - type: Clothing + HeldPrefix: off + ClothingPrefix: off + - type: PointLight + enabled: false + radius: 3 + - type: LoopingSound + - type: Appearance + visuals: + - type: FlashLightVisualizer + - type: HandheldLight + - type: PowerCellSlot + +- type: entity + parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatBlue name: blue hard hat description: A hard hat, painted in blue, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. @@ -10,7 +34,7 @@ sprite: Clothing/Head/Hardhats/blue.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatOrange name: orange hard hat description: A hard hat, painted in orange, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. @@ -21,7 +45,7 @@ sprite: Clothing/Head/Hardhats/orange.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatRed name: red hard hat description: A hard hat, painted in red, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. @@ -32,7 +56,7 @@ sprite: Clothing/Head/Hardhats/red.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatWhite name: white hard hat description: A hard hat, painted in white, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. @@ -43,7 +67,7 @@ sprite: Clothing/Head/Hardhats/white.rsi - type: entity - parent: ClothingHeadBase + parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatYellow name: yellow hard hat description: A hard hat, painted in yellow, used in dangerous working conditions to protect the head. Comes with a built-in flashlight. diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a850ef0d89953c939f371809f8b31c012e41ea9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893x)$HK(b2mV$ZB7@SK);0v)zX|<38Ij@u~Qu#pO_ROr@AZp@D%3 zOl)HAdg7b!vm`{Yd?W9E^9T1r`~B4~T$``OFu}x7rkul}=k&ZPW``=~Reuw#;+MVt qv6SIyv>yW_%M-ReKqvhF&&+U9wQ};k!wz;pE`z75pUXO@geCx&CRED+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json index adaa2fb070..ce1c5b7db5 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json @@ -10,17 +10,33 @@ { "name": "icon", "directions": 1 + }, + { + "name": "light-icon", + "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/blue.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png deleted file mode 100644 index 3833f5be96c0ec4b84f398330e6a74a91875bd80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kcv5PFDUXc8H%(#R9t!J z`kMT2EV1m1)HAg_s@P1_os&MK>^!6u;LEmo(KPi{&n7GX`X?eFC}=p#CZhP!lYWmECx?kKbLh*2~7ZnXh_Kb diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png index e9bdb52b156f17cd09c2f64bf446500c89939773..445521b606efdc6cf02ae6bc5d6c7ae2cb2c58af 100644 GIT binary patch delta 668 zcmZ3&vYB;)ayAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOqQN5jv*Dd-rU-lEu1KE{Nwwh!BK0v6+~8hu$|3_ zHVw!)vHHJjAlD-WC63Il=7Sp}?@Y%CL>?Q7qyM~?#1)c*Y_KQ5WPZOh(k z=KoF#C-@wy=i{r^%W9yO7(2@Q|-hn(Y% zA5z_iHWjC0+?{%O!$YZ#@pXtB$tWVktS|`ALpV7MF zanOy-F2+pN72(j(Knj=*$ve*0HNGsV^1eNz;Kq~&$0c_(!&0pcmB)jH2eC! z{Zm%S%CnuCz4On_ca;t6S6^J&ch16j`nuvTCsclX)iFzk zLc8c*a4>Tn+yz}K9MVOcf~(vXNGEZ!4n>fo^aU4j5%G06QyXpC*34EYu5Tanq?0NFnYHQYypruNZmHjpQHZMx$nzV+9Wvn z?etl_evQV`XMgAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOrf4Gjv*Dd-rV-h5O$PkcvybjHR^)*mH?d)uB>&r zYa5#qk1tN=*K%4?5y-O8UcFiTqRf|N9UNOTG$KT+>N#z{BzS6Qthu2ScS(vPi?`Lu zwu4LYWkrU0Uecy{OFX~*PDn7?EuA)RZls#Av~#xagu^Ni6d9Nl(2*n0>9Z+DGgmQ} zm7Lk~?b~$kqibeH`k2I+1bDs8V!rgUhg+mR-!{c-+m%(FL7sOn?=?xBxM=zBug3d-&Hk#l&BO5jsfCM+J5H*b zZ}7ON#gX@yTl)2s9}bDhcenpbdwWzM-C)nDD^FPK{?;7$a=DtPExfVfvU0_1etWHx z>;HxA)h`M=R_NAWm|Mcx!SvW+PikAk=1ni_f8UgD+pUo$G2O$4=5$pI`hvEh^UZNqn-Apb*@-4GqWMGcv6Ba55tARhS7dMKXB0 L`njxgN@xNAF$XVe delta 531 zcmV+u0_^?I1*-&*BYy$%NklLt(w~*zaU*Yn3AQV$rg;Zf;@!MDd}KJg9yHmC3FcT>JZyeTwDH1b7g!U5ZIC> zj*evsd@qQIh=_=Yh{&obMNu?%qcM#%igrqQ2QbDwaHQERnt#7MZpWZ*(h5z2x=D>` zq>IITT(ji=rvPIbX@w?T>+vSoqH8@WG+CAs`uP)k!5_Yp*o)l!<>8$nWYa%m&9fXF zwpsHmoBkOP7QTdRe)v6D^729Dp3Kh1GuIF zTnBJX1-K62nhJ0oKtx1DL_|bH@LmCM62Ao?>CG#cW`0f)%v`|mEQ^y) ztM@9T=2zMO_^t3Koi%d-!k72rC6YbwBX0M}H2>j19(1qx`g V(0FnwL<|4`002ovPDHLkV1iZu12q5u diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a850ef0d89953c939f371809f8b31c012e41ea9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893x)$HK(b2mV$ZB7@SK);0v)zX|<38Ij@u~Qu#pO_ROr@AZp@D%3 zOl)HAdg7b!vm`{Yd?W9E^9T1r`~B4~T$``OFu}x7rkul}=k&ZPW``=~Reuw#;+MVt qv6SIyv>yW_%M-ReKqvhF&&+U9wQ};k!wz;pE`z75pUXO@geCx&CRED+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json index adaa2fb070..ce1c5b7db5 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json @@ -10,17 +10,33 @@ { "name": "icon", "directions": 1 + }, + { + "name": "light-icon", + "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/orange.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/orange.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/orange.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png deleted file mode 100644 index 001a1f5d3b5d2ae91519a376fd961c27e8e9089e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHJ&bxAr*6y6C_v{Cy4Yk1sZUj zU|_6OxsEn0WNV|Kw>0>z@exn34M7 z{^2egcY{e;mCIK!G&gNwI=p}WeMuIz^(j9lNS`}!l;(87edTa$7{Q?<_dX(-mK3#8ba3<_=O2zkivU+MNKPD@Fy~e&t#(>N1pa#Tk aObjN%rl;BX?Ae#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOfH@-jv*Dd-rPEveK|me{lok0O_3|u`!;$% zscEiPp2>H0zq*)H7yZ29){bYt8ln&M{%-Y>Zdj`6`+WV+|Mhw9l1i(5FP=Q?wN=?W zSfJli!|A|up{EWB-wwNps^{r;on80u*YnHl|72$9+p*1lw%v-;jqSn@ksB*toLJ5v z?gS5r1=32JrY;azq|EimYr=Mv&;bWj!s!6(zwFOG|J=1LSL)N5f4#56w#9YU$J#S} zxp@0|d;gOs)6XwsX=wiK^0njqyeYfo9{ld_zWLAgx?$ZrCZl*}o%LZ^ei|8)3$+=9 zs_%>0zL%V5U)!UuJau@bsDbD}^ delta 534 zcmdnTx{hUnay{c$PZ!6KiaBp@?e#wFAi?%Q-IsOYlyCe21%k`-_+E)D=BvxOw6uG{ z?C4!qyRO$eu#1aFtJ|~rzEtsZEf5lS3|CZga-3A$vDI<0$=)m3AAUNvZ`t#*+JC+I z6FvncFj(~8ZSr2n#TS2kG`?+g^p4-&=kH%EyJyf7m(RbT-k2JZ2e9N11YAmng@1Fbp_VtFUo01czt@?NH+t%*hiTx+1 zeqMi?b?@t64;~y|_gLh1Jr9T9#UjV!1zrxM21z;0lkbX@*GUr7VKiYD$($Ytpf`F&H8dKV1Mo1%1ye#I{jty z9&b4%9`u}D=(9^k@m+zXixe3Wl-AeoYt#N5bo*H+$ASuJ?Pmhr#{wzrKHKl`qr?ov3-U>${Xw{5kd`XSexmoaN1E`QXXH`)c>K zemu^#E3JR0;PXiA;LN|Q7wvR~)LwB;ayiqm;PlpFUWR8$yW*9uHPj_xadk*Fd-uw% V+`sw%|F>fR0#8>zmvv4FO#s8M3c&yX diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png index dfec42517860960c94d8db2b4414b17b459d7e1a..decf2c9141d97b970dbc0d7e6158c8129cec3847 100644 GIT binary patch delta 705 zcmZ3^a)Wh(ayAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOmUtrjv*Dd-rPQ)eK|pb{loj&=Cd2)w%tw;XLYp+ zaWOAV@T`CHDBj@c;l5WJ6XR@p3^%g3<}G;S*sXDBS^bvXypAt(Bts;kjLI&)Joz$k z1AAiE$=3^)d2iP{+`J}tA3w{aWuEiDPyWuEf6rXhOS8q&q{W8Afq_Y&fq_MVff33~ zMF0nHIbam&qU%W!k)VI&@E4#A7({OG`GxOC>r?W>NIHc-n)UUmI zuyt1VbZ_k!rfna8yet*T(z9Ycc-nscg^vXu?sf~=pRLceztQD&BaOd^U+>}bXR$V? z?l$LsJJ5A%oBN07^=AZnRW<7OUhT}g!IuzT@Y-|fK3;bL z*Vdn*-=F_~E&nOqy#pQ~EoM@&iHa^6TyN{un|x6M3LItvhc0~obtv!i`}#PEn-`BA z{`#oxwuv+IoBvmC)~{uBD+`f*EBrx>A)>-=U7Nq?6v^Gi`?a$U#I^RH`1R&>`+KgP z`g-@$pIxYaU{PoNIh-Nptrx@kTka|Wf47u3La8kzq+A}j5U({;uitNPPPg^S|~w6z2$I;8#yb?;rr^)I_eRuLY( e0+)UmGbG(VzqElP=L#@sGI+ZBxvXCnvov^j?67 zh=_=Yh=`_*RNIT+DC6ngz~YeO&Js)!#=?F35knYT{_w#ObOTn_ur9?Aitzg&DNpfSbDu zwBLY6VFs>kq`rh`{>6+I9&!2mPJx4lhjQ+#o4L-pYa4%?{ujM_@#j(DmteFV*EW#R z6%0*-rxZSX4S$u#@2f=TQ(C?Rqxm=HduBE+pZ)N4G=J=`z)z&5fN}L!HDy?UbO32A zKstal79br!8VisPKtx1DL_|bH^xuXqc@JB8$yC7$&}u{Ecselta&?*@rD-8WWib{@2A z8^{{K?atLiJo&)L1q|A3^pHG@h^b!}U;)wrq_F_$0Mb~1bO32AKstc5Prg64Mhk6A R6aWAK00>D%PDHLkV1fg1_Wl3> diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a850ef0d89953c939f371809f8b31c012e41ea9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893x)$HK(b2mV$ZB7@SK);0v)zX|<38Ij@u~Qu#pO_ROr@AZp@D%3 zOl)HAdg7b!vm`{Yd?W9E^9T1r`~B4~T$``OFu}x7rkul}=k&ZPW``=~Reuw#;+MVt qv6SIyv>yW_%M-ReKqvhF&&+U9wQ};k!wz;pE`z75pUXO@geCx&CRED+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json index adaa2fb070..ce1c5b7db5 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json @@ -10,17 +10,33 @@ { "name": "icon", "directions": 1 + }, + { + "name": "light-icon", + "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/red.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/red.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/red.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png deleted file mode 100644 index 8640074077e3d3ad4eb51f0e8d8e61a3ce0ab9ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ$(}BbAr*7pUQ*;cWFT?$#j_hs?ySfLWT;B`^*&rcv!uTG^|^4;JH|)-SWvM=QTH;(A>m-fH@-n zlEQ(H^NNGr8Z{3jMsBpKm8-rP>SO<-J1s5k|3luj^GsFv)K|vgTe~DWM4f DM&VEL diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png index d8a465ba1f788e2c219ddc2755ca513f04a6dd08..3fdba97d514f923df91d6a20cbb83ef150f8162b 100644 GIT binary patch delta 680 zcmbQwvY&N=ayAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOs<|Tjv*Dd-rPFxEs`j~{^9*@UFOUDR!5p1Eu3J* z(wLL5K;!o-#|ce*feNml*()^8HnYg>dEp?w@LAXux%wj}Hd8sd5Au0UYGjVH67jx$ zCDYL$@#uj#{^rN)qRif2dAI96d)wUf%K6i4?SH?s*4Njb613uJ$AV+c3@i!^j2sRO zOacuMW7Bg`l6S=Mhs1|5T%K_16ce}afyu|sH%_c?S?)g|?|9xHlH8qx*>+vzJhK-eb_VhC&aHK+dbZ<{j$iLzZ~^9AeN z!^ARJHi)tNSvascyni`&Tl2{+H{RdAzi)q8(EZE*zr6aj@9R>%riF}e>bU-_UvXkN zgSitt3>HW!ZJE13V388rk+}->OmJ~%*f=yWD@VPQH<;@u{&bn*)vJ4+J%1j*jIIBK`D$nWESUasVCn}t#tAJ_q%rU;9|1*ej-84mSb%qzRP@enWtGI+ZB KxvX^$D&H9b6ow zMO^X#F1mGbaLeY@2XLqg;^5-Y#XNxp7oCKXZlx_ERB*Wtm)M}OnxyS*@c)*Qv?o3J zbCRLG01*)p5fKp){Wqz&2XGwc$M$5|epBMW9s&4weQ_g1^31@9+1vgX$-40sx@YQDbYG>b2AfSMNXhpzUEA+64GV zw9){U0lemcxqmwF40ZK9K~vzb-<{8V`=0BUx4`;|d;((w}U3>YN_pt}Lx7=Z2ubYlRz8_Ae#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOmUtrjv*Dd-rRP~xEvtE_Thc2&gv8_($uE2* zY~L7cRH@Ps>EHD5!-UljT#xZNe=v~P{NP|?Tdc@i$NFW5Ijwgbbnv)wBVa>oESpuE zX_b_)%Z&nw`Rx~UVzXDVNA9Yr=Q!&fcdB~-zVDOvUFXtNog~90B*&t_z{ugiz$DPX z0AV($xUJgt*uw8Dr>*sx7`y0iakVeP=Pd2C_mh%nD_kMEA$Rw~LR;$^^ZUV4kvDAY zpXm77tgg3Q{`#Wsf&{5gPXER8m;GTA|JobRdO2fdQW{+4eKdh&lG>$)@>i3H4h8#BXT1FF&lfYVx9= zd4ew@L>I6h_|8+Xh9`$gn(Of1)cV*E;B0VkjT3S4 z1++A_G`P7n-3w?af@rvd$aefp=DIWIBAN)PpXaX}Nd&OXz6ui?00000NkvXX Hu0mjfZ!PsM diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a850ef0d89953c939f371809f8b31c012e41ea9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893x)$HK(b2mV$ZB7@SK);0v)zX|<38Ij@u~Qu#pO_ROr@AZp@D%3 zOl)HAdg7b!vm`{Yd?W9E^9T1r`~B4~T$``OFu}x7rkul}=k&ZPW``=~Reuw#;+MVt qv6SIyv>yW_%M-ReKqvhF&&+U9wQ};k!wz;pE`z75pUXO@geCx&CRED+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json index adaa2fb070..ce1c5b7db5 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json @@ -10,17 +10,33 @@ { "name": "icon", "directions": 1 + }, + { + "name": "light-icon", + "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/white.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/white.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/white.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png deleted file mode 100644 index f1c549fdb92c8ba64f564af73752db6df26d2955..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJX`U{QAr*7pUf9Tc$Uva=p>~9# zlh;X>lIyz@n5(wu$ucvkc_au=JIV6JoMGa+suDpV(PTPjC8vcOd7?gLehx2~y9u&kS{4ljWrM z{Pp!W6;@Z){IX4Wk-zEooz&giE6wb#8GQ-;-r3RNaj)*ZXZMVGd^dnDWbkzLb6Mw< G&;$S*DOl(L diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png index 8d06c56c1f8f1c9af706cc94116cb752f2055910..2b88d428ae8668274a0f902c3b26228d8447225f 100644 GIT binary patch delta 678 zcmZ3$vX^y&ayAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOwOJzjv*Dd-rPQ)eK|pb{X@RjT~|fRKEMAB^Y)zN zl71=jb<^3)e4;l4Z7XigYRheZbnxJ{hew+Yju%MhIM;u?6!Kx)p9pn}5BvgxUK^h; za}G@0chAXaRd!6t+fTI%+Lyl-p5%Yerm}LjmlMYkOQDWRfd&Q^1qMbA2L>i6^O3~K z6=o@sVG7~x%Y|5LpA-~6%so`}%vs-R#o^$kd&*4rhuk_HdG61*_xq-wO=GUS@wKSz0}h#j%fP}|Lyiiml|Byzg=|OzYw>E`sd}V`O3<^O|&WJ zd_9}r(D0)S!;u?5R$R&a`^@`twg2_6eXsquvP(Se(s&`2bNkq-Pq}}7{1aJyUheR= zT#*vq<8wXhYpv#fi<^6`+*f$c+?md6?K+Y^3iIu|bLh>PnEDmJ(l-A*ZgXnFq9~EG z{@M51xOTC*1~Rd4*b(sQQ9y6hrt4I zrA;#zsCdQ}I?UnxB!n6?piq*LKACsl@v;f?&cJmY)!*M&RW80b;hYHr!wTnmf3^K} zyLWth)yn%oDkbt;y^deg1>xxquM?`)u759BR4$j0oy@uJH4}q~YopF-kEKD6e3<9# z-|&Ck)vD&}$IQ;WVrOW0y=%qQtb6M()OQ25Hmtk8o}rXs`ooavj11;^asBSXEKTQ` zQ;Z}Fzf>~U+XsZ2hS*Q|vEIFVdQ&MBb@ E0F2xvbpQYW delta 520 zcmV+j0{8vB1)v0wBYy$sNklWdH3dz{%c94W%W2+{5oA&#G!;PHe2)hHzvKIbl=%y%FN^2iunRr!I*WEn;U?)`c0)K{Xidt0_{Xq}4swxcK z6x)nn#ctF)G;~w+2R&r-3JwZs01Enp9sn#g8{GI#*YdV$nznTOsv^Aw4BZqBt&UVG zh1~ugvUvrQ(Gah1AFyp3w>NkA?j-#2wrzXc-EmNS*jpg-82|vSW*cYc*R#Rl5n9bQ z8d`nnc>l=Gzh!Yk- zb^@}o0J0O1jRlaMfNU&)>;#C2h=_=Yh={f=^3~R;&96Kex+yNNF1+z{It|r75SuST znx=_bRTTh`OeVcwCX)%(I}nQk)T*jDD5R0iD|mdkhkxTZ0A|bPVT%xp0(81o;_2lb zlhF{?;28kmI1a|+v9}7nZV_Vf3uO z-@s?(Hkw$>fH3~dTVPXI0NDx1#sbJrKsFXYb^@}o0J0O1?GpuCyOILv^OgVr002ov KPDHLkU;%=GmG4{t diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png index 186f0703034810f0b7c6d643932bf1a9862354be..17f4d27bb1ea85cb73a7308ee14af6febb08f7b9 100644 GIT binary patch delta 690 zcmZ3&a*}m|ayAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgO#YrOjv*Dd-rPQ)eK|pb{X@Rf-J{OMGLruokFI8B z^|m^nZOc1%dhA!L*=@P)k5V^mt@>y%SIIfiUPR=UT>YQIh{;=4D^;!M@fLW0@lwAQ}%o_YR#bJ3XVu2Y;{jx;l{C@?T`I502?G(eaFM>{I5 zcdaX*6ELYe$!~V%`t_zRcVpgKXHM{1+P9VIYSz~0uf2*kP6*Xc>27VVyc=`(t;KSU zhmrw$p?B&(KeyZd`Df)BjduIfOHX;6oi)W#x+d&HrFExhc<@1wI>AL=)}+kIgFu?_cF z4<$W_ZD3YJ1V!ry_ogNVmt~g@rYqfGK@KHIfC={8SYXZ*RXH*B=KsRl@8{~(c7-SO zS3iBRKdnLMbe@e|`*y|ymydJ5`!X|q-K0Hx4aFo4R(zVIa&TL&MPKt=cUKes`w2;p zOzO6juV>m}Hm$Z{`Zu8LCLN2u&%1YCv0rfW&f$v}i#s0e-n;P}1H%R#?zLgu3?Dun zUET09n?YTFsqqe*GKRnNgg(yG%rKEs);8U(^&vi4hC>h-o-xk%_O z(u1}xNPB>48`#2~x~VpU7o;Z;S|m~rFfLn7i z4of0Hw>azpS?ym4~37Kb207>{qWfpl$c_PkamfMpO!z)!4Vd zDq#WA0i>}2=>XDLfOG(9EI>K{5fKp)5fKs5e+wPx3>$edP17Hey1Bl^&%sCOk)tqk z{Ucu?`H0+p&A*?9!InVtdqec$i*0RWE=Pb2%K(#crVp8-=}0YUR^yg3Ek zZg(kudC$}Z1Wl3Y^?LKC5wP;(0xUo}fHW2$9Y7ijkPaY?1xN>w_6e7LxpBRM8x;Tm O002ovP6b4+LSTZh6!p9S diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a850ef0d89953c939f371809f8b31c012e41ea9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNq$1fP z$d`ekN|k}3p_zf<=YJsml7XSrfPvvv0t1893x)$HK(b2mV$ZB7@SK);0v)zX|<38Ij@u~Qu#pO_ROr@AZp@D%3 zOl)HAdg7b!vm`{Yd?W9E^9T1r`~B4~T$``OFu}x7rkul}=k&ZPW``=~Reuw#;+MVt qv6SIyv>yW_%M-ReKqvhF&&+U9wQ};k!wz;pE`z75pUXO@geCx&CRED+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json index adaa2fb070..ce1c5b7db5 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json @@ -10,17 +10,33 @@ { "name": "icon", "directions": 1 + }, + { + "name": "light-icon", + "directions": 1 }, { - "name": "equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-left", + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/inhand-left.png rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/inhand-right.png rename to Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png deleted file mode 100644 index dad960c29011e818ec7597e92ebb42f22c08aa8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwAr*7pUQpya?^ z=gP;{t1f7-o~FHERfg8Z484Q4Rs1KoVmzzZH#A2CU5H;ZE4|D(DScBzM@L6+Y@_q_ zP3sOkdfNN6XrCHi?CE1%eI1M`M*sdZOg3y|QchxcZYcg~pW6NHHENG-4w)uBmE81x z`TN}MDc3hYS3TbFnAJkI;q9~Ow(~5-1qB8B`KRSt2W@6M^cmAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOo5&*jv*Dd-rU;gFB~Yt{^9*@fh{KYm3Qk5H8rg!o_ek&YN~rfcoU8sY2kc)A*ra) zS$Gw5E#J{gVIt?|ZCiRj{?d~Dum8r~t6lg0?&<8-DMGz6Tv9e14h&2J4Gb&_42)1_ zuY_-&X-Z_6=enQmQ;l!!J}bG}dt;E`@!5Q{>VJe?*l%Mr-RffcQlUB-L@A zWw#crPEg2w-fz89p0~1K>HX%56OISghBEp%Prqoe!DwyLpE&z{^}CyYKQ7;Bv{p&# z-e0Az*Z#jZwO)^Vz1oUh#Qno0-UG+pOrHMJhSBA4_4@N`Zr0bIxy$qL+OmufOEgSG zc$x1lmUYNu4v3oIS%2g~@7v<_u9K3M@BaV!@6Lwj)4$DE+hlz$+=_D-Tfje&AMt^c z{TcOI;9=ol+mfyAsOaJwBM{ys!-Nz#5N1Q{;+5B|XZWaj7hS&a^yh(Zwbo+wGsJ&O zF)(a-cbi%Irt-#>YvrS>Yj++>|LD@chGn5%+kxrp!;{al=Pi2wD0NRf>m%-;dDXW= zzx*nS@cnY4mbYNV*Rz*?{VG0VQ{D4=Va@c%++4@h><`~w$8;cG`N~lNi`Bfc`u1jq z7dROtX4gaq-ZtH@8D+l-XhBEBnLqsLZip@U^89v2cuQHn~ RRR&Cr44$rjF6*2UngIJbC@}y4 delta 525 zcmX@jx|C&tay{c4PZ!6KiaBp@8G0WM5Mh0gT)0x8WY;%&uSM6-9qX(1w^=c^={-qh^iVU= zSrc`){=?Hi=he9nKkWIhvg37h?&{t5Z+=@fe+MT+!&hZ)?@WcIHy`h=OX1ZkDvaNA z{hI-AF4G<5sz`=OE9+esd}ch7b|K5|@rOO(k4;(M{W=@-=Xm8i?fLV*3jY+4S>Cya zbx{lBiaZBXwgtNwuSzt$Vhc%TSS78X1OZapFT}UGz5P91-C4Xy`+9Z%j2vCnk*s;%sM_A;ke?tWUN+qU|W_9RYT2Bvm_&gcUdT75FVRWPx{ZlHK1a?l9V~JolAe#yX4 zYQVtoDuIE)Y6b&?c>bjLqizfgOwpb$jv*Dd-rPQ)eK|pb{lk0dQ(NwpahFWh{KuZW zVWn!J+?I;Z3r_IeTXHYujlrzbEWND#T29X-x;9u|e_Q|L7~8~_RWI6vTVlgLPS9l0 zzc;5T*JjGGFYPPkQeJ+lRhST;UwPmE{&(MBDx&kAE1pwSeCEi&B+$UXqQJn&;Q(QF zB&)pA-j-`F6JV5l$?|FJ)0wt9H&y@kdoqWHe&514Ep_YN^(n{l(v4?7)?WH}`kP61 z*9&|C4^=zVE3U6nZ?_MBHvRsCDW4Wbomd?^)l~CIsJ?1`pS9kEN%3dfuEuAD-zaR{ z`uz0^ON);7{?7$>ZvD&4-1C@e@=ld?y=sOtz1yzEXX)i+9Jn^A=jF=4KR@ckjW2)S zuvO*og+=`WYyRI{7+cS|x_;4J_SE&e7-DqnYXfhaF*?7Vr?{d1^GV*jd~GY#T{o+@ ztWVBx`1K)h!7ttke2K?@c4(W|i_f~CE4bCu;K$o}_H%PA^Do}{dObX@Y7y&#pIRTb z3tnCA5K*#+>w{YdJUEUh{;_scbjgvDtx<1sMhzxVhzT6_D6v|2dGhp4mXH4LsMniy zwe5J?fqV9rzt-C>$my#{Z(FrOpJ9VV{Y_~ZjViBa=l<5(vb^f`|9+C8;p%mvd(#`G zf9X{5-8ppL%WS)Tn?uBQpj5?%4@b-Q%$vMn@7{)g%6wJT_w5+_T;&!d`)#-@BOvo# zJeZlGfxF)<>fCIge~wxz%n<(bT<*f3Y38niTic|g*1F$_f4)m=x7LsKhW9uGVXkhN dacn&!!vX22WQ%mvv4FO#mvuHQoRK delta 526 zcmcc0x{PIlay{c)PZ!6KiaBp@?e}I%lwkj`{!)^Hh1`#1j+ode8Gdf1<0qPC3E!4l zJWZ(H#A$Sp3TpYjk&}2$dLD9B=`2G z+I#jf`kPB-m2&^ITQ)_-w0>>g&fnL?c0bRb&B$P|KTmNgi;&a=uUoelyX^hpcU$Yb z;tIcskIV%8eHeSo73wWIqrM9M+`HZ}OZ4w2fsoJoXIgIc?KZKyb3W_ey!^(xA4?gU zUsZ7T2#YybHJG3f41y4FG5&K-NmXf_mfNvhBb(b7@7ik~cf{HviZw8y7d?{2|% z@3y=B{Vk1$lmC}Z3}ybW`Yfi#W*H;Hy3_TJ7TrQdFLlC-7H^!Fuz<