tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add secondary prefix for selecting radio channel, '.' (#16964)

Browse Source
This commit is contained in:
HerCoyote23
2023-07-03 01:55:08 -07:00
committed by GitHub
parent 360ae67e9d
commit 2a47302f1e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Chat/SharedChatSystem.cs
View File

@@ -9,7 +9,8 @@ public abstract class SharedChatSystem : EntitySystem
{ {
public const char RadioCommonPrefix = ';'; public const char RadioCommonPrefix = ';';
public const char RadioChannelPrefix = ':'; public const char RadioChannelPrefix = ':';
public const char LocalPrefix = '.'; public const char RadioChannelAltPrefix = '.';
public const char LocalPrefix = '>';
public const char ConsolePrefix = '/'; public const char ConsolePrefix = '/';
public const char DeadPrefix = '\\'; public const char DeadPrefix = '\\';
public const char LOOCPrefix = '('; public const char LOOCPrefix = '(';
@@ -18,7 +19,6 @@ public abstract class SharedChatSystem : EntitySystem
public const char EmotesAltPrefix = '*'; public const char EmotesAltPrefix = '*';
public const char AdminPrefix = ']'; public const char AdminPrefix = ']';
public const char WhisperPrefix = ','; public const char WhisperPrefix = ',';
public const char DefaultChannelKey = 'h'; public const char DefaultChannelKey = 'h';
public const string CommonChannel = "Common"; public const string CommonChannel = "Common";
public static string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}"; public static string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
@@ -90,7 +90,7 @@ public abstract class SharedChatSystem : EntitySystem
return true; return true;
} }
if (!input.StartsWith(RadioChannelPrefix)) if (!(input.StartsWith(RadioChannelPrefix) || input.StartsWith(RadioChannelAltPrefix)))
return false; return false;
if (input.Length < 2 || char.IsWhiteSpace(input[1])) if (input.Length < 2 || char.IsWhiteSpace(input[1]))