Adds robust granular access (#470)

* Adds robust granular access

* Updates drobes with appropriate access

* Typo/file not saved

* Remove dupe/copy-paste oops

* Remove dupe/copy-paste oops

* Remove dupe/copy-paste oops

* Revert "Typo/file not saved"

This reverts commit 190363ead8.

* Revert "Revert "Typo/file not saved""

This reverts commit dd116f2b04.

* Revert "Remove dupe/copy-paste oops"

This reverts commit 5660903ac4.

* Remove dupe, fix copy/paste

* Fix some more copy/paste

* ugg

---------

Co-authored-by: Jeff <>

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -48,6 +48,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Atmospherics",
         "Bar",
         //"Brig", Delta V: Removed Brig Access
+        "Boxer",  // DeltaV - Add Boxer access
         "Detective",
         "Captain",
         "Cargo",
@@ -55,6 +56,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Chemistry",
         "ChiefEngineer",
         "ChiefMedicalOfficer",
+        "Clown", // DeltaV - Add Clown access
         "Command",
         "Engineering",
         "External",
@@ -64,10 +66,15 @@ public sealed partial class IdCardConsoleComponent : Component
         "Janitor",
         "Kitchen",
         "Lawyer",
+        "Library",  // DeltaV - Add Library access 
         "Maintenance",
         "Medical",
+        "Mime", // DeltaV - Add Mime access
+        "Musician", // DeltaV - Add Musician access
         "Paramedic", // DeltaV - Add Paramedic access
+        "Psychologist", // DeltaV - Add Psychologist access
         "Quartermaster",
+        "Reporter", // DeltaV - Add Reporter access
         "Research",
         "ResearchDirector",
         "Salvage",
@@ -77,6 +84,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Orders", // DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
         "Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml
         "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
+        "Zookeeper",  // DeltaV - Add Zookeeper access
     };
 
     [Serializable, NetSerializable]

Resources/Locale/en-US/prototypes/access/accesses.ftl

@@ -19,19 +19,27 @@ id-card-access-level-chief-medical-officer = Chief Medical Officer
 id-card-access-level-medical = Medical
 id-card-access-level-chemistry = Chemistry
 id-card-access-level-paramedic = Paramedic
+id-card-access-level-psychologist = Psychologist
 
 id-card-access-level-quartermaster = Logistics Officer
 id-card-access-level-cargo = Logistics
 id-card-access-level-salvage = Salvage
 
 id-card-access-level-bar = Bar
+id-card-access-level-boxer = Boxer
+id-card-access-level-clown = Clown
 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-library = Library
+id-card-access-level-mime = Mime
+id-card-access-level-musician = Musician
 id-card-access-level-theatre = Theatre
 id-card-access-level-chapel = Chapel
 id-card-access-level-lawyer = Lawyer
+id-card-access-level-reporter = Reporter
+id-card-access-level-zookeeper = Zookeeper
 
 id-card-access-level-maintenance = Maintenance
 

Resources/Prototypes/Access/medical.yml

@@ -9,7 +9,7 @@
 - type: accessLevel
   id: Chemistry
   name: id-card-access-level-chemistry
-  
+
 - type: accessLevel
   id: Paramedic
   name: id-card-access-level-paramedic
@@ -21,3 +21,4 @@
   - Medical
   - Chemistry
   - Paramedic # DeltaV - Add Paramedic access
+  - Psychologist # DeltaV - Add Psychologist access

Resources/Prototypes/Access/misc.yml

@@ -35,3 +35,11 @@
   - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
   - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
   - Paramedic # DeltaV - Add Paramedic access
+  - Psychologist # DeltaV - Add Psychologist access
+  - Boxer # DeltaV - Add Boxer access
+  - Clown # DeltaV - Add Clown access
+  - Library # DeltaV - Add Library access
+  - Mime # DeltaV - Add Mime access
+  - Musician # DeltaV - Add Musician access
+  - Reporter # DeltaV - Add Reporter access
+  - Zookeeper # DeltaV - Add Zookeeper access

Resources/Prototypes/Access/service.yml

@@ -42,3 +42,10 @@
   - Theatre
   - Chapel
   - Lawyer
+  - Boxer # DeltaV - Add Boxer access
+  - Clown # DeltaV - Add Clown access
+  - Library # DeltaV - Add Library access
+  - Mime # DeltaV - Add Mime access
+  - Musician # DeltaV - Add Musician access
+  - Reporter # DeltaV - Add Reporter access
+  - Zookeeper # DeltaV - Add Zookeeper access

Resources/Prototypes/DeltaV/Access/cargo.yml

@@ -1,7 +1,3 @@
 - type: accessLevel
   id: Orders
   name: id-card-access-level-orders # Custom access level that allows the approval of orders
-
-- type: accessLevel
-  id: Mantis
-  name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors

Resources/Prototypes/DeltaV/Access/epistemics.yml

@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Mantis
+  name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors

Resources/Prototypes/DeltaV/Access/medical.yml

@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Psychologist
+  name: id-card-access-level-psychologist

Resources/Prototypes/DeltaV/Access/service.yml

@@ -0,0 +1,27 @@
+- type: accessLevel
+  id: Boxer
+  name: id-card-access-level-boxer
+
+- type: accessLevel
+  id: Clown
+  name: id-card-access-level-clown
+
+- type: accessLevel
+  id: Library
+  name: id-card-access-level-library
+
+- type: accessLevel
+  id: Mime
+  name: id-card-access-level-mime
+
+- type: accessLevel
+  id: Musician
+  name: id-card-access-level-musician
+
+- type: accessLevel
+  id: Reporter
+  name: id-card-access-level-reporter
+
+- type: accessLevel
+  id: Zookeeper
+  name: id-card-access-level-zookeeper

Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml

@@ -23,6 +23,7 @@
       - Atmospherics
       - Bar
       #- Brig #Delta V: Removed Brig Access
+      - Boxer #Delta V: Add Boxer Access
       - Detective
       - Captain
       - Cargo
@@ -30,6 +31,7 @@
       - Chemistry
       - ChiefEngineer
       - ChiefMedicalOfficer
+      - Clown #Delta V: Add Clown Access
       - Command
       - Engineering
       - External
@@ -39,16 +41,22 @@
       - Janitor
       - Kitchen
       - Lawyer
+      - Library #Delta V: Add Library Access
       - Maintenance
       - Medical
+      - Mime #Delta V: Add Mime Access
+      - Musician #Delta V: Add Musician Access
       - Paramedic # Delta V - adds Paramedic access
+      - Psychologist #Delta V: Add Psychologist Access
       - Quartermaster
+      - Reporter #Delta V: Add Reporter Access
       - Research
       - ResearchDirector
       - Salvage
       - Security
       - Service
       - Theatre
+      - Zookeeper #Delta V: Add Zookeeper Access
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -356,6 +356,80 @@
   - type: AccessReader
     access: [["External"]]
 
+#Delta V: Add Airlocks
+- type: entity
+  parent: Airlock
+  id: AirlockBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalSalvageLocked
+  suffix: External, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedical
+  id: AirlockPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+#End of Delta V
+
 # Glass Airlocks
 - type: entity
   parent: AirlockGlass
@@ -662,6 +736,80 @@
   - type: AccessReader
     access: [["NuclearOperative"]]
 
+#Delta V: Add Airlocks
+- type: entity
+  parent: AirlockGlass
+  id: AirlockBoxerGlassLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockClownGlassLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMimeGlassLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMusicianGlassLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockReporterGlassLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockLibraryGlassLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockZookeeperGlassLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassSalvageLocked
+  suffix: External, Glass, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockPsychologistGlassLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+#End of Delta V
+
 # Maintenance Hatches
 - type: entity
   parent: AirlockMaint
@@ -903,6 +1051,80 @@
   - type: AccessReader
     access: [["Armory"]]
 
+#Delta V: Add Airlocks
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintSecurityLawyerLocked
+  suffix: Security/Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"], ["Lawyer"]]
+#End of Delta V
+
 - type: entity
   parent: AirlockSyndicate
   id: AirlockSyndicateLocked

Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml

@@ -48,7 +48,7 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Boxer"]]
 
 - type: entity
   parent: VendingMachine
@@ -72,7 +72,7 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: WiresVisuals
   - type: AccessReader
-    access: [["Service"]]
+    access: [["Reporter"]]
 
 - type: entity
   parent: VendingMachine

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -12,6 +12,7 @@
   access:
   - Theatre
   - Maintenance
+  - Clown # DeltaV - Add Clown access
   special:
   - !type:AddComponentSpecial
     components:

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -9,7 +9,6 @@
   access:
   - Service
   - Janitor
-  - Service # DeltaV - quite honestly the most noble service occupation
   - Maintenance
   special:
   - !type:GiveItemOnHolidaySpecial

Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml

@@ -12,6 +12,7 @@
   access:
   - Service
   - Maintenance
+  - Library # DeltaV - Add Library access
 
 - type: startingGear
   id: LibrarianGear

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -12,10 +12,11 @@
   access:
   - Theatre
   - Maintenance
+  - Mime # DeltaV - Add Mime access
   special:
   - !type:AddComponentSpecial
     components:
-    - type: Psionic # Nyano - Summary: Makes the mime psionic. 
+    - type: Psionic # Nyano - Summary: Makes the mime psionic.
     - type: MimePowers
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Civilian/musician.yml

@@ -12,6 +12,7 @@
   access:
   - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed
   - Theatre
+  - Musician # DeltaV - Add Musician access
   special:
   - !type:GiveItemOnHolidaySpecial
     holiday: MikuDay

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -52,6 +52,13 @@
 #  - Cargo
 #  - Atmospherics
 #  - Medical
+  - Boxer # DeltaV - Add Boxer access
+  - Clown # DeltaV - Add Clown access
+  - Library # DeltaV - Add Library access
+  - Mime # DeltaV - Add Mime access
+  - Musician # DeltaV - Add Musician access
+  - Reporter # DeltaV - Add Reporter access
+  - Zookeeper # DeltaV - Add Zookeeper access
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -31,6 +31,7 @@
   - Chemistry
   - ChiefMedicalOfficer
   - Paramedic # DeltaV - Add Paramedic access
+  - Psychologist # DeltaV - Add Psychologist access
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -10,8 +10,9 @@
   icon: "JobIconBoxer"
   supervisors: job-supervisors-hop
   access:
-  - Service
   - Maintenance
+  - Theatre # DeltaV - Add Theatre access
+  - Boxer # DeltaV - Add Boxer access
   special: # Nyanotrasen - BoxerComponent, see Content.Server/Nyanotrasen/Abilities/Boxer/Boxer/BoxerComponent.cs
   - !type:AddComponentSpecial
     components:

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -15,6 +15,7 @@
   access:
   - Medical
   - Maintenance
+  - Psychologist # DeltaV - Add Psychologist access
   extendedAccess:
   - Chemistry
 

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -12,6 +12,8 @@
   access:
   - Service
   - Maintenance
+  - Theatre # DeltaV - Add Theatre access
+  - Reporter # DeltaV - Add Reporter access
 
 - type: startingGear
   id: ReporterGear

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -12,6 +12,7 @@
   access:
   - Service
   - Maintenance
+  - Zookeeper # DeltaV - Add Zookeeper access
 
 - type: startingGear
   id: ZookeeperGear