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

Comment out invalid access tags (#5619)

Browse Source
This commit is contained in:
metalgearsloth
2021-12-01 00:40:46 +11:00
committed by GitHub
parent e910a0728b
commit d0efe50e83
9 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Access/Components/AccessComponent.cs
View File

@@ -1,8 +1,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Access.Systems; using Content.Server.Access.Systems;
using Content.Shared.Access;
using Robust.Shared.Analyzers; using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Server.Access.Components namespace Content.Server.Access.Components
@@ -16,7 +18,7 @@ namespace Content.Server.Access.Components
{ {
public override string Name => "Access"; public override string Name => "Access";
[DataField("tags")] [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
[ViewVariables] [ViewVariables]
public HashSet<string> Tags = new(); public HashSet<string> Tags = new();
} }

4
Content.Shared/Roles/JobPrototype.cs
View File

@@ -1,7 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Access;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Shared.Roles namespace Content.Shared.Roles
@@ -54,7 +56,7 @@ namespace Content.Shared.Roles
[DataField("departments")] [DataField("departments")]
public IReadOnlyCollection<string> Departments { get; } = Array.Empty<string>(); public IReadOnlyCollection<string> Departments { get; } = Array.Empty<string>();
[DataField("access")] [DataField("access", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessLevelPrototype>))]
public IReadOnlyCollection<string> Access { get; } = Array.Empty<string>(); public IReadOnlyCollection<string> Access { get; } = Array.Empty<string>();
} }
} }

14
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View File

@@ -312,23 +312,23 @@
tags: tags:
- Maintenance - Maintenance
- Cargo - Cargo
- Quartermaster # - Quartermaster
- Engineering - Engineering
- ChiefEngineer # - ChiefEngineer
- Medical - Medical
- ChiefMedicalOfficer # - ChiefMedicalOfficer
- Research - Research
- ResearchDirector # - ResearchDirector
- Security - Security
- Service - Service
- Captain - Captain
- Command - Command
- External - External
- HeadOfSecurity #- HeadOfSecurity
- HeadOfPersonnel - HeadOfPersonnel
- Bar - Bar
- Hydroponics #- Hydroponics
- Kitchen #- Kitchen
- Janitor - Janitor
- Theatre - Theatre

2
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -8,7 +8,7 @@
supervisors: "the head of personnel" supervisors: "the head of personnel"
access: access:
- Cargo - Cargo
- Quartermaster # - Quartermaster
- Maintenance - Maintenance
- type: startingGear - type: startingGear

2
Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View File

@@ -7,7 +7,7 @@
icon: "Chaplain" icon: "Chaplain"
supervisors: "the head of personnel" supervisors: "the head of personnel"
access: access:
- Chapel # - Chapel
- Maintenance - Maintenance
- type: startingGear - type: startingGear
id: ChaplainGear id: ChaplainGear

4
Resources/Prototypes/Roles/Jobs/Command/captain.yml
View File

@@ -19,11 +19,11 @@
- HeadOfPersonnel - HeadOfPersonnel
- Command - Command
- Security - Security
- Brig # - Brig
- Engineering - Engineering
- Medical - Medical
- Cargo - Cargo
- ResearchDirector # - ResearchDirector
- Research - Research
- Service - Service
- Maintenance - Maintenance

2
Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
View File

@@ -8,7 +8,7 @@
supervisors: "the head of security" supervisors: "the head of security"
access: access:
- Command - Command
- Maintenence - Maintenance
- type: startingGear - type: startingGear
id: CentcomGear id: CentcomGear

2
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View File

@@ -12,7 +12,7 @@
canBeAntag: false canBeAntag: false
access: access:
- Command - Command
- Brig # - Brig
- Security - Security
- Maintenance - Maintenance
- Service - Service

2
Resources/Prototypes/Roles/Jobs/Security/warden.yml
View File

@@ -8,7 +8,7 @@
supervisors: "the head of security" supervisors: "the head of security"
access: access:
- Security - Security
- Brig # - Brig
- Maintenance - Maintenance
- Service - Service