From eb8bfe23e0acc82b1c7eee2a055337b8c90467d8 Mon Sep 17 00:00:00 2001 From: ZoNeSRuS Date: Thu, 8 Aug 2024 23:07:57 +0700 Subject: [PATCH] taserNerf --- .../Stunnable/Systems/StunOnCollideSystem.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs index 52e3cab79c5923..9ed943cf47b3b3 100644 --- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs +++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs @@ -5,6 +5,9 @@ using Robust.Shared.Physics.Dynamics; using Content.Shared.Throwing; using Robust.Shared.Physics.Events; +using Content.Shared.Clothing; +using Content.Shared.Inventory; + namespace Content.Server.Stunnable { @@ -12,6 +15,7 @@ namespace Content.Server.Stunnable internal sealed class StunOnCollideSystem : EntitySystem { [Dependency] private readonly StunSystem _stunSystem = default!; + [Dependency] private readonly InventorySystem _inventory = default!; public override void Initialize() { @@ -23,6 +27,14 @@ public override void Initialize() private void TryDoCollideStun(EntityUid uid, StunOnCollideComponent component, EntityUid target) { + //ss220 taserNerf + _inventory.TryGetSlotEntity(target, "shoes", out var entityUid); + + if (TryComp(entityUid, out var magboots)) + return; + + //ss220 taserNerf end + if (EntityManager.TryGetComponent(target, out var status)) { _stunSystem.TryStun(target, TimeSpan.FromSeconds(component.StunAmount), true, status);