Merge remote-tracking branch 'refs/remotes/upstream/master' into fork…

…/pebbleJD
DeltaV-Station · Jun 7, 2024 · f253bd2 · f253bd2
2 parents 339524d + 3850998
commit f253bd2
Show file tree

Hide file tree

Showing 234 changed files with 2,524 additions and 46 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -87,6 +87,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "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
+        "ChiefJustice",  // DeltaV - Add Chief Justice access
+        "Justice",  // DeltaV - Add Justice access
+        "Prosecutor", // Delta V - Add Prosecutor access
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/Audio/DeltaV/Items/gavel.ogg b/Resources/Audio/DeltaV/Items/gavel.ogg
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -2614,3 +2614,10 @@
   id: 383
   time: '2024-06-04T15:49:58.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1286
+- author: Leo, Velcroboy, and Timemaster
+  changes:
+  - message: Added The Justice Department >:)
+    type: Add
+  id: 384
+  time: '2024-06-07T13:22:37.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/660
diff --git a/Resources/Locale/en-US/deltav/devices/device-network.ftl b/Resources/Locale/en-US/deltav/devices/device-network.ftl
@@ -0,0 +1,2 @@
+device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras
+
diff --git a/Resources/Locale/en-US/deltav/headset/headset-component.ftl b/Resources/Locale/en-US/deltav/headset/headset-component.ftl
@@ -1 +1,3 @@
+chat-radio-justice = Justice
 chat-radio-prison = Prison
+
diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl
@@ -0,0 +1,2 @@
+department-Justice-description = Uphold justice on the station.
+
diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl
@@ -1,2 +1,4 @@
 department-Epistemics = Epistemics
 department-Logistics = Logistics
+department-Justice = Justice
+
diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl
@@ -1,2 +1,5 @@
 job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
+job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
+job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
+job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. 
 job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -1,2 +1,6 @@
 job-name-medical-borg = Medical Cyborg
+job-name-chief-justice = Chief Justice
+job-name-clerk = Clerk
+job-name-prosecutor = Prosecutor
+job-name-lawyer = Attorney
 job-name-courier = Courier
diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl
@@ -0,0 +1,2 @@
+job-supervisors-cj = the chief justice
+
diff --git a/Resources/Locale/en-US/deltav/misc/pda.ftl b/Resources/Locale/en-US/deltav/misc/pda.ftl
@@ -0,0 +1,4 @@
+ent-HoSPDA = head of security pda
+    .desc = Smells like donuts and gunpowder residue.
+ent-LawyerPDA = attorney pda
+    .desc = For attornies to poach dubious clients.
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -30,3 +30,7 @@ station-beacon-boxing-ring = Boxing
 station-beacon-park = Park
 
 station-beacon-corpsman = Corpsman
+
+station-beacon-justice = Justice
+station-beacon-chiefjustice = Chief Justice
+station-beacon-prosecutor = Prosecutor
diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
@@ -0,0 +1,3 @@
+stamp-component-stamped-name-notary = NOTARY
+stamp-component-stamped-name-chiefjustice = Chief Justice
+
diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -75,6 +75,21 @@ loadout-group-brig-medic-neck = Corpsman neck
 loadout-group-prison-guard-head = Prison Guard head
 loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit
 
+# Justice
+loadout-group-chiefjustice-head = Chief Justice head
+loadout-group-chiefjustice-jumpsuit = Chief Justice jumpsuit
+loadout-group-chiefjustice-neck = Chief Justice neck
+loadout-group-chiefjustice-outerclothing = Chief Justice outer clothing
+loadout-group-chiefjustice-shoes = Chief Justice shoes
+
+loadout-group-clerk-jumpsuit = Clerk jumpsuit
+loadout-group-clerk-neck = Clerk neck
+loadout-group-clerk-outerclothing = Clerk outer clothing
+loadout-group-clerk-shoes = Clerk shoes
+
+loadout-group-prosecutor-jumpsuit = Prosecutor jumpsuit
+loadout-group-prosecutor-neck = Prosecutor neck
+
 # Wildcards
 loadout-group-prisoner-jumpsuit = Prisoner jumpsuit
 

diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,3 +1,6 @@
-id-card-access-level-orders = Orders
+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-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
@@ -24,7 +24,8 @@ job-name-centcomoff = CentCom Official
 job-name-reporter = Reporter
 job-name-musician = Musician
 job-name-librarian = Librarian
-job-name-lawyer = Lawyer
+# DeltaV - Changed Lawyer to Attorney
+# job-name-lawyer = Lawyer
 job-name-mime = Mime
 job-name-ce = Chief Engineer
 job-name-janitor = Janitor

diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -44,4 +44,7 @@
   - Musician # DeltaV - Add Musician access
   - Reporter # DeltaV - Add Reporter access
   - Zookeeper # DeltaV - Add Zookeeper access
+  - Justice # DeltaV - Add Justice dept access
+  - ChiefJustice # DeltaV - Add Chief Justice access
+  - Prosecutor # DeltaV - Add Prosecutor access
   - Corpsman # DeltaV - Add Corpsman access
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -185,30 +185,30 @@
         - id: ClothingBackpackDuffelSyndicate
           prob: 0.005
           orGroup: syndiemaintloot
-        #- id: CyberPen # DeltaV - Nuh uh
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: CigPackSyndicate
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
+        - id: CyberPen
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: CigPackSyndicate
+          prob: 0.005
+          orGroup: syndiemaintloot
         - id: ClothingBackpackDuffelSyndicatePyjamaBundle
           prob: 0.005
           orGroup: syndiemaintloot
-        #- id: ClothingBeltMilitaryWebbing
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: ClothingShoesBootsCombatFilled
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: ToolboxSyndicateFilled
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: BalloonSyn
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: WeaponSniperMosin
-        #  prob: 0.0010
-        #  orGroup: syndiemaintloot
+        - id: ClothingBeltMilitaryWebbing
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: ClothingShoesBootsCombatFilled
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: ToolboxSyndicateFilled
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: BalloonSyn
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: WeaponSniperMosin
+          prob: 0.0010
+          orGroup: syndiemaintloot
 
 - type: entity
   id: ClosetWallMaintenanceFilledRandom

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -16,6 +16,7 @@
     ClothingNeckLawyerbadge: 2
     BriefcaseBrown: 2
     LuxuryPen: 2
+    RubberStampLawyer: 3 # DeltaV - add lawyer stamp to lawdrobe
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
   contrabandInventory:
     ClothingOuterRobesJudge: 1

diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -0,0 +1,20 @@
+- type: accessLevel
+  id: ChiefJustice
+  name: id-card-access-level-cj
+
+- type: accessLevel
+  id: Justice
+  name: id-card-access-level-justice
+
+- type: accessLevel
+  id: Prosecutor
+  name: id-card-access-level-prosecutor
+
+- type: accessGroup
+  id: Justice
+  tags:
+  - Justice
+  - Prosecutor
+  - ChiefJustice
+  - Lawyer
+
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -47,3 +47,6 @@
     - Musician
     - Reporter
     - Zookeeper
+    - Justice
+    - Prosecutor
+
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
@@ -16,6 +16,17 @@
     whitelist:
       components:
       - EncryptionKey
+
+- type: entity
+  name: justice encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyJustice
+  description: A box of spare encryption keys.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyJustice
+        amount: 4
 
 - type: entity
   name: syndicate radio implanter box

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
@@ -73,3 +73,17 @@
         amount: 2
       - id: SalvagePDA
       - id: MailCarrierPDA
+        amount: 1
+
+- type: entity
+  name: justice PDA box
+  parent: BoxPDA
+  id: BoxPDAJustice
+  description: A box of spare PDA microcomputers for the justice department.
+  components:
+  - type: StorageFill
+    contents:
+      - id: LawyerPDA
+        amount: 2
+      - id: ProsecutorPDA
+      - id: ClerkPDA
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: LockerChiefJustice
+  id: LockerChiefJusticeFilled
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingHeadsetAltJustice
+    - id: ClothingNeckCloakCJ
+    - id: ClothingUniformJumpsuitChiefJusticeFormal
+    - id: ClothingUniformJumpsuitChiefJusticeWhite
+    - id: PaperStationWarrant
+      amount: 10
+    - id: BoxPDAJustice
+    - id: BoxEncryptionKeyJustice
+    - id: ChiefJusticeIDCard
+    - id: DoorRemoteJustice
+    - id: Gavel
+    - id: RubberStampChiefJustice
+    - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+      prob: 0.3
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: LockerClerk
+  id: LockerClerkFilled
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterClerkVest
+    - id: PaperStationWarrant
+      amount: 10
+    - id: BoxEncryptionKeyJustice
+    - id: ClerkIDCard
+    - id: RubberStampNotary
+
diff --git a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml
@@ -0,0 +1,5 @@
+- type: deviceFrequency
+  id: SurveillanceCameraJustice
+  name: device-frequency-prototype-name-surveillance-camera-justice
+  frequency: 1420
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -42,6 +42,45 @@
     sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetJustice
+  name: justice headset
+  description: This is used by the justice department.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetAltJustice
+  name: chief justice's headset
+  description: The headset used by the chief justice.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
+      - EncryptionKeyPrison
+      - EncryptionKeySecurity
+      - EncryptionKeyCommon
+      - EncryptionKeyCommand
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
+    state: icon_alt
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
 
 - type: entity
   parent: ClothingHeadset
@@ -75,3 +114,4 @@
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -192,3 +192,15 @@
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatCJToque
+  name: chief justice's toque
+  description: A standard-issue judicial hat. Wigs are old-fashioned anyway.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
@@ -31,3 +31,15 @@
     sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi 
   - type: Clothing
     sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi  
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakCJ
+  name: chief justice's cloak
+  description: A hefty cloak adorned with a modest insignia and grand fur trim.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi
+  - type: StealTarget
+    stealGroup: HeadCloak
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
@@ -0,0 +1,13 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckProsecutorbadge
+  name: prosecutor badge
+  description: A badge to show that the owner is a 'legitimate' prosecutor who passed the NT bar exam required to practice law.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
+  - type: TypingIndicatorClothing
+    proto: lawyer
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
@@ -126,3 +126,17 @@
     sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
   - type: TemperatureProtection
     coefficient: 0.1
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterChiefJustice
+  name: chief justice's robes
+  description: Heavy black robes with magenta and gold trim. It smells old.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		chat-radio-justice = Justice
		chat-radio-prison = Prison
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		department-Justice-description = Uphold justice on the station.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		stamp-component-stamped-name-notary = NOTARY
		stamp-component-stamped-name-chiefjustice = Chief Justice