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

Modify admin chat (#13050)

Browse Source 
* split admin chat into new channel

* add ability to play audio when a chat message is received and add audio to admin chat

* give client control of AdminChat sound and volume + suppress sound for senders
This commit is contained in:
Chief-Engineer
2022-12-19 21:39:01 -06:00
committed by GitHub
parent 8b347dd70f
commit 5ece9bd9e8
12 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/CCVar/CCVars.cs
View File

@@ -511,6 +511,10 @@ namespace Content.Shared.CCVar
public static readonly CVarDef<bool> AdminSoundsEnabled =
CVarDef.Create("audio.admin_sounds_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY);
public static readonly CVarDef<string> AdminChatSoundPath =
CVarDef.Create("audio.admin_chat_sound_path", "/Audio/Items/pop.ogg", CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
public static readonly CVarDef<float> AdminChatSoundVolume =
CVarDef.Create("audio.admin_chat_sound_volume", -5f, CVar.ARCHIVE | CVar.CLIENT | CVar.REPLICATED);
/*
* HUD

9
Content.Shared/Chat/ChatChannel.cs
View File

@@ -60,14 +60,19 @@ namespace Content.Shared.Chat
Dead = 1 << 9,
/// <summary>
/// Admin chat
/// Misc admin messages
/// </summary>
Admin = 1 << 10,
/// <summary>
/// Admin chat
/// </summary>
AdminChat = 1 << 11,
/// <summary>
/// Unspecified.
/// </summary>
Unspecified = 1 << 11,
Unspecified = 1 << 12,
/// <summary>
/// Channels considered to be IC.

1
Content.Shared/Chat/ChatChannelExtensions.cs
View File

@@ -12,6 +12,7 @@ public static class ChatChannelExtensions
ChatChannel.OOC => Color.LightSkyBlue,
ChatChannel.Dead => Color.MediumPurple,
ChatChannel.Admin => Color.Red,
ChatChannel.AdminChat => Color.HotPink,
ChatChannel.Whisper => Color.DarkGray,
_ => Color.LightGray
};

2
Content.Shared/Chat/ChatSelectChannel.cs
View File

@@ -49,7 +49,7 @@
/// <summary>
/// Admin chat
/// </summary>
Admin = ChatChannel.Admin,
Admin = ChatChannel.AdminChat,
Console = ChatChannel.Unspecified
}

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

@@ -16,11 +16,13 @@ namespace Content.Shared.Chat
public EntityUid SenderEntity;
public bool HideChat;
public Color? MessageColorOverride;
public string? AudioPath;
public float AudioVolume;
[NonSerialized]
public bool Read;
public ChatMessage(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat = false, Color? colorOverride = null)
public ChatMessage(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat = false, Color? colorOverride = null, string? audioPath = null, float audioVolume = 0)
{
Channel = channel;
Message = message;
@@ -28,6 +30,8 @@ namespace Content.Shared.Chat
SenderEntity = source;
HideChat = hideChat;
MessageColorOverride = colorOverride;
AudioPath = audioPath;
AudioVolume = audioVolume;
}
}