Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unnecesary audio string and puts the proper vox annoucement to two events (#7982)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
T-Stalker
2022-05-07 02:09:29 -03:00
committed by GitHub
parent 6b2c3c3329
commit eb9c603583
9 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/StationEvents/Events/BureaucraticError.cs
View File

@@ -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;

2
Content.Server/StationEvents/Events/GasLeak.cs
View File

@@ -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");

2
Content.Server/StationEvents/Events/KudzuGrowth.cs
View File

@@ -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;

2
Content.Server/StationEvents/Events/MeteorSwarm.cs
View File

@@ -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;

4
Content.Server/StationEvents/Events/VentClog.cs
View File

@@ -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;

4
Content.Server/StationEvents/Events/VentCritters.cs
View File

@@ -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;

BIN
Resources/Audio/Announcements/aliens.ogg Normal file
View File

Binary file not shown.

4
Resources/Audio/Announcements/license.txt
View File

@@ -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

BIN
Resources/Audio/Announcements/meteors.ogg Normal file
View File

Binary file not shown.