diff --git a/Content.Server/StationEvents/Events/BureaucraticError.cs b/Content.Server/StationEvents/Events/BureaucraticError.cs index 5d92d844a8..ce5a54e68c 100644 --- a/Content.Server/StationEvents/Events/BureaucraticError.cs +++ b/Content.Server/StationEvents/Events/BureaucraticError.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.Station; using Content.Shared.Roles; using JetBrains.Annotations; @@ -16,8 +16,6 @@ public sealed class BureaucraticError : StationEvent Loc.GetString("station-event-bureaucratic-error-announcement"); public override string Name => "BureaucraticError"; - public override string? StartAudio => "/Audio/Announcements/announce.ogg"; - public override int MinimumPlayers => 25; public override float Weight => WeightLow; diff --git a/Content.Server/StationEvents/Events/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs index eb7ef73676..9b2ff8c0fa 100644 --- a/Content.Server/StationEvents/Events/GasLeak.cs +++ b/Content.Server/StationEvents/Events/GasLeak.cs @@ -21,8 +21,6 @@ namespace Content.Server.StationEvents.Events public override string StartAnnouncement => Loc.GetString("station-event-gas-leak-start-announcement"); - // Sourced from https://github.com/vgstation-coders/vgstation13/blob/2c5a491446ab824a8fbbf39bcf656b590e0228df/sound/misc/bloblarm.ogg - public override string StartAudio => "/Audio/Announcements/bloblarm.ogg"; protected override string EndAnnouncement => Loc.GetString("station-event-gas-leak-end-announcement"); diff --git a/Content.Server/StationEvents/Events/KudzuGrowth.cs b/Content.Server/StationEvents/Events/KudzuGrowth.cs index 1622c8c886..4d6f1627d1 100644 --- a/Content.Server/StationEvents/Events/KudzuGrowth.cs +++ b/Content.Server/StationEvents/Events/KudzuGrowth.cs @@ -18,8 +18,6 @@ public sealed class KudzuGrowth : StationEvent public override string? StartAnnouncement => Loc.GetString("station-event-kudzu-growth-start-announcement"); - public override string? StartAudio => "/Audio/Announcements/bloblarm.ogg"; - public override int EarliestStart => 15; public override int MinimumPlayers => 15; diff --git a/Content.Server/StationEvents/Events/MeteorSwarm.cs b/Content.Server/StationEvents/Events/MeteorSwarm.cs index 823cbe042e..43fc39b367 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarm.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarm.cs @@ -27,7 +27,7 @@ namespace Content.Server.StationEvents.Events public override string StartAnnouncement => Loc.GetString("station-event-meteor-swarm-start-announcement"); protected override string EndAnnouncement => Loc.GetString("station-event-meteor-swarm-ebd-announcement"); - public override string? StartAudio => "/Audio/Announcements/bloblarm.ogg"; + public override string? StartAudio => "/Audio/Announcements/meteors.ogg"; protected override float StartAfter => 30f; protected override float EndAfter => float.MaxValue; diff --git a/Content.Server/StationEvents/Events/VentClog.cs b/Content.Server/StationEvents/Events/VentClog.cs index c1c4a1cac2..cf2120525a 100644 --- a/Content.Server/StationEvents/Events/VentClog.cs +++ b/Content.Server/StationEvents/Events/VentClog.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.Atmos.Piping.Unary.Components; using Content.Server.Chemistry.ReactionEffects; using Content.Shared.Chemistry.Components; @@ -24,8 +24,6 @@ public sealed class VentClog : StationEvent public override string? StartAnnouncement => Loc.GetString("station-event-vent-clog-start-announcement"); - public override string? StartAudio => "/Audio/Announcements/bloblarm.ogg"; - public override int EarliestStart => 15; public override int MinimumPlayers => 15; diff --git a/Content.Server/StationEvents/Events/VentCritters.cs b/Content.Server/StationEvents/Events/VentCritters.cs index c92e8dc095..8e8dea0cd9 100644 --- a/Content.Server/StationEvents/Events/VentCritters.cs +++ b/Content.Server/StationEvents/Events/VentCritters.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.StationEvents.Components; using Robust.Shared.Random; @@ -17,7 +17,7 @@ public sealed class VentCritters : StationEvent public override string? StartAnnouncement => Loc.GetString("station-event-vent-spiders-start-announcement", ("data", Loc.GetString(Loc.GetString($"random-sentience-event-data-{_random.Next(1, 6)}")))); - public override string? StartAudio => "/Audio/Announcements/bloblarm.ogg"; + public override string? StartAudio => "/Audio/Announcements/aliens.ogg"; public override int EarliestStart => 15; diff --git a/Resources/Audio/Announcements/aliens.ogg b/Resources/Audio/Announcements/aliens.ogg new file mode 100644 index 0000000000..f7d1746247 Binary files /dev/null and b/Resources/Audio/Announcements/aliens.ogg differ diff --git a/Resources/Audio/Announcements/license.txt b/Resources/Audio/Announcements/license.txt index cb433bea7e..60d94c5a07 100644 --- a/Resources/Audio/Announcements/license.txt +++ b/Resources/Audio/Announcements/license.txt @@ -1 +1,3 @@ -outbreak7.ogg taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a +outbreak7.ogg taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a used under CC-BY-SA-3.0 +meteors.ogg taken from https://github.com/tgstation/tgstation/blob/95731342b97167d7883ff091d389f79c36442ee6/sound/ai/default/meteors.ogg used under CC-BY-SA-3.0 +aliens.ogg taken from https://github.com/tgstation/tgstation/blob/95731342b97167d7883ff091d389f79c36442ee6/sound/ai/default/aliens.ogg used under CC-BY-SA-3.0 diff --git a/Resources/Audio/Announcements/meteors.ogg b/Resources/Audio/Announcements/meteors.ogg new file mode 100644 index 0000000000..8f1c3aeacb Binary files /dev/null and b/Resources/Audio/Announcements/meteors.ogg differ