From d4b0fc446ac2a411fa9fdf2897f50db5bbb90efc Mon Sep 17 00:00:00 2001
From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Date: Sun, 9 Jun 2024 02:23:00 -0400
Subject: [PATCH 1/2] Removed service access from attorney, added sec playtime
 to prosecutor

---
 Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 3 +++
 Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml
index b9e0d48bb5a..d98933bd9b5 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml
@@ -6,6 +6,9 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 36000 # 10 hrs
+    - !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
+      department: Security
+      time: 21600 # 6 hours
   startingGear: ProsecutorGear
   icon: "JobIconProsecutor"
   supervisors: job-supervisors-cj
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 47c0dd3d896..93c43eaf2ac 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -14,7 +14,7 @@
   icon: "JobIconLawyer"
   supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
   access:
-  - Service
+  # - Service - DeltaV, removed from service department
   - Lawyer
   - Maintenance
 

From 08184c93f827f9c304f798ce3247aef49c8db05d Mon Sep 17 00:00:00 2001
From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Date: Mon, 10 Jun 2024 00:32:46 -0400
Subject: [PATCH 2/2] Fixed many bugs

---
 .../Components/IdCardConsoleComponent.cs      |  1 +
 .../deltav/navmap-beacons/station-beacons.ftl |  1 +
 .../deltav/prototypes/access/accesses.ftl     |  1 +
 Resources/Prototypes/Access/misc.yml          |  1 +
 .../VendingMachines/Inventories/lawdrobe.yml  |  2 +-
 .../Prototypes/DeltaV/Access/justice.yml      |  5 ++++
 Resources/Prototypes/DeltaV/Access/misc.yml   |  1 +
 .../Entities/Clothing/Ears/headsets.yml       |  2 --
 .../Devices/Electronics/door_access.yml       |  8 ++++++
 .../Objects/Devices/station_beacon.yml        |  8 ++++++
 .../Structures/Doors/Airlocks/access.yml      | 27 +++++++++++++++++++
 .../Structures/Doors/Windoors/windoor.yml     |  9 +++++++
 .../Storage/Closets/Lockers/lockers.yml       |  2 +-
 .../DeltaV/Loadouts/loadout_groups.yml        |  2 +-
 .../DeltaV/Loadouts/role_loadouts.yml         |  3 +++
 .../Roles/Jobs/Justice/chief_justice.yml      |  3 +++
 .../DeltaV/Roles/Jobs/Justice/clerk.yml       |  1 +
 .../Prototypes/DeltaV/StatusEffects/job.yml   |  2 +-
 .../Prototypes/DeltaV/radio_channels.yml      |  2 +-
 .../Objects/Tools/access_configurator.yml     |  1 +
 .../Structures/Machines/vending_machines.yml  |  2 +-
 .../Prototypes/Roles/Jobs/Civilian/lawyer.yml |  1 +
 .../Roles/Jobs/Command/head_of_personnel.yml  |  2 +-
 23 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index a34709807b1..e13540eb6f3 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -90,6 +90,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefJustice",  // DeltaV - Add Chief Justice access
         "Justice",  // DeltaV - Add Justice access
         "Prosecutor", // Delta V - Add Prosecutor access
+        "Clerk", // Delta V - Add Clerk access
     };
 
     [Serializable, NetSerializable]
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
index 8d2571920ff..e8977c1009b 100644
--- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -34,3 +34,4 @@ station-beacon-corpsman = Corpsman
 station-beacon-justice = Justice
 station-beacon-chiefjustice = Chief Justice
 station-beacon-prosecutor = Prosecutor
+station-beacon-clerk = Clerk
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 2c5a3c871c0..07a6659b05b 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -2,5 +2,6 @@ id-card-access-level-orders = Orders
 id-card-access-level-mantis = Psionic Mantis
 id-card-access-level-chief-justice = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index f717c57a000..417d2cdb028 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -47,4 +47,5 @@
   - Justice # DeltaV - Add Justice dept access
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
+  - Clerk # DeltaV - Add Clerk access
   - Corpsman # DeltaV - Add Corpsman access
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index e46ae3e668b..eaf70dc5968 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+    ClothingHeadsetJustice: 2 # DeltaV - Justice dept
     ClothingNeckLawyerbadge: 2
     BriefcaseBrown: 2
     LuxuryPen: 2
diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
index 33a2844ed20..87549f224a1 100644
--- a/Resources/Prototypes/DeltaV/Access/justice.yml
+++ b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -9,12 +9,17 @@
 - type: accessLevel
   id: Prosecutor
   name: id-card-access-level-prosecutor
+  
+- type: accessLevel
+  id: Clerk
+  name: id-card-access-level-clerk
 
 - type: accessGroup
   id: Justice
   tags:
   - Justice
   - Prosecutor
+  - Clerk
   - ChiefJustice
   - Lawyer
   
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
index ad42935662b..495e4cb456d 100644
--- a/Resources/Prototypes/DeltaV/Access/misc.yml
+++ b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -49,4 +49,5 @@
     - Zookeeper
     - Justice
     - Prosecutor
+    - Clerk
 
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index b32cab7b21a..c893b26b560 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -53,7 +53,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
   - type: Sprite
@@ -72,7 +71,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
       - EncryptionKeyCommand
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml
index 46edc0a20fd..ce4e63e30fb 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml
@@ -117,3 +117,11 @@
   components:
   - type: AccessReader
     access: [["Prosecutor"]]
+    
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsClerk
+  suffix: Clerk, Locked
+  components:
+  - type: AccessReader
+    access: [["Clerk"]]
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
index fc44704d57d..75f1e58f325 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -160,3 +160,11 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-prosecutor
+    
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconClerk
+  suffix: Clerk
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-clerk
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index 241b6db6fe1..c87a64ffc81 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -71,6 +71,24 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockJustice
+  id: AirlockClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockClerkGlassLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 # Maintenance
 - type: entity
   parent: AirlockMaint
@@ -99,6 +117,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
index 52d3b40192e..85208ee7962 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -51,6 +51,15 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsProsecutor ]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
       
 - type: entity
   parent: WindoorSecure
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index b49002ab22b..3b2f72d5d9e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -22,4 +22,4 @@
     stateDoorOpen: clerk_open
     stateDoorClosed: clerk_door
   - type: AccessReader
-    access: [["Justice"]]
+    access: [["Clerk"]]
diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
index 731d7607c1a..6abbc33429a 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
@@ -173,7 +173,7 @@
   
 - type: loadoutGroup
   id: ProsecutorNeck
-  name: loadout-group-prosecutor-jumpsuit
+  name: loadout-group-prosecutor-neck
   minLimit: 0
   loadouts:
   - ProsecutorNeck
diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
index 5c6b744d7ff..8b6299e564d 100644
--- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
@@ -34,6 +34,7 @@
   - ChiefJusticeOuterClothing
   - CommonBackpack
   - ChiefJusticeShoes
+  - Glasses
   - Trinkets
   
 - type: roleLoadout
@@ -44,6 +45,7 @@
   - ClerkOuterClothing
   - CommonBackpack
   - ClerkShoes
+  - Glasses
   - Trinkets
   
 - type: roleLoadout
@@ -52,4 +54,5 @@
   - ProsecutorJumpsuit
   - ProsecutorNeck
   - LawyerBackpack
+  - Glasses
   - Trinkets
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
index 2715e63e391..934d7e6a757 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
@@ -26,6 +26,9 @@
   - Command
   - ChiefJustice
   - Justice
+  - Lawyer
+  - Prosecutor
+  - Clerk
   - Security
   - Maintenance
   - External
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
index 9374b5868ed..d3248c0e441 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
@@ -20,6 +20,7 @@
   canBeAntag: false
   access:
   - Justice
+  - Clerk
   - Security
   - Maintenance
 
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index 894e1586b40..1b861504843 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -24,4 +24,4 @@
   id: JobIconProsecutor
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: Prosecutor #need prosecutor
+    state: Prosecutor
diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml
index 53490d90fac..4bf207472ac 100644
--- a/Resources/Prototypes/DeltaV/radio_channels.yml
+++ b/Resources/Prototypes/DeltaV/radio_channels.yml
@@ -3,7 +3,7 @@
   name: chat-radio-justice
   keycode: "j"
   frequency: 1420
-  color: "#701442"
+  color: "#c70667"
 
 - type: radioChannel
   id: Prison
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 8cfbb086225..031d373bfcf 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -63,6 +63,7 @@
       - ChiefJustice  #Delta V: Add Chief Justice Access
       - Prosecutor  #Delta V: Add Prosecutor Access
       - Justice  #Delta V: Add Justice Access
+      - Clerk  #Delta V: Add Clerk Access
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 3b0909efaad..aa33fff6bef 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1483,7 +1483,7 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
-    access: [["Lawyer"]]
+    access: [["Justice"]]
 
 - type: entity
   parent: VendingMachine
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 93c43eaf2ac..c8c19968536 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -15,6 +15,7 @@
   supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
   access:
   # - Service - DeltaV, removed from service department
+  - Justice # DeltaV - Justice dept
   - Lawyer
   - Maintenance
 
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 3f4ce4d0212..fd87a865067 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -49,7 +49,7 @@
 #  - Salvage
 #  - Security # NoooOoOo!! My HoPcurity!1
 #  - Brig
-  - Lawyer
+#  - Lawyer # Lawyer is now part of the justice dept
 #  - Cargo
 #  - Atmospherics
 #  - Medical