All high-security airlocks now have proper access restrictions (#5573)

2021-12-05 11:20:06 +08:00
parent d1ab9592aa
commit 7de3608130
12 changed files with 4574 additions and 4507 deletions
--- a/Resources/Maps/packedstation.yml
+++ b/Resources/Maps/packedstation.yml
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -5937,12 +5937,9 @@ entities:
    parent: 853
    type: Transform
 - uid: 561
-  type: AirlockCommandGlassLocked
+  type: AirlockHeadOfSecurityLocked
  components:
-  - name: Head of Security's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: -8.5,18.5
+  - pos: -8.5,18.5
    parent: 853
    type: Transform
  - containers:
@@ -6082,12 +6079,9 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 574
-  type: AirlockVaultLocked
+  type: AirlockHeadOfSecurityLocked
  components:
-  - name: Armory
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: -10.5,20.5
+  - pos: -10.5,20.5
    parent: 853
    type: Transform
  - containers:
@@ -6272,12 +6266,9 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 593
-  type: AirlockCommandGlassLocked
+  type: AirlockResearchDirectorLocked
  components:
-  - name: Research Director's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: -3.5,-21.5
+  - pos: -8.5,-21.5
    parent: 853
    type: Transform
  - containers:
@@ -6285,12 +6276,9 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 594
-  type: AirlockCommandGlassLocked
+  type: AirlockResearchDirectorLocked
  components:
-  - name: Server Room
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: -8.5,-21.5
+  - pos: -3.5,-21.5
    parent: 853
    type: Transform
  - containers:
@@ -6298,12 +6286,9 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 595
-  type: AirlockCommandGlassLocked
+  type: AirlockChiefMedicalOfficerLocked
  components:
-  - name: Chief Medical Officer's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: 20.5,-13.5
+  - pos: 20.5,-13.5
    parent: 853
    type: Transform
  - containers:
@@ -6569,12 +6554,9 @@ entities:
    parent: 853
    type: Transform
 - uid: 620
-  type: AirlockCommandGlassLocked
+  type: AirlockChiefEngineerLocked
  components:
-  - name: Chief Engineer's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: 38.5,1.5
+  - pos: 38.5,1.5
    parent: 853
    type: Transform
  - containers:
@@ -6792,12 +6774,9 @@ entities:
  - canCollide: False
    type: Physics
 - uid: 639
-  type: AirlockCommandLocked
+  type: AirlockCaptainLocked
  components:
-  - name: Captain's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: 5.5,25.5
+  - pos: 10.5,26.5
    parent: 853
    type: Transform
  - containers:
@@ -7381,11 +7360,6 @@ entities:
  - containers:
      cellslot_cell_container: !type:ContainerSlot {}
    type: ContainerContainer
-  - cellInsertSound: !type:SoundPathSpecifier
-      path: /Audio/Items/pistol_magout.ogg
-    cellRemoveSound: !type:SoundPathSpecifier
-      path: /Audio/Items/pistol_magin.ogg
-    type: PowerCellSlot
 - uid: 708
  type: WallReinforced
  components:
@@ -13585,7 +13559,7 @@ entities:
      - 0
      - 0
    type: GridAtmosphere
-  - angularDamping: 0.3
+  - linearDamping: 0.1
    fixedRotation: False
    bodyType: Dynamic
    type: Physics
@@ -23720,12 +23694,9 @@ entities:
    parent: 853
    type: Transform
 - uid: 1869
-  type: AirlockCommandLocked
+  type: AirlockHeadOfPersonnelLocked
  components:
-  - name: Head of Personnel's Office
-    type: MetaData
-  - rot: 4.371139006309477E-08 rad
-    pos: 6.5,17.5
+  - pos: 6.5,17.5
    parent: 853
    type: Transform
  - containers:
@@ -35844,6 +35815,16 @@ entities:
    type: Transform
  - canCollide: False
    type: Physics
+- uid: 3221
+  type: AirlockCaptainLocked
+  components:
+  - pos: 5.5,25.5
+    parent: 853
+    type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3222
  type: CableApcExtension
  components:
@@ -52630,16 +52611,6 @@ entities:
  - pos: 13.5,26.5
    parent: 853
    type: Transform
- uid: 5089
-  type: AirlockCommandLocked
-  components:
-  - pos: 10.5,26.5
-    parent: 853
-    type: Transform
-  - containers:
-      board: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 5090
  type: ToiletEmpty
  components:
--- a/Resources/Prototypes/AccessLevels/engineering.yml
+++ b/Resources/Prototypes/AccessLevels/engineering.yml
@@ -1,6 +1,6 @@
-#- type: accessLevel
-#  id: ChiefEngineer
-#  name: Chief Engineer
+- type: accessLevel
+  id: ChiefEngineer
+  name: Chief Engineer

 - type: accessLevel
  id: Engineering
--- a/Resources/Prototypes/AccessLevels/medical.yml
+++ b/Resources/Prototypes/AccessLevels/medical.yml
@@ -1,6 +1,6 @@
-#- type: accessLevel
-#  id: ChiefMedicalOfficer
-#  name: Chief Medical Officer
+- type: accessLevel
+  id: ChiefMedicalOfficer
+  name: Chief Medical Officer

 - type: accessLevel
  id: Medical
--- a/Resources/Prototypes/AccessLevels/research.yml
+++ b/Resources/Prototypes/AccessLevels/research.yml
@@ -1,6 +1,6 @@
-#- type: accessLevel
-#  id: ResearchDirector
-#  name: Research Director
+- type: accessLevel
+  id: ResearchDirector
+  name: Research Director

 - type: accessLevel
  id: Research
--- a/Resources/Prototypes/AccessLevels/security.yml
+++ b/Resources/Prototypes/AccessLevels/security.yml
@@ -1,15 +1,15 @@
-#- type: accessLevel
-#  id: HeadOfSecurity
-#  name: Head of Security
+- type: accessLevel
+  id: HeadOfSecurity
+  name: Head of Security

 - type: accessLevel
  id: Security
+  
+- type: accessLevel
+  id: Armory

 #- type: accessLevel
 #  id: Brig

 #- type: accessLevel
 #  id: Detective
-
- type: accessLevel
-  id: Armory
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -79,6 +79,54 @@
  - type: AccessReader
    access: [["Command"]]

+- type: entity
+  parent: AirlockCommand
+  id: AirlockCaptainLocked
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockChiefMedicalOfficerLocked
+  suffix: ChiefMedicalOfficer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockChiefEngineerLocked
+  suffix: ChiefEngineer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockHeadOfSecurityLocked
+  suffix: HeadOfSecurity, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockResearchDirectorLocked
+  suffix: ResearchDirector, Locked
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+    
+- type: entity
+  parent: AirlockCommand
+  id: AirlockHeadOfPersonnelLocked
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
 - type: entity
  parent: AirlockSecurity
  id: AirlockSecurityLocked
@@ -87,14 +135,6 @@
  - type: AccessReader
    access: [["Security"]]

- type: entity
-  parent: AirlockSecurity
-  id: AirlockVaultLocked
-  suffix: Vault, Locked
-  components:
-  - type: AccessReader
-    access: [["Security", "Command"]]
-
 - type: entity
  parent: AirlockSecurity
  id: AirlockArmoryLocked
@@ -103,6 +143,14 @@
  - type: AccessReader
    access: [["Armory"]]

+- type: entity
+  parent: AirlockSecurity
+  id: AirlockVaultLocked
+  suffix: Vault, Locked
+  components:
+  - type: AccessReader
+    access: [["Security", "Command"]]
+
 - type: entity
  parent: AirlockCommand
  id: AirlockEVALocked
@@ -280,3 +328,11 @@
  components:
  - type: AccessReader
    access: [["Security"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintHOPLocked
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -17,6 +17,10 @@
  # Guys please don't fight
  - Captain
  - HeadOfPersonnel
+  - ChiefEngineer
+  - ChiefMedicalOfficer
+  - HeadOfSecurity
+  - ResearchDirector
  - Command
  - Security
  - Armory
@@ -24,7 +28,6 @@
  - Engineering
  - Medical
  - Cargo
- # - ResearchDirector
  - Research
  - Service
  - Maintenance
@@ -33,7 +36,7 @@
  - Theatre
  - Bar
  - Chemistry
-
+  
 - type: startingGear
  id: CaptainGear
  equipment:
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -15,6 +15,7 @@
  - Engineering
  - Command
  - External
+  - ChiefEngineer

 - type: startingGear
  id: ChiefEngineerGear
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -17,6 +17,7 @@
  - Command
  - Maintenance
  - Chemistry
+  - ChiefMedicalOfficer

 - type: startingGear
  id: CMOGear
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -14,6 +14,7 @@
  - Research
  - Command
  - Maintenance
+  - ResearchDirector

 - type: startingGear
  id: ResearchDirectorGear
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -11,6 +11,7 @@
  supervisors: "the captain"
  canBeAntag: false
  access:
+  - HeadOfSecurity
  - Command
 #  - Brig
  - Security