diff --git a/Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs b/Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs
index e99aae7d99..fd7b080f79 100644
--- a/Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs
+++ b/Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs
@@ -80,6 +80,9 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
start.Comp.RevealedLayers.Add(keyCode);
var index = sprite.AddLayer(defaultLayer);
sprite.LayerMapSet(keyCode, index);
+
+ if (indexedPart.Color is not null)
+ sprite.LayerSetColor(keyCode, indexedPart.Color.Value);
}
else
{
@@ -148,6 +151,7 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
{
RsiPath = indexedPart.RsiPath,
State = state,
+ Color = indexedPart.Color,
};
var key = $"{defaultKey}-{counterPart}-default";
@@ -203,6 +207,7 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
{
RsiPath = indexedPart.RsiPath,
State = state,
+ Color = indexedPart.Color,
};
var key = $"{defaultKey}-{counterPart}-default";
diff --git a/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs b/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs
index d9c2b51f10..d35e9895df 100644
--- a/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs
+++ b/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs
@@ -28,6 +28,12 @@ public sealed partial class CP14ModularCraftPartPrototype : IPrototype
[DataField]
public string? RsiPath;
+ ///
+ /// Automatic colored all states, QoL for YML size reducing
+ ///
+ [DataField]
+ public Color? Color;
+
[DataField]
public List? IconSprite;
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml
index 46727749df..5ac96e732f 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml
@@ -17,8 +17,9 @@
name: iron axe blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronAxe
@@ -29,8 +30,10 @@
name: golden axe blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldAxe
@@ -41,8 +44,10 @@
name: copper axe blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperAxe
@@ -53,8 +58,10 @@
name: mithril axe blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilAxe
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml
index 3b1c0ada2f..218c9922b2 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml
@@ -17,8 +17,9 @@
name: iron dagger blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronDagger
@@ -29,8 +30,10 @@
name: golden dagger blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldDagger
@@ -41,8 +44,10 @@
name: copper dagger blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperDagger
@@ -53,8 +58,10 @@
name: mithril dagger blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilDagger
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml
index 9fda128dce..866b8b5e4e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml
@@ -17,8 +17,9 @@
name: iron mace ball
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronMace
@@ -29,8 +30,10 @@
name: golden mace ball
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldMace
@@ -41,8 +44,10 @@
name: copper mace ball
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperMace
@@ -53,8 +58,10 @@
name: mithril mace ball
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilMace
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml
index 01319e7141..4be5fcb4f0 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml
@@ -17,8 +17,9 @@
name: iron pickaxe head
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronPickaxe
@@ -29,8 +30,10 @@
name: golden pickaxe head
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldPickaxe
@@ -41,8 +44,10 @@
name: copper pickaxe head
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperPickaxe
@@ -53,8 +58,10 @@
name: mithril pickaxe head
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilPickaxe
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml
index 3a229f83e6..5b45ab230a 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml
@@ -17,8 +17,9 @@
name: iron rapier blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronRapier
@@ -29,8 +30,10 @@
name: golden rapier blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldRapier
@@ -41,8 +44,10 @@
name: copper rapier blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperRapier
@@ -53,8 +58,10 @@
name: mithril rapier blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilRapier
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml
index 9b9d1cd2a6..482b35c871 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml
@@ -17,8 +17,9 @@
name: iron shovel blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronShovel
@@ -29,8 +30,10 @@
name: golden shovel blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldShovel
@@ -41,8 +44,10 @@
name: copper shovel blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperShovel
@@ -53,8 +58,10 @@
name: mithril shovel blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilShovel
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml
index 59631bccc7..9f900e0e79 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml
@@ -17,8 +17,9 @@
name: iron sickle blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- BladeIronSickle
@@ -29,8 +30,10 @@
name: copper sickle blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperSickle
@@ -41,8 +44,10 @@
name: golden sickle blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldSickle
@@ -53,8 +58,10 @@
name: mithril sickle blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilSickle
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml
new file mode 100644
index 0000000000..1e75195fa4
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml
@@ -0,0 +1,71 @@
+- type: entity
+ parent: BaseItem
+ id: CP14ModularBladeSpearBase
+ categories: [ ForkFiltered ]
+ abstract: true
+ description: Hiltless spearhead. A blacksmith can use it as a spare part to create a weapon.
+ components:
+ - type: Item
+ storedRotation: 45
+ shape:
+ - 0,0,0,0
+ storedOffset: 0, 5
+
+- type: entity
+ parent: CP14ModularBladeSpearBase
+ id: CP14ModularBladeIronSpear
+ categories: [ ForkFiltered ]
+ name: iron spearhead
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ layers:
+ - state: icon
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - BladeIronSpear
+
+- type: entity
+ parent: CP14ModularBladeSpearBase
+ id: CP14ModularBladeGoldSpear
+ categories: [ ForkFiltered ]
+ name: gold spearhead
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - BladeGoldSpear
+
+- type: entity
+ parent: CP14ModularBladeSpearBase
+ id: CP14ModularBladeCopperSpear
+ categories: [ ForkFiltered ]
+ name: copper spearhead
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - BladeCopperSpear
+
+- type: entity
+ parent: CP14ModularBladeSpearBase
+ id: CP14ModularBladeMithrilSpear
+ categories: [ ForkFiltered ]
+ name: mithril spearhead
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - BladeMithrilSpear
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml
index 11360fcbf0..a3b7f0a351 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml
@@ -17,7 +17,7 @@
name: iron sword blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+ sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
state: icon
- type: CP14ModularCraftPart
possibleParts:
@@ -29,8 +29,10 @@
name: golden sword blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftPart
possibleParts:
- BladeGoldSword
@@ -41,8 +43,10 @@
name: copper sword blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- BladeCopperSword
@@ -53,8 +57,10 @@
name: mithril sword blade
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- BladeMithrilSword
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml
index 1d19c37b6c..a91fd10621 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml
@@ -11,19 +11,6 @@
- 0,0,0,0
storedOffset: 0, 5
-- type: entity
- parent: CP14ModularGardeBase
- id: CP14ModularGardeSharpGold
- categories: [ ForkFiltered ]
- name: sharp gold garde
- components:
- - type: Sprite
- sprite: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi
- state: icon
- - type: CP14ModularCraftPart
- possibleParts:
- - GardeSharpGold
-
- type: entity
parent: CP14ModularGardeBase
id: CP14ModularGardeSharpIron
@@ -31,12 +18,28 @@
name: sharp iron garde
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftPart
possibleParts:
- GardeSharpIron
+- type: entity
+ parent: CP14ModularGardeBase
+ id: CP14ModularGardeSharpGold
+ categories: [ ForkFiltered ]
+ name: sharp gold garde
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - GardeSharpGold
+
- type: entity
parent: CP14ModularGardeBase
id: CP14ModularGardeSharpCopper
@@ -44,8 +47,10 @@
name: sharp copper garde
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftPart
possibleParts:
- GardeSharpCopper
@@ -57,8 +62,10 @@
name: sharp mithril garde
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Garde/mithril_sharp.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
- type: CP14ModularCraftPart
possibleParts:
- GardeSharpMithril
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml
new file mode 100644
index 0000000000..d0dc9e68c0
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml
@@ -0,0 +1,58 @@
+- type: entity
+ parent: CP14ModularGardeBase
+ id: CP14ModularGardeSturdyIron
+ categories: [ ForkFiltered ]
+ name: sturdy iron garde
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ layers:
+ - state: icon
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - GardeSturdyIron
+
+- type: entity
+ parent: CP14ModularGardeBase
+ id: CP14ModularGardeSturdyGold
+ categories: [ ForkFiltered ]
+ name: sturdy gold garde
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - GardeSturdyGold
+
+- type: entity
+ parent: CP14ModularGardeBase
+ id: CP14ModularGardeSturdyCopper
+ categories: [ ForkFiltered ]
+ name: sturdy copper garde
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - GardeSturdyCopper
+
+- type: entity
+ parent: CP14ModularGardeBase
+ id: CP14ModularGardeSturdyMithril
+ categories: [ ForkFiltered ]
+ name: sturdy mithril garde
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
+ - type: CP14ModularCraftPart
+ possibleParts:
+ - GardeSturdyMithril
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml
deleted file mode 100644
index 001a574c44..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- type: entity
- parent: BaseItem
- id: CP14ModularBladeIronSpear
- categories: [ ForkFiltered ]
- name: iron spearhead
- description: Hiltless spearhead. A blacksmith can use it as a spare part to create a weapon.
- components:
- - type: Item
- storedRotation: 45
- shape:
- - 0,0,0,0
- storedOffset: 0, 5
- - type: Sprite
- sprite: _CP14/Objects/ModularTools/iron_spear.rsi
- state: icon
- - type: CP14ModularCraftPart
- possibleParts:
- - BladeIronSpear
-
-#- type: entity
-# parent: BaseItem
-# id: CP14ModularBladeIronSwordTwoHanded
-# categories: [ ForkFiltered ]
-# name: iron two-handed sword blade
-# description: A two-handed sword blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-# components:
-# - type: Sprite
-# sprite: _CP14/Objects/ModularTools/blade48.rsi
-# layers:
-# - state: iron_sword_twohanded
-# - type: CP14ModularCraftPart
-# possibleParts:
-# - BladeIronSwordTwoHanded
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml
index 4083c3ea4d..b343f546df 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml
@@ -111,7 +111,10 @@
name: lucens grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Grip/lucens_grip.rsi
+ sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi
+ layers:
+ - state: icon
+ color: "#0398fc"
state: icon
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripLucens
@@ -134,8 +137,9 @@
name: iron grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Grip/iron_grip.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+ layers:
+ - state: icon
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripIron
- type: Destructible
@@ -151,37 +155,16 @@
- !type:DoActsBehavior
acts: ["Destruction"]
-- type: entity
- parent: CP14ModularGripShort
- id: CP14ModularGripMithril
- name: mithril grip
- components:
- - type: Sprite
- sprite: _CP14/Objects/ModularTools/Grip/mithril_grip.rsi
- state: icon
- - type: CP14ModularCraftStartPoint
- startProtoPart: CP14ModularGripMithril
- - type: Destructible
- thresholds:
- - trigger:
- !type:DamageTrigger
- damage: 120 #x2.4 durability
- behaviors:
- - !type:PlaySoundBehavior
- sound:
- collection: MetalBreak
- - !type:CP14ModularDisassembleBehavior
- - !type:DoActsBehavior
- acts: ["Destruction"]
-
- type: entity
parent: CP14ModularGripShort
id: CP14ModularGripGolden
name: golden grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Grip/gold_grip.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripGolden
- type: Destructible
@@ -203,8 +186,10 @@
name: copper grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/Grip/copper_grip.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripCopper
- type: Destructible
@@ -220,6 +205,31 @@
- !type:DoActsBehavior
acts: ["Destruction"]
+- type: entity
+ parent: CP14ModularGripShort
+ id: CP14ModularGripMithril
+ name: mithril grip
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
+ - type: CP14ModularCraftStartPoint
+ startProtoPart: CP14ModularGripMithril
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 120 #x2.4 durability
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: MetalBreak
+ - !type:CP14ModularDisassembleBehavior
+ - !type:DoActsBehavior
+ acts: ["Destruction"]
+
# Long
- type: entity
parent: CP14ModularGripLong
@@ -250,8 +260,10 @@
name: long lucens grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi
+ layers:
+ - state: icon
+ color: "#0398fc"
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripLucensLong
- type: Destructible
@@ -273,7 +285,7 @@
name: long iron grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi
+ sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
state: icon
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripIronLong
@@ -290,29 +302,6 @@
- !type:DoActsBehavior
acts: ["Destruction"]
-- type: entity
- parent: CP14ModularGripLong
- id: CP14ModularGripMithrilLong
- name: long mithril grip
- components:
- - type: Sprite
- sprite: _CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi
- state: icon
- - type: CP14ModularCraftStartPoint
- startProtoPart: CP14ModularGripMithrilLong
- - type: Destructible
- thresholds:
- - trigger:
- !type:DamageTrigger
- damage: 120 #x2.4 durability
- behaviors:
- - !type:PlaySoundBehavior
- sound:
- collection: MetalBreak
- - !type:CP14ModularDisassembleBehavior
- - !type:DoActsBehavior
- acts: ["Destruction"]
-
- type: entity
parent: CP14ModularGripIronLong
id: CP14ModularGripIronLongGuard
@@ -329,8 +318,10 @@
name: long golden grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+ layers:
+ - state: icon
+ color: "#ffaf47"
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripGoldLong
- type: Destructible
@@ -352,8 +343,10 @@
name: long copper grip
components:
- type: Sprite
- sprite: _CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi
- state: icon
+ sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+ layers:
+ - state: icon
+ color: "#bd712f"
- type: CP14ModularCraftStartPoint
startProtoPart: CP14ModularGripCopperLong
- type: Destructible
@@ -368,3 +361,29 @@
- !type:CP14ModularDisassembleBehavior
- !type:DoActsBehavior
acts: ["Destruction"]
+
+
+- type: entity
+ parent: CP14ModularGripLong
+ id: CP14ModularGripMithrilLong
+ name: long mithril grip
+ components:
+ - type: Sprite
+ sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+ layers:
+ - state: icon
+ color: "#45d2a4"
+ - type: CP14ModularCraftStartPoint
+ startProtoPart: CP14ModularGripMithrilLong
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 120 #x2.4 durability
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: MetalBreak
+ - !type:CP14ModularDisassembleBehavior
+ - !type:DoActsBehavior
+ acts: ["Destruction"]
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml
index 9e2a9c41ce..50a252aa5d 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
index ec28d6b8b2..8291a3abb0 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml
index 3ec5f326d4..c900a8b086 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
index 7e5fb71ea2..cf364db4ba 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml
index 2d3df9ca33..5d1707e1ab 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml
index 8ca26d9f4f..dbd056566f 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml
index e22024fbb4..bae8e3a531 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/iron_spear.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
@@ -22,7 +22,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/iron_spear.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
index 71b39b5c7f..fdda94e624 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
@@ -7,7 +7,7 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
@@ -22,9 +22,9 @@
- type: Sprite
layers:
- state: icon
- - sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+ - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
state: icon
- - sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+ - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
state: icon
- type: CP14ModularCraftAutoAssemble
details:
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
index d44cce06bd..33a11f733f 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
@@ -31,42 +31,45 @@
id: BladeIronAxe
targetSlot: Blade
sourcePart: CP14ModularBladeIronAxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeAxe
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldAxe
targetSlot: Blade
sourcePart: CP14ModularBladeGoldAxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeAxe
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperAxe
targetSlot: Blade
sourcePart: CP14ModularBladeCopperAxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeAxe
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilAxe
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilAxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeAxe
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
new file mode 100644
index 0000000000..7bae56180e
--- /dev/null
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
@@ -0,0 +1,47 @@
+- type: modularPart
+ id: BaseBladeBone
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 2
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 3
+ - !type:EditMeleeWeapon
+ damageMultiplier: 0.75
+ - !type:EditIncreaseDamageOnWield
+ damageMultiplier: 0.75
+
+- type: modularPart
+ id: BaseBladeIron
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 1
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 1
+
+- type: modularPart
+ id: BaseBladeCopper
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 1.5
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 1.5
+
+- type: modularPart
+ id: BaseBladeGold
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 2
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 3
+
+- type: modularPart
+ id: BaseBladeMithril
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 1
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 1
+ - !type:EditMeleeWeapon
+ damageMultiplier: 1.25
+ - !type:EditIncreaseDamageOnWield
+ damageMultiplier: 1.25
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
index efefd12e74..a5be7ae5ab 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
@@ -36,42 +36,45 @@
id: BladeIronDagger
targetSlot: Blade
sourcePart: CP14ModularBladeIronDagger
- rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeDagger
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldDagger
targetSlot: Blade
sourcePart: CP14ModularBladeGoldDagger
- rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeDagger
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperDagger
targetSlot: Blade
sourcePart: CP14ModularBladeCopperDagger
- rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeDagger
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilDagger
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilDagger
- rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeDagger
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
index 115f6fbda0..1f0673452a 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
@@ -29,42 +29,45 @@
id: BladeIronMace
targetSlot: Blade
sourcePart: CP14ModularBladeIronMace
- rsiPath: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeMace
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldMace
targetSlot: Blade
sourcePart: CP14ModularBladeGoldMace
- rsiPath: _CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeMace
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperMace
targetSlot: Blade
sourcePart: CP14ModularBladeCopperMace
- rsiPath: _CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeMace
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilMace
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilMace
- rsiPath: _CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeMace
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
index b28f607992..f184684c6b 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
@@ -24,42 +24,45 @@
id: BladeIronPickaxe
targetSlot: Blade
sourcePart: CP14ModularBladeIronPickaxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladePickaxe
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldPickaxe
targetSlot: Blade
sourcePart: CP14ModularBladeGoldPickaxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladePickaxe
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperPickaxe
targetSlot: Blade
sourcePart: CP14ModularBladeCopperPickaxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladePickaxe
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilPickaxe
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilPickaxe
- rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladePickaxe
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml
index a457f22120..d84aabe0cc 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml
@@ -39,42 +39,45 @@
id: BladeIronRapier
targetSlot: Blade
sourcePart: CP14ModularBladeIronRapier
- rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeRapier
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldRapier
targetSlot: Blade
sourcePart: CP14ModularBladeGoldRapier
- rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeRapier
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperRapier
targetSlot: Blade
sourcePart: CP14ModularBladeCopperRapier
- rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeRapier
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilRapier
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilRapier
- rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeRapier
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
index 884999e3c3..87a6d9f350 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
@@ -35,42 +35,45 @@
id: BladeIronShovel
targetSlot: Blade
sourcePart: CP14ModularBladeIronShovel
- rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeShovel
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldShovel
targetSlot: Blade
sourcePart: CP14ModularBladeGoldShovel
- rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeShovel
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperShovel
targetSlot: Blade
sourcePart: CP14ModularBladeCopperShovel
- rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeShovel
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilShovel
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilShovel
- rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeShovel
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
index 220bb66c34..84c0636f53 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
@@ -27,42 +27,45 @@
id: BladeIronSickle
targetSlot: Blade
sourcePart: CP14ModularBladeIronSickle
- rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSickle
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldSickle
targetSlot: Blade
sourcePart: CP14ModularBladeIronSickle
- rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSickle
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperSickle
targetSlot: Blade
sourcePart: CP14ModularBladeCopperSickle
- rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSickle
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilSickle
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilSickle
- rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSickle
- - BaseWeaponMithril
+ - BaseBladeMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
new file mode 100644
index 0000000000..3b515781f0
--- /dev/null
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
@@ -0,0 +1,85 @@
+#Concept:
+# + High Throwable damage
+# Piercing animation
+# - Low Melee Damage
+
+- type: modularPart
+ id: BaseBladeSpear
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseWeaponThrowable
+ - BaseWeaponChemical
+ - BaseWeaponSharp
+ - !type:AddComponents
+ override: true
+ components:
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 15
+ - type: ThrowingAngle
+ angle: 135
+ - type: EmbeddableProjectile
+ offset: -0.15,-0.15
+ removalTime: 1.5
+ - !type:EditMeleeWeapon
+ newWideAnimation: CP14WeaponArcThrust
+ angleMultiplier: 0
+ bonusDamage:
+ types:
+ Piercing: 7
+ - !type:EditItem
+ newSize: Normal
+ adjustShape: 0, 1
+ storedOffsetBonus: 0, 5
+ - !type:EditModularSlots
+ addSlots:
+ - Garde
+
+- type: modularPart
+ id: BladeIronSpear
+ targetSlot: Blade
+ sourcePart: CP14ModularBladeIronSpear
+ rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseBladeSpear
+ - BaseBladeIron
+
+- type: modularPart
+ id: BladeGoldSpear
+ targetSlot: Blade
+ sourcePart: CP14ModularBladeGoldSpear
+ rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ color: "#ffaf47"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseBladeSpear
+ - BaseBladeGold
+
+- type: modularPart
+ id: BladeCopperSpear
+ targetSlot: Blade
+ sourcePart: CP14ModularBladeCopperSpear
+ rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ color: "#bd712f"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseBladeSpear
+ - BaseBladeCopper
+
+- type: modularPart
+ id: BladeMithrilSpear
+ targetSlot: Blade
+ sourcePart: CP14ModularBladeMithrilSpear
+ rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+ color: "#45d2a4"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseBladeSpear
+ - BaseBladeMithril
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
index 84fa2f371a..dc932f52d3 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
@@ -41,45 +41,48 @@
id: BladeIronSword
targetSlot: Blade
sourcePart: CP14ModularBladeIronSword
- rsiPath: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSword
- - BaseWeaponIron
+ - BaseBladeIron
- type: modularPart
id: BladeGoldSword
targetSlot: Blade
sourcePart: CP14ModularBladeGoldSword
- rsiPath: _CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSword
- - BaseWeaponGold
+ - BaseBladeGold
- type: modularPart
id: BladeCopperSword
targetSlot: Blade
sourcePart: CP14ModularBladeCopperSword
- rsiPath: _CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSword
- - BaseWeaponCopper
+ - BaseBladeCopper
- type: modularPart
id: BladeMithrilSword
targetSlot: Blade
sourcePart: CP14ModularBladeMithrilSword
- rsiPath: _CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi
+ rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseBladeSword
- - BaseWeaponMithril
+ - BaseBladeMithril
- type: modularPart
id: BladeBoneSword
@@ -90,18 +93,4 @@
- !type:Inherit
copyFrom:
- BaseBladeSword
- - !type:EditMeleeWeapon
- bonusDamage:
- types:
- Slash: -4
- Piercing: -3
- Blunt: 2
- - !type:EditIncreaseDamageOnWield
- bonusDamage:
- types:
- Slash: -3
- Piercing: -2
- - !type:EditDamageableModifier
- multiplier: 2.5
- - !type:EditSharpened
- sharpnessDamageMultiplier: 3
+ - BaseBladeBone
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
index dcb8196df2..3db9306cce 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
@@ -5,50 +5,49 @@
id: BaseGardeSharp
modifiers:
- !type:EditMeleeWeapon
- bonusDamage:
- types:
- Piercing: 3
-
-- type: modularPart
- id: GardeSharpGold
- targetSlot: Garde
- sourcePart: CP14ModularGardeSharpGold
- rsiPath: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi
- modifiers:
- - !type:Inherit
- copyFrom:
- - BaseGardeSharp
- - BaseWeaponGold
+ damageMultiplier: 1.2
+ - !type:EditIncreaseDamageOnWield
+ damageMultiplier: 1.2
- type: modularPart
id: GardeSharpIron
targetSlot: Garde
sourcePart: CP14ModularGardeSharpIron
- rsiPath: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseGardeSharp
+
+- type: modularPart
+ id: GardeSharpGold
+ targetSlot: Garde
+ sourcePart: CP14ModularGardeSharpGold
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ color: "#ffaf47"
modifiers:
- !type:Inherit
copyFrom:
- BaseGardeSharp
- - BaseWeaponIron
- type: modularPart
id: GardeSharpCopper
targetSlot: Garde
sourcePart: CP14ModularGardeSharpCopper
- rsiPath: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ color: "#bd712f"
modifiers:
- !type:Inherit
copyFrom:
- BaseGardeSharp
- - BaseWeaponCopper
- type: modularPart
id: GardeSharpMithril
targetSlot: Garde
sourcePart: CP14ModularGardeSharpMithril
- rsiPath: _CP14/Objects/ModularTools/Garde/mithril_sharp.rsi
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+ color: "#45d2a4"
modifiers:
- !type:Inherit
copyFrom:
- BaseGardeSharp
- - BaseWeaponMithril
diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml
new file mode 100644
index 0000000000..87d969f2c8
--- /dev/null
+++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml
@@ -0,0 +1,53 @@
+# Concept
+# + Durability
+
+- type: modularPart
+ id: BaseGardeSturdy
+ modifiers:
+ - !type:EditDamageableModifier
+ multiplier: 0.8
+ - !type:EditSharpened
+ sharpnessDamageMultiplier: 0.8
+
+- type: modularPart
+ id: GardeSturdyIron
+ targetSlot: Garde
+ sourcePart: CP14ModularGardeSturdyIron
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseGardeSturdy
+
+- type: modularPart
+ id: GardeSturdyGold
+ targetSlot: Garde
+ sourcePart: CP14ModularGardeSturdyGold
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ color: "#ffaf47"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseGardeSturdy
+
+- type: modularPart
+ id: GardeSturdyCopper
+ targetSlot: Garde
+ sourcePart: CP14ModularGardeSturdyCopper
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ color: "#bd712f"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseGardeSturdy
+
+- type: modularPart
+ id: GardeSturdyMithril
+ targetSlot: Garde
+ sourcePart: CP14ModularGardeSturdyMithril
+ rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+ color: "#45d2a4"
+ modifiers:
+ - !type:Inherit
+ copyFrom:
+ - BaseGardeSturdy
diff --git a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml
index 68f890f861..08b08f9bc6 100644
--- a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml
@@ -65,36 +65,4 @@
- type: Utensil
types:
- Knife
- - type: CP14WallpaperRemover
-
-- type: modularPart
- id: BaseWeaponIron
- modifiers:
- - !type:EditDamageableModifier
- multiplier: 1
- - !type:EditSharpened
- sharpnessDamageMultiplier: 1
-
-- type: modularPart
- id: BaseWeaponCopper
- modifiers:
- - !type:EditDamageableModifier
- multiplier: 1.5
- - !type:EditSharpened
- sharpnessDamageMultiplier: 1.5
-
-- type: modularPart
- id: BaseWeaponGold
- modifiers:
- - !type:EditDamageableModifier
- multiplier: 2
- - !type:EditSharpened
- sharpnessDamageMultiplier: 3
-
-- type: modularPart
- id: BaseWeaponMithril
- modifiers:
- - !type:EditDamageableModifier
- multiplier: 1
- - !type:EditSharpened
- sharpnessDamageMultiplier: 1
+ - type: CP14WallpaperRemover
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/ModularCraft/blade.yml b/Resources/Prototypes/_CP14/ModularCraft/blade.yml
deleted file mode 100644
index b9e017c7d8..0000000000
--- a/Resources/Prototypes/_CP14/ModularCraft/blade.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#Concept:
-# + High Throwable damage
-# Piercing animation
-# - Low Melee Damage
-- type: modularPart
- id: BladeIronSpear
- targetSlot: Blade
- sourcePart: CP14ModularBladeIronSpear
- rsiPath: _CP14/Objects/ModularTools/iron_spear.rsi
- modifiers:
- - !type:Inherit
- copyFrom:
- - BaseWeaponThrowable
- - BaseWeaponChemical
- - BaseWeaponSharp
- - !type:AddComponents
- override: true
- components:
- - type: DamageOtherOnHit
- damage:
- types:
- Piercing: 15
- - type: ThrowingAngle
- angle: 135
- - type: EmbeddableProjectile
- offset: -0.15,-0.15
- removalTime: 1.5
- - !type:EditMeleeWeapon
- newWideAnimation: CP14WeaponArcThrust
- angleMultiplier: 0
- bonusDamage:
- types:
- Piercing: 7
- - !type:EditItem
- newSize: Normal
- adjustShape: 0, 1
- storedOffsetBonus: 0, 5
- - !type:EditModularSlots
- addSlots:
- - Garde
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml
index ad580c1053..1713ed58bb 100644
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml
@@ -105,6 +105,16 @@
CP14CopperBar: 1
result: CP14Crossbolt
+- type: CP14Recipe
+ id: CP14BaseLockpick
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14IronBar: 1
+ result: CP14BaseLockpick
+
+# Dagger
+
- type: CP14Recipe
id: CP14ModularBladeIronDagger
tag: CP14RecipeAnvil
@@ -113,6 +123,32 @@
CP14IronBar: 1
result: CP14ModularBladeIronDagger
+- type: CP14Recipe
+ id: CP14ModularBladeGoldDagger
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14GoldBar: 1
+ result: CP14ModularBladeGoldDagger
+
+- type: CP14Recipe
+ id: CP14ModularBladeCopperDagger
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14CopperBar: 1
+ result: CP14ModularBladeCopperDagger
+
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilDagger
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilDagger
+
+# Spear
+
- type: CP14Recipe
id: CP14ModularBladeIronSpear
tag: CP14RecipeAnvil
@@ -121,6 +157,32 @@
CP14IronBar: 1
result: CP14ModularBladeIronSpear
+- type: CP14Recipe
+ id: CP14ModularBladeCopperSpear
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14CopperBar: 1
+ result: CP14ModularBladeCopperSpear
+
+- type: CP14Recipe
+ id: CP14ModularBladeGoldSpear
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14GoldBar: 1
+ result: CP14ModularBladeGoldSpear
+
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilSpear
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilSpear
+
+# Mace
+
- type: CP14Recipe
id: CP14ModularBladeIronMace
tag: CP14RecipeAnvil
@@ -145,6 +207,16 @@
CP14CopperBar: 1
result: CP14ModularBladeCopperMace
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilMace
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilMace
+
+# Sword
+
- type: CP14Recipe
id: CP14ModularBladeIronSword
tag: CP14RecipeAnvil
@@ -169,6 +241,16 @@
CP14CopperBar: 2
result: CP14ModularBladeCopperSword
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilSword
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14MithrilBar: 2
+ result: CP14ModularBladeMithrilSword
+
+# Sickle
+
- type: CP14Recipe
id: CP14ModularBladeIronSickle
tag: CP14RecipeAnvil
@@ -193,6 +275,16 @@
CP14GoldBar: 1
result: CP14ModularBladeGoldSickle
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilSickle
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilSickle
+
+# Shovel
+
- type: CP14Recipe
id: CP14ModularBladeIronShovel
tag: CP14RecipeAnvil
@@ -218,6 +310,16 @@
CP14CopperBar: 1
result: CP14ModularBladeCopperShovel
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilShovel
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilShovel
+
+# Pickaxe
+
- type: CP14Recipe
id: CP14ModularBladeIronPickaxe
tag: CP14RecipeAnvil
@@ -226,6 +328,32 @@
CP14IronBar: 1
result: CP14ModularBladeIronPickaxe
+- type: CP14Recipe
+ id: CP14ModularBladeGoldPickaxe
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14GoldBar: 2
+ result: CP14ModularBladeGoldPickaxe
+
+- type: CP14Recipe
+ id: CP14ModularBladeCopperPickaxe
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14CopperBar: 2
+ result: CP14ModularBladeCopperPickaxe
+
+- type: CP14Recipe
+ id: CP14ModularBladeMithrilPickaxe
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilPickaxe
+
+# Grip
+
- type: CP14Recipe
id: CP14ModularGripIron
tag: CP14RecipeAnvil
@@ -234,6 +362,32 @@
CP14IronBar: 1
result: CP14ModularGripIron
+- type: CP14Recipe
+ id: CP14ModularGripCopper
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14CopperBar: 1
+ result: CP14ModularGripCopper
+
+- type: CP14Recipe
+ id: CP14ModularGripGolden
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14GoldBar: 1
+ result: CP14ModularGripGolden
+
+- type: CP14Recipe
+ id: CP14ModularGripMithril
+ tag: CP14RecipeAnvil
+ craftTime: 2
+ stacks:
+ CP14MithrilBar: 1
+ result: CP14ModularGripMithril
+
+# Grip long
+
- type: CP14Recipe
id: CP14ModularGripIronLong
tag: CP14RecipeAnvil
@@ -259,76 +413,14 @@
result: CP14ModularGripGoldLong
- type: CP14Recipe
- id: CP14ModularGripCopper
+ id: CP14ModularGripMithrilLong
tag: CP14RecipeAnvil
craftTime: 4
stacks:
- CP14CopperBar: 1
- result: CP14ModularGripCopper
+ CP14MithrilBar: 2
+ result: CP14ModularGripMithrilLong
-- type: CP14Recipe
- id: CP14ModularGripGolden
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14GoldBar: 1
- result: CP14ModularGripGolden
-
-- type: CP14Recipe
- id: CP14ModularBladeGoldPickaxe
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14GoldBar: 2
- result: CP14ModularBladeGoldPickaxe
-
-- type: CP14Recipe
- id: CP14ModularBladeCopperPickaxe
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14CopperBar: 2
- result: CP14ModularBladeCopperPickaxe
-
-- type: CP14Recipe
- id: CP14ModularBladeGoldDagger
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14GoldBar: 1
- result: CP14ModularBladeGoldDagger
-
-- type: CP14Recipe
- id: CP14ModularBladeCopperDagger
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14CopperBar: 1
- result: CP14ModularBladeCopperDagger
-
-- type: CP14Recipe
- id: CP14ModularGardeSharpCopper
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14CopperBar: 1
- result: CP14ModularGardeSharpCopper
-
-- type: CP14Recipe
- id: CP14ModularGardeSharpIron
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14IronBar: 1
- result: CP14ModularGardeSharpIron
-
-- type: CP14Recipe
- id: CP14ModularGardeSharpGold
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14GoldBar: 1
- result: CP14ModularGardeSharpGold
+# Rapier
- type: CP14Recipe
id: CP14ModularBladeIronRapier
@@ -355,12 +447,14 @@
result: CP14ModularBladeCopperRapier
- type: CP14Recipe
- id: CP14BaseLockpick
+ id: CP14ModularBladeMithrilRapier
tag: CP14RecipeAnvil
craftTime: 4
stacks:
- CP14IronBar: 1
- result: CP14BaseLockpick
+ CP14MithrilBar: 1
+ result: CP14ModularBladeMithrilRapier
+
+# Axe
- type: CP14Recipe
id: CP14ModularBladeIronAxe
@@ -386,71 +480,39 @@
CP14GoldBar: 2
result: CP14ModularBladeGoldAxe
-## mithril
-
- type: CP14Recipe
- id: CP14ModularBladeMithrilDagger
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularBladeMithrilDagger
-
-- type: CP14Recipe
- id: CP14ModularBladeMithrilMace
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularBladeMithrilMace
-
-- type: CP14Recipe
- id: CP14ModularBladeMithrilSword
+ id: CP14ModularBladeMithrilAxe
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14MithrilBar: 2
- result: CP14ModularBladeMithrilSword
+ result: CP14ModularBladeMithrilAxe
+
+# Sharp garde
- type: CP14Recipe
- id: CP14ModularBladeMithrilSickle
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularBladeMithrilSickle
-
-- type: CP14Recipe
- id: CP14ModularBladeMithrilShovel
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularBladeMithrilShovel
-
-- type: CP14Recipe
- id: CP14ModularBladeMithrilPickaxe
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularBladeMithrilPickaxe
-
-- type: CP14Recipe
- id: CP14ModularGripMithril
- tag: CP14RecipeAnvil
- craftTime: 2
- stacks:
- CP14MithrilBar: 1
- result: CP14ModularGripMithril
-
-- type: CP14Recipe
- id: CP14ModularGripMithrilLong
+ id: CP14ModularGardeSharpCopper
tag: CP14RecipeAnvil
craftTime: 4
stacks:
- CP14MithrilBar: 2
- result: CP14ModularGripMithrilLong
+ CP14CopperBar: 1
+ result: CP14ModularGardeSharpCopper
+
+- type: CP14Recipe
+ id: CP14ModularGardeSharpIron
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14IronBar: 1
+ result: CP14ModularGardeSharpIron
+
+- type: CP14Recipe
+ id: CP14ModularGardeSharpGold
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14GoldBar: 1
+ result: CP14ModularGardeSharpGold
- type: CP14Recipe
id: CP14ModularGardeSharpMithril
@@ -460,18 +522,36 @@
CP14MithrilBar: 1
result: CP14ModularGardeSharpMithril
+# Sturdy garde
+
- type: CP14Recipe
- id: CP14ModularBladeMithrilRapier
+ id: CP14ModularGardeSturdyCopper
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14CopperBar: 1
+ result: CP14ModularGardeSturdyCopper
+
+- type: CP14Recipe
+ id: CP14ModularGardeSturdyIron
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14IronBar: 1
+ result: CP14ModularGardeSturdyIron
+
+- type: CP14Recipe
+ id: CP14ModularGardeSturdyGold
+ tag: CP14RecipeAnvil
+ craftTime: 4
+ stacks:
+ CP14GoldBar: 1
+ result: CP14ModularGardeSturdyGold
+
+- type: CP14Recipe
+ id: CP14ModularGardeSturdyMithril
tag: CP14RecipeAnvil
craftTime: 4
stacks:
CP14MithrilBar: 1
- result: CP14ModularBladeMithrilRapier
-
-- type: CP14Recipe
- id: CP14ModularBladeMithrilAxe
- tag: CP14RecipeAnvil
- craftTime: 4
- stacks:
- CP14MithrilBar: 2
- result: CP14ModularBladeMithrilAxe
+ result: CP14ModularGardeSturdyMithril
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/tools.yml b/Resources/Prototypes/_CP14/tools.yml
index 2473968a1c..3955917f98 100644
--- a/Resources/Prototypes/_CP14/tools.yml
+++ b/Resources/Prototypes/_CP14/tools.yml
@@ -3,7 +3,7 @@
name: cp14-tool-quality-digging-name
toolName: cp14-tool-quality-digging-tool-name
spawn: CP14ModularIronShovel
- icon: { sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi, state: tool}
+ icon: { sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi, state: tool}
- type: tool
id: CP14Hammering
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT1.png
deleted file mode 100644
index 3a08672e9b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT2.png
deleted file mode 100644
index a8ac8167ff..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-NECK.png
deleted file mode 100644
index e2e6fa0326..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/icon.png
deleted file mode 100644
index 22589c119e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-left.png
deleted file mode 100644
index 4d42899c4e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-right.png
deleted file mode 100644
index 8456d803db..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-left.png
deleted file mode 100644
index 39a3225fbc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-right.png
deleted file mode 100644
index 6d48746310..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT1.png
deleted file mode 100644
index 3bc1c5f3fa..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT2.png
deleted file mode 100644
index 070db9e75a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-NECK.png
deleted file mode 100644
index 8a527644c4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/icon.png
deleted file mode 100644
index 4300a61bb4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-left.png
deleted file mode 100644
index aff7ee6407..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-right.png
deleted file mode 100644
index ded076fc36..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-left.png
deleted file mode 100644
index a65058ee93..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-right.png
deleted file mode 100644
index 89d6b7d27b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT1.png
deleted file mode 100644
index 8e95ff094f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT2.png
deleted file mode 100644
index aa06f2e9c5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-NECK.png
deleted file mode 100644
index 9e51c81d0d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/icon.png
deleted file mode 100644
index 3a250f0696..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-left.png
deleted file mode 100644
index 4c34f3d977..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-right.png
deleted file mode 100644
index fd3b6e3a24..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-left.png
deleted file mode 100644
index e97e88570d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-right.png
deleted file mode 100644
index 445460530f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png
deleted file mode 100644
index d7a8e5508a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png
deleted file mode 100644
index 9eb3f4af3a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png
deleted file mode 100644
index 6c1f65555b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png
deleted file mode 100644
index c6baa10f5c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png
deleted file mode 100644
index 991c884450..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png
deleted file mode 100644
index b55867e14e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png
deleted file mode 100644
index 494ca627e4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png
deleted file mode 100644
index 224c484cf4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png
deleted file mode 100644
index e79cccfa37..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png
deleted file mode 100644
index 1eda61e148..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png
deleted file mode 100644
index 7dbae56a67..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png
deleted file mode 100644
index 4b1c4fcab8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png
deleted file mode 100644
index 3b454b9f17..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png
deleted file mode 100644
index b2d44e8eb4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png
deleted file mode 100644
index c3a6d03f06..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png
deleted file mode 100644
index 4c60365412..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT1.png
deleted file mode 100644
index 0a9f61b7a8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT2.png
deleted file mode 100644
index d70ae469e2..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-NECK.png
deleted file mode 100644
index f3ceadc0cf..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/icon.png
deleted file mode 100644
index 45a23c7835..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-left.png
deleted file mode 100644
index 801683c2c5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-right.png
deleted file mode 100644
index a5cc03f77b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-left.png
deleted file mode 100644
index 20cd5b7348..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-right.png
deleted file mode 100644
index 03a699185f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT1.png
deleted file mode 100644
index 77bba9c59d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT2.png
deleted file mode 100644
index 1ff6456ac1..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-NECK.png
deleted file mode 100644
index 37cf50ddce..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/icon.png
deleted file mode 100644
index 1a6dc6be32..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-left.png
deleted file mode 100644
index d3be4835cc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-right.png
deleted file mode 100644
index 984c724881..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-left.png
deleted file mode 100644
index 6928ba8eca..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-right.png
deleted file mode 100644
index 988898aa57..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT1.png
deleted file mode 100644
index 77171698ce..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT2.png
deleted file mode 100644
index b293342be0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-NECK.png
deleted file mode 100644
index c50b35de87..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/icon.png
deleted file mode 100644
index 5352e6c0f8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-left.png
deleted file mode 100644
index e008d7300a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-right.png
deleted file mode 100644
index 29ec828e27..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-left.png
deleted file mode 100644
index d016b00160..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-right.png
deleted file mode 100644
index 277c032c8e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT1.png
deleted file mode 100644
index 93d9a38586..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT2.png
deleted file mode 100644
index d7ac82ea3c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-NECK.png
deleted file mode 100644
index a0393085b5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/icon.png
deleted file mode 100644
index 37bbe6b7b2..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-left.png
deleted file mode 100644
index 8477de6fbd..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-right.png
deleted file mode 100644
index f80ad68b9b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-left.png
deleted file mode 100644
index 12cd2303c5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-right.png
deleted file mode 100644
index d4a07e18ed..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png
deleted file mode 100644
index 6d4aad2ff4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png
deleted file mode 100644
index 43071b4e96..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png
deleted file mode 100644
index fda4f663d4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png
deleted file mode 100644
index f681612262..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png
deleted file mode 100644
index 8c07451a20..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png
deleted file mode 100644
index 1cf9b14165..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png
deleted file mode 100644
index 22662bbf16..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png
deleted file mode 100644
index aa92d531ff..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png
deleted file mode 100644
index 91e7155fa4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png
deleted file mode 100644
index f8df5c1c00..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png
deleted file mode 100644
index 93730177b4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png
deleted file mode 100644
index aba4c44c3f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png
deleted file mode 100644
index 62f97c4c3b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png
deleted file mode 100644
index ebd37833cd..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png
deleted file mode 100644
index 1f618ad3af..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png
deleted file mode 100644
index c3e23e4977..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT1.png
deleted file mode 100644
index 62111e0477..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT2.png
deleted file mode 100644
index 90676de288..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-NECK.png
deleted file mode 100644
index ae3a968ebc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/icon.png
deleted file mode 100644
index b7e1c4a9db..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-left.png
deleted file mode 100644
index c4f0e9bf6c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-right.png
deleted file mode 100644
index 3bf3117ca1..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-left.png
deleted file mode 100644
index 468d669947..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-right.png
deleted file mode 100644
index 87a0dbedcf..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png
deleted file mode 100644
index 5878fe0bbf..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png
deleted file mode 100644
index cd0fc8b365..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png
deleted file mode 100644
index a7af00d29d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png
deleted file mode 100644
index 3dc7ab1929..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png
deleted file mode 100644
index 2cf15ddcc7..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png
deleted file mode 100644
index 0e444d5105..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png
deleted file mode 100644
index 0e22400ae9..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png
deleted file mode 100644
index 9b68669981..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png
deleted file mode 100644
index ece1896153..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png
deleted file mode 100644
index 4f831e1a3b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png
deleted file mode 100644
index d324423bb0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png
deleted file mode 100644
index f05013e9e4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png
deleted file mode 100644
index ac9a07aff5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png
deleted file mode 100644
index 4f38f27dd8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png
deleted file mode 100644
index f4d3844f0d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png
deleted file mode 100644
index c2413df0c3..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT1.png
deleted file mode 100644
index 5fc6e8a997..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT2.png
deleted file mode 100644
index e5cc3ccdf3..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-NECK.png
deleted file mode 100644
index 70f27848ee..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/icon.png
deleted file mode 100644
index c5407216a0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-left.png
deleted file mode 100644
index e8e5d9c203..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-right.png
deleted file mode 100644
index d7f21aa1d0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-left.png
deleted file mode 100644
index 9fa35bd3c0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-right.png
deleted file mode 100644
index 78b0aeaa6e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT1.png
deleted file mode 100644
index 7435a7cba4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT2.png
deleted file mode 100644
index dd29dc00e9..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-NECK.png
deleted file mode 100644
index 14c1b03c05..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/icon.png
deleted file mode 100644
index 9af1a95740..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-left.png
deleted file mode 100644
index 92c1717eb1..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-right.png
deleted file mode 100644
index 8e413e69df..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-left.png
deleted file mode 100644
index a28e197ca6..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-right.png
deleted file mode 100644
index 84ad4a6c73..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT1.png
deleted file mode 100644
index 3b68c8ce09..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT2.png
deleted file mode 100644
index 23d2c7e067..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-NECK.png
deleted file mode 100644
index 330243615c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/icon.png
deleted file mode 100644
index 2f01e7f833..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-left.png
deleted file mode 100644
index 50549eab5f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-right.png
deleted file mode 100644
index 4ed76a0598..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-left.png
deleted file mode 100644
index eff424486e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-right.png
deleted file mode 100644
index 1ed55cbe9e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/tool.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/tool.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/tool.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/tool.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT1.png
deleted file mode 100644
index 0bd74aadcb..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT2.png
deleted file mode 100644
index e5f232e739..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-NECK.png
deleted file mode 100644
index 3648a6a5fd..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/icon.png
deleted file mode 100644
index caa3e835fb..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-left.png
deleted file mode 100644
index 1f8787b9e3..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-right.png
deleted file mode 100644
index 347d0bebd0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-left.png
deleted file mode 100644
index c4bf2024e0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-right.png
deleted file mode 100644
index 007096233d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT1.png
deleted file mode 100644
index 75ce21abed..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT2.png
deleted file mode 100644
index 20bab57bd5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-NECK.png
deleted file mode 100644
index c8ae425b8e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/icon.png
deleted file mode 100644
index ad8b3ca40e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-left.png
deleted file mode 100644
index 6fa3140690..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-right.png
deleted file mode 100644
index a8c875dc96..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-left.png
deleted file mode 100644
index e4e4e25436..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-right.png
deleted file mode 100644
index 9c4370548c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT1.png
deleted file mode 100644
index cfded60566..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT2.png
deleted file mode 100644
index 3721fbb2fc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-NECK.png
deleted file mode 100644
index 431123a1c8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/icon.png
deleted file mode 100644
index ba5f7975af..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-left.png
deleted file mode 100644
index d9b02675a0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-right.png
deleted file mode 100644
index 7923b594b1..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-left.png
deleted file mode 100644
index ad53e4d471..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-right.png
deleted file mode 100644
index 44232de78b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT1.png
deleted file mode 100644
index 2c324b9ea4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT2.png
deleted file mode 100644
index efcf57f99a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-NECK.png
deleted file mode 100644
index 86d16500d4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/icon.png
deleted file mode 100644
index ea0d1c9faf..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-left.png
deleted file mode 100644
index 9ca3148702..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-right.png
deleted file mode 100644
index 78b5edd24a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-left.png
deleted file mode 100644
index 6a8b77f753..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-right.png
deleted file mode 100644
index dbff620c5d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT1.png
deleted file mode 100644
index ab7be4d1da..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT2.png
deleted file mode 100644
index 1d9987a8ac..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-NECK.png
deleted file mode 100644
index dde7b91b14..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/icon.png
deleted file mode 100644
index 7a682e3396..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-left.png
deleted file mode 100644
index d7d07899b6..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-right.png
deleted file mode 100644
index 2f7694a1ba..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-left.png
deleted file mode 100644
index d6736830c2..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-right.png
deleted file mode 100644
index 5c2649a027..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT1.png
deleted file mode 100644
index ca0659cf89..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT2.png
deleted file mode 100644
index 6c295e7e24..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-NECK.png
deleted file mode 100644
index 70d284ca26..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/icon.png
deleted file mode 100644
index 7af3e434aa..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-left.png
deleted file mode 100644
index ef07d5212f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-right.png
deleted file mode 100644
index 65a885ccb3..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-left.png
deleted file mode 100644
index 90e6e956cc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-right.png
deleted file mode 100644
index 3a9d55dc63..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT1.png
deleted file mode 100644
index 1913aafa1c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT2.png
deleted file mode 100644
index b61db11a48..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-NECK.png
deleted file mode 100644
index b57e715d8e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/icon.png
deleted file mode 100644
index 8f611707ad..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-left.png
deleted file mode 100644
index d9b0f6a866..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-right.png
deleted file mode 100644
index cbe6477d23..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/meta.json
deleted file mode 100644
index 06a73b7b49..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-left.png
deleted file mode 100644
index 9337123e88..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-right.png
deleted file mode 100644
index 7e064cc6b8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png
deleted file mode 100644
index dfb0d060e7..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png
deleted file mode 100644
index ffac36f0ad..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png
deleted file mode 100644
index 08e45051ee..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png
deleted file mode 100644
index 93d9a55e86..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png
deleted file mode 100644
index 0d4be970e5..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png
deleted file mode 100644
index 5e8b20d091..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png
deleted file mode 100644
index 5f95d41e76..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png
deleted file mode 100644
index b34143dc28..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png
deleted file mode 100644
index 0a0e7574b1..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png
deleted file mode 100644
index e14a793a1f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png
deleted file mode 100644
index 832e3e4ada..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png
deleted file mode 100644
index 4556367129..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png
deleted file mode 100644
index 40eaba46b3..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png
deleted file mode 100644
index 1c79acafa6..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png
deleted file mode 100644
index f0961714fe..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png
deleted file mode 100644
index 30e8dc6fab..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sharp.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png
new file mode 100644
index 0000000000..f026c33594
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT1.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT2.png
new file mode 100644
index 0000000000..ac451a7599
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-BELT2.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..261e443649
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/icon.png
new file mode 100644
index 0000000000..bba4a4c3e6
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-left.png
new file mode 100644
index 0000000000..9fb180da48
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-right.png
new file mode 100644
index 0000000000..b2ddcaa524
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..bb01002975
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..01ecd3e68f
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/metall_sturdy.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT1.png
deleted file mode 100644
index 49c495a0aa..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT2.png
deleted file mode 100644
index 3350409f14..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-NECK.png
deleted file mode 100644
index f23f7d021a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/icon.png
deleted file mode 100644
index 2a2d3409fd..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-left.png
deleted file mode 100644
index 1a9076aed6..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-right.png
deleted file mode 100644
index 42b4f89a9b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-left.png
deleted file mode 100644
index 92c0807c50..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-right.png
deleted file mode 100644
index e115aae263..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Garde/mithril_sharp.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png
deleted file mode 100644
index 0054c1f1ae..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png
deleted file mode 100644
index 51c23da3ae..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png
deleted file mode 100644
index 3ec10fc7c8..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png
deleted file mode 100644
index 4b39bc0a08..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png
deleted file mode 100644
index 971547768a..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png
deleted file mode 100644
index 7ae74e5815..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png
deleted file mode 100644
index 9fac684816..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png
deleted file mode 100644
index 1da61e978c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png
deleted file mode 100644
index 1c96a63d17..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png
deleted file mode 100644
index 54a9ca89fc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/meta.json
deleted file mode 100644
index 0f12276b8c..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": 1,
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github)",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json
deleted file mode 100644
index 0f12276b8c..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": 1,
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github)",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT1.png
deleted file mode 100644
index 31c149695e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT2.png
deleted file mode 100644
index 2fddabb60b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/icon.png
deleted file mode 100644
index c4a1f58414..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-left.png
deleted file mode 100644
index 44e852c3bc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-right.png
deleted file mode 100644
index 65a655928b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/meta.json
deleted file mode 100644
index 0f12276b8c..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/lucens_grip.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": 1,
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github)",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT1.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT1.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT2.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT2.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/equipped-BELT2.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/metall_grip.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT1.png
deleted file mode 100644
index 24558eacc0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT2.png
deleted file mode 100644
index 4ed2d69da9..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/equipped-BELT2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/icon.png
deleted file mode 100644
index daba907f63..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-left.png
deleted file mode 100644
index 841ae6c0e7..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-right.png
deleted file mode 100644
index 792569ffbc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/meta.json
deleted file mode 100644
index 0f12276b8c..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/Grip/mithril_grip.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "version": 1,
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github)",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- }
- ]
-}
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png
deleted file mode 100644
index bee4790f83..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png
deleted file mode 100644
index 0afa357610..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png
deleted file mode 100644
index 9699a5ec6f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png
deleted file mode 100644
index 39c17f9058..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png
deleted file mode 100644
index fb229d7e97..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png
deleted file mode 100644
index 26e00fd244..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png
deleted file mode 100644
index 3cfcdfd477..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png
deleted file mode 100644
index 6804bc0094..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png
deleted file mode 100644
index e90b8fec81..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png
deleted file mode 100644
index e64cab70dc..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/meta.json
deleted file mode 100644
index 4b7b3f4c43..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/meta.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png
deleted file mode 100644
index 5499ec31be..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png
deleted file mode 100644
index 0e35b0d20d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json
deleted file mode 100644
index 4b7b3f4c43..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/equipped-NECK.png
deleted file mode 100644
index 8efe71ae06..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/icon.png
deleted file mode 100644
index a78a5f3031..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-left.png
deleted file mode 100644
index 4119cd676d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-right.png
deleted file mode 100644
index c15f7a421f..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/meta.json
deleted file mode 100644
index 4b7b3f4c43..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/meta.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-left.png
deleted file mode 100644
index 3f67e7b0fa..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-right.png
deleted file mode 100644
index a23db93eef..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/equipped-NECK.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/equipped-NECK.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/equipped-NECK.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/wielded-inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-left.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/wielded-inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/wielded-inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-right.png
rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi/wielded-inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/equipped-NECK.png
deleted file mode 100644
index 2f1313e952..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/equipped-NECK.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/icon.png
deleted file mode 100644
index cd98ad161c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-left.png
deleted file mode 100644
index 386c058bf9..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-right.png
deleted file mode 100644
index af0473ccc4..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/meta.json
deleted file mode 100644
index 4b7b3f4c43..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/meta.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 48,
- "y": 48
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-left.png
deleted file mode 100644
index fe6adf2f09..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-right.png
deleted file mode 100644
index a8a1d1b686..0000000000
Binary files a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/meta.json
deleted file mode 100644
index 3767fb75aa..0000000000
--- a/Resources/Textures/_CP14/Objects/ModularTools/iron_spear.rsi/meta.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CLA",
- "copyright": "Created by TheShuEd (Github) ",
- "states": [
- {
- "name": "equipped-BELT1",
- "directions": 4
- },
- {
- "name": "equipped-BELT2",
- "directions": 4
- },
- {
- "name": "equipped-NECK",
- "directions": 4
- },
- {
- "name": "icon"
- },
- {
- "name": "inhand-left",
- "directions": 4
- },
- {
- "name": "inhand-right",
- "directions": 4
- },
- {
- "name": "wielded-inhand-left",
- "directions": 4
- },
- {
- "name": "wielded-inhand-right",
- "directions": 4
- }
- ]
-}
\ No newline at end of file