wylab/wylab-station-14
1
1
Fork 0
forked from space-syndicate/space-station-14
Code Pull Requests 2 Actions 27 Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync

Browse Source 
# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/test-packaging.yml
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
#	Tools/gen_build_info.py
This commit is contained in:
Morb0
2024-07-14 12:15:16 +03:00
parent 0003103fc0 bdf7293cfb
commit 8ffde2eea4
359 changed files with 5839 additions and 5001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -322,12 +322,14 @@ public sealed partial class ChatSystem : SharedChatSystem
/// <param name="colorOverride">Optional color for the announcement message</param>
public void DispatchGlobalAnnouncement(
string message,
string sender = "Central Command",
string? sender = null,
bool playSound = true,
SoundSpecifier? announcementSound = null,
Color? colorOverride = null
)
{
sender ??= Loc.GetString("chat-manager-sender-announcement");
var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message)));
_chatManager.ChatMessageToAll(ChatChannel.Radio, message, wrappedMessage, default, false, true, colorOverride);
if (playSound)
@@ -349,11 +351,13 @@ public sealed partial class ChatSystem : SharedChatSystem
public void DispatchStationAnnouncement(
EntityUid source,
string message,
string sender = "Central Command",
string? sender = null,
bool playDefaultSound = true,
SoundSpecifier? announcementSound = null,
Color? colorOverride = null)
{
sender ??= Loc.GetString("chat-manager-sender-announcement");
var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message)));
var station = _stationSystem.GetOwningStation(source);