From 6af9c96012e7fd4880589fa5056de01d66cae7eb Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Sun, 30 Jan 2022 21:34:35 +0000
Subject: [PATCH] Adds Brig Access and more access specific windoors + airlocks
 (#6394)

---
 .../Prototypes/AccessLevels/security.yml      |  4 +--
 .../Structures/Doors/Airlocks/access.yml      | 26 +++++++++++++++
 .../Structures/Doors/Windoors/windoor.yml     | 33 ++++++++++++++-----
 .../Prototypes/Roles/Jobs/Command/captain.yml |  2 +-
 .../Roles/Jobs/Security/head_of_security.yml  |  2 +-
 .../Prototypes/Roles/Jobs/Security/warden.yml |  1 +
 6 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/AccessLevels/security.yml b/Resources/Prototypes/AccessLevels/security.yml
index b214e4fa17..a8667c0665 100644
--- a/Resources/Prototypes/AccessLevels/security.yml
+++ b/Resources/Prototypes/AccessLevels/security.yml
@@ -8,8 +8,8 @@
 - type: accessLevel
   id: Armory
 
-#- type: accessLevel
-#  id: Brig
+- type: accessLevel
+  id: Brig
 
 #- type: accessLevel
 #  id: Detective
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index c67bab684e..e9d356fa3d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -203,6 +203,16 @@
     access: [["Security"]]
   - type: Wires
     LayoutId: AirlockSecurity
+    
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockBrigLocked
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+  - type: Wires
+    LayoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurity
@@ -334,6 +344,22 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+    
+- type: entity
+  parent: AirlockSecurityGlass
+  id: AirlockBrigGlassLocked
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+  
+- type: entity
+  parent: AirlockEVALocked
+  id: AirlockEVAGlassLocked
+  suffix: EVA, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
 
 # Maintenance Hatches
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 256887c490..9b53448c7d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -11,7 +11,6 @@
   description: It's a sturdy window and a sliding door. Wow!
 
 # TODO remove these with parameterized prototypes/whatever we end up doing
-# Bar windoor
 - type: entity
   parent: Windoor
   id: WindoorBarLocked
@@ -20,7 +19,6 @@
   - type: AccessReader
     access: [["Bar"]]
 
-# Botany Windoor
 - type: entity
   parent: Windoor
   id: WindoorHydroponicsLocked
@@ -29,16 +27,22 @@
   - type: AccessReader
     access: [["Hydroponics"]]
 
-# Chemistry windoor
 - type: entity
   parent: WindoorSecure
   id: WindoorMedicalLocked
   suffix: Medical, Locked
   components:
+  - type: AccessReader
+    access: [["Medical"]]
+    
+- type: entity
+  parent: WindoorSecure
+  id: WindoorChemistryLocked
+  suffix: Chemistry, Locked
+  components:
   - type: AccessReader
     access: [["Chemistry"]]
 
-# Science windoor
 - type: entity
   parent: WindoorSecure
   id: WindoorScienceLocked
@@ -47,7 +51,6 @@
   - type: AccessReader
     access: [["Research"]]
 
-# HOP's office windoor
 - type: entity
   parent: WindoorSecure
   id: WindoorCommandLocked
@@ -58,7 +61,6 @@
   - type: Wires
     LayoutId: WindoorCommand
 
-# Cargo windoor
 - type: entity
   parent: Windoor
   id: WindoorCargoLocked
@@ -67,7 +69,6 @@
   - type: AccessReader
     access: [["Cargo"]]
 
-# Security windoor
 - type: entity
   parent: WindoorSecure
   id: WindoorSecurityLocked
@@ -78,6 +79,14 @@
   - type: Wires
     LayoutId: WindoorSecurity
     
+- type: entity
+  parent: WindoorSecurityLocked
+  id: WindoorBrigLocked
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+    
 - type: entity
   parent: WindoorSecure
   id: WindoorEngineeringLocked
@@ -100,4 +109,12 @@
   suffix: Janitor, Locked
   components:
   - type: AccessReader
-    access: [["Janitor"]]
\ No newline at end of file
+    access: [["Janitor"]]
+    
+- type: entity
+  parent: WindoorSecure
+  id: WindoorKitchenLocked
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 068c64748b..cedf91c673 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -24,7 +24,7 @@
   - Command
   - Security
   - Armory
- # - Brig
+  - Brig
   - Engineering
   - Medical
   - Quartermaster
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 20c12e5f65..ae681f785a 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -13,7 +13,7 @@
   access:
   - HeadOfSecurity
   - Command
-#  - Brig
+  - Brig
   - Security
   - Armory
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 2c3807e9fe..76058b200c 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -12,6 +12,7 @@
   - Armory
   - Maintenance
   - Service
+  - Brig
 
 - type: startingGear
   id: WardenGear