Rethinking equipment (#1711)

* delete all modular content

* clean up

* Update guard.yml

* spear first pass

* Add imperial two-handed sword and update spear

Introduces the imperial two-handed sword with new sprites, prototype, and animations. Refines spear configuration: adjusts damage, animation, and offsets, and updates its sprites and prototype to use a new resource path. Improves melee weapon animation logic for both thrust and slash attacks.

* neck displacement

* Update neck.png

* Update migration.yml

* dagger

* Add sword prototype and refactor melee weapon swing logic

Introduces a new sword entity and associated textures. Refactors melee weapon swing logic by renaming SwingLeft to CPSwingLeft and updating related code. Adjusts animation offsets and rotation values for daggers, spears, and two-handed swords. Moves and updates dagger texture assets to a new directory structure.

* hatchet

* sickle

* Add skimitar sword entity and sprites

Introduced a new 'skimitar' sword entity with description and associated sprite assets, including icon, in-hand, and equipped states. Also updated the imperial sword's name and description for clarity.

* Add rapier weapon and adjust melee weapon balance

Introduced the imperial rapier weapon with associated prototype and textures. Increased the default single-target melee damage modifier to 1.3 and removed per-weapon clickDamageModifier overrides from dagger, spear, sword, and two-handed sword. Also increased sword base damage to 10 for better balance.

* Add iron tool/weapon variants and update wall thresholds

Introduces iron variants for pickaxe, shovel, dagger, rapier, spear, sword, and two-handed sword, including new sprites and YAML prototypes. Adjusts wall and ore vein damage thresholds for destruction and sound triggers. Updates migration.yml to map modular iron weapons to new iron variants and spawns stone blocks on stonebrick wall breakage. Also refactors dagger textures to use an 'iron' directory.

* Refactor ice dagger and adjust blacksmith skills

Replaced CP14IceDagger with CP14WeaponDaggerIce, updating its parent, stats, and components for consistency. Adjusted base dagger damage types. Blacksmith job and related melting skills are now commented out or disabled, reflecting a change in skill progression and job setup.

* Update ice_dagger.yml

* Deprecate sword mastery skills and update melee swing logic

Commented out SwordMastery, RapierMastery, and SkimitarMastery skills and removed their assignment from guard and artisan job prototypes. Renamed CPSwingLeft to SwingLeft in melee weapon code for clarity and updated related logic.

* Remove requiredSkills from anvil and furnace recipes

Eliminated the 'requiredSkills' field from all recipes in Anvil/misc.yml and furnace.yml. This simplifies recipe definitions and removes skill prerequisites for crafting these items.

* Update guard_commander.yml

* Comment out freeLearnedSkills for T1 and T2 skeletons

Disabled the freeLearnedSkills entries, including SwordMastery and SkimitarMastery, in both T1 and T2 DemiplaneAntag skeleton YAML prototypes. This change may be for balancing or testing purposes.

* Update migration.yml

* Update migration.yml

* guidebook

* r

* spear passive + hammer passive

* tool hammer + skimitar refactor

* balance tweak

* kick nerf

* TOWER DEFENCE UPDATE

* default shield refactor

* buckler (only sprites)

* Update migration.yml

* buckler parry

* some fixes

* Update T2.yml

* Update T2.yml

* Update instruments.yml

* Update migration.yml

* M O P

* war axe

* Update migration.yml

* Keen Eye skill

* arrows + bow + loadouts

* Update tools.yml

* trading

* fix

* Update misc.yml

* Update migration.yml

Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs

@@ -103,9 +103,9 @@ public sealed partial class MeleeWeaponSystem
             case WeaponArcAnimation.CPThrust:
                 track = EnsureComp<TrackUserComponent>(animationUid);
                 track.User = user;
-                _animation.Play(animationUid, CPGetThrustAnimation(sprite, -offset, spriteRotation, length), ThrustAnimationKey);
+                _animation.Play(animationUid, CPGetThrustAnimation(sprite, -offset * 2, spriteRotation, length), ThrustAnimationKey);
                 if (arcComponent.Fadeout)
-                    _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);
+                    _animation.Play(animationUid, GetFadeAnimation(sprite, length * 0.5f, length + 0.15f), FadeAnimationKey);
                 break;
             //CrystallEdge MeleeUpgrade end
         }
@@ -260,8 +260,9 @@ public sealed partial class MeleeWeaponSystem
         var startRotation = sprite.Rotation + (arc * 0.5f);
         var endRotation = sprite.Rotation - (arc * 0.5f);
 
-        var startRotationOffset = startRotation.RotateVec(new Vector2(0f, offset));
-        var endRotationOffset = endRotation.RotateVec(new Vector2(0f, offset));
+        var startRotationOffset = startRotation.RotateVec(new Vector2(0f, -offset * 0.9f));
+        var minRotationOffset = sprite.Rotation.RotateVec(new Vector2(0f, -offset * 1.1f));
+        var endRotationOffset = endRotation.RotateVec(new Vector2(0f, -offset * 0.9f));
 
         startRotation += spriteRotation;
         endRotation += spriteRotation;
@@ -279,6 +280,7 @@ public sealed partial class MeleeWeaponSystem
                     KeyFrames =
                     {
                         new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.5f), length * 0.3f),
                         new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,1.0f), length * 0.6f),
                         new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.8f), length * 1.0f),
                     }
@@ -290,6 +292,7 @@ public sealed partial class MeleeWeaponSystem
                     KeyFrames =
                     {
                         new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.0f), length * 0.0f),
+                        new AnimationTrackProperty.KeyFrame(minRotationOffset, length * 0.3f),
                         new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,1.0f), length * 0.6f),
                         new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.8f), length * 1.0f),
                     }
@@ -298,10 +301,10 @@ public sealed partial class MeleeWeaponSystem
         };
     }
 
-    private Animation CPGetThrustAnimation(SpriteComponent sprite, float distance, Angle spriteRotation, float length)
+    private Animation CPGetThrustAnimation(SpriteComponent sprite, float offset, Angle spriteRotation, float length)
     {
-        var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance / 5f));
-        var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance));
+        var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, 0f));
+        var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, offset / 2));
 
         sprite.Rotation += spriteRotation;
 

Content.Server/_CP14/Eye/CP14ToggleableEyeOffsetSystem.cs

@@ -0,0 +1,20 @@
+using Content.Server.Movement.Components;
+using Content.Shared._CP14.Eye;
+
+namespace Content.Server._CP14.Eye;
+
+public sealed class CP14ToggleableEyeOffsetSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<EyeComponent, CP14EyeOffsetToggleActionEvent>(OnToggleEyeOffset);
+    }
+
+    private void OnToggleEyeOffset(Entity<EyeComponent> ent, ref CP14EyeOffsetToggleActionEvent args)
+    {
+        if (!HasComp<EyeCursorOffsetComponent>(ent))
+            AddComp<EyeCursorOffsetComponent>(ent);
+        else
+            RemComp<EyeCursorOffsetComponent>(ent);
+    }
+}

Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs

@@ -66,13 +66,19 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs
     /// </remarks>
     public bool IsHit = true;
 
-    public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction)
+    /// <summary>
+    /// CP14 Heavy attack flag.
+    /// </summary>
+    public bool CP14Heavy;
+
+    public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction, bool heavy = false)
     {
         HitEntities = hitEntities;
         User = user;
         Weapon = weapon;
         BaseDamage = baseDamage;
         Direction = direction;
+        CP14Heavy = heavy; //CP14
     }
 }
 

Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

@@ -84,7 +84,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// Multiplies damage by this amount for single-target attacks.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1);
+    public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1.3); //CP14 default bonus damage
 
     // TODO: Temporarily 1.5 until interactionoutline is adjusted to use melee, then probably drop to 1.2
     /// <summary>
@@ -131,7 +131,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// CrystallEdge Melee upgrade. how far away from the player the animation should be played.
     /// </summary>
     [DataField]
-    public float CPAnimationOffset = -1f;
+    public float CPAnimationOffset = 1f;
 
     // Sounds
 

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

@@ -498,7 +498,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
+            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null, heavy: false);
             RaiseLocalEvent(meleeUid, missEvent);
             _meleeSound.PlaySwingSound(user, meleeUid, component);
             return;
@@ -507,7 +507,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
 
         // Raise event before doing damage so we can cancel damage if the event is handled
-        var hitEvent = new MeleeHitEvent(new List<EntityUid> { target.Value }, user, meleeUid, damage, null);
+        var hitEvent = new MeleeHitEvent(new List<EntityUid> { target.Value }, user, meleeUid, damage, null, heavy: false);
         RaiseLocalEvent(meleeUid, hitEvent);
 
         if (hitEvent.Handled)
@@ -600,7 +600,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
+            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction, heavy: true);
             RaiseLocalEvent(meleeUid, missEvent);
 
             // immediate audio feedback
@@ -649,7 +649,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
 
         // Raise event before doing damage so we can cancel damage if the event is handled
-        var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction);
+        var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction, heavy: true);
         RaiseLocalEvent(meleeUid, hitEvent);
 
         if (hitEvent.Handled)

Content.Shared/_CP14/Eye/CP14ToggleableEyeSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared._CP14.Eye;
+
+public sealed partial class CP14EyeOffsetToggleActionEvent : InstantActionEvent
+{
+}

Content.Shared/_CP14/MagicSpell/Spells/CP14SpellKnockdown.cs

@@ -0,0 +1,27 @@
+using Content.Shared.Stunnable;
+
+namespace Content.Shared._CP14.MagicSpell.Spells;
+
+public sealed partial class CP14SpellKnockdown : CP14SpellEffect
+{
+    [DataField]
+    public float ThrowPower = 10f;
+
+    [DataField]
+    public TimeSpan Time = TimeSpan.FromSeconds(1f);
+
+    [DataField]
+    public bool DropItems = false;
+
+    public override void Effect(EntityManager entManager, CP14SpellEffectBaseArgs args)
+    {
+        if (args.Target is null || args.User is null)
+            return;
+
+        var targetEntity = args.Target.Value;
+
+        var stun = entManager.System<SharedStunSystem>();
+
+        stun.TryKnockdown(args.Target.Value, Time, true, true, DropItems);
+    }
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14BonusDistanceMeleeDamageComponent.cs

@@ -0,0 +1,28 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// Adds bonus damage to weapons if targets are at a certain distance from the attacker.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14BonusDistanceMeleeDamageComponent : Component
+{
+    [DataField]
+    public DamageSpecifier BonusDamage = new();
+
+    [DataField]
+    public float MinDistance = 1f;
+
+    [DataField]
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/_CP14/Effects/critical.ogg")
+    {
+        Params = AudioParams.Default.WithVariation(0.125f),
+    };
+
+    [DataField]
+    public EntProtoId VFX = "CP14MeleeCritEffect";
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14ComboBonusMeleeDamageComponent.cs

@@ -0,0 +1,34 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// After several wide attacks, a light attack deals additional damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CP14ComboBonusMeleeDamageComponent : Component
+{
+    [DataField]
+    public DamageSpecifier BonusDamage = new();
+
+    [DataField]
+    public int HeavyAttackNeed = 2;
+
+    [DataField, AutoNetworkedField]
+    public int CurrentHeavyAttacks = 0;
+
+    [DataField, AutoNetworkedField]
+    public HashSet<EntityUid> HitEntities = new();
+
+    [DataField]
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/_CP14/Effects/critical_sword.ogg")
+    {
+        Params = AudioParams.Default.WithVariation(0.125f),
+    };
+
+    [DataField]
+    public EntProtoId VFX = "CP14MeleeCritEffect";
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14LightMeleeKnockdownComponent.cs

@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// After several wide attacks, a light attack deals additional damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14LightMeleeKnockdownComponent : Component
+{
+    [DataField]
+    public float ThrowDistance = 0.5f;
+
+    [DataField]
+    public TimeSpan KnockdownTime = TimeSpan.FromSeconds(0.25f);
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParriableComponent.cs

@@ -0,0 +1,16 @@
+using Robust.Shared.Audio;
+
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// allows this item to be knocked out of your hands by a successful parry
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14MeleeParriableComponent : Component
+{
+    [DataField]
+    public TimeSpan LastMeleeHit = TimeSpan.Zero;
+
+    [DataField]
+    public SoundSpecifier ParrySound = new SoundPathSpecifier("/Audio/_CP14/Effects/parry1.ogg", AudioParams.Default.WithVariation(0.2f));
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParryComponent.cs

@@ -0,0 +1,14 @@
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// attacks with this item may knock CP14ParriableComponent items out of your hand on a hit
+/// </summary>
+[RegisterComponent]
+public sealed partial class CP14MeleeParryComponent : Component
+{
+    [DataField]
+    public TimeSpan ParryWindow = TimeSpan.FromSeconds(1f);
+
+    [DataField]
+    public float ParryPower = 1f;
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeWeaponStaminaCostComponent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._CP14.MeleeWeapon.Components;
+
+/// <summary>
+/// Using this weapon damages the wearer's stamina.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CP14MeleeWeaponStaminaCostComponent : Component
+{
+    [DataField]
+    public float Stamina = 10f;
+}

Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeSelfDamageSystem.cs

@@ -1,24 +0,0 @@
-using Content.Shared._CP14.MeleeWeapon.Components;
-using Content.Shared.Damage;
-using Content.Shared.Weapons.Melee.Events;
-
-namespace Content.Shared._CP14.MeleeWeapon.EntitySystems;
-
-public sealed class CP14MeleeSelfDamageSystem : EntitySystem
-{
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<CP14MeleeSelfDamageComponent, MeleeHitEvent>(OnMeleeHit);
-    }
-
-    private void OnMeleeHit(Entity<CP14MeleeSelfDamageComponent> ent, ref MeleeHitEvent args)
-    {
-        if (!args.IsHit)
-            return;
-        if (args.HitEntities.Count == 0)
-            return;
-        _damageable.TryChangeDamage(ent, ent.Comp.DamageToSelf);
-    }
-}

Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeWeaponSystem.cs

@@ -0,0 +1,210 @@
+using System.Numerics;
+using Content.Shared._CP14.MeleeWeapon.Components;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._CP14.MeleeWeapon.EntitySystems;
+
+public sealed class CP14MeleeWeaponSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly ThrowingSystem _throw = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedStaminaSystem _stamina = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<CP14MeleeSelfDamageComponent, MeleeHitEvent>(OnMeleeHit);
+        SubscribeLocalEvent<CP14BonusDistanceMeleeDamageComponent, MeleeHitEvent>(OnDistanceBonusDamage);
+        SubscribeLocalEvent<CP14ComboBonusMeleeDamageComponent, MeleeHitEvent>(OnComboBonusDamage);
+        SubscribeLocalEvent<CP14LightMeleeKnockdownComponent, MeleeHitEvent>(OnKnockdownAttack);
+        SubscribeLocalEvent<CP14MeleeParryComponent, MeleeHitEvent>(OnMeleeParryHit);
+        SubscribeLocalEvent<CP14MeleeParriableComponent, AttemptMeleeEvent>(OnMeleeParriableHitAttmpt);
+        SubscribeLocalEvent<CP14MeleeWeaponStaminaCostComponent, MeleeHitEvent>(OnMeleeStaminaCost);
+    }
+
+    private void OnMeleeStaminaCost(Entity<CP14MeleeWeaponStaminaCostComponent> ent, ref MeleeHitEvent args)
+    {
+        _stamina.TakeStaminaDamage(args.User, ent.Comp.Stamina);
+    }
+
+    private void OnMeleeParryHit(Entity<CP14MeleeParryComponent> ent, ref MeleeHitEvent args)
+    {
+        if (args.HitEntities.Count != 1)
+            return;
+
+        var target = args.HitEntities[0];
+
+        var activeTargetHand = _hands.GetActiveHand(target);
+
+        var heldItem = _hands.GetHeldItem(target, activeTargetHand);
+        if (heldItem is null)
+            return;
+
+        if (!TryComp<CP14MeleeParriableComponent>(heldItem, out var meleeParriable))
+            return;
+
+        if (_timing.CurTime > meleeParriable.LastMeleeHit + ent.Comp.ParryWindow)
+            return;
+
+        _hands.TryDrop(target, heldItem.Value);
+        _throw.TryThrow(heldItem.Value, _random.NextAngle().ToWorldVec(), ent.Comp.ParryPower, target);
+        _popup.PopupPredicted( Loc.GetString("cp14-successful-parry"), args.User, args.User);
+        _audio.PlayPredicted(meleeParriable.ParrySound, heldItem.Value, args.User);
+    }
+
+    private void OnMeleeParriableHitAttmpt(Entity<CP14MeleeParriableComponent> ent, ref AttemptMeleeEvent args)
+    {
+        ent.Comp.LastMeleeHit = _timing.CurTime;
+    }
+
+    private void OnKnockdownAttack(Entity<CP14LightMeleeKnockdownComponent> ent, ref MeleeHitEvent args)
+    {
+        if (args.CP14Heavy)
+            return;
+
+        foreach (var hit in args.HitEntities)
+        {
+            _stun.TryKnockdown(hit, ent.Comp.KnockdownTime, true, drop: false);
+
+            // Vector from splitter to item
+            var direction = Transform(hit).Coordinates.Position - Transform(args.User).Coordinates.Position;
+            if (direction != Vector2.Zero)
+            {
+                var dir = direction.Normalized() * ent.Comp.ThrowDistance;
+                _throw.TryThrow(hit, dir, 3);
+            }
+        }
+    }
+
+    private void OnComboBonusDamage(Entity<CP14ComboBonusMeleeDamageComponent> ent, ref MeleeHitEvent args)
+    {
+        // Resets combo state
+        void Reset()
+        {
+            ent.Comp.HitEntities.Clear();
+            ent.Comp.CurrentHeavyAttacks = 0;
+            Dirty(ent);
+        }
+
+        // No hits this swing → reset
+        if (args.HitEntities.Count == 0)
+        {
+            Reset();
+            return;
+        }
+
+        var comp = ent.Comp;
+
+        // Not enough heavy attacks accumulated yet
+        if (comp.CurrentHeavyAttacks < comp.HeavyAttackNeed)
+        {
+            // Light attack before threshold → reset combo
+            if (!args.CP14Heavy)
+            {
+                Reset();
+                return;
+            }
+
+            // Heavy attack: track overlapping targets across swings
+            if (comp.HitEntities.Count == 0)
+            {
+                // First heavy: initialize the set with current hits
+                comp.HitEntities.UnionWith(args.HitEntities);
+            }
+            else
+            {
+                // Subsequent heavy: keep only targets hit every time
+                comp.HitEntities.IntersectWith(args.HitEntities);
+
+                // Diverged to different targets → reset
+                if (comp.HitEntities.Count == 0)
+                {
+                    Reset();
+                    return;
+                }
+            }
+
+            comp.CurrentHeavyAttacks++;
+            Dirty(ent);
+            return;
+        }
+
+        // Light attack after enough heavies → check if it hits any tracked target
+        if (comp.HitEntities.Overlaps(args.HitEntities) && !args.CP14Heavy)
+        {
+            if (_timing.IsFirstTimePredicted)
+            {
+                _audio.PlayPredicted(comp.Sound, ent, args.User);
+                args.BonusDamage += comp.BonusDamage;
+
+                // Visual feedback on every hit entity this swing
+                foreach (var hit in args.HitEntities)
+                {
+                    PredictedSpawnAtPosition(comp.VFX, Transform(hit).Coordinates);
+                }
+            }
+            Reset();
+        }
+    }
+
+    private void OnDistanceBonusDamage(Entity<CP14BonusDistanceMeleeDamageComponent> ent, ref MeleeHitEvent args)
+    {
+        var critical = true;
+
+        if (args.HitEntities.Count == 0)
+            return;
+
+        var userPos = _transform.GetWorldPosition(args.User);
+        //Crit only if all targets are at distance
+        foreach (var hit in args.HitEntities)
+        {
+            var targetPos = _transform.GetWorldPosition(hit);
+
+            var distance = (userPos - targetPos).Length();
+            if (distance < ent.Comp.MinDistance)
+            {
+                critical = false;
+                break;
+            }
+        }
+
+        if (!critical)
+            return;
+
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        _audio.PlayPredicted(ent.Comp.Sound, ent, args.User);
+        args.BonusDamage += ent.Comp.BonusDamage;
+
+        //Visual effect!
+        foreach (var hit in args.HitEntities)
+        {
+            PredictedSpawnAtPosition(ent.Comp.VFX, Transform(hit).Coordinates);
+        }
+    }
+
+    private void OnMeleeHit(Entity<CP14MeleeSelfDamageComponent> ent, ref MeleeHitEvent args)
+    {
+        if (!args.IsHit)
+            return;
+        if (args.HitEntities.Count == 0)
+            return;
+        _damageable.TryChangeDamage(ent, ent.Comp.DamageToSelf);
+    }
+}

Resources/Audio/_CP14/Effects/attributions.yml

@@ -132,3 +132,13 @@
   license: "CC0-1.0"
   copyright: 'Created by qubodup on Freesound.org'
   source: "https://freesound.org/people/qubodup/sounds/814055/"
+
+- files: ["critical.ogg"]
+  license: "CC-BY-3.0"
+  copyright: 'Created by CpawsMusic on Freesound.org'
+  source: "https://freesound.org/people/CpawsMusic/sounds/437113/"
+
+- files: ["critical_sword.ogg"]
+  license: "CC-BY-3.0"
+  copyright: 'Created by Merrick079 on Freesound.org'
+  source: "https://freesound.org/people/Merrick079/sounds/568170/"

Resources/Locale/en-US/_CP14/trading/factions.ftl

@@ -9,4 +9,5 @@ cp14-trade-faction-butchers = Master Butchers Union
 cp14-trade-faction-dairy = Golden Udder Dairy
 cp14-trade-faction-tailors = Silk & Needle Tailors Guild
 cp14-trade-faction-guard = Imperial Guard
-cp14-trade-faction-vampire-market = Vampire's lair
+cp14-trade-faction-vampire-market = Vampire's lair
+cp14-trade-faction-helmir-child = Helmir's childs

Resources/Locale/ru-RU/_CP14/trading/factions.ftl

@@ -9,4 +9,5 @@ cp14-trade-faction-butchers = Союз мастеровых мясников
 cp14-trade-faction-dairy = Молочная ферма 'Златовымя'
 cp14-trade-faction-tailors = Гильдия портных 'Шелк и игла'
 cp14-trade-faction-guard = Имперская стража
-cp14-trade-faction-vampire-market = Вампирское логово
+cp14-trade-faction-vampire-market = Вампирское логово
+cp14-trade-faction-helmir-child = Хельмировы потомки

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -98,7 +98,6 @@
       - id: CP14StampDenied
       - id: CP14StampApproved
       - id: CP14PaperFolderBlue
-      - id: CP14ArmorIronChainmailPresets
 
 - type: entity
   parent: CP14WoodenCloset
@@ -113,7 +112,6 @@
         amount: 2
       - id: CP14FryingPan
       - id: CP14CookingPot
-      - id: CP14ModularIronDagger
       - id: CP14SackFarmingSeed
       - id: CP14PlateWooden
         amount: 2

Resources/Prototypes/_CP14/Catalog/Fills/crates.yml

@@ -51,13 +51,8 @@
       - id: CP14Scissors
       - id: CP14Torch
       - id: CP14Lighter
-      - id: CP14ModularIronShovel
       - id: CP14KeyFile
-      - id: CP14ModularWoodMop
       - id: CP14LockCopper
-      - id: CP14ModularCopperPickaxe
-      - id: CP14ModularIronSickle
-      - id: CP14ModularIronPickaxe
         weight: 0.3
 
 

Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/keen_eye.yml

@@ -0,0 +1,15 @@
+- type: entity
+  id: CP14ActionToggleKeenEye
+  name: Keen Eye
+  parent: BaseMentalAction
+  description: You gaze into the distance, which allows you to see things that are farther away.
+  components:
+  - type: Action
+    useDelay: 5 # Spamming prevention
+    icon:
+      sprite: _CP14/Actions/Spells/physical.rsi
+      state: keen_eye
+    checkCanInteract: false
+    itemIconStyle: BigAction
+  - type: InstantAction
+    event: !type:CP14EyeOffsetToggleActionEvent

Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml

@@ -13,12 +13,10 @@
     stamina: 40
   - type: CP14MagicEffect
     effects:
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:Paralyze
-        paralyzeTime: 1
+    - !type:CP14SpellKnockdown
     - !type:CP14SpellThrowFromUser
-      throwPower: 9
+      distance: 1.5
+      throwPower: 5
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14DustEffectKickSound

Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml

@@ -33,54 +33,32 @@
       castDelay: 0.5
       breakOnMove: false
 
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollIceArrow
+  name: ice arrow spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellIceArrow
+
 - type: entity
   id: CP14IceArrow
-  parent: BaseItem
+  parent: CP14ArrowBase
   name: ice arrow
   description: A sharp ice arrow created with magic. It melts and will soon disappear, but you can shoot it once with your bow.
-  categories: [ ForkFiltered ]
   components:
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi
-    state: icon
-  - type: Item
-    storedRotation: 0
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.2
-        density: 5
-        mask:
-        - ItemMask
-        restitution: 0.3
-        friction: 0.2
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-  - type: EmbeddableProjectile
-    sound: /Audio/Weapons/star_hit.ogg
-    embedOnThrow: false
-  - type: ThrowingAngle
-    angle: 0
-  - type: Ammo
-    muzzleFlash: null
-  - type: Tag
-    tags:
-    - CP14Arrow
+    layers: 
+    - state: icon
+    - state: solution1
+      map: ["enum.SolutionContainerLayers.Fill"]
   - type: Projectile
-    deleteOnCollide: false
-    onlyCollideWhenShot: true
     damage:
       types:
         Piercing: 15
         Cold: 5
-  - type: Damageable
   - type: Destructible
     thresholds:
     - trigger:
@@ -93,18 +71,4 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: TimedDespawn
-    lifetime: 240
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 10
-
-- type: entity
-  parent: CP14BaseSpellScrollWater
-  id: CP14SpellScrollIceArrow
-  name: ice arrow spell scroll
-  components:
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellIceArrow
-
+    lifetime: 240

Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml

@@ -16,7 +16,7 @@
       - CP14ImpactEffectWaterCreation
     - !type:CP14SpellSpawnInHandEntity
       spawns:
-      - CP14IceDagger
+      - CP14WeaponDaggerIce
   - type: CP14ActionSpeaking
     startSpeech: "Un pittore sulla..."
     endSpeech: "soglia della mano"
@@ -35,92 +35,25 @@
 
 - type: entity
   name: ice dagger
-  parent: BaseItem
-  id: CP14IceDagger
+  parent: CP14BaseWeaponDagger
+  id: CP14WeaponDaggerIce
   description: A sharp ice dagger, not very durable but can temporarily replace real weapons.
-  categories: [ ForkFiltered ]
   components:
-  - type: Sharp
   - type: Sprite
-    sprite: _CP14/Objects/Weapons/Melee/ice_dagger.rsi
+    sprite: _CP14/Objects/Weapons/Melee/Dagger/ice.rsi
     state: icon
   - type: MeleeWeapon
-    resetOnHandSelected: false #Fast swap
-    range: 1.0 # 1.5 standart
-    cPAnimationOffset: -0.75 #-1 standart
-    attackRate: 1.5 # 1 standart
-    angle: 45
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Slash: 2
-        Piercing: 5
-        Cold: 3
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-    cPAnimationLength: 0.25
-  - type: Clothing
-    equipDelay: 0.25
-    unequipDelay: 0.25
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - belt
-  - type: Item
-    shape:
-    - 0,0,0,1
-    storedOffset: 0, 5
-    storedRotation: 45
-    size: Normal
-  - type: ExaminableDamage
-    messages: CP14WeaponMessages
-  - type: DisarmMalus
-  - type: ThrowingAngle
-    angle: 135
-  - type: EmbeddableProjectile
-    offset: -0.15,-0.15
-    removalTime: 0.5
-  - type: LandAtCursor
+        Slash: 3
+        Piercing: 3
+        Cold: 4
   - type: DamageOtherOnHit
     damage:
       types:
-        Piercing: 10
-        Cold: 5
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 5
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PolygonShape
-          vertices:
-            - -0.40,-0.30
-            - -0.30,-0.40
-            - 0.40,0.30
-            - 0.30,0.40
-        density: 10
-        mask:
-        - ItemMask
-        restitution: 0.3
-        friction: 0.2
-  - type: CP14SharpeningStone
-  - type: UseDelay
-  - type: Tool
-    qualities:
-      - Slicing
-    useSound:
-      path: /Audio/Items/Culinary/chop.ogg
-  - type: Utensil
-    types:
-      - Knife
-  - type: CP14WallpaperRemover
-  - type: CP14MeleeSelfDamage
-    damageToSelf:
-      types:
-        Blunt: 1 # 20 hits
-  - type: Damageable
+        Slash: 3
+        Piercing: 3
+        Cold: 4
   - type: Destructible
     thresholds:
     - trigger:
@@ -134,7 +67,6 @@
         acts: ["Destruction"]
   - type: TimedDespawn
     lifetime: 60
-  - type: Execution
 
 - type: entity
   parent: CP14BaseSpellScrollWater

Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml

@@ -39,55 +39,11 @@
 
 - type: entity
   parent: CP14ClothingBeltQuiver
-  id: CP14ClothingBeltQuiverIronArrow
+  id: CP14ClothingBeltQuiverArrows
   categories: [ ForkFiltered ]
-  suffix: Full. Iron. Arrow
+  suffix: Filled with arrows
   components:
   - type: StorageFill
     contents:
-      - id: CP14ModularIronArrow
-        amount: 16
-
-- type: entity
-  parent: CP14ClothingBeltQuiver
-  id: CP14ClothingBeltQuiverCopperArrow
-  categories: [ ForkFiltered ]
-  suffix: Full. Copper. Arrow
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14ModularCopperArrow
-        amount: 16
-
-- type: entity
-  parent: CP14ClothingBeltQuiver
-  id: CP14ClothingBeltQuiverMithrilArrow
-  categories: [ ForkFiltered ]
-  suffix: Full. Mithril. Arrow
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14ModularMithrilArrow
-        amount: 16
-
-- type: entity
-  parent: CP14ClothingBeltQuiver
-  id: CP14ClothingBeltQuiverCrossbolt
-  categories: [ ForkFiltered ]
-  suffix: Full. Iron. Crossbolt
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14CrossboltIron
-        amount: 32
-
-- type: entity
-  parent: CP14ClothingBeltQuiver
-  id: CP14ClothingBeltQuiverBigCrossbolt
-  categories: [ ForkFiltered ]
-  suffix: Full. Iron. BigCrossbolt
-  components:
-  - type: StorageFill
-    contents:
-    - id: CP14BigCrossboltIron
+    - id: CP14Arrow
       amount: 16

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/chainmail.yml

@@ -1,82 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularAventailBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Small
-    storedRotation: 0
-    shape:
-    - 0,0,0,0
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailIronChainmail
-  name: iron aventail chainmail
-  description: A aventail of chainmail to protect the neck from blows and piercing at vital points.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailIronChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailGoldChainmail
-  name: golden aventail chainmail
-  description: A aventail of chainmail to protect the neck from blows and piercing at vital points.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailGoldChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailCopperChainmail
-  name: copper aventail chainmail
-  description: A aventail of chainmail to protect the neck from blows and piercing at vital points.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailCopperChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailMithrilChainmail
-  name: mithril aventail chainmail
-  description: A aventail of chainmail to protect the neck from blows and piercing at vital points.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailMithrilChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/plate.yml

@@ -1,70 +0,0 @@
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailIronPlate
-  name: iron aventail plate
-  description: An iron sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailIronPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailGoldPlate
-  name: golden aventail plate
-  description: An golden sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailGoldPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailCopperPlate
-  name: copper aventail plate
-  description: An copper sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailCopperPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularAventailBase
-  id: CP14ModularAventailMithrilPlate
-  name: mithril aventail plate
-  description: An mithril sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - AventailMithrilPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/capellina.yml

@@ -1,143 +0,0 @@
-- type: entity
-  parent: CP14ClothingHeadBase
-  id: CP14ModularHeadBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
-  - type: CP14LabeledRenaming
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - Visor
-    - Aventail
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetIronCapellina
-  name: iron capellina
-  description: Protects against large object strikes to the head.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.93
-        Slash: 0.94
-        Piercing: 0.97
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetIronCapellina
-  - type: CP14MagicManacostModify
-    globalModifier: 1.05
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetGoldCapellina
-  name: golden capellina
-  description: Protects against large object strikes to the head.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#ffe269"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.96
-        Slash: 0.98
-        Piercing: 0.99
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.96
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetGoldCapellina
-  - type: CP14MagicManacostModify
-    globalModifier: 1.01
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetCopperCapellina
-  name: copper capellina
-  description: Protects against large object strikes to the head.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#e28f08"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.96
-        Piercing: 0.98
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetCopperCapellina
-  - type: CP14MagicManacostModify
-    globalModifier: 1.03
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetMithrilCapellina
-  name: mithril capellina
-  description: Protects against large object strikes to the head.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#38f0b3"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.91
-        Slash: 0.92
-        Piercing: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetMithrilCapellina
-  - type: CP14MagicManacostModify
-    globalModifier: 0.98
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/palm_helmet.yml

@@ -1,130 +0,0 @@
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetIronPalmHelmet
-  name: iron palm helmet
-  description: A tight fitting helmet that protects your head from impact.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.92
-        Slash: 0.97
-        Piercing: 0.95
-        Heat: 0.98
-  - type: ClothingSpeedModifier
-    walkModifier: 0.97
-    sprintModifier: 0.97
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetIronCapellina
-  - type: CP14MagicManacostModify
-    globalModifier: 1.05
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetGoldPalmHelmet
-  name: golden palm helmet
-  description: A tight fitting helmet that protects your head from impact.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#ffe269"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.96
-        Piercing: 0.96
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.96
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetGoldPalmHelmet
-  - type: CP14MagicManacostModify
-    globalModifier: 1.01
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetCopperPalmHelmet
-  name: copper palm helmet
-  description: A tight fitting helmet that protects your head from impact.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#e28f08"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.94
-        Slash: 0.98
-        Piercing: 0.96
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetCopperPalmHelmet
-  - type: CP14MagicManacostModify
-    globalModifier: 1.03
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularHeadBase
-  id: CP14HelmetMithrilPalmHelmet
-  name: mithril palm helmet
-  description: A tight fitting helmet that protects your head from impact.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: Clothing
-    sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi
-    clothingVisuals:
-      head:
-      - state: equipped-HELMET
-        color: "#38f0b3"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.90
-        Slash: 0.95
-        Piercing: 0.93
-        Heat: 0.98
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14HelmetMithrilPalmHelmet
-  - type: CP14MagicManacostModify
-    globalModifier: 0.98
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/chainmail.yml

@@ -1,82 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularVisorBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Small
-    storedRotation: 0
-    shape:
-    - 0,0,0,0
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorIronChainmail
-  name: iron visor chainmail
-  description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorIronChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorGoldChainmail
-  name: golden visor chainmail
-  description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorGoldChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorCopperChainmail
-  name: copper visor chainmail
-  description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorCopperChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorMithrilChainmail
-  name: mithril visor chainmail
-  description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorMithrilChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/plate.yml

@@ -1,70 +0,0 @@
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorIronPlate
-  name: iron visor plate
-  description: A iron plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Not as comfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorIronPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorGoldPlate
-  name: golden visor plate
-  description: A golden plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Very uncomfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorGoldPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorCopperPlate
-  name: copper visor plate
-  description: A copper plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Not as comfortable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorCopperPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularVisorBase
-  id: CP14ModularVisorMithrilPlate
-  name: mithril visor plate
-  description: A mithril plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - VisorMithrilPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml

@@ -1,119 +0,0 @@
-- type: entity
-  id: CP14ArmorIronCuirassPresets
-  parent: CP14ArmorIronCuirass
-  name: full iron cuirass
-  description: A full iron armour to protect its wearer from other sharp iron.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-      state: icon
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-      state: icon
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesIronPlate
-    - CP14ModularGreaveIronPlate
-
-- type: entity
-  id: CP14ArmorGoldCuirassPresets
-  parent: CP14ArmorGoldCuirass
-  name: full golden cuirass
-  description: A full armour of purest gold, it is as expensive as it is uncomfortable, it is hard to imagine who would wear it and why.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-      color: "#ffaf47"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-      state: icon
-      color: "#ffaf47"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-      state: icon
-      color: "#ffaf47"
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesGoldPlate
-    - CP14ModularGreaveGoldPlate
-
-- type: entity
-  id: CP14ArmorCopperCuirassPresets
-  parent: CP14ArmorCopperCuirass
-  name: full copper cuirass
-  description: Full copper armour, cheap and surly, some even find it more comfortable than iron armour.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-      color: "#bd712f"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-      state: icon
-      color: "#bd712f"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-      state: icon
-      color: "#bd712f"
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesCopperPlate
-    - CP14ModularGreaveCopperPlate
-
-- type: entity
-  id: CP14ArmorMithrilCuirassPresets
-  parent: CP14ArmorMithrilCuirass
-  name: full mithril cuirass
-  description: Every adventurer's dream, mithril armour is strong, sturdy and almost unrestrictive to movement. If there's an ideal, this is it.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-      color: "#45d2a4"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-      state: icon
-      color: "#45d2a4"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-      state: icon
-      color: "#45d2a4"
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesMithrilPlate
-    - CP14ModularGreaveMithrilPlate
-
-- type: entity
-  id: CP14ArmorIronChainmailPresets
-  parent: CP14ArmorIronChainmail
-  name: full iron chainmail
-  description: Full iron ringed armour, lightweight and has decent protection.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-      state: icon
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-      state: icon
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesIronChainmail
-    - CP14ModularGreaveIronChainmail
-
-- type: entity
-  id: CP14ArmorMithrilChainmailPresets
-  parent: CP14ArmorMithrilChainmail
-  name: full mithril chainmail
-  description: A full mithril armour that may have been slowly and painstakingly assembled by dwarven smiths. A most valuable piece of work.
-  components:
-  - type: Sprite
-    layers:
-    - state: icon
-      color: "#45d2a4"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-      state: icon
-      color: "#45d2a4"
-    - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-      state: icon
-      color: "#45d2a4"
-  - type: CP14ModularCraftAutoAssemble
-    details:
-    - CP14ModularCuissesMithrilChainmail
-    - CP14ModularGreaveMithrilChainmail

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml

@@ -1,152 +0,0 @@
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorIronChainmail
-  name: iron chainmail
-  description: Ringed armour made of many small metal rings.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.96
-        Slash: 0.85
-        Piercing: 0.96
-  - type: ClothingSpeedModifier
-    walkModifier: 0.99
-    sprintModifier: 0.99
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorIronChainmail
-  - type: CP14MagicManacostModify
-    globalModifier: 1.15
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 40
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorGoldChainmail
-  name: golden chainmail
-  description: Ringed armour made of many small metal rings.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#ffe269"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#ffe269"
-      right:
-      - state: inhand-right
-        color: "#ffe269"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.98
-        Slash: 0.92
-        Piercing: 0.99
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorGoldChainmail
-  - type: CP14MagicManacostModify
-    globalModifier: 1.05
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 40
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorCopperChainmail
-  name: copper chainmail
-  description: Ringed armour made of many small metal rings.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#e28f08"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#e28f08"
-      right:
-      - state: inhand-right
-        color: "#e28f08"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.98
-        Slash: 0.90
-        Piercing: 0.99
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorCopperChainmail
-  - type: CP14MagicManacostModify
-    globalModifier: 1.1
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 40
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorMithrilChainmail
-  name: mithril chainmail
-  description: Ringed armour made of many small metal rings.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#38f0b3"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#38f0b3"
-      right:
-      - state: inhand-right
-        color: "#38f0b3"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.90
-        Slash: 0.80
-        Piercing: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.99
-    sprintModifier: 0.99
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorMithrilChainmail
-  - type: CP14MagicManacostModify
-    globalModifier: 0.96
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 40

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml

@@ -1,174 +0,0 @@
-- type: entity
-  parent: CP14ClothingOuterClothingBase
-  id: CP14ModularArmorBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
-  - type: CP14LabeledRenaming
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - Cuisses
-    - Greave
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorIronCuirass
-  name: iron cuirass
-  description: Light armour plate on the chest, little protection, little heaviness.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.87
-        Slash: 0.95
-        Piercing: 0.87
-        Heat: 0.92
-  - type: ClothingSpeedModifier
-    walkModifier: 0.95
-    sprintModifier: 0.95
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorIronCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.2
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 50
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorGoldCuirass
-  name: golden cuirass
-  description: Light armour plate on the chest, little protection, little heaviness.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#ffe269"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#ffe269"
-      right:
-      - state: inhand-right
-        color: "#ffe269"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.94
-        Slash: 0.98
-        Piercing: 0.90
-        Caustic: 0.90
-  - type: ClothingSpeedModifier
-    walkModifier: 0.90
-    sprintModifier: 0.90
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorGoldCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.1
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 50
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorCopperCuirass
-  name: copper cuirass
-  description: Light armour plate on the chest, little protection, little heaviness.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#e28f08"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#e28f08"
-      right:
-      - state: inhand-right
-        color: "#e28f08"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.92
-        Slash: 0.99
-        Piercing: 0.92
-        Heat: 0.95
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorCopperCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.15
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 50
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorMithrilCuirass
-  name: mithril cuirass
-  description: Light armour plate on the chest, little protection, little heaviness.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#38f0b3"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#38f0b3"
-      right:
-      - state: inhand-right
-        color: "#38f0b3"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.82
-        Slash: 0.92
-        Piercing: 0.82
-        Heat: 0.84
-  - type: ClothingSpeedModifier
-    walkModifier: 0.98
-    sprintModifier: 0.98
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorMithrilCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 0.95
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 50

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml

@@ -1,159 +0,0 @@
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorIronInfantryCuirass
-  name: iron infantry cuirass
-  description: The light infantry cuirass, unlike the original, also protects from the back.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.84
-        Slash: 0.94
-        Piercing: 0.84
-        Heat: 0.88
-  - type: ClothingSpeedModifier
-    walkModifier: 0.93
-    sprintModifier: 0.93
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorIronInfantryCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.24
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 60
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorGoldInfantryCuirass
-  name: golden infantry cuirass
-  description: The light infantry cuirass, unlike the original, also protects from the back.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#ffe269"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#ffe269"
-      right:
-      - state: inhand-right
-        color: "#ffe269"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.91
-        Slash: 0.98
-        Piercing: 0.88
-        Caustic: 0.86
-  - type: ClothingSpeedModifier
-    walkModifier: 0.88
-    sprintModifier: 0.88
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorGoldInfantryCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.14
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 60
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorCopperInfantryCuirass
-  name: copper infantry cuirass
-  description: The light infantry cuirass, unlike the original, also protects from the back.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#e28f08"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#e28f08"
-      right:
-      - state: inhand-right
-        color: "#e28f08"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.90
-        Slash: 0.98
-        Piercing: 0.90
-        Heat: 0.92
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.96
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorCopperInfantryCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 1.18
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 60
-
-- type: entity
-  parent: CP14ModularArmorBase
-  id: CP14ArmorMithrilInfantryCuirass
-  name: mithril infantry cuirass
-  description: The light infantry cuirass, unlike the original, also protects from the back.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    clothingVisuals:
-      outerClothing:
-      - state: equipped-OUTERCLOTHING
-        color: "#38f0b3"
-  - type: Item
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#38f0b3"
-      right:
-      - state: inhand-right
-        color: "#38f0b3"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.80
-        Slash: 0.89
-        Piercing: 0.80
-        Heat: 0.81
-  - type: ClothingSpeedModifier
-    walkModifier: 0.96
-    sprintModifier: 0.96
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ArmorMithrilInfantryCuirass
-  - type: CP14MagicManacostModify
-    globalModifier: 0.92
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 60

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml

@@ -1,70 +0,0 @@
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesIronChainmail
-  name: iron chainmail cuisses
-  description: Ringed armour for the upper legs, the weight is virtually imperceptible.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesIronChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesGoldChainmail
-  name: golden chainmail cuisses
-  description: Ringed armour for the upper legs, the weight is virtually imperceptible.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesGoldChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesCopperChainmail
-  name: copper chainmail cuisses
-  description: Ringed armour for the upper legs, the weight is virtually imperceptible.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesCopperChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesMithrilChainmail
-  name: mithril chainmail cuisses
-  description: Ringed armour for the upper legs, the weight is virtually imperceptible.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesMithrilChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml

@@ -1,85 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularCuissesBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Small
-    storedRotation: 0
-    shape:
-    - 0,0,0,0
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - Greave
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesIronPlate
-  name: iron cuisses
-  description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesIronPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesGoldPlate
-  name: golden cuisses
-  description: Protects the top of the legs, protection is questionable, weight is decent.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesGoldPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesCopperPlate
-  name: copper cuisses
-  description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesCopperPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularCuissesBase
-  id: CP14ModularCuissesMithrilPlate
-  name: mithril cuisses
-  description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - CuissesMithrilPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml

@@ -1,70 +0,0 @@
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveIronChainmail
-  name: iron chainmail greave
-  description: Ringed greaves, comfortable and even protects a bit.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveIronChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveGoldChainmail
-  name: golden chainmail greave
-  description: Ringed greaves, comfortable and even protects a bit.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveGoldChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveCopperChainmail
-  name: copper chainmail greave
-  description: Ringed greaves, comfortable and even protects a bit.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveCopperChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveMithrilChainmail
-  name: mithril chainmail greave
-  description: Ringed greaves, comfortable and even protects a bit.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveMithrilChainmail
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml

@@ -1,82 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularGreaveBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Small
-    storedRotation: 0
-    shape:
-    - 0,0,0,0
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveIronPlate
-  name: iron greave
-  description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveIronPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveGoldPlate
-  name: golden greave
-  description: Protects the lower part of the legs, also makes it difficult to move, though the use of gold as armour seems questionable.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveGoldPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveCopperPlate
-  name: copper greave
-  description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveCopperPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularGreaveBase
-  id: CP14ModularGreaveMithrilPlate
-  name: mithril greave
-  description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GreaveMithrilPlate
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml

@@ -17,9 +17,6 @@
   - type: ClothingSpeedModifier
     walkModifier: 0.98
     sprintModifier: 0.98
-  - type: Construction
-    graph: CP14BoneArmor
-    node: cp14bonearmor
   - type: PhysicalComposition
     materialComposition:
       CP14Bone: 120

Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml

@@ -1,3 +1,26 @@
+- type: entity
+  id: CP14MeleeCritEffect
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/sparks.rsi
+    drawdepth: Effects
+    noRot: true
+    layers:
+      - state: 1
+        map: [ "random" ]
+  - type: RandomSprite
+    available:
+      - random:
+          1: ""
+          2: ""
+  - type: TimedDespawn
+    lifetime: 1.5
+  - type: Tag
+    tags:
+      - HideContextMenu
+
 - type: entity
   id: CP14DirtEffect
   categories: [ HideSpawnMenu ]

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml

@@ -64,7 +64,6 @@
           - id: CP14OreIron1
           - id: CP14ScrapCopper
           - id: CP14ScrapIron
-          - id: CP14ModularInlayQuartzElectric
           - id: CP14CopperCoin1
             weight: 3
 

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml

@@ -66,7 +66,6 @@
           - id: CP14ScrapCopper
           - id: CP14ScrapIron
           - id: CP14FoodMeatLambCutletCooked
-          - id: CP14ModularInlayQuartzFire
           - id: CP14CopperCoin1
           - id: CP14Bone1
 

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml

@@ -80,7 +80,6 @@
           - id: CP14ScrapIron
           - id: CP14Snowball
           - id: CP14CopperCoin1
-          - id: CP14ModularInlayQuartzWater
 
 - type: entity
   id: CP14AreaEntityEffectSlimeFroze

Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml

@@ -104,9 +104,6 @@
     spawned:
     - id: CP14FoodMeatMonster
       amount: 1
-    - id: CP14ModularInlayQuartzWater
-      amount: 1
-      prob: 0.1
     - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3
@@ -139,9 +136,6 @@
     spawned:
     - id: CP14FoodMeatMonster
       amount: 1
-    - id: CP14ModularInlayQuartzFire
-      amount: 1
-      prob: 0.1
     - id: CP14ScrapLeather
       amount: 1
       maxAmount: 3

Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml

@@ -22,8 +22,8 @@
     skillPoints:
       Memory:
         max: 0 
-    freeLearnedSkills:
-    - SwordMastery
+    #freeLearnedSkills:
+    #- SwordMastery
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
@@ -42,8 +42,8 @@
     skillPoints:
       Memory:
         max: 0 
-    freeLearnedSkills:
-    - SwordMastery
+    #freeLearnedSkills:
+    #- SwordMastery
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
@@ -63,7 +63,7 @@
       Memory:
         max: 0
     freeLearnedSkills:
-    - SkimitarMastery
+    #- SkimitarMastery
     - AthleticT1
     - AthleticT2
     - CP14ActionSpellKick

Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml

@@ -22,8 +22,8 @@
     skillPoints:
       Memory:
         max: 0 
-    freeLearnedSkills:
-    - SwordMastery
+    #freeLearnedSkills:
+    #- SwordMastery
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
@@ -42,8 +42,8 @@
     skillPoints:
       Memory:
         max: 0 
-    freeLearnedSkills:
-    - SwordMastery
+    #freeLearnedSkills:
+    #- SwordMastery
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
@@ -63,7 +63,7 @@
       Memory:
         max: 0
     freeLearnedSkills:
-    - SkimitarMastery
+    #- SkimitarMastery
     - AthleticT1
     - AthleticT2
     - AthleticT3
@@ -91,7 +91,6 @@
         max: 1
     freeLearnedSkills:
     - HydrosophistryT1
-    - SwordMastery
     learnedSkills:
     - CP14ActionSpellIceArrow
 
@@ -123,7 +122,7 @@
       Memory:
         max: 4
     freeLearnedSkills:
-    - SwordMastery
+    #- SwordMastery
     - HydrosophistryT1
     - HydrosophistryT2
     - MetamagicT1

Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml

@@ -146,6 +146,14 @@
           32:
             sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
             state: gloves
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: neck
+          49:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: neck
   - type: Hands
     leftHandDisplacement:
       sizeMaps:
@@ -222,6 +230,14 @@
           32:
             sprite: _CP14/Mobs/Species/Carcat/displacement.rsi
             state: gloves
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: neck
+          49:
+            sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi
+            state: neck
   - type: Hands
     leftHandDisplacement:
       sizeMaps:

Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml

@@ -27,6 +27,14 @@
           32:
             sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi
             state: pants
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -48,4 +56,12 @@
           32:
             sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi
             state: pants
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
 

Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml

@@ -66,6 +66,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: male_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -92,6 +100,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -128,6 +144,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: male_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -154,4 +178,12 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 

Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml

@@ -183,6 +183,14 @@
           32:
             sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
             state: shoes
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
+            state: neck
+          48:
+            sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi
+            state: neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -257,3 +265,11 @@
           32:
             sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
             state: shoes
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
+            state: neck
+          48:
+            sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi
+            state: neck

Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml

@@ -18,6 +18,15 @@
         max: 5.5 # +0.5 memory point
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -39,6 +48,14 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -49,6 +66,15 @@
     species: CP14Human
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       cloak:
         sizeMaps:
@@ -75,3 +101,11 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck

Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml

@@ -99,6 +99,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: male_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -125,6 +133,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -210,6 +226,14 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: male_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -236,4 +260,12 @@
           32:
             sprite: _CP14/Mobs/Species/Elf/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 

Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml

@@ -116,6 +116,15 @@
   - type: ContainerContainer
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
   - type: TransferMindOnGib
   - type: GhostTakeoverAvailable
   - type: CP14DemiplaneBlockInteractions
@@ -129,3 +138,12 @@
     species: CP14Skeleton
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck

Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml

@@ -41,6 +41,15 @@
     - PyrokineticT2
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -67,6 +76,14 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck
 
 
 - type: entity
@@ -78,6 +95,15 @@
     species: CP14Tiefling
   - type: Inventory
     templateId: CP14Human
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       cloak:
         sizeMaps:
@@ -104,3 +130,11 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: female_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: female_neck

Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml

@@ -151,6 +151,15 @@
       - CP14Mosquito
   - type: Inventory
     templateId: CP14Partial
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       outerClothing:
         sizeMaps:
@@ -172,6 +181,14 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
 
 - type: entity
   parent: CP14BaseSpeciesDummy
@@ -182,6 +199,15 @@
     species: CP14Zombie
   - type: Inventory
     templateId: CP14Partial
+    displacements:
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck
     femaleDisplacements:
       cloak:
         sizeMaps:
@@ -208,3 +234,11 @@
           32:
             sprite: _CP14/Mobs/Species/Human/displacement.rsi
             state: female_shirt
+      neck:
+        sizeMaps:
+          32:
+            sprite: _CP14/Mobs/Species/Human/displacement.rsi
+            state: male_neck
+          48:
+            sprite: _CP14/Mobs/Species/Human/displacement48.rsi
+            state: male_neck

Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml

@@ -125,4 +125,15 @@
   - type: Sprite
     state: guard
   - type: CP14TradingContract
-    faction: Guards
+    faction: Guards
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractHelmirChild
+  description: Trading contract with the "Helmirs childs". Allows you to purchase various weapons and ammunition
+  suffix: Helmirs childs
+  components:
+  - type: Sprite
+    state: helmir_child
+  - type: CP14TradingContract
+    faction: HelmirChild

Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml

@@ -18,7 +18,7 @@
     - WoodwindInstrument
   - type: PhysicalComposition
     materialComposition:
-      CP14WoodenPlanks: 40
+      CP14WoodenPlanks: 10
 
 - type: entity
   parent: BaseHandheldInstrument

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml

@@ -1,95 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeAxeBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A axe blade without a hilt. 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: CP14ModularBladeAxeBase
-  id: CP14ModularBladeIronAxe
-  name: iron axe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronAxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularBladeAxeBase
-  id: CP14ModularBladeGoldAxe
-  name: golden axe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldAxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularBladeAxeBase
-  id: CP14ModularBladeCopperAxe
-  name: copper axe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperAxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularBladeAxeBase
-  id: CP14ModularBladeMithrilAxe
-  name: mithril axe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilAxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20
-
-- type: entity
-  parent: CP14ModularBladeAxeBase
-  id: CP14ModularBladeWoodenAxe
-  name: wooden axe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/wooden_axe.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeWoodenAxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeDaggerBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A dagger blade without a hilt. 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: CP14ModularBladeDaggerBase
-  id: CP14ModularBladeIronDagger
-  name: iron dagger blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronDagger
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeDaggerBase
-  id: CP14ModularBladeGoldDagger
-  name: golden dagger blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldDagger
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeDaggerBase
-  id: CP14ModularBladeCopperDagger
-  name: copper dagger blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperDagger
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeDaggerBase
-  id: CP14ModularBladeMithrilDagger
-  name: mithril dagger blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilDagger
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hammer.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeHammerBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A hammerhead without a hilt. A blacksmith can use it as a spare part to create a tool.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-
-- type: entity
-  parent: CP14ModularBladeHammerBase
-  id: CP14ModularBladeIronHammer
-  name: iron hammerhead
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronHammer
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularBladeHammerBase
-  id: CP14ModularBladeGoldHammer
-  name: golden hammerhead
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldHammer
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularBladeHammerBase
-  id: CP14ModularBladeCopperHammer
-  name: copper hammerhead
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperHammer
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularBladeHammerBase
-  id: CP14ModularBladeMithrilHammer
-  name: mithril hammerhead
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilHammer
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml

@@ -1,80 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeHoeBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A hoe blade without a hilt. A blacksmith can use it as a spare part to create a tool.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-
-- type: entity
-  parent: CP14ModularBladeHoeBase
-  id: CP14ModularBladeIronHoe
-  name: iron hoe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronHoe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeHoeBase
-  id: CP14ModularBladeCopperHoe
-  name: copper hoe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperHoe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeHoeBase
-  id: CP14ModularBladeGoldHoe
-  name: golden hoe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldHoe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeSickleBase
-  id: CP14ModularBladeMithrilHoe
-  name: mithril hoe blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilHoe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeMaceBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A mace ball without a hilt. 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: CP14ModularBladeMaceBase
-  id: CP14ModularBladeIronMace
-  name: iron mace ball
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronMace
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeMaceBase
-  id: CP14ModularBladeGoldMace
-  name: golden mace ball
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldMace
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeMaceBase
-  id: CP14ModularBladeCopperMace
-  name: copper mace ball
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperMace
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeMaceBase
-  id: CP14ModularBladeMithrilMace
-  name: mithril mace ball
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilMace
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml

@@ -1,46 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeMopBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A mop head without a hilt. Attach it to a hilt to make a mop.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-
-- type: entity
-  parent: CP14ModularBladeMopBase
-  id: CP14ModularBladeWoodMop
-  name: wooden mop head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeWoodMop
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 10
-      CP14Cloth: 10
-
-- type: entity
-  parent: CP14ModularBladeMopBase
-  id: CP14ModularBladeLucensMop
-  name: lucens mop head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeLucensMop
-  - type: PhysicalComposition
-    materialComposition:
-      CP14LucensWoodenPlanks: 10
-      CP14Cloth: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladePickaxeBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A pickaxe head without a hilt. A blacksmith can use it as a spare part to create a tool.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,1,0
-    storedOffset: 0, 5
-
-- type: entity
-  parent: CP14ModularBladePickaxeBase
-  id: CP14ModularBladeIronPickaxe
-  name: iron pickaxe head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronPickaxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularBladePickaxeBase
-  id: CP14ModularBladeGoldPickaxe
-  name: golden pickaxe head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldPickaxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularBladePickaxeBase
-  id: CP14ModularBladeCopperPickaxe
-  name: copper pickaxe head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperPickaxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularBladePickaxeBase
-  id: CP14ModularBladeMithrilPickaxe
-  name: mithril pickaxe head
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilPickaxe
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml

@@ -1,95 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeRapierBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A rapier blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,1
-    storedOffset: 0, 10
-
-- type: entity
-  parent: CP14ModularBladeRapierBase
-  id: CP14ModularBladeIronRapier
-  name: iron rapier blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronRapier
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeRapierBase
-  id: CP14ModularBladeGoldRapier
-  name: golden rapier blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldRapier
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeRapierBase
-  id: CP14ModularBladeCopperRapier
-  name: copper rapier blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperRapier
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeRapierBase
-  id: CP14ModularBladeMithrilRapier
-  name: mithril rapier blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilRapier
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-
-- type: entity
-  parent: CP14ModularBladeRapierBase
-  id: CP14ModularBladeWoodenRapier
-  name: wooden rapier blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeWoodenRapier
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeShovelBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A shovel blade without a hilt. A blacksmith can use it as a spare part to create a tool.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-
-- type: entity
-  parent: CP14ModularBladeShovelBase
-  id: CP14ModularBladeIronShovel
-  name: iron shovel blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronShovel
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeShovelBase
-  id: CP14ModularBladeGoldShovel
-  name: golden shovel blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldShovel
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeShovelBase
-  id: CP14ModularBladeCopperShovel
-  name: copper shovel blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperShovel
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeShovelBase
-  id: CP14ModularBladeMithrilShovel
-  name: mithril shovel blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilShovel
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml

@@ -1,79 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeSickleBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A sickle blade without a hilt. 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: CP14ModularBladeSickleBase
-  id: CP14ModularBladeIronSickle
-  name: iron sickle blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronSickle
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularBladeSickleBase
-  id: CP14ModularBladeCopperSickle
-  name: copper sickle blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperSickle
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularBladeSickleBase
-  id: CP14ModularBladeGoldSickle
-  name: golden sickle blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldSickle
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularBladeSickleBase
-  id: CP14ModularBladeMithrilSickle
-  name: mithril sickle blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilSickle
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/skimitar.yml

@@ -1,78 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeSkimitarBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A skimitar blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,1
-    storedOffset: 0, 10
-
-- type: entity
-  parent: CP14ModularBladeSkimitarBase
-  id: CP14ModularBladeIronSkimitar
-  name: iron skimitar blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronSkimitar
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularBladeSkimitarBase
-  id: CP14ModularBladeGoldSkimitar
-  name: golden skimitar blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldSkimitar
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularBladeSkimitarBase
-  id: CP14ModularBladeCopperSkimitar
-  name: copper skimitar blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperSkimitar
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularBladeSkimitarBase
-  id: CP14ModularBladeMithrilSkimitar
-  name: mithril skimitar blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilSkimitar
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml

@@ -1,99 +0,0 @@
-- 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: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- 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: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldSpear
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- 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: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperSpear
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- 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: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilSpear
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-
-- type: entity
-  parent: CP14ModularBladeSpearBase
-  id: CP14ModularBladeWoodenSpear
-  name: wooden spearhead
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeWoodenSpear
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml

@@ -1,112 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeSwordBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: A sword blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,1
-    storedOffset: 0, 10
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeIronSword
-  name: iron sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronSword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeGoldSword
-  name: golden sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeGoldSword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeCopperSword
-  name: copper sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeCopperSword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeMithrilSword
-  name: mithril sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeMithrilSword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeBoneSword
-  name: bone sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeBoneSword
-  - type: Construction
-    graph: CP14BoneSword
-    node: cp14bonesword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Bone: 50
-
-- type: entity
-  parent: CP14ModularBladeSwordBase
-  id: CP14ModularBladeWoodenSword
-  name: wooden sword blade
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeWoodenSword
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/base.yml

@@ -1,13 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularGardeBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: Garde? Garde!
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml

@@ -1,17 +0,0 @@
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeGuildmaster
-  categories: [ ForkFiltered ]
-  name: guildmaster's rapier garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeGuildmaster
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 15
-

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml

@@ -1,87 +0,0 @@
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSharpIron
-  categories: [ ForkFiltered ]
-  name: sharp iron garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpIron
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- 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: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpGold
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSharpCopper
-  categories: [ ForkFiltered ]
-  name: sharp copper garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpCopper
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSharpMithril
-  categories: [ ForkFiltered ]
-  name: sharp mithril garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpMithril
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSharpWooden
-  categories: [ ForkFiltered ]
-  name: sharp wooden garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/wooden_sharp.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpWooden
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml

@@ -1,87 +0,0 @@
-- 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: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- 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: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSturdyGold
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- 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: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSturdyCopper
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- 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: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSturdyMithril
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSturdyWooden
-  categories: [ ForkFiltered ]
-  name: sturdy wooden garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/wooden_sturdy.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSturdyWooden
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/base.yml

@@ -1,13 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularInlayBase
-  categories: [ ForkFiltered ]
-  description: A small piece that can be inlaid into your weapon or tool.
-  abstract: true
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/quartz.yml

@@ -1,107 +0,0 @@
-- type: entity
-  parent: CP14ModularInlayBase
-  id: CP14ModularInlayQuartzBase
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-  - type: StaticPrice
-    price: 50
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzWater
-  name: water quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#5eabeb"
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzWater
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzHealing
-  name: healing quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#79b330"
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzHealing
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzFire
-  name: fire quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#ed731c"
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzFire
-  - type: StaticPrice
-    price: 70
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzLight
-  name: light quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#f1c7ff"
-      shader: unshaded
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzLight
-  - type: PointLight
-    radius: 2
-    color: "#f1c7ff"
-    netsync: false
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzElectric
-  name: electric quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#e6ff6b"
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzElectric
-
-- type: entity
-  parent: CP14ModularInlayQuartzBase
-  id: CP14ModularInlayQuartzDarkness
-  name: darkness quartz inlay
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
-    layers:
-    - state: item
-      color: "#391c57"
-    - state: frame
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - InlayQuartzDarkness
-

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml

@@ -1,77 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeTipBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  description: The tip on an arrow shaft, a well-finished little piece of metal.
-  components:
-  - type: Item
-    size: Tiny
-    storedRotation: 0
-
-- type: entity
-  parent: CP14ModularBladeTipBase
-  id: CP14ModularTipIronArrow
-  name: iron arrow tip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi
-    layers:
-    - state: tip
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - TipIronArrow
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 2
-
-- type: entity
-  parent: CP14ModularBladeTipBase
-  id: CP14ModularTipGoldArrow
-  name: golden arrow tip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi
-    layers:
-    - state: tip
-      color: "#ffe269"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - TipGoldArrow
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 2
-
-- type: entity
-  parent: CP14ModularBladeTipBase
-  id: CP14ModularTipCopperArrow
-  name: copper arrow tip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi
-    layers:
-    - state: tip
-      color: "#e28f08"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - TipCopperArrow
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 2
-
-- type: entity
-  parent: CP14ModularBladeTipBase
-  id: CP14ModularTipMithrilArrow
-  name: mithril arrow tip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi
-    layers:
-    - state: tip
-      color: "#38f0b3"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - TipMithrilArrow
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 2

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml

@@ -1,521 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularGripBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    storedRotation: 45
-  - type: ExaminableDamage
-    messages: CP14WeaponMessages
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: CP14MeleeSelfDamage
-    damageToSelf:
-      types:
-        Blunt: 0.5 # 100 hits
-  - type: MeleeWeapon
-    angle: 45
-    attackRate: 1
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Blunt: 0
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.25
-  - type: Clothing
-    equipDelay: 0.25
-    unequipDelay: 0.25
-    quickEquip: false
-    breakOnMove: false
-  - type: CP14LabeledRenaming
-
-- type: entity
-  parent: CP14ModularGripBase
-  id: CP14ModularGripShort
-  abstract: true
-  description: A tool for your purposes!
-  components:
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - Blade
-  - type: Item
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, -5
-  - type: MeleeWeapon
-    resetOnHandSelected: false #Fast swap
-    range: 1.0 # 1.5 standart
-    cPAnimationOffset: -0.75 #-1 standart
-    attackRate: 1 # 1 standart
-  - type: Clothing
-    slots:
-    - belt
-
-- type: entity
-  parent: CP14ModularGripBase
-  id: CP14ModularGripLong
-  abstract: true
-  description: A tool for your purposes! Now long enough to hold in two hands.
-  components:
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - Blade
-  - type: Item
-    shape:
-    - 0,0,0,1
-    storedOffset: 0, -15
-  - type: MeleeWeapon
-    resetOnHandSelected: true
-    range: 1.5 # 1.5 standart
-    attackRate: 0.7 # 1 standart
-    cPAnimationOffset: -1
-  - type: Clothing
-    slots:
-    - neck
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 0
-
-# Shorts
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripWooden
-  name: wooden grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWooden
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 20
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripLucens
-  name: lucens grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi
-    layers:
-    - state: icon
-      color: "#0398fc"
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripLucens
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14LucensWoodenPlanks: 20
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripBirch
-  name: birch grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/birch_grip.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWooden
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 20
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripIron
-  name: iron grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripIron
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100 #x2 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 10
-
-- type: entity
-  parent: CP14ModularGripIron
-  id: CP14ModularGripIronGuard
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripIronGuard
-  - type: StaticPrice
-    price: 10
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripGolden
-  name: golden grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripGolden
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 20 #~x0.3 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 10
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripCopper
-  name: copper grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripCopper
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 70 #~x0.66 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 10
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripMithril
-  name: mithril grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
-    layers:
-    - state: icon
-      color: "#38f0b3"
-  - 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: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripGuildmaster
-  name: guildmaster's rapier grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripIron
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 120 #x2.4 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 10
-      CP14Gold: 10
-
-# Long
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripWoodenLong
-  name: long wooden grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWoodenLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 40
-
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripLucensLong
-  name: long lucens grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi
-    layers:
-    - state: icon
-      color: "#0398fc"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripLucensLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14LucensWoodenPlanks: 40
-
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripBirchLong
-  name: long birch grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi
-    layers:
-    - state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWoodenLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 60
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 40
-
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripIronLong
-  name: long iron grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripIronLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100 #x2 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Iron: 20
-
-- type: entity
-  parent: CP14ModularGripIronLong
-  id: CP14ModularGripIronLongGuard
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripIronLongGuard
-  - type: StaticPrice
-    price: 10
-
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripGoldLong
-  name: long golden grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
-    layers:
-    - state: icon
-      color: "#ffe269"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripGoldLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 40 #~x0.3 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Gold: 20
-
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripCopperLong
-  name: long copper grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
-    layers:
-    - state: icon
-      color: "#e28f08"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripCopperLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 70 #~x0.66 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14Copper: 20
-
-
-- 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: "#38f0b3"
-  - 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: PhysicalComposition
-    materialComposition:
-      CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml

@@ -1,105 +0,0 @@
-- type: entity
-  parent: CP14ModularGripBase
-  id: CP14ModularRod
-  abstract: true
-  description: A thin shaft of wood, the most important part of the future arrow.
-  components:
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - ArrowTip
-  - type: Item
-    storedRotation: 0
-  - type: MeleeWeapon
-    resetOnHandSelected: false #Fast swap
-    range: 1.0 # 1.5 standart
-    cPAnimationOffset: -0.75 #-1 standart
-    attackRate: 1 # 1 standart
-  - type: Clothing
-    slots:
-    - belt
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape: !type:PhysShapeCircle
-          radius: 0.2
-        density: 5
-        mask:
-        - ItemMask
-        restitution: 0.3
-        friction: 0.2
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-  - type: EmbeddableProjectile
-    sound: /Audio/Weapons/star_hit.ogg
-    embedOnThrow: false
-  - type: ThrowingAngle
-    angle: 0
-  - type: Ammo
-    muzzleFlash: null
-  - type: Tag
-    tags:
-    - CP14Arrow
-
-# Rod
-- type: entity
-  parent: CP14ModularRod
-  id: CP14ModularRodWooden
-  name: wooden grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi
-    layers:
-    - state: tail
-    - state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularRodWooden
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 30
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14WoodenPlanks: 2
-
-- type: entity
-  parent: CP14ModularRod
-  id: CP14ModularRodLucens
-  name: lucens grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi
-    layers:
-    - state: tail
-    - state: icon
-      color: "#0398fc"
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularRodLucens
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 45
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: PhysicalComposition
-    materialComposition:
-      CP14LucensWoodenPlanks: 2

Resources/Prototypes/_CP14/Entities/Objects/Tools/fork.yml

@@ -0,0 +1,60 @@
+- type: entity
+  abstract: true
+  id: CP14BaseFork
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: ThrowingAngle
+    angle: -90
+  - type: MeleeWeapon
+    attackRate: 1
+    range: 2
+    angle: 10
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Piercing: 3
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.3
+    cPAnimationOffset: 1.75
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Piercing: 3
+  - type: CP14BonusDistanceMeleeDamage
+    minDistance: 2
+    bonusDamage:
+      types:
+        Piercing: 3
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+  - type: CP14EditTileTool
+    sound:
+      collection: CP14Digging
+    tileReplace:
+      CP14FloorDirt: CP14FloorDirtSeedbed
+      CP14FloorDirtSeedbed: CP14FloorDirt
+
+- type: entity
+  parent: CP14BaseFork
+  id: CP14WeaponFork
+  name: fork
+  description: A simple fork for digging and planting seeds in the soil.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Fork/fork.rsi
+    state: icon

Resources/Prototypes/_CP14/Entities/Objects/Tools/mop.yml

@@ -0,0 +1,53 @@
+- type: entity
+  abstract: true
+  id: CP14BaseMop
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    clickDamageModifier: 0.1
+    attackRate: 1.5
+    range: 1.6
+    angle: 30
+    wideAnimationRotation: 0
+    damage:
+      types:
+        Blunt: 2
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 2
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+  - type: Spillable
+    solution: absorbed
+  - type: Absorbent
+  - type: SolutionContainerManager
+    solutions:
+      absorbed:
+        maxVol: 50
+
+- type: entity
+  parent: CP14BaseMop
+  id: CP14Mop
+  name: mop
+  description: A simple mop for cleaning up spills and messes.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Mop/mop.rsi
+    state: icon

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml

@@ -0,0 +1,64 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponToolHammer
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponThrowable
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
+        Structural: 3
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+    autoAttack: true
+    attackRate: 2
+    range: 1.5
+    angle: 60
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Blunt: 5
+        Structural: 3
+    animation: CP14WeaponArcSlash
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+    cPAnimationOffset: 1
+  - type: Clothing
+    slots:
+    - belt
+    breakOnMove: false
+    equipDelay: 0.5
+    unequipDelay: 0.5
+  - type: Tool
+    qualities:
+      - CP14Hammering
+    useSound:
+      collection: CP14Hammering
+      params:
+        variation: 0.03
+        volume: 2
+
+- type: entity
+  parent: CP14BaseWeaponToolHammer
+  id: CP14WeaponHammerIron
+  name: iron hammer
+  description: A standard hammer made of iron.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Hammer/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml

@@ -0,0 +1,63 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponPickaxe
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 1
+    range: 1.6
+    angle: 90
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Piercing: 3
+        Structural: 4
+    animation: CP14WeaponArcSlash
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Piercing: 6
+        Structural: 20
+  - type: Wieldable
+  - type: Clothing
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - neck
+  - type: Tool
+    qualities:
+      - Prying
+    useSound:
+      path: /Audio/Items/crowbar.ogg
+  - type: ToolTileCompatible
+  - type: Prying
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/crowbar_drop.ogg
+
+- type: entity
+  parent: CP14BaseWeaponPickaxe
+  id: CP14WeaponPickaxeIron
+  name: iron pickaxe
+  description: A sturdy iron pickaxe, perfect for mining and not for combat.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml

@@ -0,0 +1,61 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponShovel
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 1
+    range: 1.6
+    angle: 170
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 3
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Slash: 5
+  - type: Wieldable
+  - type: Clothing
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+    slots:
+    - neck
+  - type: Shovel
+  - type: ToolTileCompatible
+  - type: Tool
+    qualities:
+      - CP14Digging
+    useSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+
+- type: entity
+  parent: CP14BaseWeaponShovel
+  id: CP14WeaponShovelIron
+  name: iron shovel
+  description: A sturdy iron shovel, perfect for digging and not for combat.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Shovel/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml

@@ -33,4 +33,4 @@
       path: /Audio/Items/ratchet.ogg
   - type: PhysicalComposition
     materialComposition:
-      CP14Iron: 20
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml

@@ -94,6 +94,7 @@
     messages: CP14WeaponMessages
   - type: Damageable
     damageContainer: Inorganic
+  - type: CP14MeleeParriable
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml

@@ -0,0 +1,88 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponDagger
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  - CP14BaseWeaponThrowable
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,0
+  - type: EmbeddableProjectile
+    offset: -0.15,-0.15
+    removalTime: 1.5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 4
+        Piercing: 8
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+    autoAttack: true
+    attackRate: 2
+    range: 1
+    angle: 60
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 2
+        Piercing: 3
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.15
+    cPAnimationOffset: 0.75
+  - type: Clothing
+    slots:
+    - belt
+    breakOnMove: false
+    equipDelay: 0.5
+    unequipDelay: 0.5
+
+- type: entity
+  parent: CP14BaseWeaponDagger
+  id: CP14WeaponDaggerIron
+  name: iron dagger
+  description: A standard dagger made of iron.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Dagger/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 10
+
+- type: entity
+  parent: CP14BaseWeaponDagger
+  id: CP14WeaponDaggerHatchet
+  name: hatchet
+  description: A small hatchet, commonly used as a kitchen utensil for preparing food.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 10
+
+- type: entity
+  parent: CP14BaseWeaponDagger
+  id: CP14WeaponDaggerSickle
+  name: sickle
+  description: A curved blade used for harvesting crops, but can be deadly in skilled hands.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Dagger/sickle.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/rapier.yml

@@ -0,0 +1,46 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponRapier
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 1.5
+    range: 1.2
+    angle: 20 
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Piercing: 10
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.3
+    cPAnimationOffset: 1
+  - type: Clothing
+    slots:
+    - belt
+    breakOnMove: false
+    equipDelay: 0.5
+    unequipDelay: 0.5
+
+- type: entity
+  parent: CP14BaseWeaponRapier
+  id: CP14WeaponRapierIron
+  name: rapier
+  description: An elegant and finely balanced blade, favored by Zellasian officers for its reach and precision. Its craftsmanship reflects imperial tradition and deadly efficiency.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Rapier/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml

@@ -1,19 +1,18 @@
 - type: entity
-  id: CP14BaseShield
+  id: CP14BaseWeaponShield
+  abstract: true
   parent:
   - BaseItem
-  - CP14BaseWeaponLight
-  - CP14BaseWeaponThrowable
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
   name: shield
   description: A wooden shield capable of withstanding multiple blows.
   components:
-  - type: Sprite
-    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
-    state: icon
   - type: Item
-    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
-    size: Normal
+    size: Ginormous
   - type: Blocking
+    passiveBlockFraction: 0.4
+    activeBlockFraction: 0.8
     passiveBlockModifier:
       coefficients:
         Blunt: 0.9
@@ -22,57 +21,49 @@
         Heat: 0.9
     activeBlockModifier:
       coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
+        Blunt: 0.75
+        Slash: 0.75
+        Piercing: 0.75
+        Heat: 0.75
       flatReductions:
         Blunt: 1
         Slash: 1
         Piercing: 1
         Heat: 1
   - type: Clothing
-    equipDelay: 0.45
-    unequipDelay: 0.45
-    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
+    equipDelay: 1
+    unequipDelay: 1
     quickEquip: false
     breakOnMove: false
     slots:
     - neck
   - type: MeleeWeapon
-    angle: 0
-    range: 1.2
-    attackRate: 0.5
-    wideAnimationRotation: -30
-    wideAnimation: CP14WeaponArcSlash
+    resetOnHandSelected: false
+    angle: 60
+    attackRate: 1
+    wideAnimationRotation: 0
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
     damage:
       types:
-        Blunt: 6
+        Blunt: 3
     soundHit:
       collection: MetalThud
-    cPAnimationLength: 0.3
-    cPAnimationOffset: -0.5
-  - type: DamageOnLand
-    damage:
-      types:
-        Blunt: 6
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 6
+    cPAnimationLength: 0.6
+    cPAnimationOffset: 0.5
   - type: Damageable
     damageContainer: Shield
   - type: Destructible
     thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 140
+          damage: 200
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
       - trigger:
           !type:DamageTrigger
-          damage: 100 #This is probably enough damage before it breaks
+          damage: 100 
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
@@ -84,7 +75,17 @@
               CP14WoodenPlanks1:
                 min: 1
                 max: 2
+
+- type: entity
+  parent: CP14BaseWeaponShield
+  id: CP14WeaponShieldWooden
+  name: wooden shield
+  description: A wooden shield capable of withstanding multiple blows.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
+    state: icon
   - type: PhysicalComposition
     materialComposition:
       CP14WoodenPlanks: 20
-      CP14Iron: 20
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml

@@ -0,0 +1,85 @@
+- type: entity
+  id: CP14BaseWeaponShieldBuckler
+  abstract: true
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  name: buckler
+  description: A small metallic shield, designed for quick parrying and blocking in close combat.
+  components:
+  - type: Item
+    size: Ginormous
+  - type: Blocking
+    passiveBlockFraction: 0.3
+    activeBlockFraction: 0.6
+    passiveBlockModifier:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+    activeBlockModifier:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+        Heat: 0.8
+  - type: Clothing
+    equipDelay: 0.5
+    unequipDelay: 0.5
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - neck
+  - type: CP14MeleeParry
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+    angle: 90
+    attackRate: 2
+    range: 0.75
+    wideAnimationRotation: 0
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 2
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.6
+    cPAnimationOffset: 0.5
+  - type: Damageable
+    damageContainer: Shield
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 150
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 75 
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14WoodenPlanks1:
+                min: 1
+                max: 2
+
+- type: entity
+  parent: CP14BaseWeaponShieldBuckler
+  id: CP14WeaponShieldBuckler
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/skimitar.yml

@@ -0,0 +1,51 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponSkimitar
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+    attackRate: 1.5
+    range: 1.2
+    angle: 60
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 5
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.25
+    cPAnimationOffset: 1
+  - type: CP14ComboBonusMeleeDamage
+    bonusDamage:
+      types:
+        Piercing: 5
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponSkimitar
+  id: CP14WeaponSkimitarIron
+  name: iron skimitar
+  description: A finely crafted skimitar favored by Bafamir carcats. 
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Skimitar/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml

@@ -0,0 +1,66 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponSpear
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  - CP14BaseWeaponThrowable
+  components:
+  - type: Item
+    size: Ginormous
+  - type: ThrowingAngle
+    angle: -90
+  - type: EmbeddableProjectile
+    offset: -0.15,-0.15
+    removalTime: 1.5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 16
+  - type: MeleeWeapon
+    attackRate: 1
+    range: 2.75
+    angle: 10 #Lower in 4 times
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Piercing: 5
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.3
+    cPAnimationOffset: 2
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Piercing: 5
+  - type: CP14BonusDistanceMeleeDamage
+    minDistance: 2.25
+    bonusDamage:
+      types:
+        Piercing: 5
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponSpear
+  id: CP14WeaponSpearIron
+  name: iron spear
+  description: A reliable spear that is standard in the Zellasian Empire. It strikes far, but slowly.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Spear/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
+      CP14Iron: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml

@@ -0,0 +1,50 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponSword
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 1.5
+    range: 1.2
+    angle: 60
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 7.5
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.25
+    cPAnimationOffset: 1
+  - type: CP14ComboBonusMeleeDamage
+    bonusDamage:
+      types:
+        Piercing: 5
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponSword
+  id: CP14WeaponSwordIron
+  name: iron sword
+  description: A finely crafted sword favored by imperial officers. Its blade gleams with authority and tradition.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Sword/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml

@@ -0,0 +1,94 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponTowerShield
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  name: tower wooden shield
+  description: A wooden shield capable of withstanding multiple blows.
+  components:
+  - type: Item
+    size: Ginormous
+  - type: Blocking
+    passiveBlockModifier:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+        Heat: 0.8
+    activeBlockModifier:
+      coefficients:
+        Blunt: 0.5
+        Slash: 0.5
+        Piercing: 0.5
+        Heat: 0.5
+      flatReductions:
+        Blunt: 3
+        Slash: 3
+        Piercing: 3
+  - type: Clothing
+    equipDelay: 1.5
+    unequipDelay: 1.5
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - neck
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+    angle: 60
+    attackRate: 0.5
+    wideAnimationRotation: 0
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcThrust
+    damage:
+      types:
+        Blunt: 3
+        Piercing: 3
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.6
+    cPAnimationOffset: 0.5
+  - type: CP14LightMeleeKnockdown
+  - type: Damageable
+    damageContainer: Shield
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 300
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14WoodenPlanks1:
+                min: 2
+                max: 4
+  - type: ClothingSpeedModifier
+    walkModifier: 0.7
+    sprintModifier: 0.7
+  - type: HeldSpeedModifier
+
+- type: entity
+  parent: CP14BaseWeaponTowerShield
+  id: CP14WeaponTowerShieldWooden
+  name: wooden tower shield
+  description: A wooden shield capable of withstanding multiple blows.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 50
+      CP14Iron: 40

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml

@@ -0,0 +1,55 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponTwoHandedSword
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 0.5
+    range: 1.6
+    angle: 170 #Bigger in 2 times
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 7
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Slash: 13
+  - type: CP14ComboBonusMeleeDamage
+    bonusDamage:
+      types:
+        Piercing: 10
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponTwoHandedSword
+  id: CP14WeaponTwoHandedSwordIron
+  name: iron two-handed sword
+  description: A large and heavy two-handed sword. Heavy means reliable.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Iron: 30

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml

@@ -0,0 +1,53 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponWarAxe
+  parent:
+  - BaseItem
+  - CP14BaseWeaponChemical
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponSharp
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    attackRate: 0.5
+    range: 1.6
+    angle: 170 #Bigger in 2 times
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Slash: 10
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Slash: 15
+  - type: CP14MeleeWeaponStaminaCost
+    stamina: 15
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponWarAxe
+  id: CP14WeaponWarAxeIron
+  name: iron war axe
+  description: A heavy war axe made of iron, designed for powerful strikes in battle.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/WarAxe/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
+      CP14Iron: 20

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml

@@ -0,0 +1,52 @@
+- type: entity
+  abstract: true
+  id: CP14BaseWeaponWarHammer
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    clickDamageModifier: 0.1
+    attackRate: 0.5
+    range: 1.6
+    angle: 170 #Bigger in 2 times
+    wideAnimationRotation: -90
+    damage:
+      types:
+        Blunt: 7
+    animation: CP14WeaponArcThrust
+    wideAnimation: CP14WeaponArcSlash
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.5
+    cPAnimationOffset: 1
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 13
+        Structural: 5
+  - type: CP14LightMeleeKnockdown
+  - type: Wieldable
+  - type: Clothing
+    slots:
+    - neck
+    breakOnMove: false
+    equipDelay: 1
+    unequipDelay: 1
+
+- type: entity
+  parent: CP14BaseWeaponWarHammer
+  id: CP14WeaponWarHammerIron
+  name: iron war hammer
+  description: A large and heavy war hammer. Heavy means reliable.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/WarHammer/iron.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
+      CP14Iron: 20