diff --git a/Content.Server/Access/Components/AccessComponent.cs b/Content.Server/Access/Components/AccessComponent.cs index b552642521..16a76725fb 100644 --- a/Content.Server/Access/Components/AccessComponent.cs +++ b/Content.Server/Access/Components/AccessComponent.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; using Content.Server.Access.Systems; +using Content.Shared.Access; using Robust.Shared.Analyzers; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; using Robust.Shared.ViewVariables; namespace Content.Server.Access.Components @@ -16,7 +18,7 @@ namespace Content.Server.Access.Components { public override string Name => "Access"; - [DataField("tags")] + [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] [ViewVariables] public HashSet Tags = new(); } diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 8a65d047ce..d33b52a1dd 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using Content.Shared.Access; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; using Robust.Shared.ViewVariables; namespace Content.Shared.Roles @@ -54,7 +56,7 @@ namespace Content.Shared.Roles [DataField("departments")] public IReadOnlyCollection Departments { get; } = Array.Empty(); - [DataField("access")] + [DataField("access", customTypeSerializer: typeof(PrototypeIdListSerializer))] public IReadOnlyCollection Access { get; } = Array.Empty(); } } diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index fda744465b..163e893cdf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -312,23 +312,23 @@ tags: - Maintenance - Cargo - - Quartermaster + # - Quartermaster - Engineering - - ChiefEngineer + # - ChiefEngineer - Medical - - ChiefMedicalOfficer + # - ChiefMedicalOfficer - Research - - ResearchDirector + # - ResearchDirector - Security - Service - Captain - Command - External - - HeadOfSecurity + #- HeadOfSecurity - HeadOfPersonnel - Bar - - Hydroponics - - Kitchen + #- Hydroponics + #- Kitchen - Janitor - Theatre diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 412beadc5b..06390dce09 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -8,7 +8,7 @@ supervisors: "the head of personnel" access: - Cargo - - Quartermaster + # - Quartermaster - Maintenance - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 64bcbe477a..5f2839a9c8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -7,7 +7,7 @@ icon: "Chaplain" supervisors: "the head of personnel" access: - - Chapel +# - Chapel - Maintenance - type: startingGear id: ChaplainGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 4eaad5230f..da9d0f6f78 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -19,11 +19,11 @@ - HeadOfPersonnel - Command - Security - - Brig + # - Brig - Engineering - Medical - Cargo - - ResearchDirector + # - ResearchDirector - Research - Service - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index e6f4cf97d4..cba73dee3c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -7,8 +7,8 @@ icon: "Nanotrasen" supervisors: "the head of security" access: - - Command - - Maintenence + - Command + - Maintenance - type: startingGear id: CentcomGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 884adbad13..b8aeaeb579 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -12,7 +12,7 @@ canBeAntag: false access: - Command - - Brig +# - Brig - Security - Maintenance - Service diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index fce0c1b199..4e870d14ee 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -8,7 +8,7 @@ supervisors: "the head of security" access: - Security - - Brig + # - Brig - Maintenance - Service