Merge branch 'nightly'

This commit is contained in:
Vortrex
2022-03-07 02:28:57 -06:00
48 changed files with 1005 additions and 486 deletions

View File

@@ -163,13 +163,13 @@ function messagePlayerWhisper(client, whisperingClient, messageText) {
// ===========================================================================
function messagePlayerShout(client, shoutingClient, messageText) {
function messagePlayerMegaPhone(client, shoutingClient, messageText) {
messagePlayerNormal(client, `📢 ${getPlayerAccentInlineOutput(shoutingClient)}${getClientSubAccountName(shoutingClient)} (megaphone): ${messageText}!`, getColourByType("yellow"));
}
// ===========================================================================
function messagePlayerMegaPhone(client, shoutingClient, messageText) {
function messagePlayerShout(client, shoutingClient, messageText) {
messagePlayerNormal(client, `🗣️ ${getPlayerAccentInlineOutput(shoutingClient)}${getClientSubAccountName(shoutingClient)} shouts: ${messageText}!`, getColourByType("shoutMessage"));
}