Centcomm accesses fix (#2359)

SerbiaStrong-220 · Dec 15, 2024 · a541c43 · a541c43
1 parent 53dedee
commit a541c43
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 92 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -499,12 +499,13 @@
   - type: IdCard
     jobTitle: job-name-cc-default #SS220 (upstream 65 localization)
     jobIcon: JobIconNanotrasen
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommand
-    - CentralCommandERT # SS220 New CentComm
+# SS220 centcomm access fix begin
+#  - type: Access
+#    groups:
+#    - AllAccess # SS220 Fast fix access
+#    tags:
+#    - CentralCommand
+# SS220 centcomm access fix end
   - type: PresetIdCard
     job: CentralCommandOfficial
 
@@ -523,16 +524,6 @@
     job: ERTLeader
   - type: Item
     heldPrefix: gold
-  # SS220 new CentComm begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    # SS220 centcomm access fix begin
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-    # SS220 centcomm access fix end
-  # SS220 new CentComm end
 
 - type: entity
   parent: CentcomIDCard # SS220 new CentComm begin
@@ -547,14 +538,11 @@
     job: ERTChaplain
   - type: Item
     heldPrefix: blue
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-  # SS220 centcomm access fix begin
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-  # SS220 centcomm access fix end
+# SS220 centcomm access fix begin
+#  - type: Access
+#    groups:
+#    - AllAccess # SS220 Fast fix access
+# SS220 centcomm access fix end
 
 - type: entity
   parent: IDCardStandard
@@ -567,14 +555,6 @@
     - state: ert_engineer
   - type: PresetIdCard
     job: ERTEngineer
-  # SS220 centcomm access fix begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-  # SS220 centcomm access fix end
 
 - type: entity
   parent: IDCardStandard
@@ -587,14 +567,6 @@
     - state: ert_janitor
   - type: PresetIdCard
     job: ERTJanitor
-  # SS220 centcomm access fix begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-  # SS220 centcomm access fix end
 
 - type: entity
   parent: IDCardStandard
@@ -607,14 +579,6 @@
     - state: ert_medic
   - type: PresetIdCard
     job: ERTMedical
-  # SS220 centcomm access fix begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-  # SS220 centcomm access fix end
 
 - type: entity
   parent: IDCardStandard
@@ -627,14 +591,6 @@
     - state: ert_security
   - type: PresetIdCard
     job: ERTSecurity
-  # SS220 centcomm access fix begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommand
-    - CentralCommandERT
-  # SS220 centcomm access fix end
 
 - type: entity
   parent: IDCardStandard
@@ -680,14 +636,6 @@
     heldPrefix: blue
   - type: IdCard
     jobTitle: job-name-cc-agent #SS220 (upstream 65 localization)
-  # SS220 new CentComm begin
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommandDeathSquad
-    - CentralCommand
-  # SS220 new CentComm end
   - type: PresetIdCard
     job: DeathSquad
 
@@ -865,12 +813,6 @@
   # SS220 new CentComm begin
   # SS220 CBURN questions changes name 05.07.2024
     jobTitle: job-name-cburn-agent #SS220 (upstream 65 localization)
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    tags:
-    - CentralCommandCBURN
-    - CentralCommand
   # SS220 new CentComm end
   - type: PresetIdCard
     job: CBURN

diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@@ -12,6 +12,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandCBURN # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 

diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -13,6 +13,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 
@@ -105,6 +106,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   special:
   - !type:AddComponentSpecial
     components:
@@ -189,6 +191,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 
@@ -263,6 +266,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 
@@ -355,6 +359,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 
@@ -419,6 +424,7 @@
   - AllAccess
   access:
   - CentralCommand
+  - CentralCommandERT # SS220 centcomm access fix
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 

diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/official.yml b/Resources/Prototypes/Roles/Jobs/CentComm/official.yml
@@ -13,6 +13,11 @@
   - AllAccess
   access:
   - CentralCommand
+  # SS220 centcomm access fix begin
+  - CentralCommandERT
+  - CentralCommandGSN
+  - CentralCommandCBURN
+  # SS220 centcomm access fix end
   departmentsToIgnoreInTitles: # SS220 Round End Titles
   - Command                    # SS220 Round End Titles
 

diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
@@ -38,10 +38,6 @@
     - state: idcentcom
   - type: IdCard
     jobTitle: job-name-nt-politician #SS220 (upstream 65 localization)
-  - type: Access
-    groups:
-    - AllAccess # SS220 Fast fix access
-    - CentralCommand
   - type: PresetIdCard
     job: CentCommNanoTrasenDiplomat
 
@@ -53,10 +49,6 @@
   components:
     - type: IdCard
       jobTitle: job-name-cc-operational-oficier #SS220 (upstream 65 localization)
-    - type: Access
-      groups:
-      - AllAccess # SS220 Fast fix access
-      - CentralCommand
     - type: PresetIdCard
       job: CentcomFieldOfficer
 
@@ -68,10 +60,6 @@
   components:
     - type: IdCard
       jobTitle: job-name-cc-oficier #SS220 (upstream 65 localization)
-    - type: Access
-      groups:
-      - AllAccess # SS220 Fast fix access
-      - CentralCommand
     - type: PresetIdCard
       job: CentcommOfficer
 
@@ -83,12 +71,6 @@
   components:
     - type: IdCard
       jobTitle: job-name-cc-srt-operative #SS220 (upstream 65 localization)
-    - type: Access
-      groups:
-      - AllAccess # SS220 Fast fix access
-      tags:
-      - CentralCommandGSN
-      - CentralCommand
     - type: PresetIdCard
       job: CentcomOperativeSRT
 
@@ -127,10 +109,6 @@
   components:
     - type: IdCard
       jobTitle: job-name-nt-admiral #SS220 (upstream 65 localization)
-    - type: Access
-      groups:
-      - AllAccess # SS220 Fast fix access
-      - CentralCommand
     - type: PresetIdCard
       job: CentComNanoTrasenAdmiral
 

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomFieldOfficier.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomFieldOfficier.yml
@@ -45,6 +45,11 @@
   radioBold: true
   accessGroups:
   - AllAccess
+  access:
+  - CentralCommand
+  - CentralCommandERT
+  - CentralCommandGSN
+  - CentralCommandCBURN
 
 - type: startingGear
   id: CentcomFieldOfficerGear

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOfficer.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOfficer.yml
@@ -45,6 +45,11 @@
   radioBold: true
   accessGroups:
   - AllAccess
+  access:
+  - CentralCommand
+  - CentralCommandERT
+  - CentralCommandGSN
+  - CentralCommandCBURN
 
 - type: startingGear
   id: CentCommOfficerGear

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml
@@ -45,6 +45,9 @@
   radioBold: true
   accessGroups:
   - AllAccess
+  access:
+  - CentralCommandGSN
+  - CentralCommand
 
 - type: startingGear
   id: CentcomOperativeSRTGear

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenAdmiral.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenAdmiral.yml
@@ -45,6 +45,7 @@
   radioBold: true
   accessGroups:
   - AllAccess
+  - CentralCommand
 
 - type: startingGear
   id: CentComNanoTrasenAdmiralGear

diff --git a/Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenDiplomat.yml b/Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenDiplomat.yml
@@ -45,6 +45,11 @@
   radioBold: true
   accessGroups:
   - AllAccess
+  access:
+  - CentralCommand
+  - CentralCommandERT
+  - CentralCommandGSN
+  - CentralCommandCBURN
 
 - type: startingGear
   id: CentCommNanoTrasenDiplomatGear