Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix PDA capitalization to be PascalCase (#17335)

Browse Source
This commit is contained in:
0x6273
2023-06-15 03:44:28 +02:00
committed by GitHub
parent e6bf18c05a
commit 247c7a1d4d
44 changed files with 329 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ namespace Content.Shared.Access.Components
{
[RegisterComponent, NetworkedComponent]
[AutoGenerateComponentState]
[Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
[Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
public sealed partial class IdCardComponent : Component
{
[DataField("fullName")]
@@ -17,7 +17,7 @@ namespace Content.Shared.Access.Components
[DataField("jobTitle")]
[AutoNetworkedField]
[Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem),
[Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem),
Other = AccessPermissions.ReadWrite)]
public string? JobTitle;
}

8
Content.Shared/Access/Systems/AccessReaderSystem.cs
View File

@@ -256,8 +256,8 @@ namespace Content.Shared.Access.Systems
return true;
}
if (TryComp(uid, out PDAComponent? pda) &&
pda.ContainedID?.Owner is {Valid: true} id)
if (TryComp(uid, out PdaComponent? pda) &&
pda.ContainedId?.Owner is {Valid: true} id)
{
tags = EntityManager.GetComponent<AccessComponent>(id).Tags;
return true;
@@ -279,8 +279,8 @@ namespace Content.Shared.Access.Systems
return true;
}
if (TryComp<PDAComponent>(uid, out var pda) &&
pda.ContainedID?.Owner is {Valid: true} id)
if (TryComp<PdaComponent>(uid, out var pda) &&
pda.ContainedId?.Owner is {Valid: true} id)
{
if (TryComp<StationRecordKeyStorageComponent>(id, out var pdastorage) && pdastorage.Key != null)
{

6
Content.Shared/Access/Systems/SharedIdCardSystem.cs
View File

@@ -39,16 +39,16 @@ public abstract class SharedIdCardSystem : EntitySystem
/// <summary>
/// Attempt to get an id card component from an entity, either by getting it directly from the entity, or by
/// getting the contained id from a <see cref="PDAComponent"/>.
/// getting the contained id from a <see cref="PdaComponent"/>.
/// </summary>
public bool TryGetIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
{
if (EntityManager.TryGetComponent(uid, out idCard))
return true;
if (EntityManager.TryGetComponent(uid, out PDAComponent? pda) && pda.ContainedID != null)
if (EntityManager.TryGetComponent(uid, out PdaComponent? pda) && pda.ContainedId != null)
{
idCard = pda.ContainedID;
idCard = pda.ContainedId;
return true;
}