From e7b1402e5102aa4bac68c5c392541a4fbb524983 Mon Sep 17 00:00:00 2001 From: Rinary <72972221+Rinary1@users.noreply.github.com> Date: Sun, 9 Jun 2024 01:01:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=82=20=D0=B8=20=D1=8E=D1=80=D0=B8=D0=B4=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=D0=B9=20=D0=B4=D0=B5=D0=BF=D0=B0=D1=80?= =?UTF-8?q?=D1=82=D0=B0=D0=BC=D0=B5=D0=BD=D1=82=20(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Vulpkanin Lang Fix * Blueshield * Revert "Blueshield" This reverts commit f4b74911d17037cbb14d28111eabde08b11cdfb8. * Magistrat Job * Magistrat Icons, IAA Icons Change * Changelog * Law department, Some Fixes, Add Magistrate, Lawyer to all Maps * )) * Magistrat Loadout * Lawyer, Remove Comments from Maps, Adds More Lawyers(from 1 to 3, copyed from comments) * Law department in Sunrise Maps --- Resources/Changelog/ChangelogSunrise.yml | 6 ++ .../ru-RU/_sunrise/job/department-desc.ftl | 1 + .../Locale/ru-RU/_sunrise/job/department.ftl | 1 + .../Locale/ru-RU/_sunrise/job/job-desc.ftl | 1 + .../Locale/ru-RU/_sunrise/job/job-names.ftl | 1 + .../entities/markers/spawners/jobs.ftl | 2 + .../_sunrise/entities/objects/devices/pda.ftl | 2 + .../objects/misc/identification_cards.ftl | 2 + Resources/Prototypes/Access/command.yml | 4 ++ Resources/Prototypes/Maps/bagel.yml | 5 +- Resources/Prototypes/Maps/box.yml | 6 +- Resources/Prototypes/Maps/cluster.yml | 6 +- Resources/Prototypes/Maps/core.yml | 5 +- Resources/Prototypes/Maps/europa.yml | 5 +- Resources/Prototypes/Maps/fland.yml | 5 +- Resources/Prototypes/Maps/marathon.yml | 5 +- Resources/Prototypes/Maps/meta.yml | 5 +- Resources/Prototypes/Maps/oasis.yml | 5 +- Resources/Prototypes/Maps/omega.yml | 5 +- Resources/Prototypes/Maps/origin.yml | 6 +- Resources/Prototypes/Maps/packed.yml | 5 +- Resources/Prototypes/Maps/train.yml | 5 +- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 - .../Prototypes/Roles/Jobs/departments.yml | 1 - .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++ .../Entities/Markers/Spawners/jobs.yml | 14 ++++- .../_Sunrise/Entities/Objects/Devices/pda.yml | 19 ++++++ .../Objects/Misc/identification_cards.yml | 11 +++- .../_Sunrise/Loadouts/role_loadouts.yml | 3 + Resources/Prototypes/_Sunrise/Maps/box.yml | 6 +- .../Prototypes/_Sunrise/Maps/cluster.yml | 6 +- Resources/Prototypes/_Sunrise/Maps/delta.yml | 2 + Resources/Prototypes/_Sunrise/Maps/fland.yml | 6 +- .../Prototypes/_Sunrise/Maps/marathon.yml | 6 +- .../Roles/Jobs/Civilian/Magistrat.yml | 57 ++++++++++++++++++ .../_Sunrise/Roles/Jobs/departments.yml | 10 +++ .../_Sunrise/Roles/play_time_trackers.yml | 3 + .../Prototypes/_Sunrise/StatusEffects/job.yml | 7 +++ .../Interface/Misc/job_icons.rsi/IAA.png | Bin 196 -> 183 bytes .../Misc/job_icons.rsi/Magistrat.png | Bin 0 -> 196 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 + .../Objects/Misc/id_cards.rsi/idiaa.png | Bin 242 -> 220 bytes .../Objects/Misc/id_cards.rsi/idmagistrat.png | Bin 0 -> 242 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 + .../equipped-INNERCLOTHING-digi.png | Bin 0 -> 1336 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1225 bytes .../Jumpsuit/magistratebel.rsi/icon.png | Bin 0 -> 489 bytes .../magistratebel.rsi/inhand-left.png | Bin 0 -> 571 bytes .../magistratebel.rsi/inhand-right.png | Bin 0 -> 555 bytes .../Jumpsuit/magistratebel.rsi/meta.json | 30 +++++++++ .../_Sunrise/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../_Sunrise/Markers/jobs.rsi/jobicon.png | Bin 0 -> 226 bytes .../_Sunrise/Markers/jobs.rsi/magistrat.png | Bin 0 -> 989 bytes .../_Sunrise/Markers/jobs.rsi/meta.json | 20 ++++++ 54 files changed, 266 insertions(+), 41 deletions(-) create mode 100644 Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/department.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl create mode 100644 Resources/Locale/ru-RU/_sunrise/job/job-names.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml create mode 100644 Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/Magistrat.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png create mode 100644 Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 50bf3b465dc..3b1845df456 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -311,6 +311,12 @@ Entries: type: Add id: 27 time: '2024-06-07T17:08:00.724523+00:00' +- author: Rinary + changes: + - message: "\u0431\u044B\u043B\u0430\u0020\ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430\u0020\ \u0440\u043E\u043B\u044C\u000D\u000A\ \u043C\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u0442\u0430." + type: Add + id: 27 + time: '2024-06-08T00:34:38.724523+00:00' - author: Babaev changes: - message: "\u041D\u043E\u0432\u044B\u0435 \u0441\u043F\u0440\u0430\u0439\u0442\u044B\ diff --git a/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl new file mode 100644 index 00000000000..1d6966be468 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/department-desc.ftl @@ -0,0 +1 @@ +department-Law-description = Защищяйте, судите или накажите преступников. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/department.ftl b/Resources/Locale/ru-RU/_sunrise/job/department.ftl new file mode 100644 index 00000000000..d3c033f1665 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/department.ftl @@ -0,0 +1 @@ +department-Law = Юридический отдел \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl new file mode 100644 index 00000000000..6e6507106e6 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl @@ -0,0 +1 @@ +job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl new file mode 100644 index 00000000000..08b4ca453e3 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -0,0 +1 @@ +job-name-magistrat = Магистрат \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl new file mode 100644 index 00000000000..5917c4fa041 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/markers/spawners/jobs.ftl @@ -0,0 +1,2 @@ +ent-SpawnPointMagistrat = Магистрат + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl new file mode 100644 index 00000000000..b82c53524b5 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/pda.ftl @@ -0,0 +1,2 @@ +ent-MagistratPDA = КПК Магистрата + .desc = { ent-CaptainPDA.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl new file mode 100644 index 00000000000..71e5a9d2d4f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/identification_cards.ftl @@ -0,0 +1,2 @@ +ent-MagistratIDCard = ID карта Магистрата + .desc = { ent-IDCardStandard.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index 62193d5ffee..fbd0c9e1b06 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -9,6 +9,10 @@ - type: accessLevel id: HeadOfPersonnel name: id-card-access-level-head-of-personnel + +- type: accessLevel + id: Magistrat + name: id-card-access-level-magistrat - type: accessGroup id: Command diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index c8992de5075..493971b9a3b 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -49,7 +49,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -60,5 +59,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index bf54483058a..529a91011a7 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -49,7 +49,6 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -59,6 +58,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index f69a3916d96..a1664084570 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -26,7 +26,6 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - #Lawyer: [ 1, 1 ] ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -58,6 +57,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index f249a930010..aa49a2d8226 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -49,7 +49,6 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Warden: [ 1, 1 ] - #Lawyer: [ 1, 1 ] SecurityCadet: [ 1, 1 ] Detective: [ 1, 1 ] #supply @@ -63,5 +62,7 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 1395457e359..70c72221e74 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -51,7 +51,6 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Warden: [ 1, 1 ] - #Lawyer: [ 1, 1 ] SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] #supply @@ -64,5 +63,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 58063c25171..eb1152687ad 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -50,7 +50,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -60,5 +59,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 4072914cf13..40cdfa7d22b 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -50,7 +50,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -60,5 +59,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 7ca5f8cb794..841d6176728 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -48,7 +48,6 @@ SecurityOfficer: [ 5, 7 ] Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -58,5 +57,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index cb407424100..fb33ed5de0f 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - # Lawyer: [ 3, 3 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,5 +60,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 3, 3 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index d298c35657b..96284d1cb06 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -47,7 +47,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - #Lawyer: [ 1, 1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] @@ -58,5 +57,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 7f47a5841c3..19567228baf 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -25,7 +25,6 @@ Janitor: [ 3, 3 ] Chaplain: [ 2, 2 ] Librarian: [ 2, 2 ] - #Lawyer: [ 2, 2 ] ServiceWorker: [ 3, 4 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -61,6 +60,7 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] - + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 2750dafa010..98823aec3e4 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -46,7 +46,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - #Lawyer: [ 1, 1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] @@ -57,5 +56,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 844fe87a2bc..f38fb923c6f 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -49,7 +49,6 @@ Warden: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] SecurityCadet: [ 3, 3 ] - #Lawyer: [ 1, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] @@ -60,5 +59,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 2 ] + Magistrate: [ 1, 1 ] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 92ed0935508..3ec0eba51ca 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 # Replaced on the IAA icon: "JobIconLawyer" supervisors: job-supervisors-hop access: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index bd551751238..b4308b88f25 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -38,7 +38,6 @@ color: "#052EED" # Sunrise-Edit roles: - Captain - - IAA # Sunrise-Edit - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index d67e4e89e4e..819aefab7b3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -41,3 +41,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/centcom_admiral.rsi + +- type: entity + parent: ClothingUniformBase + id: MagistratUniformSuit + name: Костюм магистрата + description: Увольте пару срочников! + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/jumpsuit/magistratebel.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml index b2ee7850031..84554ebdf1f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -1,4 +1,16 @@ - type: entity + id: SpawnPointMagistrat + parent: SpawnPointJobBase + name: Magistrat + components: + - type: SpawnPoint + job_id: Magistrat + - type: Sprite + sprite: _Sunrise/Markers/jobs.rsi + layers: + - state: green + - state: magistrat + - state: jobicon id: SpawnPointBrigmedic parent: SpawnPointJobBase name: brigmedic @@ -8,4 +20,4 @@ - type: Sprite layers: - state: green - - state: brigmedic + - state: brigmedic \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index f72b10c0a43..3972e0bfab4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,3 +11,22 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer + +- type: entity + parent: CaptainPDA + id: MagistratPDA + name: magistrat PDA + components: + - type: Pda + id: MagistratIDCard + state: pda-captain + penSlot: + startingItem: Pen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#7C5D00" + - type: Icon + state: pda-captain diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index 86a4bb0add6..5f88de8e125 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -12,6 +12,15 @@ - type: entity parent: IDCardStandard + id: MagistratIDCard + name: Magistrate ID Card + components: + - type: Sprite + layers: + - state: silver + - state: idmagistrat + - type: PresetIdCard + job: Magistrat id: BrigmedicIDCard name: brigmedic ID card components: @@ -20,4 +29,4 @@ - state: default - state: idbrigmedic - type: PresetIdCard - job: Brigmedic + job: Brigmedic \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 28dfe380b55..63c2f32b70c 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -10,6 +10,9 @@ - Socks - type: roleLoadout + id: JobMagistrat + groups: + - CommonBackpack id: JobBrigmedic groups: - BrigmedicJumpsuit diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index 25d50f586ee..75700e6c6a1 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,7 +60,10 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] + # Sunrise-Roles Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml index ee7a25922bd..50e858dd55b 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cluster.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cluster.yml @@ -28,7 +28,6 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - #Lawyer: [ 1, 1 ] ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -60,7 +59,10 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Magistrate: [ 1, 1 ] + # Sunrise-Roles Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index e5af0a953a7..b554297c6f6 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -29,6 +29,8 @@ Zookeeper: [ 1, 1 ] Captain: [ 1, 1 ] IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] ChiefEngineer: [ 1, 1 ] StationEngineer: [ 5, 5 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index 6a5e50398bb..b7634153cea 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -52,7 +52,6 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,6 +61,9 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] + # Sunrise-Roles Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index dbda3c25792..c231198e945 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -51,7 +51,6 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - #Lawyer: [ 2, 2 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -61,6 +60,9 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Sunrise-Roles + # Sunrise-Law IAA: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Magistrate: [ 1, 1 ] + # Sunrise-Roles Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml new file mode 100644 index 00000000000..066615bfe4f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civilian/Magistrat.yml @@ -0,0 +1,57 @@ +- type: job + id: Magistrat + name: job-name-magistrat + description: job-description-magistrat + playTimeTracker: JobMagistrat + requirements: + - !type:DepartmentTimeRequirement + department: Command + time: 180000 #50 hrs + startingGear: MagistratGear + icon: "JobIconMagistrat" + supervisors: job-supervisors-service + canBeAntag: false + setPreference: true + access: + - Magistrat + - Bar + - Kitchen + - Hydroponics + - Janitor + - Theatre + - Chapel + - Lawyer + - Brig + - Security + - Medical + - Research + - Engineering + - Cargo + - Salvage + - Command + extendedAccess: + - Hydroponics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: MagistratGear + equipment: + jumpsuit: MagistratUniformSuit + back: ClothingBackpackIAAFilled + shoes: ClothingShoesBootsLaceup + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesColorWhite + outerClothing: ClothingOuterRobesJudge + id: MagistratPDA + ears: ClothingHeadsetAltCommand + head: ClothingHeadHatPwig + pocket1: Flash + pocket2: ClothingNeckLawyerbadge + innerClothingSkirt: MagistratUniformSuit + satchel: ClothingBackpackSatchelIAAFilled + duffelbag: ClothingBackpackDuffelIAAFilled \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml new file mode 100644 index 00000000000..cded07650bc --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -0,0 +1,10 @@ +- type: department + id: Law + description: department-Law-description + color: "#FF5297" + weight: -10 + roles: + - Magistrat + - IAA + - Lawyer + \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index b1f8173746f..5ff997b5b76 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -1,5 +1,8 @@ - type: playTimeTracker id: JobIAA +- type: playTimeTracker + id: JobMagistrat + - type: playTimeTracker id: JobBrigmedic diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index db9c13c057f..9367978c0a7 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: IAA + +- type: statusIcon + parent: JobIcon + id: JobIconMagistrat + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Magistrat diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png b/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png index 2795c24307d928f7614e5cab5cfe6e8b5817bdca..5f70a07dbfce8d24dc132911b5a3513609a76a47 100644 GIT binary patch delta 166 zcmV;X09pUU0k;8=8Gi-<006`fzKZ|=00DDSM?wIu&K&6g0041GL_t&-m2J-<62d?b zMA0`9>z8YA0B#V4!bNkgXdDW~4RR6e8q}IaEhH)0wCF#-Y68x8trk*d-OsCtan=q; z-`q~kv;=s+7*gJj>#l{NmLJeBJCyPtLx-j%wub$PtzoV2sUL-aan|-Prp)6aJ~!<# UD)mGf+W-In07*qoM6N<$g8yMf>Hq)$ delta 179 zcmdnac!Y6+WIZzj1HNS%G~10G|+7 z(ZD8dH9P6_rT_o`2Z~u;Ju?$Xv6ck+1p`I?GyLAh7Yr2OEbxddW?5=5UuVS^9fwN{r>9I&@piZsmeTvzXT`}!`Lhz=&$i|N Wz>xp!Na-Pk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}ziUu}utJz7XFa7`jKTyo->Y159inS!jFBmBDpW*j5zF?pLXMsm# zF#`kNVGw3Kp1&dmD5&e{;us*cf~A$m`>*Gdi}$c+75e1meWv2lZ?c($6$zSvU9!IO&`J z?{_+UB=a3Z#02+wE-gQbKL0N$oMp{$GiZkL1X<@|7xoRDN!#bF3v4)h{7Od?BLjonOM~~%zn7ZgTe~DWM4f Da}!az delta 225 zcmcb^_=$0XWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP}k zx0)TFL#A~4(*OVe1I40_PTdcrSWANZf`KCc8Gdi$3kC{s7I;J!GcfQS24TkI`72U@ zg3+EXjv*HQZ~Fte4j6Dan|}P4J}<{8%Gzt{p?}-HhgYhsj5w?x^M*r7Yx8_@Mh+i0 zIT4kGA9q!%O>k|hU_Q+i->~eErqHc?y&D2w?g%`&rs&B2=*ga)i3inLHZzyz@>{p{ S-2__0z~JfX=d#Wzp$PzihEXyA diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..227b197d74a360907d056431c3247ad492e87a82 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUxz+6W95SWTm;V3%A1D@ebn1Q}#aa^N7Yr2n&+vO2UocRBv%n*= zn1O-sFbFdq&tH)O6pZ$CaSXBWf7>6(b-;kb+4SST^m#c()?QN&{oD3Eyi#Rl#9{rI zHylb@o9Bx&a`?E(iKs06xT{iaf@@O+^J%X5hGmB|g>L2R-4OV4N8rgdMMw5WPxkCg dJgCmHnYlEV-@2{uCeRiJ22WQ%mvv4FO#p;UQ3U`1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index d56e7a87c4d..5bc567fa876 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -106,6 +106,9 @@ { "name": "idiaa" }, + { + "name": "idmagistrat" + }, { "name": "idmedicaldoctor" }, diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png new file mode 100644 index 0000000000000000000000000000000000000000..afeba21924505fb51872a16fce40db1d72c157ff GIT binary patch literal 1336 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 Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cc9627e719610327d550f31b3951fb1ddb4537a GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUCt5N5&tmxg|Nqlypb&$f@e@uU#aa^N7yKUx7=CZ#3kC{s7I;J! zGcfQS0%1l`4X*~Eptq-sV~B@?x$gWw6J}T#C^5(9kGB4@z?%7I{xGmK z7){7|eIP`awT8*O;W$%IFXsc7yfbDqKGv~3bzf`OVb>wY@Q&BOf$xbyP`wS%SO!m5 KKbLh*2~7a2AVz5b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..5b6404e3c9a8513f5f61397906291c6c45e53305 GIT binary patch literal 989 zcmV<310wv1P)Px&mq|oHR9J-oRm_^Fbo4wLI_^9o`3N${@kYRc`OnfAhBZ{wrwlhwgE_| z(*PVFA1^gm;z8>7Z`Ia*2e0`aAp|!!H`=zcvO*996ib`@_H!QN=`V@rO_YSgw=dMz zeutv#QY>u}1Oc^LjiaL@YPFgUUUXfy_B#yUzDQgP66JvV@*P45imuD$;2a?YUvGT_ zK>o`w5JGS{I0x6Idv=QZGDsSKz5y2x|1ZKYD7dv>amG_KSv%w%Vpri#mNnr8H8 znpiwP27|$buapug(LVDqw`3k39x8yny*&V?Yr^>IR=;0gT>@}$Z~(yW?(W?A6W8qjD@fCO zUP_4&Vq#pg+5EU|7-4$iS$@%zN~I{3N;50sLN}u63Kt#4_t{ga)Laq^U&)dp48sW` z_mN0UAYR?3t6aQ43_~3}3`4ELeMod1PX~>v+;kfRfnJtr1wNWUM8W{BgMhJ=3kO13`3p$50->Ed!3xUPCA_dU@h|qDW$QNc?3W@ogrtha~<4FY`tc)X~fl-Mxr`U zEVwF@S<~Oc;U%Nd5dY%Bcx+iJoz5_A_u8$8yOsw*pwIbb?6dGM-go&S&#%7`00000 LNkvXXu0mjf&&$eM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json new file mode 100644 index 00000000000..d5cd9d8326b --- /dev/null +++ b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from the game", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jobicon" + }, + { + "name": "green" + }, + { + "name": "magistrat" + } + ] +} \ No newline at end of file