From cb8cee5ea3fedcb4c5c28e4b82b68e35efe3e331 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Tue, 21 Jul 2026 00:37:37 -0700 Subject: [PATCH] Cleanup DangerousAction (#44825) cleanup --- .../Actions/Components/DangerousActionComponent.cs | 2 +- Content.Shared/Actions/DangerousActionSystem.cs | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Content.Shared/Actions/Components/DangerousActionComponent.cs b/Content.Shared/Actions/Components/DangerousActionComponent.cs index ddf5be0a5a..0dd303ac2f 100644 --- a/Content.Shared/Actions/Components/DangerousActionComponent.cs +++ b/Content.Shared/Actions/Components/DangerousActionComponent.cs @@ -10,5 +10,5 @@ namespace Content.Shared.Actions.Components; public sealed partial class DangerousActionComponent : Component { [DataField] - public string PacificationMessage { get; set; } = "dangerous-action-popup"; + public LocId PacificationMessage = "dangerous-action-popup"; } diff --git a/Content.Shared/Actions/DangerousActionSystem.cs b/Content.Shared/Actions/DangerousActionSystem.cs index 7dcd6b4a43..fbbe49fec2 100644 --- a/Content.Shared/Actions/DangerousActionSystem.cs +++ b/Content.Shared/Actions/DangerousActionSystem.cs @@ -4,10 +4,7 @@ using Content.Shared.CombatMode.Pacification; using Content.Shared.Popups; namespace Content.Shared.Actions; -/// -/// Just the system to realize Dangerous Action Component. -/// -/// + public sealed partial class DangerousActionSystem : EntitySystem { [Dependency] private SharedPopupSystem _popup = default!; @@ -23,10 +20,10 @@ public sealed partial class DangerousActionSystem : EntitySystem { if (args.Cancelled) return; - //query for pacification + if (!_pacifiedQuery.HasComp(args.User)) return; - //if found popup message and cancel + _popup.PopupEntity(Loc.GetString(ent.Comp.PacificationMessage), args.User, args.User); args.Cancelled = true; }