From 34dfba2619009b95e959fc95f63e75bae2cd5684 Mon Sep 17 00:00:00 2001
From: wrexbe <81056464+wrexbe@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:13:28 -0700
Subject: [PATCH] Move slot UI files around (#11282)

* Move files around for themes
---
 Content.Client/HUD/GameHud.cs                     |   2 +-
 Content.Client/Hands/UI/HandsGui.xaml.cs          |   2 +-
 .../Entities/Clothing/Masks/base_clothingmask.yml |   2 +-
 .../{Inventory/Classic => Classic/Slots}/back.png | Bin
 .../{Inventory/Classic => Classic/Slots}/belt.png | Bin
 .../{Inventory/Classic => Classic/Slots}/ears.png | Bin
 .../Classic => Classic/Slots}/glasses.png         | Bin
 .../Classic => Classic/Slots}/gloves.png          | Bin
 .../Classic => Classic/Slots}/hand_l.png          | Bin
 .../Slots}/hand_l_no_letter.png                   | Bin
 .../Classic => Classic/Slots}/hand_r.png          | Bin
 .../Slots}/hand_r_no_letter.png                   | Bin
 .../{Inventory/Classic => Classic/Slots}/head.png | Bin
 .../{Inventory/Classic => Classic/Slots}/id.png   | Bin
 .../{Inventory/Classic => Classic/Slots}/mask.png | Bin
 .../{Inventory/Classic => Classic/Slots}/neck.png | Bin
 .../Classic => Classic/Slots}/pocket.png          | Bin
 .../Classic => Classic/Slots}/shoes.png           | Bin
 .../{Inventory/Classic => Classic/Slots}/suit.png | Bin
 .../Classic => Classic/Slots}/suit_storage.png    | Bin
 .../Classic => Classic/Slots}/uniform.png         | Bin
 .../block.png => Default/SlotBackground.png}      | Bin
 .../{Inventory/Default => Default/Slots}/back.png | Bin
 .../{Inventory/Default => Default/Slots}/belt.png | Bin
 .../{Inventory/Default => Default/Slots}/ears.png | Bin
 .../Default => Default/Slots}/ears_headset.png    | Bin
 .../Default => Default/Slots}/glasses.png         | Bin
 .../Default => Default/Slots}/gloves.png          | Bin
 .../Default => Default/Slots}/hand_l.png          | Bin
 .../Slots}/hand_l_no_letter.png                   | Bin
 .../Textures/Interface/Default/Slots/hand_m.png   | Bin 0 -> 600 bytes
 .../Default => Default/Slots}/hand_r.png          | Bin
 .../Slots}/hand_r_no_letter.png                   | Bin
 .../{Inventory/Default => Default/Slots}/head.png | Bin
 .../{Inventory/Default => Default/Slots}/id.png   | Bin
 .../Default => Default/Slots}/inventory.png       | Bin
 .../{Inventory/Default => Default/Slots}/mask.png | Bin
 .../{Inventory/Default => Default/Slots}/neck.png | Bin
 .../{Inventory/Default => Default/Slots}/pda.png  | Bin
 .../Default => Default/Slots}/pocket.png          | Bin
 .../Default => Default/Slots}/shoes.png           | Bin
 .../{Inventory/Default => Default/Slots}/suit.png | Bin
 .../Default => Default/Slots}/suit_storage.png    | Bin
 .../Default => Default/Slots}/uniform.png         | Bin
 .../Interface/{Inventory => Default}/blocked.png  | Bin
 .../Interface/{Inventory => }/Default/meta.json   |   0
 .../slot_highlight.png}                           | Bin
 .../Modernized => Modernized/Slots}/back.png      | Bin
 .../Modernized => Modernized/Slots}/belt.png      | Bin
 .../Modernized => Modernized/Slots}/block.png     | Bin
 .../Modernized => Modernized/Slots}/ears.png      | Bin
 .../Modernized => Modernized/Slots}/glasses.png   | Bin
 .../Modernized => Modernized/Slots}/gloves.png    | Bin
 .../Modernized => Modernized/Slots}/hand_l.png    | Bin
 .../Slots}/hand_l_active.png                      | Bin
 .../Modernized => Modernized/Slots}/hand_r.png    | Bin
 .../Slots}/hand_r_active.png                      | Bin
 .../Modernized => Modernized/Slots}/head.png      | Bin
 .../Modernized => Modernized/Slots}/id.png        | Bin
 .../Modernized => Modernized/Slots}/inventory.png | Bin
 .../Modernized => Modernized/Slots}/mask.png      | Bin
 .../Modernized => Modernized/Slots}/meta          |   0
 .../Modernized => Modernized/Slots}/neck.png      | Bin
 .../Modernized => Modernized/Slots}/pocket.png    | Bin
 .../Modernized => Modernized/Slots}/sheet.png     | Bin
 .../Modernized => Modernized/Slots}/shoes.png     | Bin
 .../Modernized => Modernized/Slots}/suit.png      | Bin
 .../Slots}/suit_storage.png                       | Bin
 .../Modernized => Modernized/Slots}/uniform.png   | Bin
 69 files changed, 3 insertions(+), 3 deletions(-)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/back.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/belt.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/ears.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/glasses.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/gloves.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/hand_l.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/hand_l_no_letter.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/hand_r.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/hand_r_no_letter.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/head.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/id.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/mask.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/neck.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/pocket.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/shoes.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/suit.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/suit_storage.png (100%)
 rename Resources/Textures/Interface/{Inventory/Classic => Classic/Slots}/uniform.png (100%)
 rename Resources/Textures/Interface/{Inventory/block.png => Default/SlotBackground.png} (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/back.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/belt.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/ears.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/ears_headset.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/glasses.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/gloves.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/hand_l.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/hand_l_no_letter.png (100%)
 create mode 100644 Resources/Textures/Interface/Default/Slots/hand_m.png
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/hand_r.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/hand_r_no_letter.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/head.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/id.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/inventory.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/mask.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/neck.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/pda.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/pocket.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/shoes.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/suit.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/suit_storage.png (100%)
 rename Resources/Textures/Interface/{Inventory/Default => Default/Slots}/uniform.png (100%)
 rename Resources/Textures/Interface/{Inventory => Default}/blocked.png (100%)
 rename Resources/Textures/Interface/{Inventory => }/Default/meta.json (100%)
 rename Resources/Textures/Interface/{Inventory/hand_active_gold.png => Default/slot_highlight.png} (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/back.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/belt.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/block.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/ears.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/glasses.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/gloves.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/hand_l.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/hand_l_active.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/hand_r.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/hand_r_active.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/head.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/id.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/inventory.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/mask.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/meta (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/neck.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/pocket.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/sheet.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/shoes.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/suit.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/suit_storage.png (100%)
 rename Resources/Textures/Interface/{Inventory/Modernized => Modernized/Slots}/uniform.png (100%)

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 0000000000000000000000000000000000000000..d06aaa79ddb7cc5cdd07bc77c18f27f65a886c28
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006XNkl<ZScUDE
zv2xl#5QhJg?j&7orHg5dQUpj5Qn~SrU&0R&p2~R$zeHx-xQbIGxCxM%gp?u15=fi5
zLkA*4M8bp8umciv61V?;+FRY?e;ZT&&(1I30l2C`OYipP`h9l52%!5fANKCO)w#%t
z;Mp5o*WH`*FbtuBY;`WK&dx7kMAS;aSe8U>1dL@#09Y5GF4k?e6ZkvO1Azm9N(4@u
zZ(w=4bbum##PI8<Cy6Od;N-Lo>G@!b+66d3Ofv-Sx1fkH{@yR`v@!t|xpaLnTDnjF
zEMN-(5`;$3)<UWhDMf%;781nZjOVZEFN1WRgB(KhRTtyYb{ae60Ii+!5@;pF^)-z_
z|8A>@jRJ}YP?CzUutCIXAf~z2<2gQ>FS~_#QJKJKc&8`C5d%m5F~pebv&}fBvtMw8
zggo-`;-rPqaC=UaUIi+eM(`T8bF6WzXzes7Y$(SQIKqQ;d`zPW1b6jA*)-=9Dq*r9
z&Vbqc5vmjj?&;)|;&>4~mwGJxJ=Ns?WfdzS(;uZFA>ha0Ga5k$5E9(ttLTNRbE9a!
zoe8LQ9*Y?)a8MNM`v?7x2-;mhJc9)rL<z#lL+N@@i9nK&MypoE&++~8{`ip)Mi2V8
z$^30|?M&cXK}Hvim$AcszzFE6U8>od@0&z6(B;d`v}bko2dX!?y}4$V8Av;oUfML&
mX4%*K8i^VN<Qmob4Zt4}n+$H#FbZ}60000<MNUMnLSTX*HyB<3

literal 0
HcmV?d00001

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