diff --git a/Content.Server/Ghost/Components/GhostRadioComponent.cs b/Content.Server/Ghost/Components/GhostRadioComponent.cs index ab1ffa0524..ba9ac46b29 100644 --- a/Content.Server/Ghost/Components/GhostRadioComponent.cs +++ b/Content.Server/Ghost/Components/GhostRadioComponent.cs @@ -44,7 +44,7 @@ namespace Content.Server.Ghost.Components Channel = ChatChannel.Radio, Message = message, //Square brackets are added here to avoid issues with escaping - MessageWrap = Loc.GetString("chat-radio-message-wrap", ("color", channel.Color), ("channel", $"\\[{channel.Name}\\]"), ("name", _entMan.GetComponent(speaker).EntityName)) + MessageWrap = Loc.GetString("chat-radio-message-wrap", ("color", channel.Color), ("channel", $"\\[{channel.LocalizedName}\\]"), ("name", _entMan.GetComponent(speaker).EntityName)) }; _netManager.ServerSendMessage(msg, playerChannel); diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index 30e316d46f..a9a2927805 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -60,7 +60,7 @@ namespace Content.Server.Headset Channel = ChatChannel.Radio, Message = message, //Square brackets are added here to avoid issues with escaping - MessageWrap = Loc.GetString("chat-radio-message-wrap", ("color", channel.Color), ("channel", $"\\[{channel.Name}\\]"), ("name", _entMan.GetComponent(source).EntityName)) + MessageWrap = Loc.GetString("chat-radio-message-wrap", ("color", channel.Color), ("channel", $"\\[{channel.LocalizedName}\\]"), ("name", _entMan.GetComponent(source).EntityName)) }; _netManager.ServerSendMessage(msg, playerChannel); diff --git a/Content.Server/Headset/HeadsetSystem.cs b/Content.Server/Headset/HeadsetSystem.cs index 4f9c81c06d..793894fe39 100644 --- a/Content.Server/Headset/HeadsetSystem.cs +++ b/Content.Server/Headset/HeadsetSystem.cs @@ -29,7 +29,7 @@ namespace Content.Server.Headset args.PushMarkup(Loc.GetString("examine-headset-channel", ("color", proto.Color), ("key", proto.KeyCode), - ("id", proto.Name), + ("id", proto.LocalizedName), ("freq", proto.Frequency))); } diff --git a/Content.Shared/Radio/RadioChannelPrototype.cs b/Content.Shared/Radio/RadioChannelPrototype.cs index 0348320212..b6cb011b37 100644 --- a/Content.Shared/Radio/RadioChannelPrototype.cs +++ b/Content.Shared/Radio/RadioChannelPrototype.cs @@ -10,6 +10,8 @@ namespace Content.Shared.Radio /// [ViewVariables] [DataField("name")] public string Name { get; private set; } = string.Empty; + [ViewVariables(VVAccess.ReadOnly)] public string LocalizedName => Loc.GetString(Name); + /// /// Single-character prefix to determine what channel a message should be sent to. /// diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 9ff3ec06b3..aea359acec 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -7,3 +7,14 @@ examine-headset = A small screen on the headset displays the following available examine-headset-channel = [color={$color}]:{$key} for {$id} ({$freq})[/color] examine-headset-chat-prefix = Use {$prefix} for the currently tuned frequency. + +chat-radio-common = Common +chat-radio-centcom = CentCom +chat-radio-command = Command +chat-radio-engineering = Engineering +chat-radio-medical = Medical +chat-radio-science = Science +chat-radio-security = Security +chat-radio-service = Service +chat-radio-supply = Supply +chat-radio-syndicate = Syndicate diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index e31cc44684..47a09d9dee 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -1,69 +1,69 @@ - type: radioChannel id: Common - name: "Common" + name: chat-radio-common keycode: ";" frequency: 1459 color: "#1ecc43" - type: radioChannel id: CentCom - name: "CentCom" + name: chat-radio-centcom keycode: 'y' frequency: 1337 color: "#2681a5" - type: radioChannel id: Command - name: "Command" + name: chat-radio-command keycode: 'c' frequency: 1353 color: "#fcdf03" - type: radioChannel id: Engineering - name: "Engineering" + name: chat-radio-engi keycode: 'e' frequency: 1357 color: "#f37746" - type: radioChannel id: Medical - name: "Medical" + name: chat-radio-med keycode: 'm' frequency: 1355 color: "#57b8f0" - type: radioChannel id: Science - name: "Science" + name: chat-radio-sci keycode: 'n' frequency: 1351 color: "#c68cfa" - type: radioChannel id: Security - name: "Security" + name: chat-radio-sec keycode: 's' frequency: 1359 color: "#dd3535" - type: radioChannel id: Service - name: "Service" + name: chat-radio-serv keycode: 'v' frequency: 1349 color: "#6ca729" - type: radioChannel id: Supply - name: "Supply" + name: chat-radio-sup keycode: 'u' frequency: 1347 color: "#b88646" - type: radioChannel id: Syndicate - name: "Syndicate" + name: chat-radio-syndie keycode: 't' frequency: 1213 color: "#8f4a4b"