Фикс рапиры (#2861)

Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

@@ -71,12 +71,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public bool ResistanceBypass = false;
 
-    /// <summary>
-    /// Sunrise Edit bypass OnWide
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool ResistanceBypassOnWide = false;
-
     /// <summary>
     /// Base damage for this weapon. Can be modified via heavy damage or other means.
     /// </summary>

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

@@ -470,7 +470,6 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         // If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant
         var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component);
         var target = GetEntity(ev.Target);
-        var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
 
         // For consistency with wide attacks stuff needs damageable.
         if (Deleted(target) ||
@@ -529,6 +528,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         RaiseLocalEvent(target.Value, attackedEvent);
 
         var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList);
+var resistanceBypass = GetResistanceBypass(meleeUid, user, component); // Sunrise-edit ЛКМ пробивает броню
         var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass);
 
         if (damageResult is {Empty: false})
@@ -580,7 +580,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         var distance = Math.Min(component.Range, direction.Length());
 
         var damage = GetDamage(meleeUid, user, component);
-        var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
+        var resistanceBypass = false; // Sunrise-edit ПКМ не пробивает броню
         var entities = GetEntityList(ev.Entities);
 
         entities = entities.Where(e => !_tagSystem.HasTag(e, "IgnoreMelee")).ToList(); //Sunrise-edit

Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml

@@ -915,11 +915,6 @@
     Telecrystal: 10
   categories:
   - UplinkWeaponry
-  conditions:
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
 
 - type: listing
   id: UplinkFireAxeFlaming

Resources/Prototypes/_Sunrise/FleshCult/hands_mods.yml

@@ -117,7 +117,6 @@
         types:
           Piercing: 19
       resistanceBypass: true
-      resistanceBypassOnWide: true
       soundHit:
           path: /Audio/Weapons/bladeslice.ogg
     - type: Item