Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Server/GameTicking/GameTicker.Player.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.GameTicking
if (args.NewStatus != SessionStatus.Disconnected)
{
mind.Session = session;
_pvsOverride.AddSessionOverride(mindId.Value, session);
_pvsOverride.AddSessionOverride(GetNetEntity(mindId.Value), session);
}
DebugTools.Assert(mind.Session == session);
@@ -120,7 +120,7 @@ namespace Content.Server.GameTicking
_chatManager.SendAdminAnnouncement(Loc.GetString("player-leave-message", ("name", args.Session.Name)));
if (mind != null)
{
_pvsOverride.ClearOverride(mindId!.Value);
_pvsOverride.ClearOverride(GetNetEntity(mindId!.Value));
mind.Session = null;
}

4
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -362,7 +362,7 @@ namespace Content.Server.GameTicking
playerIcName = icName;
if (TryGetEntity(mind.OriginalOwnedEntity, out var entity))
_pvsOverride.AddGlobalOverride(entity.Value, recursive: true);
_pvsOverride.AddGlobalOverride(GetNetEntity(entity.Value), recursive: true);
var roles = _roles.MindGetAllRoles(mindId);
@@ -611,7 +611,7 @@ namespace Content.Server.GameTicking
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString(proto.Message), playSound: true);
if (proto.Sound != null)
SoundSystem.Play(proto.Sound.GetSound(), Filter.Broadcast());
_audio.PlayGlobal(proto.Sound, Filter.Broadcast(), true);
}
private async void SendRoundStartedDiscordMessage()

3
Content.Server/GameTicking/GameTicker.cs
View File

@@ -19,6 +19,8 @@ using Content.Shared.Roles;
using Robust.Server;
using Robust.Server.GameObjects;
using Robust.Server.GameStates;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Console;
using Robust.Shared.Map;
@@ -61,6 +63,7 @@ namespace Content.Server.GameTicking
[Dependency] private readonly PlayTimeTrackingSystem _playTimeTrackings = default!;
[Dependency] private readonly PvsOverrideSystem _pvsOverride = default!;
[Dependency] private readonly ServerUpdateManager _serverUpdates = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly StationJobsSystem _stationJobs = default!;
[Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;

1
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -45,6 +45,7 @@ using Robust.Server.GameObjects;
using Robust.Server.Maps;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;

3
Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
View File

@@ -16,6 +16,9 @@ using Content.Shared.Preferences;
using Content.Shared.Roles;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Enums;
using Robust.Shared.Map;

1
Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
View File

@@ -24,6 +24,7 @@ using Content.Shared.Revolutionary.Components;
using Content.Shared.Roles;
using Content.Shared.Stunnable;
using Content.Shared.Zombies;
using Robust.Server.Audio;
using Robust.Server.GameObjects;
using Robust.Shared.Timing;

3
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -17,6 +17,9 @@ using Content.Shared.PDA;
using Content.Shared.Preferences;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;

2
Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
View File

@@ -22,6 +22,8 @@ using Content.Shared.Roles;
using Content.Shared.Zombies;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
using Robust.Shared.Random;