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 2795c24307d..5f70a07dbfc 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/IAA.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Magistrat.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Magistrat.png new file mode 100644 index 00000000000..2795c24307d Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Magistrat.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 26c29d8fa67..55740d4ad14 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -175,6 +175,9 @@ { "name": "HeadRevolutionary" }, + { + "name": "Magistrat" + }, { "name": "MindShield", "delays": diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png index 227b197d74a..bf3ce8c722c 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png differ 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 00000000000..227b197d74a Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmagistrat.png differ 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 00000000000..afeba219245 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING-digi.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f6cadf54dc1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/icon.png new file mode 100644 index 00000000000..d6c2b7916e6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-left.png new file mode 100644 index 00000000000..ca082418764 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-right.png new file mode 100644 index 00000000000..0e532103f35 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/meta.json new file mode 100644 index 00000000000..80272dfa8e5 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA 3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING-digi", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png new file mode 100644 index 00000000000..0becfdb0c54 Binary files /dev/null and b/Resources/Textures/_Sunrise/Markers/jobs.rsi/green.png differ 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 00000000000..4cc9627e719 Binary files /dev/null and b/Resources/Textures/_Sunrise/Markers/jobs.rsi/jobicon.png differ 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 00000000000..5b6404e3c9a Binary files /dev/null and b/Resources/Textures/_Sunrise/Markers/jobs.rsi/magistrat.png differ 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