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

Unrevert audio (#21330)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
This commit is contained in:
metalgearsloth
2023-11-27 22:12:34 +11:00
committed by GitHub
parent d3486d3b25
commit 269c93245d
288 changed files with 848 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
View File

@@ -7,6 +7,8 @@ using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Events;
using Content.Shared.Throwing;
using Content.Shared.Toggleable;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Network;
@@ -232,10 +234,10 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
// Sad...
if (_netManager.IsServer && component.Stream == null)
component.Stream = _audio.PlayPredicted(component.Sound, gunUid, null);
component.Stream = _audio.PlayPredicted(component.Sound, gunUid, null)?.Entity;
Dirty(tethered);
Dirty(component);
Dirty(target, tethered);
Dirty(gunUid, component);
}
protected virtual void StopTether(EntityUid gunUid, BaseForceGunComponent component, bool land = true, bool transfer = false)
@@ -269,7 +271,7 @@ public abstract partial class SharedTetherGunSystem : EntitySystem
if (!transfer)
{
component.Stream?.Stop();
_audio.Stop(component.Stream);
component.Stream = null;
}