Remove redundant access levels and jobs. (#3360)

We do not need access levels like ResearchDirector when Research | Command works fine.

We also do not need a QM.

Etc...

Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs

@@ -6,9 +6,13 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Shared.Access;
 using Content.Shared.GameObjects.Components.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
@@ -103,6 +107,20 @@ namespace Content.Server.GameObjects.Components.Access
             return Array.Empty<string>();
         }
 
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            var proto = IoCManager.Resolve<IPrototypeManager>();
+            foreach (var level in AccessLists.SelectMany(c => c).Union(DenyTags))
+            {
+                if (!proto.HasIndex<AccessLevelPrototype>(level))
+                {
+                    Logger.ErrorS("access", $"Invalid access level: {level}");
+                }
+            }
+        }
+
         public override void ExposeData(ObjectSerializer serializer)
         {
             base.ExposeData(serializer);

Resources/Prototypes/AccessLevels/cargo.yml

@@ -1,5 +1,5 @@
-- type: accessLevel
+#- type: accessLevel
-  id: Quartermaster
+#  id: Quartermaster
 
 - type: accessLevel
   id: Cargo

Resources/Prototypes/AccessLevels/engineering.yml

@@ -1,6 +1,6 @@
-- type: accessLevel
+#- type: accessLevel
-  id: ChiefEngineer
+#  id: ChiefEngineer
-  name: Chief Engineer
+#  name: Chief Engineer
 
 - type: accessLevel
   id: Engineering

Resources/Prototypes/AccessLevels/medical.yml

@@ -1,6 +1,6 @@
-- type: accessLevel
+#- type: accessLevel
-  id: ChiefMedicalOfficer
+#  id: ChiefMedicalOfficer
-  name: Chief Medical Officer
+#  name: Chief Medical Officer
 
 - type: accessLevel
   id: Medical

Resources/Prototypes/AccessLevels/research.yml

@@ -1,6 +1,6 @@
-- type: accessLevel
+#- type: accessLevel
-  id: ResearchDirector
+#  id: ResearchDirector
-  name: Research Director
+#  name: Research Director
 
 - type: accessLevel
   id: Research

Resources/Prototypes/AccessLevels/security.yml

@@ -1,12 +1,12 @@
-- type: accessLevel
+#- type: accessLevel
-  id: HeadOfSecurity
+#  id: HeadOfSecurity
-  name: Head of Security
+#  name: Head of Security
 
 - type: accessLevel
   id: Security
 
-- type: accessLevel
+#- type: accessLevel
-  id: Brig
+#  id: Brig
 
-- type: accessLevel
+#- type: accessLevel
-  id: Detective
+#  id: Detective

Resources/Prototypes/AccessLevels/service.yml

@@ -1,11 +1,11 @@
-- type: accessLevel
+#- type: accessLevel
-  id: Bar
+#  id: Bar
 
-- type: accessLevel
+#- type: accessLevel
-  id: Kitchen
+#  id: Kitchen
 
-- type: accessLevel
+#- type: accessLevel
-  id: Hydroponics
+#  id: Hydroponics
 
 - type: accessLevel
   id: Service

Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml

@@ -76,7 +76,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Bar"]]
+    access: [["Service"]]
 
 - type: entity
   parent: VendingMachine
@@ -236,7 +236,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Kitchen"]]
+    access: [["Service"]]
 
 - type: entity
   parent: VendingMachine
@@ -417,7 +417,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Hydroponics"]]
+    access: [["Service"]]
 
 - type: entity
   parent: VendingMachine
@@ -525,7 +525,7 @@
       broken: true
     - type: WiresVisualizer
   - type: AccessReader
-    access: [["Hydroponics"]]
+    access: [["Service"]]
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml

@@ -9,4 +9,4 @@
     - type: StorageVisualizer
       state: cabinet
   - type: AccessReader
-    access: [["Bar"]]
+    access: [["Service"]]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml

@@ -9,7 +9,7 @@
     - type: StorageVisualizer
       state: ce
   - type: AccessReader
-    access: [ [ "ChiefEngineer" ] ]
+    access: [ [ "Engineering", "Command" ] ]
 
 # Electrical supplies
 - type: entity

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml

@@ -8,4 +8,4 @@
     - type: StorageVisualizer
       state: hydro
   - type: AccessReader
-    access: [ [ "Hydroponics" ] ]
+    access: [ [ "Service" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml

@@ -50,4 +50,4 @@
     - type: StorageVisualizer
       state: cmo
   - type: AccessReader
-    access: [ [ "ChiefMedicalOfficer" ] ]
+    access: [ [ "Medical", "Command" ] ]

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml

@@ -8,7 +8,7 @@
     - type: StorageVisualizer
       state: rd
   - type: AccessReader
-    access: [ [ "ResearchDirector" ] ]
+    access: [ [ "Research", "Command" ] ]
 
 - type: entity
   id: LockerScientist

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml

@@ -9,7 +9,7 @@
     - type: StorageVisualizer
       state: hos
   - type: AccessReader
-    access: [["HeadOfSecurity"]]
+    access: [["Security", "Command"]]
 
 # Warden
 - type: entity

Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_types.yml

@@ -375,7 +375,7 @@
   parent: CrateGeneric
   components:
   - type: AccessReader
-    access: [["Science"]]
+    access: [["Research"]]
   - type: SecureEntityStorage
   - type: Sprite
     sprite: Constructible/Storage/Crates/scicrate_secure.rsi

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -1,26 +1,26 @@
-- type: job
+#- type: job
-  id: Quartermaster
+#  id: Quartermaster
-  name: "quartermaster"
+#  name: "quartermaster"
-  positions: 1
+#  positions: 1
-  spawnPositions: 1
+#  spawnPositions: 1
-  startingGear: QuartermasterGear
+#  startingGear: QuartermasterGear
-  departments:
+#  departments:
-  - Cargo
+#  - Cargo
-  icon: "QuarterMaster"
+#  icon: "QuarterMaster"
-  access:
+#  access:
-  - Cargo
+#  - Cargo
-  - Quartermaster
+#  - Quartermaster
-  - Maintenance
+#  - Maintenance
-
+#
-- type: startingGear
+#- type: startingGear
-  id: QuartermasterGear
+#  id: QuartermasterGear
-  equipment:
+#  equipment:
-    head: ClothingHeadHatCargosoft
+#    head: ClothingHeadHatCargosoft
-    innerclothing: ClothingUniformJumpsuitQM
+#    innerclothing: ClothingUniformJumpsuitQM
-    backpack: ClothingBackpackFilled
+#    backpack: ClothingBackpackFilled
-    shoes: ClothingShoesColorBrown
+#    shoes: ClothingShoesColorBrown
-    idcard: QuartermasterPDA
+#    idcard: QuartermasterPDA
-    ears: ClothingHeadsetCargo
+#    ears: ClothingHeadsetCargo
-  innerclothingskirt: ClothingUniformJumpskirtQM
+#  innerclothingskirt: ClothingUniformJumpskirtQM
-  satchel: ClothingBackpackSatchelFilled
+#  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+#  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml

@@ -8,7 +8,6 @@
   icon: "Bartender"
   access:
   - Service
-  - Bar
   - Maintenance
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -9,7 +9,6 @@
   icon: "Botanist"
   access:
   - Service
-  - Hydroponics
   - Maintenance
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Civilian/chef.yml

@@ -8,7 +8,6 @@
   icon: "Chef"
   access:
   - Service
-  - Kitchen
   - Maintenance
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -16,21 +16,13 @@
   - HeadOfPersonnel
   - Command
   - Security
-  - HeadOfSecurity
   - Brig
-  - Detective
-  - ChiefEngineer
   - Engineering
-  - ChiefMedicalOfficer
   - Medical
-  - Quartermaster
   - Cargo
   - ResearchDirector
   - Research
-  - Bar
-  - Kitchen
   - Service
-  - Hydroponics
   - Maintenance
   - External
   - Janitor

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -11,7 +11,6 @@
   access:
   - Maintenance
   - Engineering
-  - ChiefEngineer
   - Command
   - External
 

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -12,7 +12,6 @@
   icon: "ChiefMedicalOfficer"
   access:
   - Medical
-  - ChiefMedicalOfficer
   - Command
   - Maintenance
 

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -10,7 +10,6 @@
   icon: "ResearchDirector"
   access:
   - Research
-  - ResearchDirector
   - Command
   - Maintenance
 

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -10,9 +10,7 @@
   icon: "HeadOfSecurity"
   access:
   - Command
-  - HeadOfSecurity
   - Brig
-  - Detective
   - Security
   - Maintenance
   - Service