From 3f7df3c4fa30169a9b89a6f960bc4ed93892233c Mon Sep 17 00:00:00 2001
From: ReWAFFlution <153686236+ReWAFFlution@users.noreply.github.com>
Date: Mon, 25 Aug 2025 12:33:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B0=D0=BF?=
=?UTF-8?q?=D0=B8=D1=80=D1=8B=20(#2861)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs | 6 ------
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 4 ++--
Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml | 5 -----
Resources/Prototypes/_Sunrise/FleshCult/hands_mods.yml | 1 -
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index fb9572b703..84e88156ad 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -71,12 +71,6 @@ public sealed partial class MeleeWeaponComponent : Component
[DataField, AutoNetworkedField]
public bool ResistanceBypass = false;
- ///
- /// Sunrise Edit bypass OnWide
- ///
- [DataField, AutoNetworkedField]
- public bool ResistanceBypassOnWide = false;
-
///
/// Base damage for this weapon. Can be modified via heavy damage or other means.
///
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index d5bbf8552a..c032b8b926 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/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
diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
index 92c833a6fd..7bd4089319 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
+++ b/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
diff --git a/Resources/Prototypes/_Sunrise/FleshCult/hands_mods.yml b/Resources/Prototypes/_Sunrise/FleshCult/hands_mods.yml
index b994d09d34..c3f89b6419 100644
--- a/Resources/Prototypes/_Sunrise/FleshCult/hands_mods.yml
+++ b/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