rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
View file

@ -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,

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.
/// </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;
}
}