[Access] Detective personal access (#15109)

* [Access] Detective personal access

* [Add] technical airlock with detective access.

* vendind and locker change access

* Detective access on ID card console

diff --git a/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs
index b7c0b621eef008cebd549ce6d41e00e91c0876d1..be2f604f4acb6551a7977128b504458634f44d58 100644 (file)
--- 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 f3a9e81070919de3cfbb651d33f77bc3f2c9111f..54db7ca0437d676bc9e29c291c40ccf76b688484 100644 (file)
--- 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 ec6cfa49ba83ab2b80eb843a06851676e4452a42..ec832bc761c5cbf8693840de2dab7daf0f1fb1c3 100644 (file)
--- 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 e5ec85282b012a171311e1fe2cb4ecf98b8caad0..044e5b66fc9fcc1b7678a31ce550963de658224a 100644 (file)
--- 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 7345b626f361cd2f4e805d98fd748bec2a052775..d2ae3974828889ad1f94083e305fd6a911a444a0 100644 (file)
--- 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 66e669ef57b473c3d4e4bd23e531411a895cb8cd..a2bbed49437d9ec5e76b7384c7f47b8554847bea 100644 (file)
--- 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 f7b9b03b606b0e81708c13da914506df49d31a9e..c5740b94124843a5b2ef358811904554b633b586 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -16,6 +16,7 @@
   - Brig\r
   - Maintenance\r
   - Service\r
+  - Detective\r
 \r
 - type: startingGear\r
   id: DetectiveGear\r

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index f3918d12ee29d7758529db451f1022ae9308adc4..f31999d4f9ea9d2538add38aa7eb83f592346de3 100644 (file)
--- 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 8768c2873b9349cced460f2fde100f98d343e25b..a446c2d74c117597e810715b4acd78d637eb9668 100644 (file)
--- 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