tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add DoPopup data field to OnUseTimerTrigger (#28691)

Browse Source
This commit is contained in:
DrSmugleaf
2024-06-07 22:36:29 -07:00
committed by GitHub
parent 0762f9da17
commit 7f1933169e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
View File

@@ -171,6 +171,7 @@ public sealed partial class TriggerSystem
if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead) if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
return; return;
if (component.DoPopup)
_popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User); _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
HandleTimerTrigger( HandleTimerTrigger(

5
Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
View File

@@ -45,5 +45,10 @@ namespace Content.Shared.Explosion.Components
/// Whether you can examine the item to see its timer or not. /// Whether you can examine the item to see its timer or not.
/// </summary> /// </summary>
[DataField] public bool Examinable = true; [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;
} }
} }