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

tweak(HealthAnalyzer): Stop showing poup when used on self or when cancelled (by twitter) (#30467)

Browse Source 
* .
This commit is contained in:
Brandon Hu
2024-08-09 06:19:58 +00:00
committed by GitHub
parent 619ba162ce
commit e05df5d3e2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Medical/HealthAnalyzerSystem.cs
View File

@@ -86,11 +86,14 @@ public sealed class HealthAnalyzerSystem : EntitySystem
_audio.PlayPvs(uid.Comp.ScanningBeginSound, uid); _audio.PlayPvs(uid.Comp.ScanningBeginSound, uid);
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid) var doAfterCancelled = !_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
{ {
NeedHand = true, NeedHand = true,
BreakOnMove = true, BreakOnMove = true,
}); });
if (args.Target == args.User || doAfterCancelled)
return;
var msg = Loc.GetString("health-analyzer-popup-scan-target", ("user", Identity.Entity(args.User, EntityManager))); var msg = Loc.GetString("health-analyzer-popup-scan-target", ("user", Identity.Entity(args.User, EntityManager)));
_popupSystem.PopupEntity(msg, args.Target.Value, args.Target.Value, PopupType.Medium); _popupSystem.PopupEntity(msg, args.Target.Value, args.Target.Value, PopupType.Medium);