juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-hardcode shuttle docking messages/audio (#37813)

Browse Source
This commit is contained in:
Tayrtahn
2025-05-25 11:46:52 -04:00
committed by GitHub
parent 97e6ad7c9d
commit 4c4c98617e
2 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
View File

@@ -323,6 +323,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
/// </summary>
public void AnnounceShuttleDock(ShuttleDockResult result, bool extended)
{
var stationShuttleComp = result.Station.Comp;
var shuttle = result.Station.Comp.EmergencyShuttle;
DebugTools.Assert(shuttle != null);
@@ -331,11 +332,11 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
{
_chatSystem.DispatchStationAnnouncement(
result.Station,
Loc.GetString("emergency-shuttle-good-luck"),
Loc.GetString(stationShuttleComp.FailureAnnouncement),
playDefaultSound: false);
// TODO: Need filter extensions or something don't blame me.
_audio.PlayGlobal("/Audio/Misc/notice1.ogg", Filter.Broadcast(), true);
_audio.PlayGlobal(stationShuttleComp.FailureAudio, Filter.Broadcast(), true);
return;
}
@@ -354,10 +355,10 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
var location = FormattedMessage.RemoveMarkupPermissive(
_navMap.GetNearestBeaconString((shuttle.Value, Transform(shuttle.Value))));
var extendedText = extended ? Loc.GetString("emergency-shuttle-extended") : "";
var extendedText = extended ? Loc.GetString(stationShuttleComp.LaunchExtendedMessage) : "";
var locKey = result.ResultType == ShuttleDockResultType.NoDock
? "emergency-shuttle-nearby"
: "emergency-shuttle-docked";
? stationShuttleComp.NearbyAnnouncement
: stationShuttleComp.DockedAnnouncement;
_chatSystem.DispatchStationAnnouncement(
result.Station,
@@ -390,8 +391,8 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
// Play announcement audio.
var audioFile = result.ResultType == ShuttleDockResultType.NoDock
? "/Audio/Misc/notice1.ogg"
: "/Audio/Announcements/shuttle_dock.ogg";
? stationShuttleComp.NearbyAudio
: stationShuttleComp.DockedAudio;
// TODO: Need filter extensions or something don't blame me.
_audio.PlayGlobal(audioFile, Filter.Broadcast(), true);