tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace all instances of "department-{id}" with department.name (#34607)

Browse Source 
replace all instances of "department-{id}" with department.name"
This commit is contained in:
Ignaz "Ian" Kraft
2025-01-24 04:46:32 +01:00
committed by GitHub
parent 5e7cc99555
commit 371b1f8012
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/CrewManifest/UI/CrewManifestSection.cs
View File

@@ -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()

2
Content.Client/LateJoin/LateJoinGui.cs
View File

@@ -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<string, BoxContainer>();
var stationAvailable = _gameTicker.JobsAvailable[id];
var jobsAvailable = new List<JobPrototype>();

2
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -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))
{

4
Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
View File

@@ -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

3
Content.Shared/Contraband/ContrabandSystem.cs
View File

@@ -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);