From 64048058df74dc3ae7395d21e404ddfa5d36c189 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 24 Dec 2023 20:54:17 +0200 Subject: [PATCH] Perms --- Content.Server/Silicons/Borgs/BorgSystem.cs | 3 ++- Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/chef.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/clown.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/mime.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/musician.yml | 1 + Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml | 1 + Resources/Prototypes/Roles/Jobs/Command/captain.yml | 2 ++ Resources/Prototypes/Roles/Jobs/Medical/chemist.yml | 1 + .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 1 + Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml | 1 + Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml | 1 + Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml | 1 + Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml | 1 + Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 1 + Resources/Prototypes/Roles/Jobs/Science/scientist.yml | 1 + Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml | 1 + Resources/Prototypes/Roles/Jobs/Security/detective.yml | 1 + Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml | 1 + Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml | 1 + Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml | 1 + Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml | 1 + Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml | 1 + Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml | 1 + Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml | 2 +- .../Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml | 1 + 33 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index 4f2b7a4f99a..e73cbfcd5e9 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -294,12 +294,13 @@ public void BorgActivate(EntityUid uid, BorgChassisComponent component) access.Clear(); access.Add($"Captain"); + access.Add($"Maintenance"); + access.Add($"External"); access.Add($"Cargo"); access.Add($"Salvage"); access.Add($"Medical"); access.Add($"Service"); access.Add($"Research"); - access.Add($"Engineering"); _access.TrySetTags(uid, access); } diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index 5cf4fd9449b..995d86641bc 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -8,6 +8,7 @@ supervisors: job-supervisors-everyone access: - Maintenance + - External # Frontier - type: startingGear id: PassengerGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 74384461c62..85b217a84b8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -13,6 +13,7 @@ - Service - Maintenance - Bar + - External # Frontier extendedAccess: - Kitchen - Hydroponics diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 08fdeb940de..52753ccaea0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -13,6 +13,7 @@ - Service - Maintenance - Hydroponics + - External # Frontier extendedAccess: - Kitchen - Bar diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index ed659e7efa8..c51905cd91b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -12,6 +12,7 @@ access: - Chapel - Maintenance + - External # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 0a400b19d21..f467c7304b5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -13,6 +13,7 @@ - Service - Maintenance - Kitchen + - External # Frontier extendedAccess: - Hydroponics - Bar #Nyano - Summary: After this line, Professional Che is a component to be added. Very important. diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index b8640c8d605..ce727a616f4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -12,6 +12,7 @@ access: - Theatre - Maintenance + - External # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 3157605f152..1a784f01cf4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -12,6 +12,7 @@ access: - Janitor - Maintenance + - External # Frontier special: - !type:GiveItemOnHolidaySpecial holiday: GarbageDay diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index e7f87a64071..42a08414811 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -13,6 +13,7 @@ - Service - Brig - Maintenance + - External # Frontier - type: startingGear id: LawyerGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index dc379216d70..e14a17b965b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -12,6 +12,7 @@ access: - Service - Maintenance + - External # Frontier - type: startingGear id: LibrarianGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index d086c59e330..0f20e8558a0 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -12,6 +12,7 @@ access: - Theatre - Maintenance + - External # Frontier special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 75534b6f3fb..94091b076a6 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -12,6 +12,7 @@ access: - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed - Theatre + - External # Frontier special: - !type:GiveItemOnHolidaySpecial holiday: MikuDay diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 3cff97c163b..3033777ab54 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -15,6 +15,7 @@ - Maintenance - Bar - Kitchen + - External # Frontier extendedAccess: - Hydroponics diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index fb6413abf25..9df7d5c7990 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -31,6 +31,8 @@ canBeAntag: false access: - Captain # Just making sure in the case of any error that this role cannot be used for any bad doing. + - Maintenance # Frontier + - External # Frontier # accessGroups: # - AllAccess # special: diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 7302d7b4891..1b8ad313f16 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -13,6 +13,7 @@ - Medical - Chemistry - Maintenance + - External # Frontier - type: startingGear id: ChemistGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 5e605b42aab..98d031aee11 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -20,6 +20,7 @@ - Maintenance - Chemistry - ChiefMedicalOfficer + - External # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index df990775623..62af62184dd 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -12,6 +12,7 @@ access: - Medical - Maintenance + - External # Frontier extendedAccess: - Chemistry diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index c6ff734587c..586c437c54e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -15,6 +15,7 @@ access: - Medical - Maintenance + - External # Frontier - type: startingGear id: MedicalInternGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index e83ed1ebb63..858eb903c21 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -12,7 +12,7 @@ access: - Medical - Maintenance - - External + - External # Frontier extendedAccess: - Chemistry diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 0a21c15e5cd..910460b53eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -20,6 +20,7 @@ - Medical - Maintenance - Chemistry + - External # Frontier - type: startingGear id: SeniorPhysicianGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 996a3051340..b4e93d239e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -15,6 +15,7 @@ access: - Research - Maintenance + - External # Frontier - type: startingGear id: ResearchAssistantGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 16a26d0bcb6..70e0a22bcfb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -17,6 +17,7 @@ - Command - Maintenance - ResearchDirector + - External # Frontier special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index e205715626a..a596d3a38d3 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -12,6 +12,7 @@ access: - Research - Maintenance + - External # Frontier - type: startingGear id: ScientistGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 6155eb189d3..4f0b988a293 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -13,6 +13,7 @@ access: - Research - Maintenance + - External # Frontier - type: startingGear id: SeniorResearcherGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 8611237de60..ec82cfd8ace 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -16,6 +16,7 @@ - Maintenance - Service - Detective + - External # Frontier - Mercenary # Frontier - Captain # Frontier special: diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 147d296eba7..80bf28f4393 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -12,6 +12,7 @@ access: - Service - Maintenance + - External # Frontier - type: startingGear id: BoxerGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 7b8854b6e84..4f1bfbd71d4 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -12,6 +12,7 @@ access: - Medical - Maintenance + - External # Frontier extendedAccess: - Chemistry diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 16e2a4359ab..580449359d4 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -12,6 +12,7 @@ access: - Service - Maintenance + - External # Frontier - type: startingGear id: ReporterGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 4e3f58a4dc0..d055dc13050 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -12,6 +12,7 @@ access: - Service - Maintenance + - External # Frontier - type: startingGear id: ZookeeperGear diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml index 88ee0f7248b..1ffce0a3a82 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml @@ -13,6 +13,7 @@ - Cargo - Maintenance - Service + - External # Frontier - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml index 99ec294e245..94dd5e34169 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml @@ -16,6 +16,7 @@ - Cargo - Maintenance - Janitor + - External # Frontier - type: startingGear id: ValetGear diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml index c5a1c4a7a0f..fe6c23edfbb 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml @@ -13,4 +13,4 @@ access: - Service - Maintenance - + - External # Frontier diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml index 4243dd59663..152111301aa 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml @@ -12,6 +12,7 @@ access: - Service - Maintenance + - External # Frontier - type: startingGear id: MartialGear