Cleans up StatusIconSystem and fixing some bugs (#28270)
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
using Content.Shared.StatusIcon;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.Access.Systems
|
||||
@@ -23,12 +25,12 @@ namespace Content.Shared.Access.Systems
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class AgentIDCardBoundUserInterfaceState : BoundUserInterfaceState
|
||||
{
|
||||
public readonly HashSet<string> Icons;
|
||||
public readonly HashSet<ProtoId<StatusIconPrototype>> Icons;
|
||||
public string CurrentName { get; }
|
||||
public string CurrentJob { get; }
|
||||
public string CurrentJobIconId { get; }
|
||||
|
||||
public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId, HashSet<string> icons)
|
||||
public AgentIDCardBoundUserInterfaceState(string currentName, string currentJob, string currentJobIconId, HashSet<ProtoId<StatusIconPrototype>> icons)
|
||||
{
|
||||
Icons = icons;
|
||||
CurrentName = currentName;
|
||||
@@ -62,9 +64,9 @@ namespace Content.Shared.Access.Systems
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class AgentIDCardJobIconChangedMessage : BoundUserInterfaceMessage
|
||||
{
|
||||
public string JobIconId { get; }
|
||||
public ProtoId<StatusIconPrototype> JobIconId { get; }
|
||||
|
||||
public AgentIDCardJobIconChangedMessage(string jobIconId)
|
||||
public AgentIDCardJobIconChangedMessage(ProtoId<StatusIconPrototype> jobIconId)
|
||||
{
|
||||
JobIconId = jobIconId;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user