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

PopupSystem public methods rejig (#12830)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 10:41:47 +13:00
committed by GitHub
parent e459452333
commit 881a2b2ece
164 changed files with 721 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -321,7 +321,7 @@ public abstract class SharedActionsSystem : EntitySystem
if (action.Sound == null && string.IsNullOrWhiteSpace(action.Popup))
return false;
var filter = Filter.Pvs(performer).RemoveWhereAttachedEntity(e => e == performer);
var filter = Filter.PvsExcept(performer);
_audio.Play(action.Sound, filter, performer, true, action.AudioParams);
@@ -332,7 +332,7 @@ public abstract class SharedActionsSystem : EntitySystem
? Loc.GetString(action.Popup)
: Loc.GetString(action.Popup + action.PopupToggleSuffix);
_popupSystem.PopupEntity(msg, performer, filter);
_popupSystem.PopupEntity(msg, performer, filter, true);
return true;
}