From 3ee3549e53397584cd363cd340b53dd91eb55478 Mon Sep 17 00:00:00 2001 From: Bolper Date: Wed, 31 Jul 2024 14:21:40 +0300 Subject: [PATCH 01/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=BF=D0=B5=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/paper/stamp-component.ftl | 1 + .../prototypes/Entities/Objects/Misc/paper.ftl | 3 +++ .../ADT/Entities/Objects/Misc/rubber_stamp.yml | 13 +++++++++++++ .../ADT/Objects/Misc/stampsADT.rsi/meta.json | 14 ++++++++++++++ .../Misc/stampsADT.rsi/stamp-magistrat.png | Bin 0 -> 331 bytes 5 files changed, 31 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/paper/stamp-component.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml create mode 100644 Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png 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/Entities/Objects/Misc/paper.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl new file mode 100644 index 00000000000..2742143b492 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl @@ -0,0 +1,3 @@ +ent-RubberStampMagisrat = Печать магистрата + .suffix = DO NOT MAP + .desc = Выглядит угрожающее. От нее веет неоспоримой мощью и величием. 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/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 0000000000000000000000000000000000000000..67d707bf6c45a697fa3a7ba2c76a01c27c07e67c GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQdZ z#W5tJ_3aeHEG9>hw*4&DN0SVtZ@fKv%-AP!q4*5%CmfazeGejSjyXwrCYp1vJ1ugW zZ`x!h-j#q9<|w(PYYPFI?QmuuZ|_80QHJf*~pJ>kw)hd_~($Zya0=$y6=U6-)C zreEe)O_}Wb{726o7QUQ(eLMe0mk<%xpZjZ=zwHYtZ(ve!1A3P)HNrE^*Ox&H$mRfI T5V#aP8AN%y`njxgN@xNA7_oiM literal 0 HcmV?d00001 From 27597383c6d52ea7148ad68cb7df71691095a303 Mon Sep 17 00:00:00 2001 From: Bolper Date: Wed, 31 Jul 2024 16:10:04 +0300 Subject: [PATCH 02/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=B3=D0=B0=D1=80=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=83=D1=80=D0=B0=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0,=20=D0=B3=D0=B0=D1=80=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=83=D1=80=D0=B0=20=D1=8E=D1=80=D0=B8=D1=81=D1=82=D0=B0?= =?UTF-8?q?,=20=D0=B3=D0=B0=D1=80=D0=BD=D0=B8=D1=82=D1=83=D1=80=D0=B0=20?= =?UTF-8?q?=D0=90=D0=B3=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B2=D0=BD=D1=83=D1=82?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BD=D0=B8=D1=85=20=D0=B4=D0=B5=D0=BB,=20?= =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D0=BE=D1=82=D0=B0=20=D1=8E=D1=80=20?= =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D0=B0.=20=D0=92=20EncryptionKeyS?= =?UTF-8?q?tationMaster=20=D0=B5=D0=B5=20=D0=BD=D0=B5=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Ears/headsets.ftl | 6 +++ .../Objects/Device/encryption_keys.ftl | 2 + .../entities/clothing/ears/headsets.ftl | 2 - .../ADT/Entities/Clothing/Ears/headsets.yml | 47 +++++++++++++++++++ .../Objects/Device/encryption_keys.yml | 14 ++++++ Resources/Prototypes/ADT/radio_channels.yml | 7 +++ .../Entities/Clothing/Ears/headsets.yml | 3 +- .../Entities/Clothing/Ears/headsets.yml | 1 + .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 2 +- 9 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Ears/headsets.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/encryption_keys.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml create mode 100644 Resources/Prototypes/ADT/radio_channels.yml 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/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/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl index 989ef2605ab..e69de29bb2d 100644 --- 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 @@ -1,2 +0,0 @@ -ent-ClothingHeadsetIAA = гарнитура АВД - .desc = Гарнитура агента внутренних дел, чтобы услышать последние слова капитана. 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/Objects/Device/encryption_keys.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml new file mode 100644 index 00000000000..09ba604d7fc --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/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/radio_channels.yml b/Resources/Prototypes/ADT/radio_channels.yml new file mode 100644 index 00000000000..dc33a7f08eb --- /dev/null +++ b/Resources/Prototypes/ADT/radio_channels.yml @@ -0,0 +1,7 @@ +- type: radioChannel + id: ADTLawyerChannel + name: Юридический + keycode: 'ю' + frequency: 1305 + color: "#c6d2f5" + longRange: true 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/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index a2e18d99aa2..005fb040b65 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -86,6 +86,7 @@ key_slots: - EncryptionKeyCentCom - EncryptionKeyStationMaster + - ADTEncryptionKeyLawyer - type: Sprite sprite: Clothing/Ears/Headsets/centcom.rsi - type: Clothing diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 07c76b9d1b0..7505ca10948 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -21,7 +21,7 @@ equipment: shoes: ClothingShoesBootsLaceup id: LawyerPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetLawyer inhand: - BriefcaseBrownFilled storage: From fbfcd820719b6fa4a33dcf99c002e60613a089f1 Mon Sep 17 00:00:00 2001 From: Bolper Date: Wed, 31 Jul 2024 19:53:26 +0300 Subject: [PATCH 03/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=94=D0=BE=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=D1=8B:=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=82,=20=D0=90=D0=92=D0=94.=20=D0=9A=D0=9F=D0=9A=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B0.?= =?UTF-8?q?=20airlock=20=D1=81=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=B0=20=D0=B8=20=D0=90=D0=92=D0=94.=20=D0=94?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=8E?= =?UTF-8?q?=D1=80=D0=B8=D0=B4=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=B4=D0=B5=D0=BF=D0=B0=D1=80=D1=82=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/prototypes/Access/accesses.ftl | 2 ++ .../Entities/Objects/Device/pda.ftl | 2 ++ .../Objects/Misc/identification_cards.ftl | 2 ++ .../Entities/Roles/Jobs/departments.ftl | 2 ++ .../prototypes/Entities/Roles/Jobs/jobs.ftl | 2 ++ Resources/Locale/ru-RU/job/job-names.ftl | 2 +- .../objects/devices/encryption_keys.ftl | 1 + .../Prototypes/ADT/Access/LawDepartament.yml | 18 +++++++++++ .../Circuitboards/Machine/fill.txt | 0 .../Devices/Electronics/door_access.yml | 15 +++++++++ .../{Device => Devices}/encryption_keys.yml | 0 .../ADT/Entities/Objects/Devices/pda.yml | 11 +++++++ .../{Device => Devices}/translators.yml | 0 .../Objects/Misc/identification_cards.yml | 12 +++++++ .../Structures/Doors/Airlock/access.yml | 17 ++++++++++ .../Roles/Jobs/LawDepartament/Magistrat.yml | 30 ++++++++++++++++++ .../Prototypes/ADT/Roles/Jobs/departments.yml | 8 +++++ .../ADT/Roles/Jobs/play_time_trackers.yml | 2 ++ Resources/Prototypes/ADT/StatusIcon/job.yml | 6 ++++ Resources/Prototypes/Access/service.yml | 5 --- .../Corvax/Roles/Jobs/Command/iaa.yml | 1 + .../Objects/Misc/identification_cards.yml | 1 + .../Objects/Tools/access_configurator.yml | 2 ++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 - .../Prototypes/Roles/Jobs/departments.yml | 2 -- .../Misc/job_icons.rsi/Magistrat.png | Bin 0 -> 238 bytes .../Interface/Misc/job_icons.rsi/meta.json | 15 +++++++++ 27 files changed, 150 insertions(+), 9 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Access/accesses.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl create mode 100644 Resources/Prototypes/ADT/Access/LawDepartament.yml rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/Circuitboards/Machine/fill.txt (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Devices/Electronics/door_access.yml rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/encryption_keys.yml (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml rename Resources/Prototypes/ADT/Entities/Objects/{Device => Devices}/translators.yml (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml create mode 100644 Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml create mode 100644 Resources/Prototypes/ADT/Roles/Jobs/departments.yml create mode 100644 Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml create mode 100644 Resources/Prototypes/ADT/StatusIcon/job.yml create mode 100644 Resources/Textures/ADT/Interface/Misc/job_icons.rsi/Magistrat.png create mode 100644 Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json 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/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl new file mode 100644 index 00000000000..b844222e71a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl @@ -0,0 +1,2 @@ +ent-MagistratPDA = КПК Магистрата + .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/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/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/LawDepartament.yml b/Resources/Prototypes/ADT/Access/LawDepartament.yml new file mode 100644 index 00000000000..a8e9403ede5 --- /dev/null +++ b/Resources/Prototypes/ADT/Access/LawDepartament.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/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/Device/encryption_keys.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml rename to Resources/Prototypes/ADT/Entities/Objects/Devices/encryption_keys.yml 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 new file mode 100644 index 00000000000..c9c3dc0edd1 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -0,0 +1,12 @@ +- 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 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/Roles/Jobs/LawDepartament/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml new file mode 100644 index 00000000000..7406ca5b1de --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml @@ -0,0 +1,30 @@ +- 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 ] 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/Jobs/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml new file mode 100644 index 00000000000..64279858b03 --- /dev/null +++ b/Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobMagistrat 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/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/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/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/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 7505ca10948..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: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a9d0e8e7a42..3d91de5bf1a 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/Interface/Misc/job_icons.rsi/Magistrat.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/Magistrat.png new file mode 100644 index 0000000000000000000000000000000000000000..9addb688c06ca0efd71f262b100bdd5cceb0618c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9F5he4R}c>anMpkSM) zi(`ny)Z~*N?JNerD$Fv+mZ%IGAjBX@7?$MLXe5e)xBT4K=%WwKp~{6mu42 z27>9^xDWB(IIw+nwS_-V_ApFX?R%5a`F;e@MSQ6do@u_m3|c@o V$PXZJDR?r7@^tlcS?83{1OTJDQXBvP literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..5cd0029884a --- /dev/null +++ b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "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" + } + ] +} From dcc6bbb697fa30e8ae6c6fe649640dc6f53ff36e Mon Sep 17 00:00:00 2001 From: Bolper Date: Wed, 31 Jul 2024 20:54:49 +0300 Subject: [PATCH 04/19] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=B0:=D0=91=D0=B5=D0=BB=D1=8B=D0=B9=20=D0=BA=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8E=D0=BC=20=D0=B4=D0=B8=D0=BF=D0=BB=D0=BE=D0=BC=D0=B0?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Uniforms/jumpsuits.ftl | 2 ++ .../Entities/Clothing/Uniforms/Jumpsuits.yml | 10 +++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 977 bytes .../white-diplomat-suit.rsi/icon.png | Bin 0 -> 416 bytes .../white-diplomat-suit.rsi/inhand-left.png | Bin 0 -> 621 bytes .../white-diplomat-suit.rsi/inhand-right.png | Bin 0 -> 613 bytes .../white-diplomat-suit.rsi/meta.json | 26 ++++++++++++++++++ 7 files changed, 38 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json 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/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/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 0000000000000000000000000000000000000000..a9bcfd38b1d09f249d1bec6d85e87ab389625ab2 GIT binary patch literal 977 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>?NMQuI$el<%GmFg%&(c0t$(j zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwD3=GUVo-U3d6?5K3ZCrQDKxFH#@|PF3I)(1u zFeU!QorOIss`BgW8UJ!j^E+_hg!Ig=E3IpNI223M)_VPpi0xb5t*6E>r2cJT)y9%1 zH~Nat+wLr!@qIN5yg0Mq81XI|B9N!3xinYTTg z@y74JAD%M+xw9Aw@^;_7^|R((&${c`*?DQ}+@$|X^s6$>neDfn@6nnzxz#ZYg>ft| zzW@HuQc?aoYl~}xgwg@c8-g91rK}f4=R)@^(x6_Pf&Uji>`67C4nEThy^5uCl&maEL@?L(~ z@bSkR4`UAg$lG50{JCDGlf0=@OuJ>@+28j(w5hx-B-Stqatw9n@|eB(aTj(F0$Ug zT~Sgo>GpGxP==f0Q|@1^Di+y&^djqx+ZUv_%yPf@q$8?9i--R`@M*a5o5|rCQ-vr~iv+*pHLEEh40~PUu2o1fZdy>jW)a7O`;4+(nsfRO zD$Zzl!oJAwWzAKYEJhGKCF#FW_n!p&PmyID6SUM7%=o!JW;4xYkS<}$`NMkIL`(Jz S8&?1*hk3gCxvX z0t3^BdWO_Us};G?$G-~(>q#=$<*ogy_Wk)`@3;DYXFYdj2-8ZEsIAgpcRW$X*vZd- zQFg%X=Ea{r@3~f0BI*{pK!YnZbn2^J>+Y|9U1hL7f9HAU$Z5Xuj2!BZLmgOuyqw7Y zSF+i?NMQuI$el<%Gmlas=n!2MURo zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwD3=E7XJY5_^D&{<$c`&!xLBKV9=ku;3ntPWt zZF#8YA#8G>F{{&D^RlgSPS zUOk6q?hC{*d$Tt#%Y0!~;%h_wja5r6XN$LL-2DPf36U$5A#I0Vu>-)9H!_Ea3t5$K9 z#_GRLl+ZiZ|Gxdg_rE`PMVFS$UAI5Xz5U5Oy*m6-m7KUIr&8_+XK^1vzTRvRr%L@ekr4?hMu;gmgsQZWr|;tLM4 aX4o+XNtG<=Sn6s5ihWO4KbLh*2~7Z?6ZFdf literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..86fb676e73ee3282c7e0ae6a45b14b12628a596d GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>?NMQuI$el<%Fcv9ky-I01Anh zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G}EByV>YhW{YAVDIwD3=E71JY5_^D&{<$c`&!xK%{N$ood%dS7NOk zubmJ};S_stU@Lb)8ru>-$Jv`#yJtTUn4OUF^6}Pbc9CTdUVfIZsX7*w{m*y@1FxP# zGxvoDOeVxJh3~9cb&BtB!e86S({{Rhj>)~xn0Ws7b?1f3?GN@$XFOqfZO`J?SG(pp z7i9A?TKJd$NWXVb>9NJR%vsxCo0$6=zn9l#xgTv)oB!WN@%`kFZh<1pa-%lM<@=M+46N_2*PVYRSuI%ZVW#m2SUsT=l{~raa_b#44WzUW8 zdu8vRxBr~4_-n!Wbxy0ww@j$MdABw)n?vEMb<_#b488Tmj=YRZs@985`tm2zn?dv5 zMW?*h?A^zx Xz*F>v!}#}8P^^2p`njxgN@xNA!29?Y literal 0 HcmV?d00001 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 + } + ] +} From d38f31801d46adac2565b74db024208b6c4bcb20 Mon Sep 17 00:00:00 2001 From: Bolper Date: Wed, 31 Jul 2024 22:20:45 +0300 Subject: [PATCH 05/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=B5=20=D1=81=D0=BD=D0=B0=D1=80=D1=8F=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5,=20=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D0=BD=D1=82=D1=8B=20=D0=9C=D0=B0=D0=B3=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D0=90=D0=92=D0=94(=D0=BF=D0=BE=20=D0=BD=D0=B5=D0=B8?= =?UTF-8?q?=D0=B7=D0=B2=D0=B5=D1=81=D1=82=D0=BD=D1=8B=D0=BC=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=BD=D0=B0=D0=BC=20=D0=BD=D0=B5=20=D1=84?= =?UTF-8?q?=D1=83=D1=80=D1=8B=D1=87=D0=B0=D1=82).=20=D0=9D=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=B6=D0=B4=D1=83=D1=8E=20=D0=BA=D0=B0=D1=80=D1=82=D1=83?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=B8=D0=BA=D0=BD=D1=83=D1=82=D1=8C=20=D0=90?= =?UTF-8?q?=D0=92=D0=94,=20=D0=9C=D0=B0=D0=B3=D1=83,=20=D1=8E=D1=80=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Markers/Spawners/jobs.ftl | 1 + .../ADT/Entities/Markers/Spawners/jobs.yml | 34 ++++++++++++++++++ .../Roles/Jobs/LawDepartament/Magistrat.yml | 27 +++++++++++++- .../Entities/Markers/Spawners/jobs.yml | 2 +- Resources/Prototypes/Maps/atlas.yml | 5 +++ Resources/Prototypes/Maps/bagel.yml | 4 +++ Resources/Prototypes/Maps/box.yml | 6 ++-- Resources/Prototypes/Maps/cluster.yml | 8 +++-- 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 | 5 ++- Resources/Prototypes/Maps/packed.yml | 5 ++- Resources/Prototypes/Maps/reach.yml | 4 +++ Resources/Prototypes/Maps/saltern.yml | 5 ++- Resources/Prototypes/Maps/train.yml | 5 ++- .../Textures/ADT/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../Textures/ADT/Markers/jobs.rsi/iaa.png | Bin 0 -> 1080 bytes .../ADT/Markers/jobs.rsi/magistrat.png | Bin 0 -> 919 bytes .../Textures/ADT/Markers/jobs.rsi/meta.json | 20 +++++++++++ 24 files changed, 148 insertions(+), 18 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/jobs.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml create mode 100644 Resources/Textures/ADT/Markers/jobs.rsi/green.png create mode 100644 Resources/Textures/ADT/Markers/jobs.rsi/iaa.png create mode 100644 Resources/Textures/ADT/Markers/jobs.rsi/magistrat.png create mode 100644 Resources/Textures/ADT/Markers/jobs.rsi/meta.json 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/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..2887e4f3aaa --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,34 @@ +- type: entity + id: ADTSpawnPointJobBase + parent: MarkerBase + abstract: true + suffix: Job Spawn + components: + - type: SpawnPoint + spawn_type: Job + - type: Sprite + sprite: ADT/Markers/jobs.rsi + +- 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: Magistrat + - type: Sprite + layers: + - state: green + - state: iaa diff --git a/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml index 7406ca5b1de..f9f3b89b059 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml @@ -10,7 +10,7 @@ # - !type:DepartmentTimeRequirement # department: Sponsor # time: 10 -# startingGear: MagistratGear + startingGear: MagistratGear icon: "JobIconMagistrat" requireAdminNotify: true joinNotifyCrew: true @@ -28,3 +28,28 @@ 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 + pocket1: RubberStampMagisrat +# pocket2: 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/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/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index 6fe3eff030a..7ec87415138 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -55,3 +55,8 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] + diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 0bd4714e3ec..7b948f47f3b 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -61,3 +61,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index ecd4ef07404..2bd0df1164e 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 8485b068f8d..75f4d82076b 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index e531579b336..84d35f542d0 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,7 @@ Musician: [ 1, 1 ] Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 84961a3874b..62a683da4dc 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,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 97ed26c8ec9..dbec7a43030 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index d3968c369a1..225ca9590f8 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 67600c501d6..007d696e346 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index d11a1217d90..b7bdfd120cd 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,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index b4df9c756da..d8ba24d67ea 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,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index fa7c6435577..42ec161ee4e 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,8 @@ Musician: [ 2, 2 ] Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index fdffc03fcd6..2162992a72f 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,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 1 , 1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index a0d6752c1fb..0c859ebbead 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -31,4 +31,8 @@ AtmosphericTechnician: [ 1, 1 ] StationEngineer: [ 1, 2 ] Passenger: [ -1, -1 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index e49fde94efa..734d6e240e1 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -59,4 +59,7 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 46492e80f06..9e7b4fbc973 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,7 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + # Юрдеп + Magistrat: [ 1, 1 ] + IAA: [ 1, 1 ] + Lawyer: [ 1, 1 ] diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/green.png b/Resources/Textures/ADT/Markers/jobs.rsi/green.png new file mode 100644 index 0000000000000000000000000000000000000000..0becfdb0c54a42a943da2d51056a0bc22c451f37 GIT binary patch literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Markers/jobs.rsi/iaa.png b/Resources/Textures/ADT/Markers/jobs.rsi/iaa.png new file mode 100644 index 0000000000000000000000000000000000000000..f93b5d5034934904799b7de460efc5b6c7995570 GIT binary patch literal 1080 zcmV-81jqY{P)ByqRTId+WSXp$ghoWnPS4NZrN68@-v95v05DLS;3~ zB9w5weiZ?4+*gYtno?UZf{3qa-=evH#6`&hx&{^ZeiE z<2~=Sf8*jtfbTfWM~?6lu|s>|0s!$4i3GYVCBsYI`mFF9uJzP0f-e64RwL(+{CBTpOhaKr>frp zzu#Yp)c-=@c4L~RF+M&{B9Q=pH$TmP$%%ms{k_4OdQB66@~#ZSARdobWU*Kbfa3?h z17P-K8}WD?!!WotTJ=yfS7zu9!$2tofUfHRD5Z#pU*_r5dwl)E4ucokxERX-jcO4$Gm!>Bm9`RWx`viEUlx|1LND4A<*CfWatXf!HY+Zmago0DCq5(orD z*L4Yp!?JImPr~7_=(;X}KtME26M(t7IoaCINHiL)TL(2G&}-iyK0iw^pWxDDL;yS< z4^WQE2QS@QNsTGLG#Qa#K0$nbmR|ct-A&dcAh{d>sn{a!R$tXzHk)O1`cJaiY?a*I z>LV3ftkQ3qKqj5$#A~DM*SkorFI72LN}=mIN~tOm$@L}n>s{oGzsRK1bqUlxv5xk5 z1YmwGYcq2U|8@gV)t*Wz+r`tP0`TPN59`{mx!`DzN5c1)ziz7=d45gbQ|WP~6q=@0 zMxdd#yB(IVWTx|MHj7~x73bz?6-^N^Yhd?mFk7@K0+w#YcLH~vK;0CqZrq_u<}NH% z?5%AG<(At^X2oX1MR?)-c>y>+GJ?glh{(B#iH2`P4KW=X8{5-hBoeXJnrp=N yKf{{BhB>XC#{d8T4rN$LW=%~1DgXcg2mk;800000(o>TF00008_H$&&y6DFwj=7R_KQh)4)dFlX5bG>r?)@ka8 zF0y>D0fQI0Z_lta7Y-sYKy`D5f%GViTAfCGmPW14Kzfww=1iFS!F2QT1+nrmNhA`o zu&^K}UVFt|TltvWynJETL)lU0>^ZUWF##lzNXXK)Z``$&kBK>ZE-*mg>9z7Px%cQ( zo{N3x`dYR!^(b(@P{*fvwNDDaeeBv}2T!x-RVP%gKtZai3c%3N5HD`L>H2@!_Z=%M zD*#MSPlvt}x)!%>TXbEQjfakuN+q%KF)5WwvhmOnUDw67ZD~RJm9Jx{s;XqOS=XLZ zzXU+}=q-;8kj-WZ0?`%V&&kHd#uy(TXLWTIl%wd^zUAa`2mALz$GFe{@Z_yDO`}lQ zDN-yJ0hm7WBLK&uUr{I&&@_$qZtV)7)p||SNT<`TztshRuWyXP+*z*NeHnmsI_*OE z>4NX8IFrdl05nZ=A?){mX6n=@Y@DjF7Jc6HoL_YWn5v&=->s8m_iG-1rBVSvThDsz zZgGF7j+Wq{ zdhcw<8XY?zTU!7;C@vE1J>c0hO_S6+moQD!%e@UdshJ7$bAvfb={rn_OHUSEO(vB zWFqY`y9Q{Ns;V+MISD-J!oYpapOp=V`# zyG~zU{|?Zd+rIPq>OgXMMEd*pdwh;#1JEkozMmW(5x)?=0BW@wwOTFoekc6_&AEx$ t!Y#N60000EWmrjOO-%qQ00008000000002eQ Date: Wed, 31 Jul 2024 22:42:19 +0300 Subject: [PATCH 06/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20=D0=A7=D1=83=D1=82=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81?= =?UTF-8?q?=D0=BF=D0=B0=D0=B2=D0=BD=20=D0=90=D0=92=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml index 2887e4f3aaa..ef6d511358b 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -27,7 +27,7 @@ name: IAA components: - type: SpawnPoint - job_id: Magistrat + job_id: IAA - type: Sprite layers: - state: green From 1fa20bb0d8704fb93de1746673e5bef1f642c493 Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 09:18:10 +0300 Subject: [PATCH 07/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B0=D0=B3=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/loadout.ftl | 2 ++ .../ADT/Loadouts/Jobs/Juridical/magistrat.yml | 8 +++++++ .../ADT/Loadouts/Jobs/loadout_groups.yml | 22 +++++++++++++++++++ .../ADT/Loadouts/Jobs/role_loadouts.yml | 12 ++++++++++ .../Roles/Jobs/LawDepartament/Magistrat.yml | 6 ++--- 5 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/loadout.ftl create mode 100644 Resources/Prototypes/ADT/Loadouts/Jobs/Juridical/magistrat.yml create mode 100644 Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml create mode 100644 Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml diff --git a/Resources/Locale/ru-RU/ADT/loadout.ftl b/Resources/Locale/ru-RU/ADT/loadout.ftl new file mode 100644 index 00000000000..6da7b7dde51 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/loadout.ftl @@ -0,0 +1,2 @@ +ent-MagistratNeck = Галстуки +ent-MagistratJumpsuit = Костюмы 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/Jobs/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml new file mode 100644 index 00000000000..6e89cb43ab3 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml @@ -0,0 +1,22 @@ +- 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 diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml new file mode 100644 index 00000000000..eb2076fc676 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml @@ -0,0 +1,12 @@ +- type: roleLoadout + id: JobMagistrat + groups: + - Inventory # Corvax-Loadouts + - GroupTankHarness + - MagistratNeck + - MagistratJumpsuit + - CommonBackpack + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml index f9f3b89b059..ca258ad2391 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml @@ -32,7 +32,7 @@ - type: startingGear id: MagistratGear equipment: - jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL +# jumpsuit: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL # back: ClothingBackpackIAAFilled shoes: ClothingShoesBootsLaceup #mask: Ну что за косипор оставляет пустуе значения? @@ -44,8 +44,8 @@ ears: ClothingHeadsetMagistrat #belt: neck: ClothingNeckLawyerbadge - pocket1: RubberStampMagisrat -# pocket2: ADTtelescopicBaton + pocket2: RubberStampMagisrat +# pocket1: ADTtelescopicBaton # underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear # socks: ClothingUnderwearSocksNormal # underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear From 49017fe14814000030d91006b8fc982f06e79249 Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 10:04:56 +0300 Subject: [PATCH 08/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?:=20=D0=B4=D0=B0=D0=BB=D0=B8=20=D0=B4=D0=BE=D1=81=D1=82=D1=83?= =?UTF-8?q?=D0=BF=20=D0=BA=D1=8D=D0=BF=D1=83.=20=D0=A2=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20=D0=B2=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=20=D1=88?= =?UTF-8?q?=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81?= =?UTF-8?q?=D0=BE=20=D0=B2=D1=81=D0=B5=D0=BC=D0=B8=20=D0=BA=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D0=B0=D0=BC=D0=B8=20=D0=B5=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB=20=D1=8E=D1=80=D0=B4=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0.=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BB=D1=8C.=20=D0=A1=D0=BF=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/radio_channels.yml | 2 +- Resources/Prototypes/Access/misc.yml | 2 ++ Resources/Prototypes/Entities/Clothing/Ears/headsets.yml | 1 - Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml | 3 ++- .../Prototypes/Entities/Objects/Devices/encryption_keys.yml | 1 + .../Prototypes/Entities/Structures/Machines/telecomms.yml | 1 + Resources/Prototypes/Maps/bagel.yml | 1 - 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/radio_channels.yml b/Resources/Prototypes/ADT/radio_channels.yml index dc33a7f08eb..53f3d776ab3 100644 --- a/Resources/Prototypes/ADT/radio_channels.yml +++ b/Resources/Prototypes/ADT/radio_channels.yml @@ -4,4 +4,4 @@ keycode: 'ю' frequency: 1305 color: "#c6d2f5" - longRange: true + longRange: false diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index f79f1779c22..cc22ab91532 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,3 +32,5 @@ - Chapel - Hydroponics - Atmospherics + - IAA + - Magistratе diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 005fb040b65..a2e18d99aa2 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -86,7 +86,6 @@ key_slots: - EncryptionKeyCentCom - EncryptionKeyStationMaster - - ADTEncryptionKeyLawyer - type: Sprite sprite: Clothing/Ears/Headsets/centcom.rsi - type: Clothing 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/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/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/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 7b948f47f3b..a46da85b154 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 ] From cd7d985b30fe903be748e8c7fd772783e61d678f Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 10:12:52 +0300 Subject: [PATCH 09/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=9C=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0?= =?UTF-8?q?=D1=82=D0=BA=D0=B0.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D1=83=20=D0=BA=D1=8D=D0=BF?= =?UTF-8?q?=D0=B0=20=D0=B5=D1=81=D1=82=D1=8C=20=D0=B4=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=83=D0=BF=20=D0=B2=D0=BE=20=D0=B2=D0=B5=D1=81=D1=8C=20=D1=8E?= =?UTF-8?q?=D1=80=D0=B4=D0=B5=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Access/misc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index cc22ab91532..0ac85d29ee5 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -33,4 +33,4 @@ - Hydroponics - Atmospherics - IAA - - Magistratе + - Magistrate From bf8d49956e503475029aa16dbcb10d9e6ec093d2 Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 12:53:34 +0300 Subject: [PATCH 10/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20fix:=20YAML=20Linter.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl | 1 + Resources/Prototypes/ADT/radio_channels.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl new file mode 100644 index 00000000000..ddb67d55b5e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl @@ -0,0 +1 @@ +ADT-Lawyer-Channel-name = Юридический diff --git a/Resources/Prototypes/ADT/radio_channels.yml b/Resources/Prototypes/ADT/radio_channels.yml index 53f3d776ab3..bde851d1453 100644 --- a/Resources/Prototypes/ADT/radio_channels.yml +++ b/Resources/Prototypes/ADT/radio_channels.yml @@ -1,6 +1,6 @@ - type: radioChannel id: ADTLawyerChannel - name: Юридический + name: ADT-Lawyer-Channel-name keycode: 'ю' frequency: 1305 color: "#c6d2f5" From 1a108faa23acc3e77e48f862c033123cd0df088d Mon Sep 17 00:00:00 2001 From: Bolper <169089627+Bolper@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:39:08 +0300 Subject: [PATCH 11/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20FTL?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/ears/headsets.ftl 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 e69de29bb2d..00000000000 From fd3c1c6001b635978772d945f0976e12ab4a8201 Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 14:13:01 +0300 Subject: [PATCH 12/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20fix:=20=D0=BA=D0=BE=D0=B4=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B2=D1=8C=D1=8E=20=D0=BF=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/{loadout.ftl => Preferences/loadout-groups.ftl} | 0 .../ADT/{prototypes/radio_channels.ftl => headset-component.ftl} | 0 .../Entities/Objects/Misc/{paper.ftl => rubber_stamp.ftl} | 0 .../Prototypes/ADT/Access/{LawDepartament.yml => juridical.yml} | 0 Resources/Prototypes/ADT/Loadouts/{Jobs => }/loadout_groups.yml | 0 Resources/Prototypes/ADT/Loadouts/{Jobs => }/role_loadouts.yml | 0 .../ADT/Roles/Jobs/{LawDepartament => Juridical}/Magistrat.yml | 0 Resources/Prototypes/ADT/Roles/{Jobs => }/play_time_trackers.yml | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/ADT/{loadout.ftl => Preferences/loadout-groups.ftl} (100%) rename Resources/Locale/ru-RU/ADT/{prototypes/radio_channels.ftl => headset-component.ftl} (100%) rename Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/{paper.ftl => rubber_stamp.ftl} (100%) rename Resources/Prototypes/ADT/Access/{LawDepartament.yml => juridical.yml} (100%) rename Resources/Prototypes/ADT/Loadouts/{Jobs => }/loadout_groups.yml (100%) rename Resources/Prototypes/ADT/Loadouts/{Jobs => }/role_loadouts.yml (100%) rename Resources/Prototypes/ADT/Roles/Jobs/{LawDepartament => Juridical}/Magistrat.yml (100%) rename Resources/Prototypes/ADT/Roles/{Jobs => }/play_time_trackers.yml (100%) diff --git a/Resources/Locale/ru-RU/ADT/loadout.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/loadout.ftl rename to Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl b/Resources/Locale/ru-RU/ADT/headset-component.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/radio_channels.ftl rename to Resources/Locale/ru-RU/ADT/headset-component.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/paper.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/rubber_stamp.ftl diff --git a/Resources/Prototypes/ADT/Access/LawDepartament.yml b/Resources/Prototypes/ADT/Access/juridical.yml similarity index 100% rename from Resources/Prototypes/ADT/Access/LawDepartament.yml rename to Resources/Prototypes/ADT/Access/juridical.yml diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml similarity index 100% rename from Resources/Prototypes/ADT/Loadouts/Jobs/loadout_groups.yml rename to Resources/Prototypes/ADT/Loadouts/loadout_groups.yml diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml similarity index 100% rename from Resources/Prototypes/ADT/Loadouts/Jobs/role_loadouts.yml rename to Resources/Prototypes/ADT/Loadouts/role_loadouts.yml diff --git a/Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml b/Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml similarity index 100% rename from Resources/Prototypes/ADT/Roles/Jobs/LawDepartament/Magistrat.yml rename to Resources/Prototypes/ADT/Roles/Jobs/Juridical/Magistrat.yml diff --git a/Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml similarity index 100% rename from Resources/Prototypes/ADT/Roles/Jobs/play_time_trackers.yml rename to Resources/Prototypes/ADT/Roles/play_time_trackers.yml From 6cc6cbc96f7992b159e1420116abbe5796b3b8db Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 15:13:55 +0300 Subject: [PATCH 13/19] test fix --- Resources/Prototypes/Corvax/Maps/astra.yml | 3 +-- Resources/Prototypes/Corvax/Maps/avrite.yml | 1 - Resources/Prototypes/Corvax/Maps/delta.yml | 1 - Resources/Prototypes/Corvax/Maps/gelta.yml | 1 - Resources/Prototypes/Corvax/Maps/ishimura.yml | 1 - Resources/Prototypes/Corvax/Maps/maus.yml | 1 - Resources/Prototypes/Corvax/Maps/outpost.yml | 1 - Resources/Prototypes/Corvax/Maps/paper.yml | 1 - Resources/Prototypes/Corvax/Maps/pearl.yml | 3 +-- Resources/Prototypes/Corvax/Maps/pilgrim.yml | 1 - Resources/Prototypes/Corvax/Maps/silly.yml | 1 - Resources/Prototypes/Corvax/Maps/split.yml | 1 - Resources/Prototypes/Corvax/Maps/terra.yml | 1 - 13 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Corvax/Maps/astra.yml b/Resources/Prototypes/Corvax/Maps/astra.yml index bb8e1fd516a..2cebd799e88 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 ] From e6f5374e341aeb5e3d3004e273f51838897df98c Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 15:45:33 +0300 Subject: [PATCH 14/19] =?UTF-8?q?=D0=9C=D1=8F=D1=83~=20=D0=A3=D0=B1=D0=B8?= =?UTF-8?q?=D1=80=D0=B0=D0=B5=D0=BC=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=8E?= =?UTF-8?q?=20=D1=85=D1=83=D0=B9=D0=BD=D1=8E,=20=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=83=D1=8E=20=D1=8F=20=D0=B6=D0=B5=20=D1=81=D0=B0=D0=BC?= =?UTF-8?q?=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB.=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B0:?= =?UTF-8?q?=20remove:=20=D0=B2=20=D0=BA=D0=B0=D1=80=D1=82=D0=B0=D1=85=20?= =?UTF-8?q?=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D0=B8?= =?UTF-8?q?=D0=BA=D0=BD=D1=83=D1=82=D1=8C=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=BC=D0=B0=D0=B3=D0=B8=20=D0=B8=20?= =?UTF-8?q?=D0=B0=D0=B2=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Maps/atlas.yml | 2 -- Resources/Prototypes/Maps/bagel.yml | 2 -- Resources/Prototypes/Maps/box.yml | 2 -- Resources/Prototypes/Maps/cluster.yml | 2 -- Resources/Prototypes/Maps/core.yml | 2 -- Resources/Prototypes/Maps/europa.yml | 2 -- Resources/Prototypes/Maps/fland.yml | 2 -- Resources/Prototypes/Maps/marathon.yml | 2 -- Resources/Prototypes/Maps/meta.yml | 2 -- Resources/Prototypes/Maps/oasis.yml | 2 -- Resources/Prototypes/Maps/omega.yml | 2 -- Resources/Prototypes/Maps/origin.yml | 2 -- Resources/Prototypes/Maps/packed.yml | 2 -- Resources/Prototypes/Maps/reach.yml | 2 -- Resources/Prototypes/Maps/saltern.yml | 2 -- Resources/Prototypes/Maps/train.yml | 2 -- 16 files changed, 32 deletions(-) diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index 7ec87415138..335f8ded25c 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -56,7 +56,5 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index a46da85b154..2771582fa35 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -61,6 +61,4 @@ Musician: [ 1, 1 ] Reporter: [ 2, 2 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index 2bd0df1164e..13f7381c28d 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -60,6 +60,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 75f4d82076b..b7bb6339e24 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -59,6 +59,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 84d35f542d0..f543e8ce63d 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -64,6 +64,4 @@ Boxer: [ 2, 2 ] Reporter: [ 2, 2 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 62a683da4dc..dd185b849df 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -62,6 +62,4 @@ Musician: [ 1, 1 ] Reporter: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index dbec7a43030..96c57be02f2 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -61,6 +61,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 225ca9590f8..e684a59e30e 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -61,6 +61,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 007d696e346..efdcb6626b7 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -59,6 +59,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index b7bdfd120cd..1fafb22fb10 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -62,6 +62,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index d8ba24d67ea..b51099c9f7d 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -59,6 +59,4 @@ Musician: [ 1, 1 ] Borg: [ 2, 2 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 42ec161ee4e..d61d913b696 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -62,7 +62,5 @@ Boxer: [ 1, 1 ] Reporter: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 2162992a72f..af3eb47e518 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -58,6 +58,4 @@ Musician: [ 1, 1 ] Borg: [ 1 , 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index 0c859ebbead..bfb2255fe87 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -32,7 +32,5 @@ StationEngineer: [ 1, 2 ] Passenger: [ -1, -1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index 734d6e240e1..d56d56fc8b8 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -60,6 +60,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 9e7b4fbc973..a1ef8670dd7 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -61,6 +61,4 @@ Musician: [ 1, 1 ] Borg: [ 2, 2 ] # Юрдеп - Magistrat: [ 1, 1 ] - IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] From 0d2701710620755c62f4ceab7d31db979a267cb9 Mon Sep 17 00:00:00 2001 From: Bolper Date: Thu, 1 Aug 2024 15:59:00 +0300 Subject: [PATCH 15/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D0=B0.=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Maps/reach.yml | 2 -- Resources/Prototypes/Maps/saltern.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index bfb2255fe87..a0d6752c1fb 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -31,6 +31,4 @@ AtmosphericTechnician: [ 1, 1 ] StationEngineer: [ 1, 2 ] Passenger: [ -1, -1 ] - # Юрдеп - Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index d56d56fc8b8..f9a5094fa0a 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -59,5 +59,3 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - # Юрдеп - Lawyer: [ 1, 1 ] From ee62d6465945e226ffab04749feee34556ac1929 Mon Sep 17 00:00:00 2001 From: Bolper Date: Sat, 3 Aug 2024 16:43:26 +0300 Subject: [PATCH 16/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20fix=20Resources\Prototypes\ADT\Enti?= =?UTF-8?q?ties\Objects\Misc\identification=5Fcards.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Misc/identification_cards.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index 2bd1eee8036..b7928e36d39 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -10,6 +10,9 @@ - state: idlawyer - type: PresetIdCard job: Magistrat + +- type: entity + parent: IDCardStandard id: ADTPathologistIDCard name: pathologist's ID card components: @@ -19,4 +22,4 @@ - state: default - state: id-pathologist - type: PresetIdCard - job: ADTPathologist \ No newline at end of file + job: ADTPathologist From 7baf95f34749ffffb418b75c929bce2a488acf32 Mon Sep 17 00:00:00 2001 From: Bolper Date: Sat, 3 Aug 2024 17:14:27 +0300 Subject: [PATCH 17/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0:=20fix:=20Resources\Textures\ADT\Marke?= =?UTF-8?q?rs\job.rsi\meta.json=20Resources\Prototypes\ADT\Entities\Marker?= =?UTF-8?q?s\Spawners\jobs.yml=20Resources\Textures\ADT\Markers\jobs.rsi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Markers/Spawners/job.yml | 23 ------------- .../ADT/Entities/Markers/Spawners/jobs.yml | 14 +++++++- .../Interface/Misc/job_icons.rsi/meta.json | 10 ++---- .../Textures/ADT/Markers/job.rsi/green.png | Bin 309 -> 0 bytes .../Textures/ADT/Markers/job.rsi/iaa.png | Bin 1080 -> 0 bytes .../ADT/Markers/job.rsi/magistrat.png | Bin 919 -> 0 bytes .../Textures/ADT/Markers/job.rsi/meta.json | 29 ---------------- .../{job.rsi => jobs.rsi}/investigator.png | Bin .../Textures/ADT/Markers/jobs.rsi/meta.json | 31 +++++++++++------- .../{job.rsi => jobs.rsi}/pathologist.png | Bin .../Markers/{job.rsi => jobs.rsi}/urist.png | Bin 11 files changed, 35 insertions(+), 72 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/green.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/iaa.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/magistrat.png delete mode 100644 Resources/Textures/ADT/Markers/job.rsi/meta.json rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/investigator.png (100%) rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/pathologist.png (100%) rename Resources/Textures/ADT/Markers/{job.rsi => jobs.rsi}/urist.png (100%) 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 index ef6d511358b..10d99928089 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/jobs.yml @@ -2,13 +2,25 @@ id: ADTSpawnPointJobBase parent: MarkerBase abstract: true - suffix: Job Spawn + 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 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 b442515e295..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,9 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "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.", -======= - "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, @@ -12,11 +10,7 @@ "states": [ { "name": "Magistrat" - } - ] -} -======= - + }, { "name": "ADTPathologist" } diff --git a/Resources/Textures/ADT/Markers/job.rsi/green.png b/Resources/Textures/ADT/Markers/job.rsi/green.png deleted file mode 100644 index 0becfdb0c54a42a943da2d51056a0bc22c451f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)h6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! diff --git a/Resources/Textures/ADT/Markers/job.rsi/iaa.png b/Resources/Textures/ADT/Markers/job.rsi/iaa.png deleted file mode 100644 index f93b5d5034934904799b7de460efc5b6c7995570..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1080 zcmV-81jqY{P)ByqRTId+WSXp$ghoWnPS4NZrN68@-v95v05DLS;3~ zB9w5weiZ?4+*gYtno?UZf{3qa-=evH#6`&hx&{^ZeiE z<2~=Sf8*jtfbTfWM~?6lu|s>|0s!$4i3GYVCBsYI`mFF9uJzP0f-e64RwL(+{CBTpOhaKr>frp zzu#Yp)c-=@c4L~RF+M&{B9Q=pH$TmP$%%ms{k_4OdQB66@~#ZSARdobWU*Kbfa3?h z17P-K8}WD?!!WotTJ=yfS7zu9!$2tofUfHRD5Z#pU*_r5dwl)E4ucokxERX-jcO4$Gm!>Bm9`RWx`viEUlx|1LND4A<*CfWatXf!HY+Zmago0DCq5(orD z*L4Yp!?JImPr~7_=(;X}KtME26M(t7IoaCINHiL)TL(2G&}-iyK0iw^pWxDDL;yS< z4^WQE2QS@QNsTGLG#Qa#K0$nbmR|ct-A&dcAh{d>sn{a!R$tXzHk)O1`cJaiY?a*I z>LV3ftkQ3qKqj5$#A~DM*SkorFI72LN}=mIN~tOm$@L}n>s{oGzsRK1bqUlxv5xk5 z1YmwGYcq2U|8@gV)t*Wz+r`tP0`TPN59`{mx!`DzN5c1)ziz7=d45gbQ|WP~6q=@0 zMxdd#yB(IVWTx|MHj7~x73bz?6-^N^Yhd?mFk7@K0+w#YcLH~vK;0CqZrq_u<}NH% z?5%AG<(At^X2oX1MR?)-c>y>+GJ?glh{(B#iH2`P4KW=X8{5-hBoeXJnrp=N yKf{{BhB>XC#{d8T4rN$LW=%~1DgXcg2mk;800000(o>TF00008_H$&&y6DFwj=7R_KQh)4)dFlX5bG>r?)@ka8 zF0y>D0fQI0Z_lta7Y-sYKy`D5f%GViTAfCGmPW14Kzfww=1iFS!F2QT1+nrmNhA`o zu&^K}UVFt|TltvWynJETL)lU0>^ZUWF##lzNXXK)Z``$&kBK>ZE-*mg>9z7Px%cQ( zo{N3x`dYR!^(b(@P{*fvwNDDaeeBv}2T!x-RVP%gKtZai3c%3N5HD`L>H2@!_Z=%M zD*#MSPlvt}x)!%>TXbEQjfakuN+q%KF)5WwvhmOnUDw67ZD~RJm9Jx{s;XqOS=XLZ zzXU+}=q-;8kj-WZ0?`%V&&kHd#uy(TXLWTIl%wd^zUAa`2mALz$GFe{@Z_yDO`}lQ zDN-yJ0hm7WBLK&uUr{I&&@_$qZtV)7)p||SNT<`TztshRuWyXP+*z*NeHnmsI_*OE z>4NX8IFrdl05nZ=A?){mX6n=@Y@DjF7Jc6HoL_YWn5v&=->s8m_iG-1rBVSvThDsz zZgGF7j+Wq{ zdhcw<8XY?zTU!7;C@vE1J>c0hO_S6+moQD!%e@UdshJ7$bAvfb={rn_OHUSEO(vB zWFqY`y9Q{Ns;V+MISD-J!oYpapOp=V`# zyG~zU{|?Zd+rIPq>OgXMMEd*pdwh;#1JEkozMmW(5x)?=0BW@wwOTFoekc6_&AEx$ t!Y#N60000EWmrjOO-%qQ00008000000002eQ Date: Sat, 3 Aug 2024 17:22:57 +0300 Subject: [PATCH 18/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20fix:=20Resources\Prototypes\ADT\Loa?= =?UTF-8?q?douts\loadout=5Fgroups.yml=20Resources\Prototypes\ADT\Loadouts\?= =?UTF-8?q?role=5Floadouts.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Loadouts/loadout_groups.yml | 2 ++ Resources/Prototypes/ADT/Loadouts/role_loadouts.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 1a7fef95d00..e17e604bf6c 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -20,6 +20,8 @@ minLimit: 0 loadouts: - LawyerNeck + +- type: loadoutGroup id: PathologHead name: loadout-group-patholog-head minLimit: 0 diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index 40960f6060b..cd4402dbf11 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -10,6 +10,8 @@ - Survival - Trinkets - GroupSpeciesBreathTool + +- type: roleLoadout id: JobADTPathologist groups: - Inventory # Corvax-Loadouts @@ -24,4 +26,4 @@ - Glasses - SurvivalMedical - Trinkets - - GroupSpeciesBreathToolMedical \ No newline at end of file + - GroupSpeciesBreathToolMedical From de6d78b49b28f90796c91c6b77c019afed916dc2 Mon Sep 17 00:00:00 2001 From: Bolper Date: Sat, 3 Aug 2024 17:42:35 +0300 Subject: [PATCH 19/19] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=B0.=20fix:=20Resources\Prototypes\ADT\Rol?= =?UTF-8?q?es\play=5Ftime=5Ftrackers.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Roles/play_time_trackers.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Roles/play_time_trackers.yml b/Resources/Prototypes/ADT/Roles/play_time_trackers.yml index fbaa38d06f3..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: JobMagistrat \ No newline at end of file + id: JobMagistrat + +- type: playTimeTracker + id: JobADTPathologist