Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Centcomm accesses fix #2359

Merged
merged 2 commits into from
Dec 15, 2024
Merged

Centcomm accesses fix #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df015c2
Centcomm accesses fix
Kirus59 Dec 15, 2024
91cf111
fix2
Kirus59 Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 12 additions & 70 deletions Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandCBURN # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down Expand Up @@ -105,6 +106,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
special:
- !type:AddComponentSpecial
components:
Expand Down Expand Up @@ -189,6 +191,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down Expand Up @@ -263,6 +266,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down Expand Up @@ -355,6 +359,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down Expand Up @@ -419,6 +424,7 @@
- AllAccess
access:
- CentralCommand
- CentralCommandERT # SS220 centcomm access fix
departmentsToIgnoreInTitles: # SS220 Round End Titles
- Command # SS220 Round End Titles

Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Roles/Jobs/CentComm/official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 0 additions & 22 deletions Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomFieldOfficier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
radioBold: true
accessGroups:
- AllAccess
access:
- CentralCommand
- CentralCommandERT
- CentralCommandGSN
- CentralCommandCBURN

- type: startingGear
id: CentcomFieldOfficerGear
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOfficer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
radioBold: true
accessGroups:
- AllAccess
access:
- CentralCommand
- CentralCommandERT
- CentralCommandGSN
- CentralCommandCBURN

- type: startingGear
id: CentCommOfficerGear
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/CentComm/CentcomOperativeSRT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
radioBold: true
accessGroups:
- AllAccess
access:
- CentralCommandGSN
- CentralCommand

- type: startingGear
id: CentcomOperativeSRTGear
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenAdmiral.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
radioBold: true
accessGroups:
- AllAccess
- CentralCommand

- type: startingGear
id: CentComNanoTrasenAdmiralGear
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/SS220/Roles/Jobs/CentComm/NanoTrasenDiplomat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
radioBold: true
accessGroups:
- AllAccess
access:
- CentralCommand
- CentralCommandERT
- CentralCommandGSN
- CentralCommandCBURN

- type: startingGear
id: CentCommNanoTrasenDiplomatGear
Expand Down
Loading