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

Fix popup spam and audio outside prediction for devour action (#19768)

Browse Source
This commit is contained in:
DrSmugleaf
2023-09-02 18:59:36 -07:00
committed by GitHub
parent 5ca7d257cc
commit eadf6e3fe6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Devour/SharedDevourSystem.cs
View File

@@ -1,10 +1,10 @@
using Content.Shared.DoAfter;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs;
using Robust.Shared.Containers;
using Content.Server.Devour.Components; using Content.Server.Devour.Components;
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.DoAfter;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Popups; using Content.Shared.Popups;
using Robust.Shared.Containers;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Shared.Devour; namespace Content.Shared.Devour;
@@ -61,17 +61,17 @@ public abstract class SharedDevourSystem : EntitySystem
}); });
break; break;
default: default:
_popupSystem.PopupEntity(Loc.GetString("devour-action-popup-message-fail-target-alive"), uid, uid); _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-fail-target-alive"), uid,uid);
break; break;
} }
return; return;
} }
_popupSystem.PopupEntity(Loc.GetString("devour-action-popup-message-structure"), uid, uid); _popupSystem.PopupClient(Loc.GetString("devour-action-popup-message-structure"), uid, uid);
if (component.SoundStructureDevour != null) if (component.SoundStructureDevour != null)
_audioSystem.PlayPvs(component.SoundStructureDevour, uid, component.SoundStructureDevour.Params); _audioSystem.PlayPredicted(component.SoundStructureDevour, uid, uid, component.SoundStructureDevour.Params);
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(uid, component.StructureDevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid) _doAfterSystem.TryStartDoAfter(new DoAfterArgs(uid, component.StructureDevourTime, new DevourDoAfterEvent(), uid, target: target, used: uid)
{ {