diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs index 29cf850e2b..1e853bf153 100644 --- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs +++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs @@ -22,7 +22,7 @@ public sealed class CrewManifestSection : BoxContainer AddChild(new Label() { StyleClasses = { "LabelBig" }, - Text = Loc.GetString($"department-{section.ID}") + Text = Loc.GetString(section.Name) }); var gridContainer = new GridContainer() diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index 13cf281513..7d1921816f 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -170,7 +170,7 @@ namespace Content.Client.LateJoin foreach (var department in departments) { - var departmentName = Loc.GetString($"department-{department.ID}"); + var departmentName = Loc.GetString(department.Name); _jobCategories[id] = new Dictionary(); var stationAvailable = _gameTicker.JobsAvailable[id]; var jobsAvailable = new List(); diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index e81f72ba67..0f618cb71c 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -839,7 +839,7 @@ namespace Content.Client.Lobby.UI foreach (var department in departments) { - var departmentName = Loc.GetString($"department-{department.ID}"); + var departmentName = Loc.GetString(department.Name); if (!_jobCategories.TryGetValue(department.ID, out var category)) { diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index 51974d7036..b697a42d51 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -22,6 +22,7 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Verbs; using Robust.Shared.Containers; using Robust.Shared.Map; +using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -42,6 +43,7 @@ public sealed class SuitSensorSystem : EntitySystem [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; public override void Initialize() { @@ -369,7 +371,7 @@ public sealed class SuitSensorSystem : EntitySystem userJobIcon = card.Comp.JobIcon; foreach (var department in card.Comp.JobDepartments) - userJobDepartments.Add(Loc.GetString($"department-{department}")); + userJobDepartments.Add(Loc.GetString(_proto.Index(department).Name)); } // get health mob state diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs index 48055fc3de..ff18a08cef 100644 --- a/Content.Shared/Contraband/ContrabandSystem.cs +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -55,8 +55,7 @@ public sealed class ContrabandSystem : EntitySystem using (args.PushGroup(nameof(ContrabandComponent))) { - // TODO shouldn't department prototypes have a localized name instead of just using the ID for this? - var localizedDepartments = ent.Comp.AllowedDepartments.Select(p => Loc.GetString("contraband-department-plural", ("department", Loc.GetString($"department-{p.Id}")))); + var localizedDepartments = ent.Comp.AllowedDepartments.Select(p => Loc.GetString("contraband-department-plural", ("department", Loc.GetString(_proto.Index(p).Name)))); var localizedJobs = ent.Comp.AllowedJobs.Select(p => Loc.GetString("contraband-job-plural", ("job", _proto.Index(p).LocalizedName))); var severity = _proto.Index(ent.Comp.Severity);