diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 07c158021e..a34709807b 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -87,6 +87,9 @@ public sealed partial class IdCardConsoleComponent : Component "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 new file mode 100644 index 0000000000..c6061cbb3d Binary files /dev/null and b/Resources/Audio/DeltaV/Items/gavel.ogg differ diff --git a/Resources/Locale/en-US/deltav/devices/device-network.ftl b/Resources/Locale/en-US/deltav/devices/device-network.ftl new file mode 100644 index 0000000000..644d2e240a --- /dev/null +++ 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 index d3c3f2e735..9801bce3ab 100644 --- 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 new file mode 100644 index 0000000000..530a1b0a5a --- /dev/null +++ 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 index fc6d81e938..2653e8f46c 100644 --- 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 index e04acbefec..1ddd5f7529 100644 --- 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 index 0b707a82fa..175da8ba69 100644 --- 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 new file mode 100644 index 0000000000..f1c0ade32a --- /dev/null +++ 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 new file mode 100644 index 0000000000..a64a4e3423 --- /dev/null +++ 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 index 7b2d06a04e..8d2571920f 100644 --- 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 new file mode 100644 index 0000000000..efb392c4bf --- /dev/null +++ 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 index edad6d7555..f80fe66a7c 100644 --- 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 index 84245872f5..2c5a3c871c 100644 --- 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 index 58c653db3e..4b7b5ccc42 100644 --- 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 index 99ad59700e..f717c57a00 100644 --- 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/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 33aa5d3895..e46ae3e668 100644 --- 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 new file mode 100644 index 0000000000..33a2844ed2 --- /dev/null +++ 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 index df3f60a4f8..ad42935662 100644 --- 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 index 8e55746f61..aaab0d1193 100644 --- 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 index 54e138d053..62d771077e 100644 --- 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 new file mode 100644 index 0000000000..0f7eb99d45 --- /dev/null +++ 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 new file mode 100644 index 0000000000..9e48c28c70 --- /dev/null +++ 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 new file mode 100644 index 0000000000..34f213077c --- /dev/null +++ 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 index c65dd62312..b32cab7b21 100644 --- 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 index 1c5cef39af..bdb5ad85d9 100644 --- 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 index 5ff195cfda..a5a9200b56 100644 --- 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 new file mode 100644 index 0000000000..7ec38bb144 --- /dev/null +++ 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 index 7d344926bd..954255a3dc 100644 --- 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 + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml index cdc7958407..445158f89b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml @@ -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 + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4c02763764..9e80bc4ff2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -93,3 +93,37 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtChiefJustice + name: chief justice's jumpskirt + description: A fancy black jumpskirt with a lace cravat to make it even more fancy. Proper judicial attire. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniform/Jumpskirt/cj.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtClerk + name: clerk's dress skirt + description: A modest dress skirt for the person with the power to notarize anything. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtProsecutor + name: prosecutor's dress skirt + description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index f3fdeabd10..b831c37947 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -244,6 +244,50 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJustice + name: chief justice's jumpsuit + description: A fancy black jumpsuit with a lace cravat to make it even more fancy. Proper judicial attire. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJusticeFormal + name: chief justice's formal jumpsuit + description: A fancy double-breasted suit with golden accoutrements. Sharp and authoritative. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJusticeWhite + name: chief justice's white jumpsuit + description: A modest, white office shirt with hard-earned rank epaulets. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitClerk + name: clerk's suit + description: A modest suit for the person with the power to notarize anything. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitChemShirt @@ -253,4 +297,16 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi \ No newline at end of file + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitProsecutor + name: prosecutor's suit + description: A red suit with a fancy cravat. Perfect for a prosecutor. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index a25bae98b1..512be9814a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -13,6 +13,45 @@ - sprite: Mobs/Silicon/chassis.rsi state: medical_e +- type: entity + id: SpawnPointChiefJustice + parent: SpawnPointJobBase + name: chiefjustice + components: + - type: SpawnPoint + job_id: ChiefJustice + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: chiefjustice + +- type: entity + id: SpawnPointClerk + parent: SpawnPointJobBase + name: clerk + components: + - type: SpawnPoint + job_id: Clerk + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: clerk + +- type: entity + id: SpawnPointProsecutor + parent: SpawnPointJobBase + name: prosecutor + components: + - type: SpawnPoint + job_id: Prosecutor + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: prosecutor + - type: entity id: SpawnPointCourier parent: SpawnPointJobBase 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 1fea754ce6..46edc0a20f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -93,3 +93,27 @@ components: - type: AccessReader access: [["Mail"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsChiefJustice + suffix: ChiefJustice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsJustice + suffix: Justice, Locked + components: + - type: AccessReader + access: [["Justice"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsProsecutor + suffix: Prosecutor, Locked + components: + - type: AccessReader + access: [["Prosecutor"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml new file mode 100644 index 0000000000..27fa0a3653 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml @@ -0,0 +1,15 @@ +- type: entity + parent: DoorRemoteDefault + id: DoorRemoteJustice + name: justice door remote + components: + - type: Sprite + layers: + - state: door_remotebase + - state: door_remotelightscolour + color: "#6b2833" + - state: door_remotescreencolour + color: "#6b2833" + - type: Access + groups: + - Justice diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml index c41c235c13..67b723e431 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml @@ -1,3 +1,19 @@ +- type: entity + parent: EncryptionKey + id: EncryptionKeyJustice + name: justice encryption key + description: An encryption key used by the justice department. + components: + - type: EncryptionKey + channels: + - Justice + defaultChannel: Justice + - type: Sprite + layers: + - state: crypt_gray + - sprite: DeltaV/Objects/Devices/encryption_keys.rsi + state: justice_label + - type: entity parent: EncryptionKey id: EncryptionKeyPrison diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 18ddf5e05f..04e82ef7e6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -42,6 +42,123 @@ scanningEndSound: path: "/Audio/Items/Medical/healthscanner.ogg" +- type: entity + parent: BasePDA + id: ChiefJusticePDA + name: chief justice PDA + description: Whosoever bears this PDA is the law. + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: Pda + id: ChiefJusticeIDCard + state: pda-chiefjustice + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#470823" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-chiefjustice + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + +- type: entity + parent: BasePDA + id: ClerkPDA + name: clerk PDA + description: It has the stamp to prove it's been officially notarized! + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: Pda + id: ClerkIDCard + state: pda-clerk + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#611528" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-clerk + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + +- type: entity + parent: BasePDA + id: ProsecutorPDA + name: prosecutor PDA + description: Sharp. Looks like it could prosecute you all on its own. + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: Pda + id: ProsecutorIDCard + state: pda-prosecutor + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#6f6192" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-prosecutor + - type: CartridgeLoader # DeltaV - Crime Assist + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - type: entity parent: SyndiPDA id: SyndiListeningPostPDA diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index 2e38df5a82..fc44704d57 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -134,3 +134,29 @@ components: - type: NavMapBeacon defaultText: station-beacon-corpsman + +#Justice +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconJustice + suffix: Justice + components: + - type: NavMapBeacon + defaultText: station-beacon-justice + color: "#6b2833" + +- type: entity + parent: DefaultStationBeaconJustice + id: DefaultStationBeaconChiefJustice + suffix: Chief Justice + components: + - type: NavMapBeacon + defaultText: station-beacon-chiefjustice + +- type: entity + parent: DefaultStationBeaconJustice + id: DefaultStationBeaconProsecutor + suffix: Prosecutor + components: + - type: NavMapBeacon + defaultText: station-beacon-prosecutor diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 33c6f52983..1d1f1bad17 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,42 @@ +- type: entity + parent: IDCardStandard + id: ChiefJusticeIDCard + name: chief justice ID card + components: + - type: PresetIdCard + job: ChiefJustice + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idchiefjustice + +- type: entity + parent: IDCardStandard + id: ClerkIDCard + name: clerk ID card + components: + - type: PresetIdCard + job: Clerk + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idclerk + +- type: entity + parent: IDCardStandard + id: ProsecutorIDCard + name: presecutor ID card + components: + - type: PresetIdCard + job: Prosecutor + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idprosecutor + - type: entity parent: IDCardStandard id: CourierIDCard diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml new file mode 100644 index 0000000000..53f4d188d4 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -0,0 +1,25 @@ +- type: entity + name: station warrant + parent: Paper + id: PaperStationWarrant + description: 'A paper warrant issued by the justice department.' + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#e0bc99" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#e0bc99" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png" + headerMargin: 0.0, 0.0, 10.0, 16.0 + backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" + backgroundModulate: "#e0bc99" + backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 + contentMargin: 32.0, 16.0, 32.0, 0.0 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 6c03128209..4719f8a597 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -11,3 +11,33 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-psychologist + +- type: entity + name: notary stamp + parent: RubberStampBase + id: RubberStampNotary + description: An old-fashioned seal for marking important documents, made of polished bronze. + components: + - type: Stamp + stampedName: stamp-component-stamped-name-notary + stampedColor: "#a81f3d" + stampState: "paper_stamp-notary" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-notary + - type: StealTarget + stealGroup: RubberStampNotary + +- type: entity + name: chief justice stamp + parent: RubberStampBase + id: RubberStampChiefJustice + components: + - type: Stamp + stampedName: stamp-component-stamped-name-chiefjustice + stampedColor: "#6b2833" + stampState: "paper_stamp-notary" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-cj + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml new file mode 100644 index 0000000000..52f5286e34 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -0,0 +1,21 @@ +- type: entity + parent: BaseItem + id: Gavel + name: gavel + description: A hardwood mallet made to keep order in the court. + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi + layers: + - state: icon + - type: MeleeWeapon + wideAnimationRotation: -90 + damage: + types: + Blunt: 2 + - type: Item + size: Small + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi + - type: Tag + tags: + - Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml new file mode 100644 index 0000000000..a74ae7a9ff --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseItem + id: GavelBlock + name: gavel block + description: A hardwood block that, when hit with a gavel, emits an aura of authority. + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi + layers: + - state: icon + - type: Item + size: Small + - type: Clickable + - type: EmitSoundOnInteractUsing + sound: + path: /Audio/DeltaV/Items/gavel.ogg + whitelist: + tags: + - Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml new file mode 100644 index 0000000000..3e847b3a84 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -0,0 +1,24 @@ +- type: entity + id: TrialTimer + parent: SignalTimer + name: trial timer + description: A fancy timer with a screen, designed to keep trials within their time limit. + components: + - type: SignalTimer + canEditLabel: true + - type: TextScreenVisuals + color: "#b03060" + textOffset: 1,8 + timerOffset: 1,8 + textLength: 5 + rows: 1 + - type: Sprite + drawdepth: SmallObjects + sprite: DeltaV/Objects/Specific/Justice/trialtimer.rsi + state: trialtimer + noRot: true + - type: Construction + graph: Timer + node: screen + + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index e709d989c9..241b6db6fe 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -17,6 +17,88 @@ containers: board: [ DoorElectronicsMantis ] +- type: entity + parent: AirlockCommand + id: AirlockChiefJusticeLocked + suffix: Chief Justice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] + +- type: entity + parent: AirlockCommandGlass + id: AirlockChiefJusticeGlassLocked + suffix: ChiefJustice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] + +- type: entity + parent: AirlockJustice + id: AirlockJusticeLocked + suffix: Justice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] + +- type: entity + parent: AirlockJusticeGlass + id: AirlockJusticeGlassLocked + suffix: Justice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] + +- type: entity + parent: AirlockJustice + id: AirlockProsecutorLocked + suffix: Prosecutor, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] + +- type: entity + parent: AirlockJusticeGlass + id: AirlockProsecutorGlassLocked + suffix: Prosecutor, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] + +# Maintenance +- type: entity + parent: AirlockMaint + id: AirlockMaintChiefJusticeLocked + suffix: ChiefJustice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] + +- type: entity + parent: AirlockMaint + id: AirlockMaintJusticeLocked + suffix: Justice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] + +- type: entity + parent: AirlockMaint + id: AirlockMaintProsecutorLocked + suffix: Prosecutor, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] + - type: entity parent: AirlockSecurity id: AirlockCorpsmanLocked diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml new file mode 100644 index 0000000000..93a8cec851 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -0,0 +1,22 @@ +- type: entity + parent: Airlock + id: AirlockJustice + suffix: Justice + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi + - type: PaintableAirlock + department: Justice + +# Glass + +- type: entity + parent: AirlockGlass + id: AirlockJusticeGlass + suffix: Justice + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi + - type: PaintableAirlock + department: Justice + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 759f97a80b..52d3b40192 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -24,3 +24,39 @@ - type: ContainerFill containers: board: [ DoorElectronicsParamedic ] + +- type: entity + parent: WindoorSecure + id: WindoorSecureChiefJusticeLocked + suffix: ChiefJustice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] + +- type: entity + parent: WindoorSecure + id: WindoorSecureJusticeLocked + suffix: Justice, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] + +- type: entity + parent: WindoorSecure + id: WindoorSecureProsecutorLocked + suffix: Prosecutor, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] + +- type: entity + parent: WindoorSecure + id: WindoorSecureLawyerLocked + suffix: Lawyer, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsLawyer ] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 0000000000..b49002ab22 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,25 @@ +- type: entity + id: LockerChiefJustice + parent: LockerBaseSecure + name: chief justice's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: cj + stateDoorOpen: cj_open + stateDoorClosed: cj_door + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + id: LockerClerk + parent: LockerBaseSecure + name: clerk's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: clerk + stateDoorOpen: clerk_open + stateDoorClosed: clerk_door + - type: AccessReader + access: [["Justice"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 6129ff6c41..3b5329e230 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -17,3 +17,25 @@ - type: Sprite sprite: DeltaV/Structures/Wallmounts/signs.rsi state: direction_mail + +- type: entity + parent: BaseSignDirectional + id: SignDirectionalJustice + name: justice department sign + description: A direction sign, pointing out which way the Justice department is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_justice + +- type: entity + parent: BaseSignDirectional + id: SignDirectionaCourt + name: court room sign + description: A direction sign, pointing out which way the court room is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_court + + diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml new file mode 100644 index 0000000000..db7c2e6ddb --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml @@ -0,0 +1,76 @@ +# Head +- type: loadout + id: CJToque + equipment: CJToque + +- type: startingGear + id: CJToque + equipment: + head: ClothingHeadHatCJToque + +# Jumpsuit +- type: loadout + id: ChiefJusticeJumpsuit + equipment: ChiefJusticeJumpsuit + +- type: startingGear + id: ChiefJusticeJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJustice + +- type: loadout + id: ChiefJusticeJumpskirt + equipment: ChiefJusticeJumpskirt + +- type: startingGear + id: ChiefJusticeJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtChiefJustice + +- type: loadout + id: ChiefJusticeFormalJumpsuit + equipment: ChiefJusticeFormalJumpsuit + +- type: startingGear + id: ChiefJusticeFormalJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJusticeFormal + +- type: loadout + id: ChiefJusticeWhiteJumpsuit + equipment: ChiefJusticeWhiteJumpsuit + +- type: startingGear + id: ChiefJusticeWhiteJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJusticeWhite + +# Neck +- type: loadout + id: ChiefJusticeCloak + equipment: ChiefJusticeCloak + +- type: startingGear + id: ChiefJusticeCloak + equipment: + neck: ClothingNeckCloakCJ + +# Outer Clothing +- type: loadout + id: ChiefJusticeRobe + equipment: ChiefJusticeRobe + +- type: startingGear + id: ChiefJusticeRobe + equipment: + outerClothing: ClothingOuterChiefJustice + +# Shoes +- type: loadout + id: LeatherShoes + equipment: LeatherShoes + +- type: startingGear + id: LeatherShoes + equipment: + shoes: ClothingShoesLeather diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml new file mode 100644 index 0000000000..0d4bc067a8 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml @@ -0,0 +1,83 @@ +# Jumpsuit +- type: loadout + id: ClerkJumpsuit + equipment: ClerkJumpsuit + +- type: startingGear + id: ClerkJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitClerk + +- type: loadout + id: ClerkJumpskirt + equipment: ClerkJumpskirt + +- type: startingGear + id: ClerkJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtClerk + +# Neck +- type: loadout + id: BlackTie + equipment: BlackTie + +- type: startingGear + id: BlackTie + equipment: + neck: ClothingNeckTieBlack + +- type: loadout + id: BlueTie + equipment: BlueTie + +- type: startingGear + id: BlueTie + equipment: + neck: ClothingNeckTieBlue + +- type: loadout + id: BrownTie + equipment: BrownTie + +- type: startingGear + id: BrownTie + equipment: + neck: ClothingNeckTieBrown + +- type: loadout + id: GreenTie + equipment: GreenTie + +- type: startingGear + id: GreenTie + equipment: + neck: ClothingNeckTieGreen + +- type: loadout + id: RedTie + equipment: RedTie + +- type: startingGear + id: RedTie + equipment: + neck: ClothingNeckTieRed + +- type: loadout + id: WhiteTie + equipment: WhiteTie + +- type: startingGear + id: WhiteTie + equipment: + neck: ClothingNeckTieWhite + +# Outer Clothing +- type: loadout + id: ClerkVest + equipment: ClerkVest + +- type: startingGear + id: ClerkVest + equipment: + outerClothing: ClothingOuterClerkVest diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml new file mode 100644 index 0000000000..ab50699667 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml @@ -0,0 +1,28 @@ +# Jumpsuit +- type: loadout + id: ProsecutorJumpsuit + equipment: ProsecutorJumpsuit + +- type: startingGear + id: ProsecutorJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitProsecutor + +- type: loadout + id: ProsecutorJumpskirt + equipment: ProsecutorJumpskirt + +- type: startingGear + id: ProsecutorJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtProsecutor + +# Neck +- type: loadout + id: ProsecutorNeck + equipment: ProsecutorNeck + +- type: startingGear + id: ProsecutorNeck + equipment: + neck: ClothingNeckProsecutorbadge diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 10ba7d8e0b..731d7607c1 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -79,6 +79,104 @@ - BrigMedicBackpack - BrigMedicSatchel - BrigMedicDuffel + +# Justice +## Chief Justice +- type: loadoutGroup + id: ChiefJusticeHead + name: loadout-group-chiefjustice-head + minLimit: 0 + loadouts: + - CJToque + +- type: loadoutGroup + id: ChiefJusticeJumpsuit + name: loadout-group-chiefjustice-jumpsuit + loadouts: + - ChiefJusticeJumpsuit + - ChiefJusticeJumpskirt + - ChiefJusticeFormalJumpsuit + - ChiefJusticeWhiteJumpsuit + +- type: loadoutGroup + id: ChiefJusticeNeck + name: loadout-group-chiefjustice-neck + minLimit: 0 + loadouts: + - ChiefJusticeCloak + +- type: loadoutGroup + id: ChiefJusticeOuterClothing + name: loadout-group-chiefjustice-outerclothing + minLimit: 0 + loadouts: + - ChiefJusticeRobe + +- type: loadoutGroup + id: ChiefJusticeShoes + name: loadout-group-chiefjustice-shoes + loadouts: + - LeatherShoes + - LaceupShoes + +## Clerk +- type: loadoutGroup + id: ClerkJumpsuit + name: loadout-group-clerk-jumpsuit + loadouts: + - ClerkJumpsuit + - ClerkJumpskirt + +- type: loadoutGroup + id: ClerkNeck + name: loadout-group-clerk-neck + minLimit: 0 + loadouts: + - BlackTie + - BlueTie + - BrownTie + - GreenTie + - RedTie + - WhiteTie + +- type: loadoutGroup + id: ClerkOuterClothing + name: loadout-group-clerk-outerclothing + minLimit: 0 + loadouts: + - ClerkVest + +- type: loadoutGroup + id: ClerkShoes + name: loadout-group-clerk-shoes + loadouts: + - LaceupShoes + - LeatherShoes + +## Prosecutor +- type: loadoutGroup + id: ProsecutorJumpsuit + name: loadout-group-prosecutor-jumpsuit + loadouts: + - ProsecutorJumpsuit + - ProsecutorJumpskirt + - LawyerJumpsuit + - LawyerJumpskirt + - LawyerJumpsuitBlue + - LawyerJumpskirtBlue + - LawyerJumpsuitPurple + - LawyerJumpskirtPurple + - LawyerJumpsuitRed + - LawyerJumpskirtRed + - LawyerJumpsuitGood + - LawyerJumpskirtGood + +- type: loadoutGroup + id: ProsecutorNeck + name: loadout-group-prosecutor-jumpsuit + minLimit: 0 + loadouts: + - ProsecutorNeck - type: loadoutGroup id: Scarfs diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 4f332464ba..5c6b744d7f 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -23,3 +23,33 @@ - SecurityOuterClothing - MedicalGloves - Trinkets + +# Justice +- type: roleLoadout + id: JobChiefJustice + groups: + - ChiefJusticeHead + - ChiefJusticeJumpsuit + - ChiefJusticeNeck + - ChiefJusticeOuterClothing + - CommonBackpack + - ChiefJusticeShoes + - Trinkets + +- type: roleLoadout + id: JobClerk + groups: + - ClerkJumpsuit + - ClerkNeck + - ClerkOuterClothing + - CommonBackpack + - ClerkShoes + - Trinkets + +- type: roleLoadout + id: JobProsecutor + groups: + - ProsecutorJumpsuit + - ProsecutorNeck + - LawyerBackpack + - Trinkets diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index cf7d4f90d6..b311330873 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -18,3 +18,12 @@ sprite: sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi state: base + +- type: stealTargetGroup + id: RubberStampNotary + name: notary stamp + sprite: + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-notary + + diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index 4fa25f2698..d27ec220fa 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -32,3 +32,16 @@ - type: StealCondition stealGroup: WeaponEnergyGunMultiphase owner: job-name-hos + +- type: entity # Clerk steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: ClerkNotaryStealObjective + components: + - type: NotJobRequirement + job: Clerk + - type: StealCondition + stealGroup: RubberStampNotary + owner: job-name-clerk + + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml new file mode 100644 index 0000000000..2715e63e39 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -0,0 +1,59 @@ +- type: job + id: ChiefJustice + name: job-name-chief-justice + description: job-description-chief-justice + playTimeTracker: JobChiefJustice + requirements: + - !type:RoleTimeRequirement + role: JobClerk + time: 36000 # DeltaV - 10 hours + - !type:RoleTimeRequirement + role: JobLawyer + time: 36000 # 10 hours + - !type:RoleTimeRequirement + role: JobProsecutor + time: 36000 # 10 hours + - !type:OverallPlaytimeRequirement + time: 90000 # 25 hours + - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges + weight: 20 + startingGear: CJGear + icon: "JobIconChiefJustice" + requireAdminNotify: true + supervisors: job-supervisors-captain + canBeAntag: false + access: + - Command + - ChiefJustice + - Justice + - Security + - Maintenance + - External + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + - !type:AddComponentSpecial + components: + - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + flatBonus: 0.025 + +- type: startingGear + id: CJGear + equipment: + #jumpsuit: ClothingUniformJumpsuitChiefJustice + #back: ClothingBackpackFilled # TODO- make Justice department bags + #shoes: ClothingShoesLeather + #head: ClothingHeadHatCJToque + #outerClothing: ClothingOuterChiefJustice + id: ChiefJusticePDA + ears: ClothingHeadsetAltJustice + #gloves: ClothingHandsGlovesColorWhite + # Todo - pocket1: Gavel + #innerClothingSkirt: ClothingUniformJumpskirtChiefJustice + #satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags + #duffelbag: ClothingBackpackDuffelFilled + + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml new file mode 100644 index 0000000000..9374b5868e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -0,0 +1,38 @@ +- type: job + id: Clerk + name: job-name-clerk + description: job-description-clerk + playTimeTracker: JobClerk + antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10 hrs + - !type:RoleTimeRequirement + role: JobLawyer + time: 36000 # 10 hours + - !type:RoleTimeRequirement + role: JobProsecutor + time: 36000 # 10 hours + startingGear: ClerkGear + icon: "JobIconClerk" + requireAdminNotify: true + supervisors: job-supervisors-cj + canBeAntag: false + access: + - Justice + - Security + - Maintenance + +- type: startingGear + id: ClerkGear + equipment: + #jumpsuit: ClothingUniformJumpsuitClerk + #back: ClothingBackpackFilled + #shoes: ClothingShoesBootsLaceup + id: ClerkPDA + ears: ClothingHeadsetJustice + #innerClothingSkirt: ClothingUniformJumpskirtClerk + #satchel: ClothingBackpackSatchelFilled + #duffelbag: ClothingBackpackDuffelFilled + + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml new file mode 100644 index 0000000000..1051e34921 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -0,0 +1,34 @@ +- type: job + id: Prosecutor + name: job-name-prosecutor + description: job-description-prosecutor + playTimeTracker: JobProsecutor + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10 hrs + startingGear: ProsecutorGear + icon: "JobIconProsecutor" + supervisors: job-supervisors-cj + access: + - Prosecutor + - Justice + - Security + - Maintenance + +- type: startingGear + id: ProsecutorGear + equipment: + #jumpsuit: ClothingUniformJumpsuitProsecutor + #neck: ClothingNeckProsecutorbadge + #back: ClothingBackpackLawyerFilled + shoes: ClothingShoesBootsLaceup + id: ProsecutorPDA + ears: ClothingHeadsetSecurity + # TODO add copy of space law + inhand: + - BriefcaseBrownFilled + #innerClothingSkirt: ClothingUniformJumpskirtProsecutor + #satchel: ClothingBackpackSatchelFilled + #duffelbag: ClothingBackpackDuffelFilled + + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml new file mode 100644 index 0000000000..c4d5fbfe20 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -0,0 +1,11 @@ +- type: department + id: Justice + description: department-justice-description + color: "#701442" + roles: + - ChiefJustice + - Clerk + - Prosecutor + - Lawyer + + diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 4ab6f3eed4..0909c6c410 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -4,5 +4,14 @@ - type: playTimeTracker id: JobMedicalBorg +- type: playTimeTracker + id: JobChiefJustice + +- type: playTimeTracker + id: JobClerk + +- type: playTimeTracker + id: JobProsecutor + - type: playTimeTracker id: JobCourier diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 949ac6a99e..894e1586b4 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -4,3 +4,24 @@ icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: MedicalBorg + +- type: statusIcon + parent: JobIcon + id: JobIconChiefJustice + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: ChiefJustice + +- type: statusIcon + parent: JobIcon + id: JobIconClerk + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: Clerk + +- type: statusIcon + parent: JobIcon + id: JobIconProsecutor + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: Prosecutor #need prosecutor diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml index 639eea09b3..53490d90fa 100644 --- a/Resources/Prototypes/DeltaV/radio_channels.yml +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -1,6 +1,15 @@ +- type: radioChannel + id: Justice + name: chat-radio-justice + keycode: "j" + frequency: 1420 + color: "#701442" + - type: radioChannel id: Prison name: chat-radio-prison keycode: 'p' frequency: 1601 - color: "#FFA500" \ No newline at end of file + color: "#FFA500" + + diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 26dde9d188..0e83467282 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -24,6 +24,9 @@ - type: Tag id: ForensicBeltEquip +- type: Tag + id: Gavel + - type: Tag id: GasPipeHalf #Craftable Musket diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index d270c93e50..49ef98d769 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -67,6 +67,7 @@ - Common - Command - Engineering + - Justice # Delta V- adds Justice department - Medical - Science - Security diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 68e6cdfd51..2f232c566a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -355,12 +355,13 @@ - type: entity parent: IDCardStandard id: LawyerIDCard - name: lawyer ID card + name: attorney ID card # DeltaV - Changed Lawyer to Attorney components: - type: Sprite layers: - state: default - - state: idlawyer + - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Justice colors + state: idlawyer - type: PresetIdCard job: Lawyer @@ -654,6 +655,9 @@ - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - JobIconForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml + - JobIconClerk # Delta V - Added justice dept + - JobIconChiefJustice # Delta V - Added justice dept + - JobIconProsecutor # Delta V - Added justice dept - JobIconVisitor - type: ActivatableUI key: enum.AgentIDCardUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 21295333b6..8cfbb08622 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -60,6 +60,9 @@ - Service - Theatre - Zookeeper #Delta V: Add Zookeeper Access + - ChiefJustice #Delta V: Add Chief Justice Access + - Prosecutor #Delta V: Add Prosecutor Access + - Justice #Delta V: Add Justice Access privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 5b5bc98abf..f417b60677 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -11,7 +11,7 @@ layoutId: AirlockService - type: entity - parent: AirlockServiceLocked + parent: AirlockJustice # DeltaV - Lawyer is in Justice Dept id: AirlockLawyerLocked suffix: Lawyer, Locked components: @@ -423,8 +423,8 @@ layoutId: AirlockService - type: entity - parent: AirlockServiceGlassLocked - id: AirlockLawyerGlassLocked + parent: AirlockJusticeGlass + id: AirlockLawyerGlassLocked # DeltaV - Lawyer is in Justice Dept suffix: Lawyer, Locked components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index dfb37f4986..2cb30277d2 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -13,6 +13,7 @@ science: Structures/Doors/Airlocks/Standard/science.rsi security: Structures/Doors/Airlocks/Standard/security.rsi virology: Structures/Doors/Airlocks/Standard/virology.rsi + justice: DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi # Delta V - Add Justice Dept - type: AirlockGroup id: Glass @@ -28,6 +29,7 @@ medical: Structures/Doors/Airlocks/Glass/medical.rsi security: Structures/Doors/Airlocks/Glass/security.rsi virology: Structures/Doors/Airlocks/Glass/virology.rsi + justice: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Delta V - Add Justice Dept - type: AirlockGroup id: Windoor diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index 5bdefb8bfc..13fdb7e80d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -80,6 +80,7 @@ - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyCommand + - EncryptionKeyJustice #DeltaV - Justice dept - type: entity parent: TelecomServer @@ -140,6 +141,7 @@ containers: key_slots: - EncryptionKeySecurity + - EncryptionKeyJustice #DeltaV - Justice dept - type: entity parent: TelecomServer diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index c5e893397a..ab8ac25a4a 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -1,4 +1,4 @@ -- type: palette +- type: palette id: Departmental name: Departmental colors: @@ -10,6 +10,7 @@ bar: "#79150096" epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo + justice: "#6b2833DD" #DeltaV - Added Justice Department janitor: "#8c347f96" chemistry: "#fa750096" virology: "#43990996" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index b458e82bdb..10d6e504d9 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -12,7 +12,7 @@ time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-hop + supervisors: job-supervisors-cj # Delta V - Change supervisor to chief justice access: - Service - Lawyer diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d280c67a35..958a8f9753 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -24,7 +24,7 @@ - Clown - HeadOfPersonnel - Janitor - - Lawyer + # - Lawyer # DeltaV - Move Lawyer into Justice - Librarian - Mime - Musician diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 9e9a298605..975d944bb2 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -121,8 +121,8 @@ parent: JobIcon id: JobIconLawyer icon: - sprite: /Textures/Interface/Misc/job_icons.rsi - state: Lawyer + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice + state: Lawyer # DeltaV - Move Lawyer into Justice - type: statusIcon parent: JobIcon diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000..9522966b6c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png new file mode 100644 index 0000000000..0633bb3644 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png new file mode 100644 index 0000000000..0ce0c363f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png new file mode 100644 index 0000000000..2142eee039 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json new file mode 100644 index 0000000000..116c0e53e7 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 | Modified by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_alt" + }, + { + "name": "equipped-EARS", + "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..2fc2172afa Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png new file mode 100644 index 0000000000..3a06285c67 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png new file mode 100644 index 0000000000..60426ff87f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png new file mode 100644 index 0000000000..d6ed79e225 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json new file mode 100644 index 0000000000..9d421b646b --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Spritework by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png new file mode 100644 index 0000000000..49bc499a87 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png new file mode 100644 index 0000000000..ce23046a1f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png new file mode 100644 index 0000000000..80531e8b56 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png new file mode 100644 index 0000000000..0bd0f37f11 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json new file mode 100644 index 0000000000..a0670a97c9 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Spritework by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png new file mode 100644 index 0000000000..ce4e527400 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png new file mode 100644 index 0000000000..d3f712e8d7 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json new file mode 100644 index 0000000000..7f12698657 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png new file mode 100644 index 0000000000..9a881bf0dd Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png new file mode 100644 index 0000000000..7fd93b7fd5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json new file mode 100644 index 0000000000..a04b75dd78 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..7d77d8b53f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png new file mode 100644 index 0000000000..eb6ff72244 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png new file mode 100644 index 0000000000..f7b9b21ebd Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png new file mode 100644 index 0000000000..5d366f23d9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json new file mode 100644 index 0000000000..11ac46694c --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..a5575e393c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png new file mode 100644 index 0000000000..443dbf1af9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png new file mode 100644 index 0000000000..cf49f4588a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png new file mode 100644 index 0000000000..c2e88069f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json new file mode 100644 index 0000000000..11ac46694c --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..24c2af227b Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png new file mode 100644 index 0000000000..77371a3ba8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png new file mode 100644 index 0000000000..9b19bead35 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png new file mode 100644 index 0000000000..571ae1697c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json new file mode 100644 index 0000000000..faf5084407 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..64e6927cf6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png new file mode 100644 index 0000000000..58a60bc768 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png new file mode 100644 index 0000000000..5dcb8e026e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png new file mode 100644 index 0000000000..5e7d377451 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json new file mode 100644 index 0000000000..faf5084407 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a1ae36f210 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png new file mode 100644 index 0000000000..5130d57e8c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png new file mode 100644 index 0000000000..d04680f3ca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png new file mode 100644 index 0000000000..af7f24e84e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json new file mode 100644 index 0000000000..322f9da00e --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b2e475bdbe Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png new file mode 100644 index 0000000000..03f703a26c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png new file mode 100644 index 0000000000..9b19bead35 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png new file mode 100644 index 0000000000..571ae1697c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json new file mode 100644 index 0000000000..faf5084407 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e735c5a2b2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png new file mode 100644 index 0000000000..bf6ed67bc8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png new file mode 100644 index 0000000000..aa33404831 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png new file mode 100644 index 0000000000..deb205205a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json new file mode 100644 index 0000000000..0445151280 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..9caa2e705e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png new file mode 100644 index 0000000000..0f2a20fa1a Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png new file mode 100644 index 0000000000..4e73693046 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png new file mode 100644 index 0000000000..567d302dc5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json new file mode 100644 index 0000000000..0445151280 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..330926db8c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png new file mode 100644 index 0000000000..337c3132ca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png new file mode 100644 index 0000000000..5dcb8e026e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png new file mode 100644 index 0000000000..5e7d377451 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json new file mode 100644 index 0000000000..faf5084407 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "sprites by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f21dce44e2 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png new file mode 100644 index 0000000000..0d2266c7ff Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png new file mode 100644 index 0000000000..d04680f3ca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png new file mode 100644 index 0000000000..af7f24e84e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json new file mode 100644 index 0000000000..322f9da00e --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png new file mode 100644 index 0000000000..6cba0e4a93 Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png new file mode 100644 index 0000000000..90e01b97cd Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png new file mode 100644 index 0000000000..9ef5c30527 Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png new file mode 100644 index 0000000000..997b29b2a4 Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 3f3c6b04e2..09d18e3ab7 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)", "size": { "x": 8, "y": 8 @@ -27,6 +27,18 @@ }, { "name": "MedicalBorg" + }, + { + "name": "ChiefJustice" + }, + { + "name": "Clerk" + }, + { + "name": "Prosecutor" + }, + { + "name": "Lawyer" } ] } diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg new file mode 100644 index 0000000000..74e0876fb9 --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png new file mode 100644 index 0000000000..d13d8cf76b Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png differ diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png new file mode 100644 index 0000000000..b69ced20cf Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png differ diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png new file mode 100644 index 0000000000..5e6ce9fece Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png differ diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json index 7e31fd2911..a7534b9ee5 100644 --- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -7,12 +7,21 @@ "y": 32 }, "states": [ + { + "name": "chiefjustice" + }, + { + "name": "clerk" + }, { "name": "nyanogladiator" }, { "name": "nyanoprisonguard" }, + { + "name": "prosecutor" + }, { "name": "nyanomailcarrier" }, diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png new file mode 100644 index 0000000000..e384f90fb1 Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png new file mode 100644 index 0000000000..962d09200d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json index 440000d647..eb55c2b4e7 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,13 +1,14 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by DangerRevolution for Space Station 14.", + "license": "CC0-1.0", + "copyright": "justice_label by leonardo_dabepis (Discord) | prisoner_label, crypt_orange Created by DangerRevolution for Space Station 14.", "size": { "x": 32, "y": 32 }, "states": [ - {"name": "prisoner_label"}, + {"name": "justice_label"}, + {"name": "prisoner_label"}, {"name": "crypt_orange"} ] -} \ No newline at end of file +} diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 24d83ed6a0..176af07719 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-chiefjustice and pda-clerk by leonardo_dabepis (Discord) | pda-prosecutor by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 @@ -31,6 +31,15 @@ }, { "name": "pda-corpsman" + }, + { + "name": "pda-chiefjustice" + }, + { + "name": "pda-clerk" + }, + { + "name": "pda-prosecutor" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png new file mode 100644 index 0000000000..ec2543a97c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png new file mode 100644 index 0000000000..6f690e235d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png new file mode 100644 index 0000000000..e44dcea1b5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index 75c5548e64..5e2c34d530 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png new file mode 100644 index 0000000000..54b75e16dc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idclerk.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idclerk.png new file mode 100644 index 0000000000..25848b5a1d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idclerk.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png new file mode 100644 index 0000000000..044079dd7e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idprosecutor.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idprosecutor.png new file mode 100644 index 0000000000..66f4626f58 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idprosecutor.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 521c6e58fa..cd479792df 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 @@ -27,6 +27,18 @@ }, { "name": "nyanomantis" + }, + { + "name": "idchiefjustice" + }, + { + "name": "idclerk" + }, + { + "name": "idprosecutor" + }, + { + "name": "idlawyer" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 01ac69bef6..04f5979761 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -1,12 +1,18 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "stamp-cj" + }, + { + "name": "stamp-notary" + }, { "name": "stamp-psychologist" } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png new file mode 100644 index 0000000000..3ca58c4bc6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png new file mode 100644 index 0000000000..b726cab3d3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png new file mode 100644 index 0000000000..3cf56d4537 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png new file mode 100644 index 0000000000..a41d27bcc7 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png new file mode 100644 index 0000000000..cbabf3b291 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json new file mode 100644 index 0000000000..39ff0ed9d9 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png new file mode 100644 index 0000000000..c1254bb808 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json new file mode 100644 index 0000000000..5abad9b422 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json new file mode 100644 index 0000000000..8081065c32 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "trialtimer" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png new file mode 100644 index 0000000000..34c8f1b90a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png new file mode 100644 index 0000000000..056fcc5c14 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png new file mode 100644 index 0000000000..6857f2a241 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png new file mode 100644 index 0000000000..04842eb1c7 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png new file mode 100644 index 0000000000..c78d01c42d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png new file mode 100644 index 0000000000..fd27f05b3a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png new file mode 100644 index 0000000000..2a71f76d5d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png new file mode 100644 index 0000000000..817f2fb3f9 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json new file mode 100644 index 0000000000..e4c020ff61 --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png new file mode 100644 index 0000000000..10d823bfe8 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png new file mode 100644 index 0000000000..540ccf3de4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png new file mode 100644 index 0000000000..84933bd5ed Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png new file mode 100644 index 0000000000..db7be0bc4a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png new file mode 100644 index 0000000000..24eb2aedc2 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png new file mode 100644 index 0000000000..fc90acd637 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png new file mode 100644 index 0000000000..a0040dfdc7 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png new file mode 100644 index 0000000000..35efd5f6dd Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png new file mode 100644 index 0000000000..6857f2a241 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png new file mode 100644 index 0000000000..64e00a086d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png new file mode 100644 index 0000000000..c78d01c42d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png new file mode 100644 index 0000000000..2a33b5d48a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png new file mode 100644 index 0000000000..2a71f76d5d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png new file mode 100644 index 0000000000..817f2fb3f9 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json new file mode 100644 index 0000000000..e4c020ff61 --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png new file mode 100644 index 0000000000..0c731ca796 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png new file mode 100644 index 0000000000..e8e146a32d Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png new file mode 100644 index 0000000000..84933bd5ed Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png new file mode 100644 index 0000000000..db7be0bc4a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png new file mode 100644 index 0000000000..24eb2aedc2 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png new file mode 100644 index 0000000000..fc90acd637 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png new file mode 100644 index 0000000000..a0040dfdc7 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png new file mode 100644 index 0000000000..dcb76fc263 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png differ diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png new file mode 100644 index 0000000000..ef94a9998f Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png differ diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json index 0d38f6d859..ab3feb6715 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers", + "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 @@ -14,6 +14,14 @@ { "name": "direction_mail", "directions": 4 + }, + { + "name": "direction_court", + "directions": 4 + }, + { + "name": "direction_justice", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 6d3743dfcb..f3b410c357 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -228,6 +228,9 @@ { "name": "paper_stamp-psychologist" }, + { + "name": "paper_stamp-notary" + }, { "name": "paper_stamp-signature" } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png new file mode 100644 index 0000000000..603351ace5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj.png b/Resources/Textures/Structures/Storage/closet.rsi/cj.png new file mode 100644 index 0000000000..c57b4b8899 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png new file mode 100644 index 0000000000..f406e39807 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png new file mode 100644 index 0000000000..8ba72a5bcc Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk.png new file mode 100644 index 0000000000..d941ab4bf5 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png new file mode 100644 index 0000000000..e31a6468b9 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png new file mode 100644 index 0000000000..ab865e6cbe Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index c52bc13540..d3802637c0 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), CJ and Clerk lockers edited by Timemaster99 (Discord), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", "license": "CC-BY-SA-3.0", "states": [ { @@ -163,6 +163,24 @@ { "name": "chemical_door" }, + { + "name": "cj" + }, + { + "name": "cj_door" + }, + { + "name": "cj_open" + }, + { + "name": "clerk" + }, + { + "name": "clerk_door" + }, + { + "name": "clerk_open" + }, { "name": "cmo" },