diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 47f2660d80..f630803446 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -63,6 +63,7 @@ public sealed partial class IdCardConsoleComponent : Component "Hydroponics", "Janitor", "Kitchen", + "Lawyer", "Maintenance", "Medical", "Quartermaster", diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index e9bf2bcb8b..d4be51c509 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -5,7 +5,6 @@ id-card-access-level-head-of-personnel = Head of Personnel id-card-access-level-head-of-security = Head of Security id-card-access-level-security = Security id-card-access-level-armory = Armory -id-card-access-level-brig = Brig id-card-access-level-detective = Detective id-card-access-level-chief-engineer = Chief Engineer @@ -25,12 +24,14 @@ id-card-access-level-cargo = Cargo id-card-access-level-salvage = Salvage id-card-access-level-bar = Bar +id-card-access-level-brig = Brig id-card-access-level-kitchen = Kitchen id-card-access-level-hydroponics = Hydroponics id-card-access-level-service = Service id-card-access-level-janitor = Janitor id-card-access-level-theatre = Theatre id-card-access-level-chapel = Chapel +id-card-access-level-lawyer = Lawyer id-card-access-level-maintenance = Maintenance diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 54db7ca043..848a27f413 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -13,6 +13,7 @@ - Detective - Armory - Brig + - Lawyer - Engineering - Medical - Quartermaster diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml index 492e7a9092..cb62a3f6e7 100644 --- a/Resources/Prototypes/Access/service.yml +++ b/Resources/Prototypes/Access/service.yml @@ -26,6 +26,10 @@ id: Chapel name: id-card-access-level-chapel +- type: accessLevel + id: Lawyer + name: id-card-access-level-lawyer + - type: accessGroup id: Service tags: @@ -37,3 +41,4 @@ - Janitor - Theatre - Chapel + - Lawyer diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 7863cf8c09..9a367841c4 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -38,6 +38,7 @@ - Hydroponics - Janitor - Kitchen + - Lawyer - Maintenance - Medical - Quartermaster diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 125a8a7927..0ba94f7b2f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -7,6 +7,14 @@ - type: AccessReader access: [["Service"]] +- type: entity + parent: Airlock + id: AirlockLawyerLocked + suffix: Lawyer, Locked + components: + - type: AccessReader + access: [["Lawyer"]] + - type: entity parent: Airlock id: AirlockTheatreLocked @@ -127,6 +135,14 @@ - type: AccessReader access: [["Kitchen"], ["Hydroponics"]] +- type: entity + parent: AirlockFreezer + id: AirlockFreezerHydroponicsLocked + suffix: Hydroponics, Locked + components: + - type: AccessReader + access: [["Hydroponics"]] + - type: entity parent: AirlockEngineering id: AirlockEngineeringLocked @@ -295,6 +311,16 @@ - type: Wires layoutId: AirlockSecurity +- type: entity + parent: AirlockSecurity + id: AirlockSecurityLawyerLocked + suffix: Security/Lawyer, Locked + components: + - type: AccessReader + access: [["Security"], ["Lawyer"]] + - type: Wires + layoutId: AirlockSecurity + - type: entity parent: AirlockSecurity id: AirlockArmoryLocked @@ -330,6 +356,14 @@ - type: AccessReader access: [["Service"]] +- type: entity + parent: AirlockGlass + id: AirlockLawyerGlassLocked + suffix: Lawyer, Locked + components: + - type: AccessReader + access: [["Lawyer"]] + - type: entity parent: AirlockGlass id: AirlockBarGlassLocked @@ -442,6 +476,14 @@ - type: AccessReader access: [["Salvage"]] +- type: entity + parent: AirlockChemistryGlass + id: AirlockChemistryGlassLocked + suffix: Chemistry, Locked + components: + - type: AccessReader + access: [["Chemistry"]] + - type: entity parent: AirlockMedicalGlass id: AirlockMedicalGlassLocked @@ -562,6 +604,14 @@ - type: AccessReader access: [["Brig"]] +- type: entity + parent: AirlockSecurityGlass + id: AirlockSecurityLawyerGlassLocked + suffix: Security/Lawyer, Locked + components: + - type: AccessReader + access: [["Security"], ["Lawyer"]] + - type: entity parent: AirlockSecurityGlass id: AirlockArmoryGlassLocked @@ -691,6 +741,22 @@ - type: AccessReader access: [["Janitor"]] +- type: entity + parent: AirlockMaint + id: AirlockMaintLawyerLocked + suffix: Lawyer, Locked + components: + - type: AccessReader + access: [["Lawyer"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintServiceLocked + suffix: Service, Locked + components: + - type: AccessReader + access: [["Service"]] + - type: entity parent: AirlockMaint id: AirlockMaintTheatreLocked @@ -779,6 +845,46 @@ - type: AccessReader access: [["Captain"]] +- type: entity + parent: AirlockMaint + id: AirlockMaintChiefEngineerLocked + suffix: ChiefEngineer, Locked + components: + - type: AccessReader + access: [["ChiefEngineer"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintChiefMedicalOfficerLocked + suffix: ChiefMedicalOfficer, Locked + components: + - type: AccessReader + access: [["ChiefMedicalOfficer"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintHeadOfSecurityLocked + suffix: HeadOfSecurity, Locked + components: + - type: AccessReader + access: [["HeadOfSecurity"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintResearchDirectorLocked + suffix: ResearchDirector, Locked + components: + - type: AccessReader + access: [["ResearchDirector"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintArmoryLocked + suffix: Armory, Locked + components: + - type: AccessReader + access: [["Armory"]] + - type: entity parent: AirlockSyndicate id: AirlockSyndicateLocked diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 940e2e8b36..b41487815a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -180,6 +180,16 @@ - type: PaintableAirlock group: Glass +- type: entity + parent: AirlockGlass + id: AirlockChemistryGlass + suffix: Chemistry + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/medical.rsi + - type: PaintableAirlock + group: Glass + - type: entity parent: AirlockGlass id: AirlockMedicalGlass @@ -240,4 +250,4 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi - type: PaintableAirlock - group: Glass \ No newline at end of file + group: Glass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 75162c022a..b4910f32f4 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -175,6 +175,14 @@ - type: AccessReader access: [["Kitchen"]] +- type: entity + parent: WindoorSecureSecurityLocked + id: WindoorSecureSecurityLawyerLocked + suffix: Security/Lawyer, Locked + components: + - type: AccessReader + access: [["Security"], ["Lawyer"]] + - type: entity parent: WindoorSecure id: WindoorSecureMedicalLocked diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 02443f1e27..e7b3fb57fc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1454,7 +1454,7 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader - access: [["Brig"]] + access: [["Lawyer"]] - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index ed48ea2711..2b778ee6c2 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -7,6 +7,7 @@ icon: "JobIconJanitor" supervisors: job-supervisors-hop access: + - Service - Janitor - Maintenance special: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 2dd13d03a4..9137eccd65 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -11,7 +11,7 @@ supervisors: job-supervisors-hop access: - Service - - Brig + - Lawyer - Maintenance - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 02c26b2e9c..840f1b25a5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -7,7 +7,6 @@ icon: "JobIconLibrarian" supervisors: job-supervisors-hop access: - - Service - Maintenance - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 9444842c42..abd9c643e6 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -44,6 +44,7 @@ - Salvage - Security - Brig + - Lawyer - Cargo - Atmospherics - Medical diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index d368f34213..d2f8008248 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -13,10 +13,10 @@ canBeAntag: false access: - Security + - Brig - Armory - Maintenance - Service - - Brig - External - Detective special: