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

19
Content.Server/Singularity/EntitySystems/SingularitySystem.cs
View File

@@ -5,6 +5,8 @@ using Content.Shared.Singularity.Components;
using Content.Shared.Singularity.EntitySystems;
using Content.Shared.Singularity.Events;
using Robust.Server.GameStates;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.GameStates;
using Robust.Shared.Player;
using Robust.Shared.Timing;
@@ -204,9 +206,9 @@ public sealed class SingularitySystem : SharedSingularitySystem
MetaDataComponent? metaData = null;
if (Resolve(uid, ref metaData) && metaData.EntityLifeStage <= EntityLifeStage.Initializing)
_audio.Play(comp.FormationSound, Filter.Pvs(uid), uid, true);
_audio.PlayPvs(comp.FormationSound, uid);
comp.AmbientSoundStream = _audio.Play(comp.AmbientSound, Filter.Pvs(uid), uid, true);
comp.AmbientSoundStream = _audio.PlayPvs(comp.AmbientSound, uid)?.Entity;
UpdateSingularityLevel(uid, comp);
}
@@ -219,7 +221,7 @@ public sealed class SingularitySystem : SharedSingularitySystem
/// <param name="args">The event arguments.</param>
public void OnDistortionStartup(EntityUid uid, SingularityDistortionComponent comp, ComponentStartup args)
{
_pvs.AddGlobalOverride(uid);
_pvs.AddGlobalOverride(GetNetEntity(uid));
}
/// <summary>
@@ -232,11 +234,18 @@ public sealed class SingularitySystem : SharedSingularitySystem
/// <param name="args">The event arguments.</param>
public void OnSingularityShutdown(EntityUid uid, SingularityComponent comp, ComponentShutdown args)
{
comp.AmbientSoundStream?.Stop();
comp.AmbientSoundStream = _audio.Stop(comp.AmbientSoundStream);
MetaDataComponent? metaData = null;
if (Resolve(uid, ref metaData) && metaData.EntityLifeStage >= EntityLifeStage.Terminating)
_audio.Play(comp.DissipationSound, Filter.Pvs(uid), uid, true);
{
var xform = Transform(uid);
var coordinates = xform.Coordinates;
// I feel like IsValid should be checking this or something idk.
if (!TerminatingOrDeleted(coordinates.EntityId))
_audio.PlayPvs(comp.DissipationSound, coordinates);
}
}
/// <summary>