diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs index 2b899ab9d..269c3e682 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs @@ -159,8 +159,8 @@ namespace Barotrauma keyMapping[(int)InputType.Right] = new KeyOrMouse(Keys.D); keyMapping[(int)InputType.Run] = new KeyOrMouse(Keys.LeftShift); - keyMapping[(int)InputType.Chat] = new KeyOrMouse(Keys.Tab); + keyMapping[(int)InputType.RadioChat] = new KeyOrMouse(Keys.OemPipe); keyMapping[(int)InputType.CrewOrders] = new KeyOrMouse(Keys.C); keyMapping[(int)InputType.Select] = new KeyOrMouse(Keys.E); diff --git a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs index eb7eeaff6..d52d2a503 100644 --- a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs +++ b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs @@ -222,7 +222,8 @@ namespace Barotrauma.Networking //tab doesn't autoselect the chatbox when debug console is open, //because tab is used for autocompleting console commands - if (PlayerInput.KeyHit(InputType.Chat) && chatMsgBox.Visible && !DebugConsole.IsOpen) + if ((PlayerInput.KeyHit(InputType.Chat) || PlayerInput.KeyHit(InputType.RadioChat)) && + chatMsgBox.Visible && !DebugConsole.IsOpen) { if (chatMsgBox.Selected) { @@ -232,6 +233,12 @@ namespace Barotrauma.Networking else { chatMsgBox.Select(); + if (PlayerInput.KeyHit(InputType.RadioChat)) + { + chatMsgBox.Text = "r; "; + chatMsgBox.OnTextChanged?.Invoke(chatMsgBox, chatMsgBox.Text); + + } } } #endif diff --git a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs index de76504a4..6c7938757 100644 --- a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs +++ b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs @@ -11,7 +11,7 @@ namespace Barotrauma Up, Down, Left, Right, Attack, Run, Crouch, - Chat, CrewOrders + Chat, RadioChat, CrewOrders } public class KeyOrMouse