diff --git a/Content.Client/HUD/GameHud.cs b/Content.Client/HUD/GameHud.cs index 5b22c04aa0..d31960894c 100644 --- a/Content.Client/HUD/GameHud.cs +++ b/Content.Client/HUD/GameHud.cs @@ -118,7 +118,7 @@ namespace Content.Client.HUD } dir = proto.Path; - var resourcePath = (new ResourcePath("/Textures/Interface/Inventory") / dir) / path; + var resourcePath = (new ResourcePath("/Textures/Interface/") / dir) / "Slots" / path; return _resourceCache.GetTexture(resourcePath); } diff --git a/Content.Client/Hands/UI/HandsGui.xaml.cs b/Content.Client/Hands/UI/HandsGui.xaml.cs index 52e67a18b1..515c521024 100644 --- a/Content.Client/Hands/UI/HandsGui.xaml.cs +++ b/Content.Client/Hands/UI/HandsGui.xaml.cs @@ -30,7 +30,7 @@ namespace Content.Client.Hands.UI private readonly HandsComponent _handsComponent; private string StorageTexture => "back.png"; - private Texture BlockedTexture => _resourceCache.GetTexture("/Textures/Interface/Inventory/blocked.png"); + private Texture BlockedTexture => _resourceCache.GetTexture("/Textures/Interface/Default/blocked.png"); private ItemStatusPanel StatusPanel { get; } diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index c7b841bdfb..31d28794d7 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -18,5 +18,5 @@ name: action-name-mask description: action-description-mask-toggle icon: Clothing/Mask/gas.rsi/icon.png - iconOn: Interface/Inventory/blocked.png + iconOn: Interface/Default/blocked.png event: !type:ToggleMaskEvent diff --git a/Resources/Textures/Interface/Inventory/Classic/back.png b/Resources/Textures/Interface/Classic/Slots/back.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/back.png rename to Resources/Textures/Interface/Classic/Slots/back.png diff --git a/Resources/Textures/Interface/Inventory/Classic/belt.png b/Resources/Textures/Interface/Classic/Slots/belt.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/belt.png rename to Resources/Textures/Interface/Classic/Slots/belt.png diff --git a/Resources/Textures/Interface/Inventory/Classic/ears.png b/Resources/Textures/Interface/Classic/Slots/ears.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/ears.png rename to Resources/Textures/Interface/Classic/Slots/ears.png diff --git a/Resources/Textures/Interface/Inventory/Classic/glasses.png b/Resources/Textures/Interface/Classic/Slots/glasses.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/glasses.png rename to Resources/Textures/Interface/Classic/Slots/glasses.png diff --git a/Resources/Textures/Interface/Inventory/Classic/gloves.png b/Resources/Textures/Interface/Classic/Slots/gloves.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/gloves.png rename to Resources/Textures/Interface/Classic/Slots/gloves.png diff --git a/Resources/Textures/Interface/Inventory/Classic/hand_l.png b/Resources/Textures/Interface/Classic/Slots/hand_l.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/hand_l.png rename to Resources/Textures/Interface/Classic/Slots/hand_l.png diff --git a/Resources/Textures/Interface/Inventory/Classic/hand_l_no_letter.png b/Resources/Textures/Interface/Classic/Slots/hand_l_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/hand_l_no_letter.png rename to Resources/Textures/Interface/Classic/Slots/hand_l_no_letter.png diff --git a/Resources/Textures/Interface/Inventory/Classic/hand_r.png b/Resources/Textures/Interface/Classic/Slots/hand_r.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/hand_r.png rename to Resources/Textures/Interface/Classic/Slots/hand_r.png diff --git a/Resources/Textures/Interface/Inventory/Classic/hand_r_no_letter.png b/Resources/Textures/Interface/Classic/Slots/hand_r_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/hand_r_no_letter.png rename to Resources/Textures/Interface/Classic/Slots/hand_r_no_letter.png diff --git a/Resources/Textures/Interface/Inventory/Classic/head.png b/Resources/Textures/Interface/Classic/Slots/head.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/head.png rename to Resources/Textures/Interface/Classic/Slots/head.png diff --git a/Resources/Textures/Interface/Inventory/Classic/id.png b/Resources/Textures/Interface/Classic/Slots/id.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/id.png rename to Resources/Textures/Interface/Classic/Slots/id.png diff --git a/Resources/Textures/Interface/Inventory/Classic/mask.png b/Resources/Textures/Interface/Classic/Slots/mask.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/mask.png rename to Resources/Textures/Interface/Classic/Slots/mask.png diff --git a/Resources/Textures/Interface/Inventory/Classic/neck.png b/Resources/Textures/Interface/Classic/Slots/neck.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/neck.png rename to Resources/Textures/Interface/Classic/Slots/neck.png diff --git a/Resources/Textures/Interface/Inventory/Classic/pocket.png b/Resources/Textures/Interface/Classic/Slots/pocket.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/pocket.png rename to Resources/Textures/Interface/Classic/Slots/pocket.png diff --git a/Resources/Textures/Interface/Inventory/Classic/shoes.png b/Resources/Textures/Interface/Classic/Slots/shoes.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/shoes.png rename to Resources/Textures/Interface/Classic/Slots/shoes.png diff --git a/Resources/Textures/Interface/Inventory/Classic/suit.png b/Resources/Textures/Interface/Classic/Slots/suit.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/suit.png rename to Resources/Textures/Interface/Classic/Slots/suit.png diff --git a/Resources/Textures/Interface/Inventory/Classic/suit_storage.png b/Resources/Textures/Interface/Classic/Slots/suit_storage.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/suit_storage.png rename to Resources/Textures/Interface/Classic/Slots/suit_storage.png diff --git a/Resources/Textures/Interface/Inventory/Classic/uniform.png b/Resources/Textures/Interface/Classic/Slots/uniform.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Classic/uniform.png rename to Resources/Textures/Interface/Classic/Slots/uniform.png diff --git a/Resources/Textures/Interface/Inventory/block.png b/Resources/Textures/Interface/Default/SlotBackground.png similarity index 100% rename from Resources/Textures/Interface/Inventory/block.png rename to Resources/Textures/Interface/Default/SlotBackground.png diff --git a/Resources/Textures/Interface/Inventory/Default/back.png b/Resources/Textures/Interface/Default/Slots/back.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/back.png rename to Resources/Textures/Interface/Default/Slots/back.png diff --git a/Resources/Textures/Interface/Inventory/Default/belt.png b/Resources/Textures/Interface/Default/Slots/belt.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/belt.png rename to Resources/Textures/Interface/Default/Slots/belt.png diff --git a/Resources/Textures/Interface/Inventory/Default/ears.png b/Resources/Textures/Interface/Default/Slots/ears.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/ears.png rename to Resources/Textures/Interface/Default/Slots/ears.png diff --git a/Resources/Textures/Interface/Inventory/Default/ears_headset.png b/Resources/Textures/Interface/Default/Slots/ears_headset.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/ears_headset.png rename to Resources/Textures/Interface/Default/Slots/ears_headset.png diff --git a/Resources/Textures/Interface/Inventory/Default/glasses.png b/Resources/Textures/Interface/Default/Slots/glasses.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/glasses.png rename to Resources/Textures/Interface/Default/Slots/glasses.png diff --git a/Resources/Textures/Interface/Inventory/Default/gloves.png b/Resources/Textures/Interface/Default/Slots/gloves.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/gloves.png rename to Resources/Textures/Interface/Default/Slots/gloves.png diff --git a/Resources/Textures/Interface/Inventory/Default/hand_l.png b/Resources/Textures/Interface/Default/Slots/hand_l.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/hand_l.png rename to Resources/Textures/Interface/Default/Slots/hand_l.png diff --git a/Resources/Textures/Interface/Inventory/Default/hand_l_no_letter.png b/Resources/Textures/Interface/Default/Slots/hand_l_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/hand_l_no_letter.png rename to Resources/Textures/Interface/Default/Slots/hand_l_no_letter.png diff --git a/Resources/Textures/Interface/Default/Slots/hand_m.png b/Resources/Textures/Interface/Default/Slots/hand_m.png new file mode 100644 index 0000000000..d06aaa79dd Binary files /dev/null and b/Resources/Textures/Interface/Default/Slots/hand_m.png differ diff --git a/Resources/Textures/Interface/Inventory/Default/hand_r.png b/Resources/Textures/Interface/Default/Slots/hand_r.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/hand_r.png rename to Resources/Textures/Interface/Default/Slots/hand_r.png diff --git a/Resources/Textures/Interface/Inventory/Default/hand_r_no_letter.png b/Resources/Textures/Interface/Default/Slots/hand_r_no_letter.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/hand_r_no_letter.png rename to Resources/Textures/Interface/Default/Slots/hand_r_no_letter.png diff --git a/Resources/Textures/Interface/Inventory/Default/head.png b/Resources/Textures/Interface/Default/Slots/head.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/head.png rename to Resources/Textures/Interface/Default/Slots/head.png diff --git a/Resources/Textures/Interface/Inventory/Default/id.png b/Resources/Textures/Interface/Default/Slots/id.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/id.png rename to Resources/Textures/Interface/Default/Slots/id.png diff --git a/Resources/Textures/Interface/Inventory/Default/inventory.png b/Resources/Textures/Interface/Default/Slots/inventory.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/inventory.png rename to Resources/Textures/Interface/Default/Slots/inventory.png diff --git a/Resources/Textures/Interface/Inventory/Default/mask.png b/Resources/Textures/Interface/Default/Slots/mask.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/mask.png rename to Resources/Textures/Interface/Default/Slots/mask.png diff --git a/Resources/Textures/Interface/Inventory/Default/neck.png b/Resources/Textures/Interface/Default/Slots/neck.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/neck.png rename to Resources/Textures/Interface/Default/Slots/neck.png diff --git a/Resources/Textures/Interface/Inventory/Default/pda.png b/Resources/Textures/Interface/Default/Slots/pda.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/pda.png rename to Resources/Textures/Interface/Default/Slots/pda.png diff --git a/Resources/Textures/Interface/Inventory/Default/pocket.png b/Resources/Textures/Interface/Default/Slots/pocket.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/pocket.png rename to Resources/Textures/Interface/Default/Slots/pocket.png diff --git a/Resources/Textures/Interface/Inventory/Default/shoes.png b/Resources/Textures/Interface/Default/Slots/shoes.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/shoes.png rename to Resources/Textures/Interface/Default/Slots/shoes.png diff --git a/Resources/Textures/Interface/Inventory/Default/suit.png b/Resources/Textures/Interface/Default/Slots/suit.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/suit.png rename to Resources/Textures/Interface/Default/Slots/suit.png diff --git a/Resources/Textures/Interface/Inventory/Default/suit_storage.png b/Resources/Textures/Interface/Default/Slots/suit_storage.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/suit_storage.png rename to Resources/Textures/Interface/Default/Slots/suit_storage.png diff --git a/Resources/Textures/Interface/Inventory/Default/uniform.png b/Resources/Textures/Interface/Default/Slots/uniform.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/uniform.png rename to Resources/Textures/Interface/Default/Slots/uniform.png diff --git a/Resources/Textures/Interface/Inventory/blocked.png b/Resources/Textures/Interface/Default/blocked.png similarity index 100% rename from Resources/Textures/Interface/Inventory/blocked.png rename to Resources/Textures/Interface/Default/blocked.png diff --git a/Resources/Textures/Interface/Inventory/Default/meta.json b/Resources/Textures/Interface/Default/meta.json similarity index 100% rename from Resources/Textures/Interface/Inventory/Default/meta.json rename to Resources/Textures/Interface/Default/meta.json diff --git a/Resources/Textures/Interface/Inventory/hand_active_gold.png b/Resources/Textures/Interface/Default/slot_highlight.png similarity index 100% rename from Resources/Textures/Interface/Inventory/hand_active_gold.png rename to Resources/Textures/Interface/Default/slot_highlight.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/back.png b/Resources/Textures/Interface/Modernized/Slots/back.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/back.png rename to Resources/Textures/Interface/Modernized/Slots/back.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/belt.png b/Resources/Textures/Interface/Modernized/Slots/belt.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/belt.png rename to Resources/Textures/Interface/Modernized/Slots/belt.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/block.png b/Resources/Textures/Interface/Modernized/Slots/block.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/block.png rename to Resources/Textures/Interface/Modernized/Slots/block.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/ears.png b/Resources/Textures/Interface/Modernized/Slots/ears.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/ears.png rename to Resources/Textures/Interface/Modernized/Slots/ears.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/glasses.png b/Resources/Textures/Interface/Modernized/Slots/glasses.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/glasses.png rename to Resources/Textures/Interface/Modernized/Slots/glasses.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/gloves.png b/Resources/Textures/Interface/Modernized/Slots/gloves.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/gloves.png rename to Resources/Textures/Interface/Modernized/Slots/gloves.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/hand_l.png b/Resources/Textures/Interface/Modernized/Slots/hand_l.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/hand_l.png rename to Resources/Textures/Interface/Modernized/Slots/hand_l.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/hand_l_active.png b/Resources/Textures/Interface/Modernized/Slots/hand_l_active.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/hand_l_active.png rename to Resources/Textures/Interface/Modernized/Slots/hand_l_active.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/hand_r.png b/Resources/Textures/Interface/Modernized/Slots/hand_r.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/hand_r.png rename to Resources/Textures/Interface/Modernized/Slots/hand_r.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/hand_r_active.png b/Resources/Textures/Interface/Modernized/Slots/hand_r_active.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/hand_r_active.png rename to Resources/Textures/Interface/Modernized/Slots/hand_r_active.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/head.png b/Resources/Textures/Interface/Modernized/Slots/head.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/head.png rename to Resources/Textures/Interface/Modernized/Slots/head.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/id.png b/Resources/Textures/Interface/Modernized/Slots/id.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/id.png rename to Resources/Textures/Interface/Modernized/Slots/id.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/inventory.png b/Resources/Textures/Interface/Modernized/Slots/inventory.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/inventory.png rename to Resources/Textures/Interface/Modernized/Slots/inventory.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/mask.png b/Resources/Textures/Interface/Modernized/Slots/mask.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/mask.png rename to Resources/Textures/Interface/Modernized/Slots/mask.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/meta b/Resources/Textures/Interface/Modernized/Slots/meta similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/meta rename to Resources/Textures/Interface/Modernized/Slots/meta diff --git a/Resources/Textures/Interface/Inventory/Modernized/neck.png b/Resources/Textures/Interface/Modernized/Slots/neck.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/neck.png rename to Resources/Textures/Interface/Modernized/Slots/neck.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/pocket.png b/Resources/Textures/Interface/Modernized/Slots/pocket.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/pocket.png rename to Resources/Textures/Interface/Modernized/Slots/pocket.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/sheet.png b/Resources/Textures/Interface/Modernized/Slots/sheet.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/sheet.png rename to Resources/Textures/Interface/Modernized/Slots/sheet.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/shoes.png b/Resources/Textures/Interface/Modernized/Slots/shoes.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/shoes.png rename to Resources/Textures/Interface/Modernized/Slots/shoes.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/suit.png b/Resources/Textures/Interface/Modernized/Slots/suit.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/suit.png rename to Resources/Textures/Interface/Modernized/Slots/suit.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/suit_storage.png b/Resources/Textures/Interface/Modernized/Slots/suit_storage.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/suit_storage.png rename to Resources/Textures/Interface/Modernized/Slots/suit_storage.png diff --git a/Resources/Textures/Interface/Inventory/Modernized/uniform.png b/Resources/Textures/Interface/Modernized/Slots/uniform.png similarity index 100% rename from Resources/Textures/Interface/Inventory/Modernized/uniform.png rename to Resources/Textures/Interface/Modernized/Slots/uniform.png