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

Adds the Justice Department #660

Merged
merged 132 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 85 commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
7137764
legal departmant
leonardo-dabepis Jan 5, 2024
e3b49ae
god i wish i knew what i was doing
leonardo-dabepis Jan 10, 2024
f1f0a8b
minor rsi fixes
leonardo-dabepis Jan 10, 2024
8205d40
i forgor the legal radio frequency
leonardo-dabepis Jan 12, 2024
c7940e7
Merge branch 'master' into legal-department
leonardo-dabepis Jan 12, 2024
c70a695
Minor fixes to radio, stamp, PDA, etc...
leonardo-dabepis Jan 23, 2024
0aca607
add department
leonardo-dabepis Feb 7, 2024
f5a279e
Merge remote-tracking branch 'origin/legal-department' into Legral
BurningRash Feb 28, 2024
b961de0
Edits from Velcroboy
BurningRash Feb 28, 2024
0c6038e
Merge remote-tracking branch 'upstream/master' into Legral
BurningRash Feb 28, 2024
8458d66
Add trial timer
leonardo-dabepis Mar 1, 2024
d95415f
add department signs
leonardo-dabepis Mar 4, 2024
8dcede2
Changes all references of legal -> justice and adds prosecutor access
BurningRash Mar 5, 2024
99c365e
Missed one
BurningRash Mar 5, 2024
5438a6f
Adjust lawyer
BurningRash Mar 5, 2024
4de5712
Merge remote-tracking branch 'upstream/master' into Legral
BurningRash Mar 5, 2024
9720f91
update lawyer icon
BurningRash Mar 5, 2024
b7df6f2
temp to fix
BurningRash Mar 5, 2024
9a1bf9e
revert to fix
BurningRash Mar 5, 2024
9627350
add airlock texture
leonardo-dabepis Mar 8, 2024
bd1a7ed
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
leonardo-dabepis Mar 8, 2024
920bf75
Merge remote-tracking branch 'upstream/master' into Legral
BurningRash Mar 8, 2024
9a49a7b
fix bureaucracy meta
BurningRash Mar 8, 2024
585a411
More meta fixes
BurningRash Mar 8, 2024
bf5cdd3
Connect airlocks to yaml
BurningRash Mar 8, 2024
6a371c9
Fixes, tweaks, and last reference of "legal" maybe
BurningRash Mar 8, 2024
fb8525c
Add justice to airlock groups
BurningRash Mar 9, 2024
52f5e75
add prosc. drip and fix prosecutor typos
leonardo-dabepis Mar 12, 2024
0059203
Changes prosecutor's supervisor to CJ
Timemaster99 Mar 13, 2024
962fc6b
Attorney <- Lawyer locale edit
Timemaster99 Mar 14, 2024
3e6a65f
Removed modified shoukou file
Timemaster99 Mar 14, 2024
371a897
Added antag objective and touched up yaml
Timemaster99 Mar 14, 2024
d8090b1
Attorney <- Lawyer, now including the PDA
Timemaster99 Mar 14, 2024
da6c192
Fixed typo in Clerk Vest ID
Timemaster99 Mar 14, 2024
702a789
Added Chief Justice locker, all of its contents, and a prosecutor PDA…
Timemaster99 Mar 14, 2024
9949bc2
lockers 2, electric boogaloo. Committing files I forgot to commit
Timemaster99 Mar 14, 2024
4f81ac1
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 Mar 14, 2024
b539e0f
Added CJ stamp and put it into CJ locker. Fixed notary stamp and put …
Timemaster99 Mar 14, 2024
d9fc30a
Attempt to resolve merge conflicts
Timemaster99 Mar 18, 2024
ea146c1
Merge master to resolve conflicts
Timemaster99 Mar 18, 2024
1187d55
Remove conflict markers
Timemaster99 Mar 18, 2024
b6c8c6f
Added stamp sprite, implemented CJ cloak
Timemaster99 Mar 18, 2024
8daf03d
Merge branch 'master' into legal-department
Timemaster99 Mar 19, 2024
c3274ab
Implemented Gavel Prototype and added to CJ locker
Timemaster99 Mar 20, 2024
3612b2f
Removed justice access from attorney as it will be used to secure Cle…
Timemaster99 Mar 20, 2024
df9c522
Added Clerk locker and placed Notary Stamp into it. Uncommented gavel…
Timemaster99 Mar 20, 2024
a9e7ccb
Added lawyer's stamp to lawdrobe
Timemaster99 Mar 20, 2024
f4aeb98
Added Prosecutor PDA, icon, and ID sprite
Timemaster99 Mar 20, 2024
b8c1f55
Merge branch 'master' into legal-department
Timemaster99 Mar 20, 2024
698cb10
Added gavel block and made gavel tap when clicking on it
Timemaster99 Mar 21, 2024
cac4e35
Add component, EmitSoundOnInteractUsing onto the gavel block
blueDev2 Mar 21, 2024
4025925
Added sprites for CJ and Clerk locker
Timemaster99 Mar 21, 2024
6dc5c62
Spell-checked and edited job descriptions slightly
Timemaster99 Mar 21, 2024
cf26379
Merge pull request #1 from blueDev2/legal-department-Gavelblock-Compo…
leonardo-dabepis Mar 24, 2024
ecb7c7a
Merge branch 'master' into legal-department
Timemaster99 Mar 26, 2024
cd08f48
Fixing missing type entity access.yml
Timemaster99 Mar 26, 2024
2d0df79
Adjusted rsi paths for gavel and gavel block to use forward slash
Timemaster99 Mar 27, 2024
79c6564
Fixed a variety of invalid rsi references, and door remote yaml issue
Timemaster99 Mar 27, 2024
ff23dcf
Added Lawyer access to Justice access group, fixed door_remote.yml ac…
Timemaster99 Mar 27, 2024
32e6213
Remove antagadvantage from chief justice
Timemaster99 Mar 27, 2024
700de49
Apply suggestions from code review
Timemaster99 Mar 27, 2024
a07f941
Hopefully remove shoukou.yml from the changed files
Timemaster99 Mar 27, 2024
d1a8709
Once again attempt to remove shoukou.yml from changed files
Timemaster99 Mar 27, 2024
b094bab
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 Mar 27, 2024
f1768ef
Attempt once more to remove shoukou.yml from changed files
Timemaster99 Mar 27, 2024
629b10a
Fixed justice pda box description
Timemaster99 Mar 27, 2024
bafe122
Please go home, shoukou. We don't want you here
Timemaster99 Mar 27, 2024
451fb72
Merge branch 'master' into legal-department
Timemaster99 Mar 27, 2024
4364576
Fixing prototype references pt1
Timemaster99 Mar 27, 2024
83037d8
Renamed headsets/legal.rsi to headsets/justice.rsi
Timemaster99 Mar 28, 2024
6eaaa2e
Added hyphen to chief justice localizations
Timemaster99 Mar 28, 2024
8e949d7
Ordered justice accesses alphabetically
Timemaster99 Mar 28, 2024
76a5eeb
Added prison key to justice headset
Timemaster99 Mar 28, 2024
fa8c79f
Various yaml fixes from review
Timemaster99 Mar 28, 2024
30bd9ad
Apply suggestions from code review
Timemaster99 Mar 28, 2024
f43f6bc
Localized changes to pdas and jobs
Timemaster99 Mar 28, 2024
6180e8a
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 Mar 28, 2024
370c210
Removed indents in locale
Timemaster99 Mar 28, 2024
85df660
Fixed reference to chief justice stamp
Timemaster99 Mar 28, 2024
d319156
Merge branch 'master' into legal-department
Timemaster99 Mar 28, 2024
4e7e0bd
Apply suggestions from code review
Timemaster99 Mar 28, 2024
250720a
Renamed Lawyer to Attorney in locale, added deltav marker
Timemaster99 Mar 29, 2024
09c1853
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 Mar 29, 2024
c35e9aa
Lawyer to Attorney, Warrant Document in Clerk and CJ locker
Timemaster99 Mar 29, 2024
45725e7
Apply suggestions from code review
Timemaster99 Mar 29, 2024
9b50f50
Replaced legal with justice in job-description.ftl
Timemaster99 Mar 29, 2024
01dde62
Moved job-name-lawyer to DeltaV locale
Timemaster99 Apr 2, 2024
ac36b2a
Remove added space in accesses.ftl
Timemaster99 Apr 2, 2024
acc150e
Removed unneeded deletion of unneeded spaces in headsets.yml
Timemaster99 Apr 2, 2024
8842f34
Changed Lawyer ID name to Attorney ID
Timemaster99 Apr 2, 2024
d21606b
Updated copyrights in all of the meta.json files affected
Timemaster99 Apr 3, 2024
1b1966a
Merge branch 'master' into legal-department
Timemaster99 Apr 3, 2024
2f1b1e7
Added formal and white variants of CJ jumpsuit to locker
Timemaster99 Apr 3, 2024
d57101c
Merge branch 'master' into legal-department
Timemaster99 Apr 3, 2024
d4db0e5
Merge branch 'master' into legal-department
Timemaster99 Apr 6, 2024
5d621a6
Updated to use upstream's EmitSoundOnInteractUsing
Timemaster99 Apr 9, 2024
f453d4e
Removing old component stuff
Timemaster99 Apr 9, 2024
b5b370f
Merge branch 'master' into legal-department
Timemaster99 Apr 9, 2024
f7302be
Gave Prosecutor Filled Lawyer Backpack
Timemaster99 Apr 9, 2024
80c4bcb
Deleted old component
Timemaster99 Apr 9, 2024
1e09479
Merge branch 'master' into legal-department
Timemaster99 Apr 10, 2024
df3f159
Merge branch 'master' into legal-department
Timemaster99 Apr 11, 2024
7ac1951
Merge branch 'master' into legal-department
Timemaster99 Apr 17, 2024
6a4abf7
Merge branch 'master' into legal-department
Timemaster99 Apr 24, 2024
1ef0f92
Merge branch 'master' into legal-department
A-z-z-y May 6, 2024
909ca3c
Merge branch 'master' into legal-department
Timemaster99 May 6, 2024
88477ba
Merge branch 'master' into legal-department
Timemaster99 May 25, 2024
7546e16
Removed old comments
Timemaster99 May 25, 2024
f0b33f3
Updated doors to electronics system, fixed courier spawner that I bot…
Timemaster99 May 25, 2024
8105f39
Fixed door_access indentation
Timemaster99 May 25, 2024
01037e5
Merge branch 'master' into legal-department
Timemaster99 May 25, 2024
0934d73
Adding a little bit of loadouts
Timemaster99 May 29, 2024
d223e53
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 May 29, 2024
f36c722
Merge branch 'master' into legal-department
Timemaster99 May 29, 2024
5ad3c56
Add loadouts for justice
Timemaster99 May 29, 2024
e491c22
Removed accessreader from windoors
Timemaster99 May 29, 2024
e9496ff
Added job spawner icons
Timemaster99 May 29, 2024
13be855
Fixed spawner sprite layering
Timemaster99 May 29, 2024
563956d
Merge branch 'master' into legal-department
Timemaster99 May 29, 2024
503e4a8
Added missing parent in ID cards
Timemaster99 May 29, 2024
10ba7ee
Merge branch 'legal-department' of https://github.com/leonardo-dabepi…
Timemaster99 May 29, 2024
3eef06e
Merge branch 'master' into legal-department
Timemaster99 May 31, 2024
2233102
Merge branch 'master' into legal-department
Timemaster99 Jun 1, 2024
6a31d03
Removed redundant laceup shoes loadout
Timemaster99 Jun 1, 2024
feb2b7a
Merge branch 'master' into legal-department
Timemaster99 Jun 2, 2024
9baf515
Merge branch 'master' into legal-department
Timemaster99 Jun 4, 2024
e2a5a41
Added lawyer windoor, fixed spawner names, fixed locker names
Timemaster99 Jun 5, 2024
df1b464
Merge branch 'master' into legal-department
Timemaster99 Jun 5, 2024
375098d
Added station beacons
Timemaster99 Jun 5, 2024
fba6933
Softened justice dept palette
Timemaster99 Jun 6, 2024
5913cc8
Added justice key to telecomms
Timemaster99 Jun 7, 2024
b54a39a
Added deltaV comments to telecomms
Timemaster99 Jun 7, 2024
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
@@ -0,0 +1,14 @@
using Content.Shared.Sound.Components;

namespace Content.Server.Sound.Components
{
/// <summary>
/// Whenever this item is used upon by a specific entity prototype in the hand of a user, play a sound
/// </summary>
[RegisterComponent]
public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent
{
[DataField("UsedItemID")]
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
public string UsedItemID = "";
}
}
10 changes: 10 additions & 0 deletions Content.Server/Sound/EmitSoundSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Content.Shared.UserInterface;
using Content.Shared.Sound;
using Robust.Shared.Random;
using Content.Shared.Interaction;

namespace Content.Server.Sound;

Expand Down Expand Up @@ -40,6 +41,7 @@ public override void Initialize()

SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
SubscribeLocalEvent<EmitSoundOnUIOpenComponent, AfterActivatableUIOpenEvent>(HandleEmitSoundOnUIOpen);
SubscribeLocalEvent<EmitSoundOnInteractUsingComponent, InteractUsingEvent>(HandleEmitSoundOnInteractUsing);
}

private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args)
Expand All @@ -52,4 +54,12 @@ private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent
TryEmitSound(uid, component, args.User, false);
args.Handled = true;
}
private void HandleEmitSoundOnInteractUsing(EntityUid uid, EmitSoundOnInteractUsingComponent component, InteractUsingEvent args)
{
var curUsedItemID = Prototype(args.Used)?.ID;
if (component.UsedItemID == curUsedItemID)
{
TryEmitSound(uid, component, args.User, false);
}
}
}
3 changes: 3 additions & 0 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> 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]
Expand Down
Binary file added Resources/Audio/DeltaV/Items/gavel.ogg
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/devices/device-network.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/headset/headset-component.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
chat-radio-justice = Justice
chat-radio-prison = Prison
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/department-desc.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
department-Justice-description = Uphold justice on the station.
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
department-Epistemics = Epistemics
department-Logistics = Logistics
department-Justice = Justice
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1 +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 legal department, act as a judge, and ensure everyone recieves fair and just treatment.
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
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.
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
job-name-medical-borg = Medical Cyborg
job-name-chief-justice = Chief Justice
job-name-clerk = Clerk
job-name-prosecutor = Prosecutor
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
job-supervisors-cj = the chief justice
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/misc/pda.ftl
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/paper/stamp-component.ftl
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
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
id-card-access-level-orders = Orders
id-card-access-level-orders = Orders
id-card-access-level-mantis = Psionic Mantis
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
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
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
# DeltaV - Renamed Lawyer to Attorney
job-name-lawyer = Attorney
job-name-mime = Mime
job-name-ce = Chief Engineer
job-name-janitor = Janitor
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
ClothingNeckLawyerbadge: 2
ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
LuxuryPen: 2
RubberStampLawyer: 3 # DeltaV - add lawyer stamp to lawdrobe
contrabandInventory:
ClothingOuterRobesJudge: 1
ClothingHeadHatPwig: 1
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Access/justice.yml
Original file line number Diff line number Diff line change
@@ -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:
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
- Justice
- Prosecutor
- ChiefJustice
- Lawyer
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,6 @@
- Musician
- Reporter
- Zookeeper
- Justice
- Prosecutor
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@
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
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,17 @@
amount: 1
- 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
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
contents:
- id: LawyerPDA
amount: 2
- id: ProsecutorPDA
- id: ClerkPDA
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: entity
parent: LockerChiefJustice
id: LockerChiefJusticeFilled
name: chief justice's locker
Colin-Tel marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: StorageFill
contents:
- id: ClothingHeadsetAltJustice
- id: ClothingNeckCloakCJ
- id: PaperStationWarrant
amount: 10
- id: BoxPDAJustice
- id: BoxEncryptionKeyJustice
- id: ChiefJusticeIDCard
- id: DoorRemoteJustice
- id: Gavel
- id: RubberStampChiefJustice
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: LockerClerk
id: LockerClerkFilled
name: clerk's locker
Colin-Tel marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: StorageFill
contents:
- id: ClothingOuterClerkVest
- id: PaperStationWarrant
amount: 10
- id: BoxEncryptionKeyJustice
- id: ClerkIDCard
- id: RubberStampNotary
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: deviceFrequency
id: SurveillanceCameraJustice
name: device-frequency-prototype-name-surveillance-camera-justice
frequency: 1420
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
sprite: DeltaV/Clothing/Ears/Headsets/service.rsi
- type: Clothing
sprite: DeltaV/Clothing/Ears/Headsets/service.rsi

IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: ClothingHeadsetAltSyndicate
id: ClothingHeadsetAltSyndicateListening
Expand All @@ -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:
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
- 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
Expand Down Expand Up @@ -75,3 +114,4 @@
sprite: Clothing/Ears/Headsets/security.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/security.rsi

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
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
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
IamVelcroboy marked this conversation as resolved.
Show resolved Hide resolved
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
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,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
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@
Heat: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9

- type: entity
parent: ClothingOuterBase
id: ClothingOuterClerkVest
name: clerk's vest
description: a silken magenta vest with a pocket to put your notary stamp.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
Timemaster99 marked this conversation as resolved.
Show resolved Hide resolved

Loading
Loading