Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Justice patch 06/09/2024 #1340

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ClothingUniformJumpsuitLawyerGood: 1
ClothingUniformJumpskirtLawyerGood: 1
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2
ClothingHeadsetJustice: 2 # DeltaV - Justice dept
ClothingNeckLawyerbadge: 2
BriefcaseBrown: 2
LuxuryPen: 2
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Access/justice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 change: 1 addition & 0 deletions Resources/Prototypes/DeltaV/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@
- Zookeeper
- Justice
- Prosecutor
- Clerk

Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
Expand All @@ -72,7 +71,6 @@
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- EncryptionKeyCommand
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,11 @@
components:
- type: AccessReader
access: [["Prosecutor"]]

- type: entity
parent: DoorElectronics
id: DoorElectronicsClerk
suffix: Clerk, Locked
components:
- type: AccessReader
access: [["Clerk"]]
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
stateDoorOpen: clerk_open
stateDoorClosed: clerk_door
- type: AccessReader
access: [["Justice"]]
access: [["Clerk"]]
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@

- type: loadoutGroup
id: ProsecutorNeck
name: loadout-group-prosecutor-jumpsuit
name: loadout-group-prosecutor-neck
minLimit: 0
loadouts:
- ProsecutorNeck
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
- ChiefJusticeOuterClothing
- CommonBackpack
- ChiefJusticeShoes
- Glasses
- Trinkets

- type: roleLoadout
Expand All @@ -44,6 +45,7 @@
- ClerkOuterClothing
- CommonBackpack
- ClerkShoes
- Glasses
- Trinkets

- type: roleLoadout
Expand All @@ -52,4 +54,5 @@
- ProsecutorJumpsuit
- ProsecutorNeck
- LawyerBackpack
- Glasses
- Trinkets
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
- Command
- ChiefJustice
- Justice
- Lawyer
- Prosecutor
- Clerk
- Security
- Maintenance
- External
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
canBeAntag: false
access:
- Justice
- Clerk
- Security
- Maintenance

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
id: JobIconProsecutor
icon:
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: Prosecutor #need prosecutor
state: Prosecutor
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/radio_channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: chat-radio-justice
keycode: "j"
frequency: 1420
color: "#701442"
color: "#c70667"

- type: radioChannel
id: Prison
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["Lawyer"]]
access: [["Justice"]]

- type: entity
parent: VendingMachine
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
# - Salvage
# - Security # NoooOoOo!! My HoPcurity!1
# - Brig
- Lawyer
# - Lawyer # Lawyer is now part of the justice dept
# - Cargo
# - Atmospherics
# - Medical
Expand Down
Loading