Justice patch 06/09/2024 (#1340)

* Removed service access from attorney, added sec playtime to prosecutor * Fixed many bugs
2024-06-10 06:17:38 -04:00 · 2024-06-10 06:17:38 -04:00 · 4455e1ec30
parent 6eb6c276fa
commit 4455e1ec30
24 changed files with 82 additions and 10 deletions
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@ -90,6 +90,7 @@ public sealed partial class IdCardConsoleComponent : Component
        "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]
--- 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
--- 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
--- 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
--- 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
--- 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
  
--- a/Resources/Prototypes/DeltaV/Access/misc.yml
+++ b/Resources/Prototypes/DeltaV/Access/misc.yml
@ -49,4 +49,5 @@
    - Zookeeper
    - Justice
    - Prosecutor
+    - Clerk

--- 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
--- 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"]]
--- 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
--- 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
--- 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
--- 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"]]
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@ -14,7 +14,8 @@
  icon: "JobIconLawyer"
  supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
  access:
-  - Service
+  # - Service - DeltaV, removed from service department
+  - Justice # DeltaV - Justice dept
  - Lawyer
  - Maintenance

--- 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