Add DoPopup data field to OnUseTimerTrigger (#28691)

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
index 786d29d94a96f7d0805a5abdef9a83897792565d..8725dd1ae738ed7ed921cd5f2d9fdaa8da58e577 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -171,7 +171,8 @@ public sealed partial class TriggerSystem
         if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
             return;
 
-        _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
+        if (component.DoPopup)
+            _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
 
         HandleTimerTrigger(
             uid,

diff --git a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
index 5e509cb10bbaeac9d85a49c68e6eb42bc3c90db8..c4e6e787a4aff96eb9450439a5a3cca99505c2dc 100644 (file)
--- a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
@@ -45,5 +45,10 @@ namespace Content.Shared.Explosion.Components
         ///     Whether you can examine the item to see its timer or not.
         /// </summary>
         [DataField] public bool Examinable = true;
+
+        /// <summary>
+        ///     Whether or not to show the user a popup when starting the timer.
+        /// </summary>
+        [DataField] public bool DoPopup = true;
     }
 }