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 0000000000..3a850ef0d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png differ 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 3833f5be96..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-icon.png and /dev/null differ 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 e9bdb52b15..445521b606 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png index dbba1db1ad..42d3d419f5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png differ 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 0000000000..3a850ef0d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ 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 001a1f5d3b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png index 42647c87af..4ba1cf4cf2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png differ 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 dfec425178..decf2c9141 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png differ 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 0000000000..3a850ef0d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ 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 8640074077..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-icon.png and /dev/null differ 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 d8a465ba1f..3fdba97d51 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png index abb0ee0352..8c21e80749 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png differ 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 0000000000..3a850ef0d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ 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 f1c549fdb9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-icon.png and /dev/null differ 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 8d06c56c1f..2b88d428ae 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png differ 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 186f070303..17f4d27bb1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png differ 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 0000000000..3a850ef0d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ 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 dad960c290..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png index d065fc1995..823ef43e0b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png index 553cb45028..77db56b89d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png differ