Remove duplicate data from preset ID cards.

It is now fetched from the corresponding job.

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

@@ -0,0 +1,42 @@
+using Content.Shared.Jobs;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+#nullable enable
+
+namespace Content.Server.GameObjects.Components.Access
+{
+    [RegisterComponent]
+    public class PresetIdCardComponent : Component, IMapInit
+    {
+        public override string Name => "PresetIdCard";
+
+        private string? _jobName;
+
+        public override void ExposeData(ObjectSerializer serializer)
+        {
+            base.ExposeData(serializer);
+
+            serializer.DataField(ref _jobName, "job", null);
+        }
+
+        void IMapInit.MapInit()
+        {
+            if (_jobName == null)
+            {
+                return;
+            }
+
+            var prototypes = IoCManager.Resolve<IPrototypeManager>();
+            var job = prototypes.Index<JobPrototype>(_jobName);
+            var access = Owner.GetComponent<AccessComponent>();
+            var idCard = Owner.GetComponent<IdCardComponent>();
+
+            access.SetTags(job.Access);
+            idCard.JobTitle = job.Name;
+        }
+    }
+}

Resources/Prototypes/Entities/Items/Clothing/identification_cards.yml

@@ -14,6 +14,8 @@
     - idcard
     sprite: Clothing/id_cards.rsi
     HeldPrefix: default
+  - type: Access
+  - type: IdCard
 
 #IDs with layers
 
@@ -29,10 +31,8 @@
     - state: idassistant
   - type: Icon
     state: default
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Assistant
+    job: Assistant
-  - type: Access
-    tags: ["Maintenance", "Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -48,10 +48,8 @@
     state: gold
   - type: Clothing
     HeldPrefix: gold
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Captain
+    job: Captain
-  - type: Access
-    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External", "HeadOfPersonnel"]
 
 - type: entity
   parent: IDCardStandard
@@ -65,10 +63,8 @@
     - state: idsecurityofficer
   - type: Icon
     state: idsecurityofficer
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Security Officer
+    job: SecurityOfficer
-  - type: Access
-    tags: ["Security", "Maintenance", "Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -82,10 +78,8 @@
     - state: idstationengineer
   - type: Icon
     state: idstationengineer
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Engineer
+    job: StationEngineer
-  - type: Access
-    tags: ["Engineering", "Maintenance", "External"]
 
 - type: entity
   parent: IDCardStandard
@@ -99,10 +93,8 @@
     - state: idmedicaldoctor
   - type: Icon
     state: idmedicaldoctor
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Doctor
+    job: MedicalDoctor
-  - type: Access
-    tags: ["Medical"]
 
 - type: entity
   parent: IDCardStandard
@@ -116,10 +108,8 @@
     - state: idcargotechnician
   - type: Icon
     state: idcargotechnician
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Cargo Technician
+    job: CargoTechnician
-  - type: Access
-    tags: ["Cargo", "Maintenance"]
 
 - type: entity
   parent: IDCardStandard
@@ -133,10 +123,8 @@
     - state: idscientist
   - type: Icon
     state: idscientist
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Scientist
+    job: Scientist
-  - type: Access
-    tags: ["Research"]
 
 - type: entity
   parent: IDCardStandard
@@ -150,10 +138,8 @@
     - state: idclown
   - type: Icon
     state: idclown
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Clown
+    job: Clown
-  - type: Access
-    tags: ["Maintenance", "Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -167,10 +153,8 @@
     - state: idjanitor
   - type: Icon
     state: idjanitor
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Janitor
+    job: Janitor
-  - type: Access
-    tags: ["Maintenance", "Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -184,10 +168,8 @@
     - state: idbartender
   - type: Icon
     state: idbartender
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Bartender
+    job: Bartender
-  - type: Access
-    tags: ["Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -201,10 +183,8 @@
     - state: idcook
   - type: Icon
     state: idcook
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Chef
+    job: Chef
-  - type: Access
-    tags: ["Maintenance", "Service"]
 
 - type: entity
   parent: IDCardStandard
@@ -220,10 +200,8 @@
     state: idheadofpersonnel
   - type: Clothing
     HeldPrefix: silver
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Head of Personnel
+    job: HeadOfPersonnel
-  - type: Access
-    tags: ["Maintenance", "Cargo", "Security", "Service", "Command", "HeadOfPersonnel", "Janitor"]
 
 - type: entity
   parent: IDCardStandard
@@ -239,10 +217,8 @@
     state: idchiefengineer
   - type: Clothing
     HeldPrefix: silver
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Chief Engineer
+    job: ChiefEngineer
-  - type: Access
-    tags: ["Engineering", "Command", "Maintenance", "External"]
 
 - type: entity
   parent: IDCardStandard
@@ -258,10 +234,8 @@
     state: idchiefmedicalofficer
   - type: Clothing
     HeldPrefix: silver
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Chief Medical Officer
+    job: ChiefMedicalOfficer
-  - type: Access
-    tags: ["Medical", "Command", "Maintenance"]
 
 - type: entity
   parent: IDCardStandard
@@ -277,10 +251,8 @@
     state: idresearchdirector
   - type: Clothing
     HeldPrefix: silver
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Research Director
+    job: ResearchDirector
-  - type: Access
-    tags: ["Research", "Command", "Maintenance"]
 
 - type: entity
   parent: IDCardStandard
@@ -296,10 +268,8 @@
     state: idheadofsecurity
   - type: Clothing
     HeldPrefix: silver
-  - type: IdCard
+  - type: PresetIdCard
-    jobTitle: Head of Security
+    job: HeadOfSecurity
-  - type: Access
-    tags: ["Security", "Maintenance", "Service", "Command"]
 
 - type: entity
   parent: IDCardStandard
@@ -318,4 +288,4 @@
   - type: IdCard
     jobTitle: Central Commander
   - type: Access
-    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External", "HeadOfPersonnel"]
+    tags: ["Maintenance", "Cargo", "Engineering", "Medical", "Research", "Security", "Service", "Captain", "Command", "External", "HeadOfPersonnel", "Janitor", "Theatre"]