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

Fix IDs without station records not being able to have nonstandard contents (#34921)

Browse Source 
* fix ID console resetting to passenger

* review

* whoopsie! whitespace

---------

Co-authored-by: Milon <milonpl.git@proton.me>
This commit is contained in:
Alfred Baumann
2025-04-14 17:02:27 +02:00
committed by GitHub
parent 3cc917f1a8
commit 5e74afc72c
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
View File

@@ -174,7 +174,8 @@ namespace Content.Client.Access.UI
new List<ProtoId<AccessLevelPrototype>>());
var jobIndex = _jobPrototypeIds.IndexOf(state.TargetIdJobPrototype);
// If the job index is < 0 that means they don't have a job registered in the station records.
// If the job index is < 0 that means they don't have a job registered in the station records
// or the IdCardComponent's JobPrototype field.
// For example, a new ID from a box would have no job index.
if (jobIndex < 0)
{

11
Content.Server/Access/Systems/IdCardConsoleSystem.cs
View File

@@ -98,9 +98,9 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
var targetIdComponent = EntityManager.GetComponent<IdCardComponent>(targetId);
var targetAccessComponent = EntityManager.GetComponent<AccessComponent>(targetId);
var jobProto = new ProtoId<AccessLevelPrototype>(string.Empty);
var jobProto = targetIdComponent.JobPrototype ?? new ProtoId<AccessLevelPrototype>(string.Empty);
if (TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
&& keyStorage.Key is {} key
&& keyStorage.Key is { } key
&& _record.TryGetRecord<GeneralStationRecord>(key, out var record))
{
jobProto = record.JobPrototype;
@@ -151,6 +151,13 @@ public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem
}
UpdateStationRecord(uid, targetId, newFullName, newJobTitle, job);
if ((!TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
|| keyStorage.Key is not { } key
|| !_record.TryGetRecord<GeneralStationRecord>(key, out _))
&& newJobProto != string.Empty)
{
Comp<IdCardComponent>(targetId).JobPrototype = newJobProto;
}
if (!newAccessList.TrueForAll(x => component.AccessLevels.Contains(x)))
{

7
Content.Shared/Access/Components/IdCardComponent.cs
View File

@@ -36,6 +36,13 @@ public sealed partial class IdCardComponent : Component
[AutoNetworkedField]
public ProtoId<JobIconPrototype> JobIcon = "JobIconUnknown";
/// <summary>
/// Holds the job prototype when the ID card has no associated station record
/// </summary>
[DataField]
[AutoNetworkedField]
public ProtoId<AccessLevelPrototype>? JobPrototype;
/// <summary>
/// The proto IDs of the departments associated with the job
/// </summary>