From 98df9c66416d354b399d2c1fef208d82aff12f0e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Mon, 17 Apr 2023 22:30:40 +0000 Subject: [PATCH] [fix] prevent removing battery from suit (#15491) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Shared/Ninja/Systems/NinjaSuitSystem.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Content.Shared/Ninja/Systems/NinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/NinjaSuitSystem.cs index 3090218865..67ca7c33ab 100644 --- a/Content.Shared/Ninja/Systems/NinjaSuitSystem.cs +++ b/Content.Shared/Ninja/Systems/NinjaSuitSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Ninja.Components; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Content.Shared.Timing; +using Robust.Shared.Containers; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; @@ -23,6 +24,7 @@ public abstract class SharedNinjaSuitSystem : EntitySystem SubscribeLocalEvent(OnEquipped); SubscribeLocalEvent(OnGetItemActions); + SubscribeLocalEvent(OnSuitRemoveAttempt); SubscribeLocalEvent(OnUnequipped); SubscribeNetworkEvent(OnSetCloakedMessage); @@ -48,6 +50,12 @@ public abstract class SharedNinjaSuitSystem : EntitySystem args.Actions.Add(comp.EmpAction); } + private void OnSuitRemoveAttempt(EntityUid uid, NinjaSuitComponent comp, ContainerIsRemovingAttemptEvent args) + { + // no removing your battery idiot!!! + args.Cancel(); + } + private void OnUnequipped(EntityUid uid, NinjaSuitComponent comp, GotUnequippedEvent args) { UserUnequippedSuit(uid, comp, args.Equipee); -- 2.51.2