diff --git a/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs index b7c0b621ee..be2f604f4a 100644 --- a/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs @@ -46,7 +46,7 @@ namespace Content.Shared.Access.Components "Atmospherics", "Bar", "Brig", - // "Detective", + "Detective", "Captain", "Cargo", "Chapel", diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index f3a9e81070..54db7ca043 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -1,4 +1,4 @@ -- type: accessGroup +- type: accessGroup id: AllAccess tags: - EmergencyShuttleRepealAll @@ -10,6 +10,7 @@ - ResearchDirector - Command - Security + - Detective - Armory - Brig - Engineering diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index ec6cfa49ba..ec832bc761 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/Resources/Prototypes/Access/security.yml @@ -14,8 +14,9 @@ id: Brig name: id-card-access-level-brig -#- type: accessLevel -# id: Detective +- type: accessLevel + id: Detective + name: id-card-access-level-detective - type: accessGroup id: Security @@ -24,11 +25,11 @@ - Security - Armory - Brig - # - Detective + - Detective - type: accessGroup id: Armory tags: - Security - Armory - - Brig \ No newline at end of file + - Brig diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index e5ec85282b..044e5b66fc 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -259,6 +259,16 @@ - type: Wires LayoutId: AirlockSecurity +- type: entity + parent: AirlockSecurity + id: AirlockDetectiveLocked + suffix: Detective, Locked + components: + - type: AccessReader + access: [["Detective"]] + - type: Wires + LayoutId: AirlockSecurity + - type: entity parent: AirlockSecurity id: AirlockBrigLocked @@ -504,6 +514,14 @@ - type: AccessReader access: [["Security"]] +- type: entity + parent: AirlockSecurityGlass + id: AirlockDetectiveGlassLocked + suffix: Detective, Locked + components: + - type: AccessReader + access: [["Detective"]] + - type: entity parent: AirlockSecurityGlass id: AirlockBrigGlassLocked @@ -689,6 +707,14 @@ - type: AccessReader access: [["Security"]] +- type: entity + parent: AirlockMaint + id: AirlockMaintDetectiveLocked + suffix: Detective, Locked + components: + - type: AccessReader + access: [["Detective"]] + - type: entity parent: AirlockMaint id: AirlockMaintHOPLocked diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 7345b626f3..d2ae397482 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1573,7 +1573,7 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader - access: [["Security"]] + access: [["Detective"]] - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 66e669ef57..a2bbed4943 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -329,7 +329,7 @@ description: Usually cold and empty... like your heart. components: - type: AccessReader - access: [["Security"]] # TODO access [["Detective"]] + access: [["Detective"]] - type: entity id: LockerEvidence diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index f7b9b03b60..c5740b9412 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -16,6 +16,7 @@ - Brig - Maintenance - Service + - Detective - type: startingGear id: DetectiveGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index f3918d12ee..f31999d4f9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -27,6 +27,7 @@ - Maintenance - Service - External + - Detective - type: startingGear id: HoSGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 8768c2873b..a446c2d74c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -18,6 +18,7 @@ - Service - Brig - External + - Detective - type: startingGear id: WardenGear