diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index e4790b63742..3829b95bf22 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -1,5 +1,8 @@ +ent-MagistratNeck = Галстуки +ent-MagistratJumpsuit = Костюмы loadout-group-patholog-head = Патологоанатом, голова loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон loadout-group-patholog-outerclothing = Патологоанатом, верхняя одежда loadout-group-patholog-shoes = Патологоанатом, обувь -loadout-group-patholog-backpack = Патологоанатом, рюкзак \ No newline at end of file +loadout-group-patholog-backpack = Патологоанатом, рюкзак + diff --git a/Resources/Locale/ru-RU/ADT/headset-component.ftl b/Resources/Locale/ru-RU/ADT/headset-component.ftl new file mode 100644 index 00000000000..ddb67d55b5e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/headset-component.ftl @@ -0,0 +1 @@ +ADT-Lawyer-Channel-name = Юридический diff --git a/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl b/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl new file mode 100644 index 00000000000..adbd7867c76 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl @@ -0,0 +1 @@ +stamp-component-stamped-name-magistrat = Магистрат diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl new file mode 100644 index 00000000000..0c64681745c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl @@ -0,0 +1,2 @@ +id-card-access-level-iaa = Агент Внутренних Дел +id-card-access-level-magistrate = Магистрат diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl new file mode 100644 index 00000000000..75f46dc8e15 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl @@ -0,0 +1,6 @@ +ent-ClothingHeadsetMagistrat = Гарнитура магистрата + .desc = Переговоры особой важности происходят по этой гарнитуре. +ent-ClothingHeadsetLawyer = Гарнитура юриста + .desc = Обычная гарнитура юриста. +ent-ClothingHeadsetIAA = Гарнитура Агента Внутренних Дел + .desc = Переговоры о нарушениях СРП происходят по этой гарнитуре. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl new file mode 100644 index 00000000000..c17f23f08de --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -0,0 +1,2 @@ +ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата + .desc = Специально сделанный белый костюм дипломата NanoTrasen. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl new file mode 100644 index 00000000000..69090db7208 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl @@ -0,0 +1 @@ +ent-SpawnPointMagistrat = Точка спавна магистрата diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/encryption_keys.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/encryption_keys.ftl new file mode 100644 index 00000000000..f3484952b83 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/encryption_keys.ftl @@ -0,0 +1,2 @@ +ent-ADTEncryptionKeyLawyer = Ключ шифрования юридического отдела. + .desc = Переговоры особой важности происходят по этой частоте. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl index e3d91b8b990..1167841880c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -1,2 +1,5 @@ +ent-MagistratPDA = КПК Магистрата + .desc = В заметках данного КПК можно найти компромат на каждого из глав. ent-ADTPathologistPDA = КПК патологоанатома - .desc = От него веет прохладой. \ No newline at end of file + .desc = От него веет прохладой. + diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl new file mode 100644 index 00000000000..08cf8797b42 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-MagistratIDCard = ID Магистрата + .desc = Серебрянная карта с значком Юриста. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl new file mode 100644 index 00000000000..2742143b492 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl @@ -0,0 +1,3 @@ +ent-RubberStampMagisrat = Печать магистрата + .suffix = DO NOT MAP + .desc = Выглядит угрожающее. От нее веет неоспоримой мощью и величием. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl new file mode 100644 index 00000000000..6f650f214b3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl @@ -0,0 +1,2 @@ +department-Juridical-description = Следите за соблюдением СРП, правильной трактовкой КЗ, защищайте подсудимых! +department-Juridical = Юридический департамент diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl new file mode 100644 index 00000000000..4c5ca3d3ff0 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl @@ -0,0 +1,2 @@ +job-name-magistrat = Магистрат +job-description-magistrat = Самый грозный и богатый на станции. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 35d1660add6..75b2a8c8b29 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -24,7 +24,7 @@ job-name-centcomoff = представитель Центком job-name-reporter = репортёр job-name-musician = музыкант job-name-librarian = библиотекарь -job-name-lawyer = адвокат +job-name-lawyer = юрист job-name-mime = мим job-name-ce = старший инженер job-name-janitor = уборщик diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl deleted file mode 100644 index 989ef2605ab..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ClothingHeadsetIAA = гарнитура АВД - .desc = Гарнитура агента внутренних дел, чтобы услышать последние слова капитана. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl index f1b32d9d160..6dc02e6b1ff 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl @@ -1,2 +1,3 @@ ent-EncryptionKeyIAA = ключ шифрования агента внутренних дел .desc = Ключ шифрования, используемый самой дотошной персоной. + .suffix = НЕ ТРОГАТЬ, это Корвакс diff --git a/Resources/Prototypes/ADT/Access/juridical.yml b/Resources/Prototypes/ADT/Access/juridical.yml new file mode 100644 index 00000000000..a8e9403ede5 --- /dev/null +++ b/Resources/Prototypes/ADT/Access/juridical.yml @@ -0,0 +1,18 @@ +- type: accessLevel + id: Lawyer + name: id-card-access-level-lawyer + +- type: accessLevel + id: IAA + name: id-card-access-level-iaa + +- type: accessLevel + id: Magistrate + name: id-card-access-level-magistrate + +- type: accessGroup + id: LawyerDepartament + tags: + - Lawyer + - Magistrate + - IAA diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml new file mode 100644 index 00000000000..200cf36bc4c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml @@ -0,0 +1,47 @@ +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetMagistrat + name: magistrat headset + description: magistrat's headset. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyLawyer + - EncryptionKeyCommand + - EncryptionKeySecurity + - EncryptionKeyCommon + - EncryptionKeyCentCom + - type: Sprite + sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetLawyer + name: lawyer headset + description: lawyer's headset. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyLawyer + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetIAA + name: IAA headset + description: IAA's headset. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyLawyer + - EncryptionKeyCommand + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/servicesecurity.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml new file mode 100644 index 00000000000..a2ef44656e6 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL + name: white-diplomat-suit-namе + description: white-diplomat-suit-desc + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml deleted file mode 100644 index 2376de0f27d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml +++ /dev/null @@ -1,23 +0,0 @@ - -- type: entity - id: ADTSpawnPointJobBase - parent: MarkerBase - abstract: true - suffix: Job Spawn ADT - components: - - type: SpawnPoint - spawn_type: Job - - type: Sprite - sprite: ADT/Markers/job.rsi - -- type: entity - id: SpawnPointADTPathologist - parent: ADTSpawnPointJobBase - name: pathologist - components: - - type: SpawnPoint - job_id: ADTPathologist - - type: Sprite - layers: - - state: green - - state: pathologist \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..10d99928089 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,46 @@ +- type: entity + id: ADTSpawnPointJobBase + parent: MarkerBase + abstract: true + suffix: Job Spawn ADT + components: + - type: SpawnPoint + spawn_type: Job + - type: Sprite + sprite: ADT/Markers/jobs.rsi + +- type: entity + id: SpawnPointADTPathologist + parent: ADTSpawnPointJobBase + name: pathologist + components: + - type: SpawnPoint + job_id: ADTPathologist + - type: Sprite + layers: + - state: green + - state: pathologist + +- type: entity + id: SpawnPointMagistrat + parent: ADTSpawnPointJobBase + name: magistrat + components: + - type: SpawnPoint + job_id: Magistrat + - type: Sprite + layers: + - state: green + - state: magistrat + +- type: entity + id: SpawnPointIAA + parent: ADTSpawnPointJobBase + name: IAA + components: + - type: SpawnPoint + job_id: IAA + - type: Sprite + layers: + - state: green + - state: iaa diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/fill.txt similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/fill.txt rename to Resources/Prototypes/ADT/Entities/Objects/Devices/Circuitboards/Machine/fill.txt diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/Electronics/door_access.yml new file mode 100644 index 00000000000..7db42283dc1 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/Electronics/door_access.yml @@ -0,0 +1,15 @@ +- type: entity + parent: DoorElectronics + id: DoorElectronicsIAA + suffix: IAA, Locked + components: + - type: AccessReader + access: [["IAA"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsMagistrate + suffix: Magistrate, Locked + components: + - type: AccessReader + access: [["Magistrate"]] diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml new file mode 100644 index 00000000000..09ba604d7fc --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml @@ -0,0 +1,14 @@ +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyLawyer + name: law department encryption key + description: The encryption key used by the most hated person (after the clown). + components: + - type: EncryptionKey + channels: + - ADTLawyerChannel + defaultChannel: ADTLawyerChannel + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..52b435d325e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BasePDA + id: MagistratPDA + name: magistrat PDA + description: magistrat PDA + components: + - type: Pda + id: MagistratIDCard + state: pda-lawyer + - type: Icon + state: pda-lawyer diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/translators.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/translators.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index d35ebc5245a..b7928e36d39 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,16 @@ +- type: entity + parent: IDCardStandard + id: MagistratIDCard + name: magistrat ID card + description: magistrat ID card + components: + - type: Sprite + layers: + - state: silver + - state: idlawyer + - type: PresetIdCard + job: Magistrat + - type: entity parent: IDCardStandard id: ADTPathologistIDCard @@ -9,4 +22,4 @@ - state: default - state: id-pathologist - type: PresetIdCard - job: ADTPathologist \ No newline at end of file + job: ADTPathologist diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml new file mode 100644 index 00000000000..df00f40884b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml @@ -0,0 +1,13 @@ +- type: entity + name: magistrat's rubber stamp + parent: RubberStampBase + id: RubberStampMagisrat + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-magistrat + stampedColor: "#754d36" + stampState: "paper_stamp-detective" + - type: Sprite + sprite: ADT/Objects/Misc/stampsADT.rsi + state: stamp-magistrat diff --git a/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml b/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml new file mode 100644 index 00000000000..d777d7c6774 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml @@ -0,0 +1,17 @@ +- type: entity + parent: AirlockCommandGlass + id: AirlockMagistrateGlassLocked + suffix: Magistrate, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsMagistrate ] + +- type: entity + parent: AirlockCommandGlass + id: AirlockIAAGlassLocked + suffix: IAA, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsIAA ] diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Juridical/magistrat.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Juridical/magistrat.yml new file mode 100644 index 00000000000..350aef8cb43 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Juridical/magistrat.yml @@ -0,0 +1,8 @@ +- type: loadout + id: MagistratJumpsuit + equipment: MagistratJumpsuit + +- type: startingGear + id: MagistratJumpsuit + equipment: + jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 42082308c62..e17e604bf6c 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -1,3 +1,26 @@ +- type: loadoutGroup + id: MagistratJumpsuit + name: loadout-group-lawyer-jumpsuit + loadouts: + - MagistratJumpsuit + - LawyerJumpsuit + - LawyerJumpskirt + - LawyerJumpsuitBlue + - LawyerJumpskirtBlue + - LawyerJumpsuitPurple + - LawyerJumpskirtPurple + - LawyerJumpsuitRed + - LawyerJumpskirtRed + - LawyerJumpsuitGood + - LawyerJumpskirtGood + +- type: loadoutGroup + id: MagistratNeck + name: loadout-group-lawyer-neck + minLimit: 0 + loadouts: + - LawyerNeck + - type: loadoutGroup id: PathologHead name: loadout-group-patholog-head @@ -37,4 +60,4 @@ name: loadout-group-patholog-shoes loadouts: - BlueShoes - - MedicalWinterBoots \ No newline at end of file + - MedicalWinterBoots diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index abb495f6845..cd4402dbf11 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -1,3 +1,16 @@ +- type: roleLoadout + id: JobMagistrat + groups: + - Inventory # Corvax-Loadouts + - GroupTankHarness + - MagistratNeck + - MagistratJumpsuit + - CommonBackpack + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + - type: roleLoadout id: JobADTPathologist groups: @@ -13,4 +26,4 @@ - Glasses - SurvivalMedical - Trinkets - - GroupSpeciesBreathToolMedical \ No newline at end of file + - GroupSpeciesBreathToolMedical diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml new file mode 100644 index 00000000000..ca258ad2391 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml @@ -0,0 +1,55 @@ +- type: job + id: Magistrat + name: job-name-magistrat + description: job-description-magistrat + playTimeTracker: JobMagistrat + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 600000 + # - !type:DepartmentTimeRequirement + # department: Sponsor + # time: 10 + startingGear: MagistratGear + icon: "JobIconMagistrat" + requireAdminNotify: true + joinNotifyCrew: true + supervisors: job-supervisors-captain + canBeAntag: false + access: + - Command + - Brig + - Maintenance + - Service + - Security + - Magistrate + - Lawyer + - IAA + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: MagistratGear + equipment: +# jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL +# back: ClothingBackpackIAAFilled + shoes: ClothingShoesBootsLaceup + #mask: Ну что за косипор оставляет пустуе значения? + #outerClothing: ClothingOuterRobesJudge + eyes: ClothingEyesGlassesSunglasses + #head: ClothingHeadHatPwig + id: MagistratPDA + #gloves: + ears: ClothingHeadsetMagistrat + #belt: + neck: ClothingNeckLawyerbadge + pocket2: RubberStampMagisrat +# pocket1: ADTtelescopicBaton +# underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear +# socks: ClothingUnderwearSocksNormal +# underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear +# underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear +# innerClothingSkirt: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL +# satchel: ClothingBackpackSatchelIAAFilled +# duffelbag: ClothingBackpackDuffelIAAFilled diff --git a/Resources/Prototypes/ADT/Roles/Jobs/departments.yml b/Resources/Prototypes/ADT/Roles/Jobs/departments.yml new file mode 100644 index 00000000000..7cb060cb2e0 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/departments.yml @@ -0,0 +1,8 @@ +- type: department + id: Juridical + description: department-Juridical-description + color: "#777777" + roles: + - Magistrat + - IAA + - Lawyer diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index ed8123ead80..4197c525e5c 100644 --- a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml @@ -1,2 +1,5 @@ - type: playTimeTracker - id: JobADTPathologist \ No newline at end of file + id: JobMagistrat + +- type: playTimeTracker + id: JobADTPathologist diff --git a/Resources/Prototypes/ADT/StatusIcon/job.yml b/Resources/Prototypes/ADT/StatusIcon/job.yml new file mode 100644 index 00000000000..aef4c3dbf9d --- /dev/null +++ b/Resources/Prototypes/ADT/StatusIcon/job.yml @@ -0,0 +1,6 @@ +- type: statusIcon + parent: JobIcon + id: JobIconMagistrat + icon: + sprite: /Textures/ADT/Interface/Misc/job_icons.rsi + state: Magistrat diff --git a/Resources/Prototypes/ADT/radio_channels.yml b/Resources/Prototypes/ADT/radio_channels.yml new file mode 100644 index 00000000000..bde851d1453 --- /dev/null +++ b/Resources/Prototypes/ADT/radio_channels.yml @@ -0,0 +1,7 @@ +- type: radioChannel + id: ADTLawyerChannel + name: ADT-Lawyer-Channel-name + keycode: 'ю' + frequency: 1305 + color: "#c6d2f5" + longRange: false diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index f79f1779c22..0ac85d29ee5 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,3 +32,5 @@ - Chapel - Hydroponics - Atmospherics + - IAA + - Magistrate diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml index cb62a3f6e70..492e7a9092a 100644 --- a/Resources/Prototypes/Access/service.yml +++ b/Resources/Prototypes/Access/service.yml @@ -26,10 +26,6 @@ id: Chapel name: id-card-access-level-chapel -- type: accessLevel - id: Lawyer - name: id-card-access-level-lawyer - - type: accessGroup id: Service tags: @@ -41,4 +37,3 @@ - Janitor - Theatre - Chapel - - Lawyer diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml index 160f5a4c172..62e27fa5fc8 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml @@ -1,6 +1,7 @@ - type: entity parent: ClothingHeadset - id: ClothingHeadsetIAA + id: СorvaxClothingHeadsetIAA + suffix: DONT TOUCH! It`s Corvax Headset name: iaa headset description: A headset for internal affairs agent to hear the captain's last words. components: diff --git a/Resources/Prototypes/Corvax/Maps/astra.yml b/Resources/Prototypes/Corvax/Maps/astra.yml index 5147963e580..0ce81c8b307 100644 --- a/Resources/Prototypes/Corvax/Maps/astra.yml +++ b/Resources/Prototypes/Corvax/Maps/astra.yml @@ -35,7 +35,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 3 ] @@ -74,4 +73,4 @@ - Zoo - MiningOutpost - Tesla - - VirusologyAmbusol \ No newline at end of file + - VirusologyAmbusol diff --git a/Resources/Prototypes/Corvax/Maps/avrite.yml b/Resources/Prototypes/Corvax/Maps/avrite.yml index 3e391c082ab..ca15d2d811d 100644 --- a/Resources/Prototypes/Corvax/Maps/avrite.yml +++ b/Resources/Prototypes/Corvax/Maps/avrite.yml @@ -35,7 +35,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/delta.yml b/Resources/Prototypes/Corvax/Maps/delta.yml index e3a012684a6..0716618463a 100644 --- a/Resources/Prototypes/Corvax/Maps/delta.yml +++ b/Resources/Prototypes/Corvax/Maps/delta.yml @@ -31,7 +31,6 @@ Mime: [ 1, 1 ] Zookeeper: [ 1, 1 ] Captain: [ 1, 1 ] - IAA: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] ChiefEngineer: [ 1, 1 ] StationEngineer: [ 5, 5 ] diff --git a/Resources/Prototypes/Corvax/Maps/gelta.yml b/Resources/Prototypes/Corvax/Maps/gelta.yml index fb366c97ddd..a661c0d4bf7 100644 --- a/Resources/Prototypes/Corvax/Maps/gelta.yml +++ b/Resources/Prototypes/Corvax/Maps/gelta.yml @@ -27,7 +27,6 @@ Janitor: [ 1, 2 ] Mime: [ 1, 1 ] Captain: [ 1, 1 ] - IAA: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] ChiefEngineer: [ 1, 1 ] StationEngineer: [ 5, 5 ] diff --git a/Resources/Prototypes/Corvax/Maps/ishimura.yml b/Resources/Prototypes/Corvax/Maps/ishimura.yml index 13845eb009e..cd14370b4ee 100644 --- a/Resources/Prototypes/Corvax/Maps/ishimura.yml +++ b/Resources/Prototypes/Corvax/Maps/ishimura.yml @@ -35,7 +35,6 @@ Reporter: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/maus.yml b/Resources/Prototypes/Corvax/Maps/maus.yml index 7393383e90b..f92353ee43a 100644 --- a/Resources/Prototypes/Corvax/Maps/maus.yml +++ b/Resources/Prototypes/Corvax/Maps/maus.yml @@ -30,7 +30,6 @@ Janitor: [ 1, 1 ] Mime: [ 1, 1 ] Captain: [ 1, 1 ] - IAA: [1, 1] HeadOfPersonnel: [ 1, 1 ] ChiefEngineer: [ 1, 1 ] StationEngineer: [ 2, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/outpost.yml b/Resources/Prototypes/Corvax/Maps/outpost.yml index 556e08c8fba..e143a9a0cce 100644 --- a/Resources/Prototypes/Corvax/Maps/outpost.yml +++ b/Resources/Prototypes/Corvax/Maps/outpost.yml @@ -21,7 +21,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] diff --git a/Resources/Prototypes/Corvax/Maps/paper.yml b/Resources/Prototypes/Corvax/Maps/paper.yml index 8f4edfd4081..216865daa5f 100644 --- a/Resources/Prototypes/Corvax/Maps/paper.yml +++ b/Resources/Prototypes/Corvax/Maps/paper.yml @@ -36,7 +36,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/pearl.yml b/Resources/Prototypes/Corvax/Maps/pearl.yml index 4f49826da2f..f1b5da402b6 100644 --- a/Resources/Prototypes/Corvax/Maps/pearl.yml +++ b/Resources/Prototypes/Corvax/Maps/pearl.yml @@ -37,7 +37,6 @@ Musician: [ 2, 2 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 2, 2 ] @@ -73,4 +72,4 @@ - Bank - Zoo - MiningOutpost - - Tesla \ No newline at end of file + - Tesla diff --git a/Resources/Prototypes/Corvax/Maps/pilgrim.yml b/Resources/Prototypes/Corvax/Maps/pilgrim.yml index bf7a03406ac..01c583de79b 100644 --- a/Resources/Prototypes/Corvax/Maps/pilgrim.yml +++ b/Resources/Prototypes/Corvax/Maps/pilgrim.yml @@ -36,7 +36,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] diff --git a/Resources/Prototypes/Corvax/Maps/silly.yml b/Resources/Prototypes/Corvax/Maps/silly.yml index af9addc6763..d234f4bcae9 100644 --- a/Resources/Prototypes/Corvax/Maps/silly.yml +++ b/Resources/Prototypes/Corvax/Maps/silly.yml @@ -65,7 +65,6 @@ Librarian: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] StationEngineer: [ 2, 2 ] diff --git a/Resources/Prototypes/Corvax/Maps/split.yml b/Resources/Prototypes/Corvax/Maps/split.yml index 2a8d7fcf113..b848ac90d7e 100644 --- a/Resources/Prototypes/Corvax/Maps/split.yml +++ b/Resources/Prototypes/Corvax/Maps/split.yml @@ -41,7 +41,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering AtmosphericTechnician: [ 1, 1 ] # medical diff --git a/Resources/Prototypes/Corvax/Maps/terra.yml b/Resources/Prototypes/Corvax/Maps/terra.yml index 6a69392fe1e..537577aeb96 100644 --- a/Resources/Prototypes/Corvax/Maps/terra.yml +++ b/Resources/Prototypes/Corvax/Maps/terra.yml @@ -49,7 +49,6 @@ Zookeeper: [ 1, 1 ] # command Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # engineering ChiefEngineer: [ 1, 1 ] StationEngineer: [ 2, 2 ] diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index 004e5f0db8e..b5679503610 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -21,6 +21,7 @@ - Command - External - Lawyer + - IAA special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 9dd72691b5a..e6a38cb0e9b 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true parent: ClothingHeadset id: ClothingHeadsetAlt @@ -110,6 +110,7 @@ - EncryptionKeySecurity - EncryptionKeyCommand - EncryptionKeyCommon + - ADTEncryptionKeyLawyer - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index c80bacdfc90..33e03de0388 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -239,7 +239,7 @@ name: lawyer components: - type: SpawnPoint - job_id: IAA # Corvax-IAA: Lawyer replaced with IAA + job_id: Lawyer # Corvax-IAA: Lawyer replaced with IAA - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 75cca712214..4b2907f1ab6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -72,6 +72,7 @@ - Security - Service - Supply + - ADTLawyerChannel #ADT defaultChannel: Command - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 41677e26a93..7de4bdba5fd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -602,6 +602,7 @@ icons: # TODO figure out a better way of doing this. # Probably by adding a bool or icon-category data-field to the icon prototype? + - JobIconMagistrat - JobIconDetective - JobIconQuarterMaster - JobIconBotanist diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 3c5bc93b42c..ce9224d588e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -48,6 +48,8 @@ - Security - Service - Theatre + - Magistrate + - IAA privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index 4a1b5a3560a..a9a857c316f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -86,6 +86,7 @@ - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyCommand + - ADTEncryptionKeyLawyer - type: entity parent: TelecomServer diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index 6fe3eff030a..335f8ded25c 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -55,3 +55,6 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] + diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 0bd4714e3ec..2771582fa35 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -19,7 +19,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -61,3 +60,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ecd4ef07404..13f7381c28d 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -18,7 +18,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -60,4 +59,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 8485b068f8d..b7bb6339e24 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: Cluster mapName: 'Cluster' mapPath: /Maps/cluster.yml @@ -19,7 +19,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -59,4 +58,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index e531579b336..f543e8ce63d 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -25,7 +25,6 @@ Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] @@ -64,3 +63,5 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 84961a3874b..dd185b849df 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -25,7 +25,6 @@ Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] @@ -62,3 +61,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 97ed26c8ec9..96c57be02f2 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -20,7 +20,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -61,3 +60,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index d3968c369a1..e684a59e30e 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -19,7 +19,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] @@ -61,3 +60,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 67600c501d6..efdcb6626b7 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -18,7 +18,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] @@ -59,3 +58,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index d11a1217d90..1fafb22fb10 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -18,7 +18,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] @@ -62,3 +61,5 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index b4df9c756da..b51099c9f7d 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -19,7 +19,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -59,3 +58,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index fa7c6435577..d61d913b696 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -18,7 +18,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -62,4 +61,6 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index fdffc03fcd6..af3eb47e518 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -17,7 +17,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 1, 2 ] @@ -58,3 +57,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index e49fde94efa..f9a5094fa0a 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -59,4 +59,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 46492e80f06..a1ef8670dd7 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -21,7 +21,6 @@ availableJobs: #service Captain: [ 1, 1 ] - IAA: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -61,3 +60,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + # Юрдеп + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 07c76b9d1b0..584b0dece3d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -7,7 +7,6 @@ - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs startingGear: LawyerGear - setPreference: false # Corvax-IAA icon: "JobIconLawyer" supervisors: job-supervisors-hop access: @@ -21,7 +20,7 @@ equipment: shoes: ClothingShoesBootsLaceup id: LawyerPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetLawyer inhand: - BriefcaseBrownFilled storage: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index efc9e003a8a..36f44a6bb9a 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -22,7 +22,6 @@ - Clown - HeadOfPersonnel - Janitor - - Lawyer - Librarian - Mime - Musician @@ -38,7 +37,6 @@ color: "#334E6D" roles: - Captain - - IAA # Corvax-IAA - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a9bcfd38b1d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png new file mode 100644 index 00000000000..09c98d746a7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png new file mode 100644 index 00000000000..e87a2b72740 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png new file mode 100644 index 00000000000..86fb676e73e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json new file mode 100644 index 00000000000..0cb998035f3 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "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/ADT/Interface/Misc/job_icons.rsi/Magistrat.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/Magistrat.png new file mode 100644 index 00000000000..9addb688c06 Binary files /dev/null and b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/Magistrat.png differ diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json index ee1e4cc3a1d..a71d57c8075 100644 --- a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -1,16 +1,18 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by JustKeks(github) ", + "copyright": "ADTPathologist icon made by JustKeks(github) | Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi . Blueshield made by Tamioki.", "size": { "x": 8, "y": 8 }, "states": [ - + { + "name": "Magistrat" + }, { "name": "ADTPathologist" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/jobs.rsi/green.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/green.png rename to Resources/Textures/ADT/Markers/jobs.rsi/green.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/jobs.rsi/iaa.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/iaa.png rename to Resources/Textures/ADT/Markers/jobs.rsi/iaa.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/investigator.png b/Resources/Textures/ADT/Markers/jobs.rsi/investigator.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/investigator.png rename to Resources/Textures/ADT/Markers/jobs.rsi/investigator.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/magistrat.png b/Resources/Textures/ADT/Markers/jobs.rsi/magistrat.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/magistrat.png rename to Resources/Textures/ADT/Markers/jobs.rsi/magistrat.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/meta.json b/Resources/Textures/ADT/Markers/jobs.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/meta.json rename to Resources/Textures/ADT/Markers/jobs.rsi/meta.json diff --git a/Resources/Textures/ADT/Markers/job.rsi/pathologist.png b/Resources/Textures/ADT/Markers/jobs.rsi/pathologist.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/pathologist.png rename to Resources/Textures/ADT/Markers/jobs.rsi/pathologist.png diff --git a/Resources/Textures/ADT/Markers/job.rsi/urist.png b/Resources/Textures/ADT/Markers/jobs.rsi/urist.png similarity index 100% rename from Resources/Textures/ADT/Markers/job.rsi/urist.png rename to Resources/Textures/ADT/Markers/jobs.rsi/urist.png diff --git a/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json new file mode 100644 index 00000000000..f0ca450081a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:KING_DICE#4881", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-magistrat" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png b/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png new file mode 100644 index 00000000000..67d707bf6c4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png differ