From 173ce6dc9384197c4f6e12c214c1b7376fde18ab Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 13:24:19 +0300 Subject: [PATCH 01/12] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B8=20=D0=B2=D0=B5=D0=B4=D1=83=D1=89=D0=B8?= =?UTF-8?q?=D1=85.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=80?= =?UTF-8?q?=D1=8E=D0=BA=D0=B7=D0=B0=D0=BA=D0=B8=20=D0=9F=D0=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Loadouts/Jobs/engineering.yml | 46 --------- .../Prototypes/Loadouts/Jobs/medical.yml | 78 --------------- .../Prototypes/Loadouts/Jobs/science.yml | 51 ---------- .../Prototypes/Loadouts/Jobs/security.yml | 94 +++++++++---------- 4 files changed, 42 insertions(+), 227 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml index 2bf857c85fb..beef8a9bb5d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml +++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml @@ -26,52 +26,6 @@ items: - ClothingOuterVestHazard -- type: loadout - id: LoadoutEngineeringUniformJumpskirtSenior - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorEngineer - -- type: loadout - id: LoadoutEngineeringUniformJumpsuitSenior - category: JobsEngineering - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsEngineering - - !type:CharacterJobRequirement - jobs: - - StationEngineer - - !type:CharacterPlaytimeRequirement - tracker: JobAtmosphericTechnician - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobStationEngineer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Engineering - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorEngineer - - type: loadout id: LoadoutEngineeringChickenSuit # :) category: JobsEngineering diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml index 6a2d5fb9d2e..ffc107c862c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/medical.yml +++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml @@ -234,58 +234,6 @@ items: - ClothingUniformJumpskirtParamedic -- type: loadout - id: LoadoutMedicalUniformJumpskirtSenior - category: JobsMedical - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorPhysician - -- type: loadout - id: LoadoutMedicalUniformJumpsuitSenior - category: JobsMedical - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorPhysician - - type: loadout id: LoadoutMedicalHeadNurse category: JobsMedical @@ -300,32 +248,6 @@ items: - ClothingHeadNurseHat -- type: loadout - id: LoadoutMedicalHeadBeretSeniorPhysician - category: JobsMedical - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHeadMedical - - !type:CharacterJobRequirement - jobs: - - MedicalDoctor - - Chemist - - Paramedic - - ChiefMedicalOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobChemist - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobMedicalDoctor - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Medical - min: 216000 # 60 hours - items: - - ClothingHeadHatBeretSeniorPhysician - - type: loadout id: LoadoutMedicalHeadSurgcapBlue category: JobsMedical diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml index 198d7f9cc60..d005f8c1005 100644 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ b/Resources/Prototypes/Loadouts/Jobs/science.yml @@ -1,39 +1,5 @@ # Uniforms -- type: loadout - id: LoadoutScienceUniformJumpskirtSenior - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorResearcher - -- type: loadout - id: LoadoutScienceUniformJumpsuitSenior - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorResearcher - - type: loadout id: LoadoutScienceUniformJumpskirtRoboticist category: JobsScience @@ -148,23 +114,6 @@ items: - ClothingOuterWinterSci -- type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher - category: JobsScience - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutOuterScience - - !type:CharacterDepartmentRequirement - departments: - - Epistemics - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - min: 216000 # 60 hours - items: - - ClothingOuterCoatLabSeniorResearcher - - type: loadout id: LoadoutScienceOuterExplorerLabcoat category: JobsScience diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index a738034be93..8cf261613c5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -55,58 +55,6 @@ items: - ClothingUniformJumpskirtSecBlue -- type: loadout - id: LoadoutSecurityUniformJumpskirtSenior - category: JobsSecurity - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours - items: - - ClothingUniformJumpskirtSeniorOfficer - -- type: loadout - id: LoadoutSecurityUniformJumpsuitSenior - category: JobsSecurity - cost: 1 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsSecurity - - !type:CharacterJobRequirement - jobs: - - SecurityOfficer - - !type:CharacterPlaytimeRequirement - tracker: JobWarden - min: 21600 # 6 hours - - !type:CharacterPlaytimeRequirement - tracker: JobDetective - min: 7200 # 2 hours - - !type:CharacterPlaytimeRequirement - tracker: JobSecurityOfficer - min: 21600 # 6 hours - - !type:CharacterDepartmentTimeRequirement - department: Security - min: 216000 # 60 hours - items: - - ClothingUniformJumpsuitSeniorOfficer - - type: loadout id: LoadoutUniformJumpsuitWardenBlue category: JobsSecurity @@ -381,6 +329,48 @@ items: - ClothingBackpackDuffelSecurity +- type: loadout + id: LoadoutClothingBackpackSecurityEngineer + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackSecurity + - !type:CharacterDepartmentRequirement + jobs: + - LPPSecurityEngineer + items: + - LPPClothingBackpackSecurityEngineer + +- type: loadout + id: LoadoutClothingSatchelSecurityEngineer + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackSecurity + - !type:CharacterDepartmentRequirement + jobs: + - LPPSecurityEngineer + items: + - LPPClothingSatchelSecurityEngineer + +- type: loadout + id: LoadoutClothingBackpackDuffelSecurityEngineer + category: JobsSecurity + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackSecurity + - !type:CharacterDepartmentRequirement + jobs: + - LPPSecurityEngineer + items: + - LPPClothingBackpackDuffelSecurityEngineer + # Head - type: loadout id: LoadoutSecurityHeadHatBeret From 9b0628171424de3049afde512b0f717f9a652084 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 13:36:03 +0300 Subject: [PATCH 02/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Loadouts/Jobs/security.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index 8cf261613c5..a4f2feec16f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -338,6 +338,8 @@ - !type:CharacterItemGroupRequirement group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement + departments: + - Security jobs: - LPPSecurityEngineer items: @@ -352,6 +354,8 @@ - !type:CharacterItemGroupRequirement group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement + departments: + - Security jobs: - LPPSecurityEngineer items: @@ -366,6 +370,8 @@ - !type:CharacterItemGroupRequirement group: LoadoutBackSecurity - !type:CharacterDepartmentRequirement + departments: + - Security jobs: - LPPSecurityEngineer items: From 62fa83b89929c97551a2cb76423ae177a9335701 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 14:16:39 +0300 Subject: [PATCH 03/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Loadouts/Jobs/security.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index a4f2feec16f..819096e24b6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -340,6 +340,7 @@ - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterJobRequirement jobs: - LPPSecurityEngineer items: @@ -356,6 +357,7 @@ - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterJobRequirement jobs: - LPPSecurityEngineer items: @@ -372,6 +374,7 @@ - !type:CharacterDepartmentRequirement departments: - Security + - !type:CharacterJobRequirement jobs: - LPPSecurityEngineer items: From f75957727265f51ad0ec5fbbab241bb6ac3332f9 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 16:38:51 +0300 Subject: [PATCH 04/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/deltav/job/job-names.ftl | 2 +- .../ru-RU/deltav/job/job-supervisors.ftl | 2 +- .../deltav/navmap-beacons/station-beacons.ftl | 2 +- .../ru-RU/deltav/paper/stamp-component.ftl | 2 +- .../deltav/prototypes/access/accesses.ftl | 2 +- .../structures/doors/airlocks/access.ftl | 6 ++-- .../structures/doors/windoors/windoor.ftl | 2 +- .../Loadouts/Jobs/Heads/chiefjustice.yml | 36 +++++++++++++++++++ .../ServerInfo/Guidebook/DeltaV/Justice.xml | 4 +-- ...sitionsAuthorizedToCarryOutPunishments.xml | 10 +++--- 10 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml diff --git a/Resources/Locale/ru-RU/deltav/job/job-names.ftl b/Resources/Locale/ru-RU/deltav/job/job-names.ftl index 26d9180f86c..cab5eba4370 100644 --- a/Resources/Locale/ru-RU/deltav/job/job-names.ftl +++ b/Resources/Locale/ru-RU/deltav/job/job-names.ftl @@ -1,5 +1,5 @@ job-name-medical-borg = Медицинский киборг -job-name-chief-justice = Верховный судья +job-name-chief-justice = Верховный Судья job-name-clerk = Судья job-name-prosecutor = Прокурор job-name-lawyer = Адвокат diff --git a/Resources/Locale/ru-RU/deltav/job/job-supervisors.ftl b/Resources/Locale/ru-RU/deltav/job/job-supervisors.ftl index 5257936f8e8..8a6f03a784d 100644 --- a/Resources/Locale/ru-RU/deltav/job/job-supervisors.ftl +++ b/Resources/Locale/ru-RU/deltav/job/job-supervisors.ftl @@ -1 +1 @@ -job-supervisors-cj = верховный судья +job-supervisors-cj = Верховный Судья diff --git a/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl index e04086221b5..d0116cb0f90 100644 --- a/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl @@ -21,5 +21,5 @@ station-beacon-boxing-ring = Боксёрская station-beacon-park = Парк station-beacon-corpsman = Полевой Врач station-beacon-justice = Судебная -station-beacon-chiefjustice = Верховный судья +station-beacon-chiefjustice = Верховный Судья station-beacon-prosecutor = Прокурор diff --git a/Resources/Locale/ru-RU/deltav/paper/stamp-component.ftl b/Resources/Locale/ru-RU/deltav/paper/stamp-component.ftl index 558c69e90d8..93ac95db082 100644 --- a/Resources/Locale/ru-RU/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/deltav/paper/stamp-component.ftl @@ -1,4 +1,4 @@ stamp-component-stamped-name-lawyer = Адвокат stamp-component-stamped-name-psychologist = Психолог stamp-component-stamped-name-notary = Нотариус -stamp-component-stamped-name-chiefjustice = Верховный судья +stamp-component-stamped-name-chiefjustice = Верховный Судья diff --git a/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl index 27a4c3e8695..79ce25954ed 100644 --- a/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl @@ -1,6 +1,6 @@ id-card-access-level-orders = Заказы id-card-access-level-mantis = Мантис -id-card-access-level-cj = Верховный судья +id-card-access-level-cj = Верховный Судья id-card-access-level-prosecutor = Прокурор id-card-access-level-justice = Суд id-card-access-level-corpsman = Полевой Врач diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl index 5bf7dad3638..e16afc4ed42 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl @@ -5,10 +5,10 @@ ent-AirlockMantisGlassLocked = { ent-AirlockScienceGlass } .suffix = Мантис, Закрыто .desc = { ent-AirlockScienceGlass.desc } ent-AirlockChiefJusticeLocked = { ent-AirlockCommand } - .suffix = Верховный судья, Закрыто + .suffix = Верховный Судья, Закрыто .desc = { ent-AirlockCommand.desc } ent-AirlockChiefJusticeGlassLocked = { ent-AirlockCommandGlass } - .suffix = Верховный судья, Закрыто + .suffix = Верховный Судья, Закрыто .desc = { ent-AirlockCommandGlass.desc } ent-AirlockJusticeLocked = { ent-AirlockJustice } .suffix = Судья, Закрыто @@ -23,7 +23,7 @@ ent-AirlockProsecutorGlassLocked = { ent-AirlockJusticeGlass } .suffix = Прокурор, Закрыто .desc = { ent-AirlockJusticeGlass.desc } ent-AirlockMaintChiefJusticeLocked = { ent-AirlockMaint } - .suffix = Верховный судья, Закрыто + .suffix = Верховный Судья, Закрыто .desc = { ent-AirlockMaint.desc } ent-AirlockMaintJusticeLocked = { ent-AirlockMaint } .suffix = Судья, Закрыто diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/windoors/windoor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/windoors/windoor.ftl index d337a723b63..188d0189324 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/windoors/windoor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/windoors/windoor.ftl @@ -8,7 +8,7 @@ ent-WindoorSecureParamedicLocked = { ent-WindoorSecure } .suffix = Парамедик, Закрыто .desc = { ent-WindoorSecure.desc } ent-WindoorSecureChiefJusticeLocked = { ent-WindoorSecure } - .suffix = Верховный судья, Закрыто + .suffix = Верховный Судья, Закрыто .desc = { ent-WindoorSecure.desc } ent-WindoorSecureJusticeLocked = { ent-WindoorSecure } .suffix = Судья, Закрыто diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml new file mode 100644 index 00000000000..6dad6e8cf2f --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml @@ -0,0 +1,36 @@ +- type: loadout + id: LoadoutClothingOuterRobesJudge + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefJustice + + items: + - ClothingOuterRobesJudge + +- type: loadout + id: LoadoutLPPWeaponRevolverJudge + category: JobsCommand + cost: 6 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefJustice + items: + - LPPWeaponRevolverJudge + +- type: loadout + id: LoadoutMagazineBoxAntiMateriel + category: JobsCommand + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefJustice + items: + - MagazineBoxAntiMateriel \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Justice.xml b/Resources/ServerInfo/Guidebook/DeltaV/Justice.xml index 45cd6d5dacd..98482917729 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Justice.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Justice.xml @@ -9,7 +9,7 @@ ## Роли -- [color=#a4885c]Верховный судья[/color] должен выступать в качестве судьи во время судебных процессов и координировать работу с безопасностью для подготовки предстоящих судебных процессов или для пересмотра предыдущих. +- [color=#a4885c]Верховный Судья[/color] должен выступать в качестве судьи во время судебных процессов и координировать работу с безопасностью для подготовки предстоящих судебных процессов или для пересмотра предыдущих. - [color=#a4885c]Адвокаты[/color] должны представлять защиту во время судебных процессов и должны связываться с заключенными, нуждающимися в защите или юридической помощи. Они также играют роль государственного защитника экипажа, также выполняя функцию [color=#a4885c]предъявления иска[/color] от имени экипажа, когда это необходимо. - [color=#a4885c]Прокуроры[/color] должны представлять сторону обвинения во время судебных процессов и должны работать с отделом безопасности для подготовки судебных процессов к суду. В случае ареста прокурор должен получить заявление от арестовавшего офицера по этому вопросу и, в случае тяжких преступлений, [color=#a4885c]отвечает за вынесение приговора[/color]. Если возможно, прокурор должен работать с [color=#a4885c]детективами[/color] для запроса доказательств. - [color=#a4885c]Судьи[/color] должны готовить свидетелей и доказательства для представления и помогать в судебных разбирательствах во время текущего судебного разбирательства, а в противном случае должны помогать всем канцелярским аспектам Министерства юридического отдела и всему экипажу. Они также являются фактическим менеджером [color=#a4885c]таймера зала суда[/color] и должны обеспечивать рассмотрение текущих дел в порядке срочности. @@ -25,7 +25,7 @@ -Верховный судья также имеет право предъявить обвинение в неуважении к суду, [color=#FF0000]тяжком преступлении[/color], если лицо мешает рассмотрению дела. +Верховный Судья также имеет право предъявить обвинение в неуважении к суду, [color=#FF0000]тяжком преступлении[/color], если лицо мешает рассмотрению дела. [color=#FFFF00]УГОЛОВНЫЕ ПРОЦЕССЫ[/color] diff --git a/Resources/ServerInfo/Guidebook/_LostParadise/SpaceLaw/TheRatioOfTheSeverityOfTheViolationAndThePositionsAuthorizedToCarryOutPunishments.xml b/Resources/ServerInfo/Guidebook/_LostParadise/SpaceLaw/TheRatioOfTheSeverityOfTheViolationAndThePositionsAuthorizedToCarryOutPunishments.xml index d5ba8b5ffb8..b3aa176d11b 100644 --- a/Resources/ServerInfo/Guidebook/_LostParadise/SpaceLaw/TheRatioOfTheSeverityOfTheViolationAndThePositionsAuthorizedToCarryOutPunishments.xml +++ b/Resources/ServerInfo/Guidebook/_LostParadise/SpaceLaw/TheRatioOfTheSeverityOfTheViolationAndThePositionsAuthorizedToCarryOutPunishments.xml @@ -3,13 +3,13 @@ Те, кто может выносить действия, относительно действий с субъектом. К примеру, при 2ХХ статьях и заключения по этой статье. Детектив при 4ХХ статьях должен запросить разрешение у ГСБ, Капитана или Центральное командование. --[color=yellow]I[/color] — Офицер, Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный судья, Центральное командование. +-[color=yellow]I[/color] — Офицер, Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный Судья, Центральное командование. --[color=yellow]II[/color] — Офицер, Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный судья, Центральное командование. +-[color=yellow]II[/color] — Офицер, Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный Судья, Центральное командование. --[color=yellow]III[/color] — Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный судья, Центральное командование. +-[color=yellow]III[/color] — Детектив, Инструктор, Смотритель, ГСБ, Капитан, Судья, Верховный Судья, Центральное командование. --[color=yellow]IV[/color] — Смотритель, ГСБ, Капитан, Судья, Верховный судья, Центральное командование. +-[color=yellow]IV[/color] — Смотритель, ГСБ, Капитан, Судья, Верховный Судья, Центральное командование. --[color=yellow]V[/color] — Капитан, Судья, Верховный судья, Центральное командование. +-[color=yellow]V[/color] — Капитан, Судья, Верховный Судья, Центральное командование. From 26dfa8c9453d62a9cd87d6330b2c0381c856c347 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 19:33:48 +0300 Subject: [PATCH 05/12] =?UTF-8?q?=D0=A4=D0=B0=D0=B9=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CharacterItemGroups/securityGroups.yml | 11 +++++++++++ Resources/Prototypes/Loadouts/backpacks.yml | 14 ++++++++++++++ Resources/Prototypes/Loadouts/duffelbags.yml | 14 ++++++++++++++ Resources/Prototypes/Loadouts/satchels.yml | 14 ++++++++++++++ .../Loadouts/Jobs/justice.yml} | 2 +- 5 files changed, 54 insertions(+), 1 deletion(-) rename Resources/Prototypes/{Loadouts/Jobs/Heads/chiefjustice.yml => _LostParadise/Loadouts/Jobs/justice.yml} (97%) diff --git a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml index 9aae6d88ad7..83965812dc7 100644 --- a/Resources/Prototypes/CharacterItemGroups/securityGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/securityGroups.yml @@ -276,6 +276,17 @@ - type: loadout id: LoadoutClothingBackSecurityDuffel +- type: characterItemGroup + maxItems: 1 + id: LoadoutBackSecurityEngineer + items: + - type: loadout + id: LoadoutClothingBackpackSecurityEngineer + - type: loadout + id: LoadoutClothingSatchelSecurityEngineer + - type: loadout + id: LoadoutClothingBackpackDuffelSecurityEngineer + - type: characterItemGroup maxItems: 1 id: LoadoutHoSWeapon diff --git a/Resources/Prototypes/Loadouts/backpacks.yml b/Resources/Prototypes/Loadouts/backpacks.yml index 5fd812380c5..d54c05f53db 100644 --- a/Resources/Prototypes/Loadouts/backpacks.yml +++ b/Resources/Prototypes/Loadouts/backpacks.yml @@ -51,6 +51,20 @@ departments: - Security +- type: loadout + id: LoadoutBackpackSecurityEngineer + category: Backpacks + cost: 0 + exclusive: true + items: + - LPPClothingBackpackSecurityEngineer + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - LPPSecurityEngineer + - type: loadout id: LoadoutBackpackBrigmedic category: Backpacks diff --git a/Resources/Prototypes/Loadouts/duffelbags.yml b/Resources/Prototypes/Loadouts/duffelbags.yml index 89997326f1a..7d735cfcbe0 100644 --- a/Resources/Prototypes/Loadouts/duffelbags.yml +++ b/Resources/Prototypes/Loadouts/duffelbags.yml @@ -37,6 +37,20 @@ departments: - Security +- type: loadout + id: LoadoutBackpackDuffelSecurityEngineer + category: Backpacks + cost: 0 + exclusive: true + items: + - LPPClothingBackpackDuffelSecurityEngineer + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - LPPSecurityEngineer + - type: loadout id: LoadoutBackpackDuffelBrigmedic category: Backpacks diff --git a/Resources/Prototypes/Loadouts/satchels.yml b/Resources/Prototypes/Loadouts/satchels.yml index 4f21dc7656f..5c25ac34ebc 100644 --- a/Resources/Prototypes/Loadouts/satchels.yml +++ b/Resources/Prototypes/Loadouts/satchels.yml @@ -50,6 +50,20 @@ departments: - Security +- type: loadout + id: LoadoutSatchelSecurityEngineer + category: Backpacks + cost: 0 + exclusive: true + items: + - LPPClothingSatchelSecurityEngineer + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBackpacks + - !type:CharacterJobRequirement + jobs: + - LPPSecurityEngineer + - type: loadout id: LoadoutBackpackSatchelBrigmedic category: Backpacks diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml similarity index 97% rename from Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml rename to Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml index 6dad6e8cf2f..a0f607c1825 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefjustice.yml +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml @@ -7,7 +7,7 @@ - !type:CharacterJobRequirement jobs: - ChiefJustice - + - Clerk items: - ClothingOuterRobesJudge From 93094672075f755ba602d36e16d66bdcf3423187 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 19:59:47 +0300 Subject: [PATCH 06/12] =?UTF-8?q?=D0=92=D1=81=D1=91=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=BC..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/en-US/_LostParadise/Jobs/jobs.ftl | 16 ++++++++-------- .../en-US/_LostParadise/Jobs/sec-pilot.ftl | 2 +- .../Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 16 ++++++++-------- .../ru-RU/_LostParadise/Jobs/sec-pilot.ftl | 2 +- .../Locale/ru-RU/nyanotrasen/job/job-names.ftl | 2 +- .../markers/spawners/random/spawnMarker.ftl | 2 +- .../entities/markers/spawners/jobs.ftl | 2 +- .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Recipes/Lathes/security.yml | 8 ++++++++ 9 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index ea56477b64c..09dc0b4a028 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -17,24 +17,24 @@ lpp-job-name-virologist = Вирусолог lpp-job-description-virologist = Лечите экипаж от OwOнавируса. Вы же не хотите восстание кошкомальчиков? lpp-job-name-prisoner = Заключённый lpp-job-description-prisoner = Будьте единственным(или одним из) разумным существом на весь бриг. -job-name-senior-engineer = Ведущий инженер +job-name-senior-engineer = Ведущий Инженер job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции. -job-name-senior-researcher = Ведущий учёный +job-name-senior-researcher = Ведущий Учёный job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов. -job-name-senior-physician = Ведущий врач +job-name-senior-physician = Ведущий Врач job-description-senior-physician = Обучайте новых врачей основам оказания помощи раненым, химии, диагностике больных и утилизации трупов. job-name-senior-officer = Инструктор СБ job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием. job-name-roboticist = Робототехник job-description-roboticist = Создавайте различных мехов, киборгов и роботов для помощи станции. -JobSeniorEngineer = Ведущий инженер +JobSeniorEngineer = Ведущий Инженер JobSeniorOfficer = Инструктор СБ -JobSeniorPhysician = Ведущий врач -JobSeniorResearcher = Ведущий учёный +JobSeniorPhysician = Ведущий Врач +JobSeniorResearcher = Ведущий Учёный JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEnginer = Полевой инженер -job-name-security-enginer = Полевой инженер +LPPJobSecurityEnginer = Полевой Инженер +job-name-security-enginer = Полевой Инженер job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl index 6b2381adaa6..037f2a5d674 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl @@ -1,2 +1,2 @@ -job-name-secpilot = пилот СБ +job-name-secpilot = Пилот СБ job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index ea56477b64c..09dc0b4a028 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -17,24 +17,24 @@ lpp-job-name-virologist = Вирусолог lpp-job-description-virologist = Лечите экипаж от OwOнавируса. Вы же не хотите восстание кошкомальчиков? lpp-job-name-prisoner = Заключённый lpp-job-description-prisoner = Будьте единственным(или одним из) разумным существом на весь бриг. -job-name-senior-engineer = Ведущий инженер +job-name-senior-engineer = Ведущий Инженер job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции. -job-name-senior-researcher = Ведущий учёный +job-name-senior-researcher = Ведущий Учёный job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов. -job-name-senior-physician = Ведущий врач +job-name-senior-physician = Ведущий Врач job-description-senior-physician = Обучайте новых врачей основам оказания помощи раненым, химии, диагностике больных и утилизации трупов. job-name-senior-officer = Инструктор СБ job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием. job-name-roboticist = Робототехник job-description-roboticist = Создавайте различных мехов, киборгов и роботов для помощи станции. -JobSeniorEngineer = Ведущий инженер +JobSeniorEngineer = Ведущий Инженер JobSeniorOfficer = Инструктор СБ -JobSeniorPhysician = Ведущий врач -JobSeniorResearcher = Ведущий учёный +JobSeniorPhysician = Ведущий Врач +JobSeniorResearcher = Ведущий Учёный JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEnginer = Полевой инженер -job-name-security-enginer = Полевой инженер +LPPJobSecurityEnginer = Полевой Инженер +job-name-security-enginer = Полевой Инженер job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl index 6b2381adaa6..037f2a5d674 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl @@ -1,2 +1,2 @@ -job-name-secpilot = пилот СБ +job-name-secpilot = Пилот СБ job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. diff --git a/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl b/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl index 3636061c7a9..8bb01a16f03 100644 --- a/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl +++ b/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl @@ -1,5 +1,5 @@ job-name-gladiator = Гладиатор -job-name-guard = Охранник тюрьмы +job-name-guard = Охранник Тюрьмы job-name-mail-carrier = Курьер job-name-martialartist = Мастер боевых искусств job-name-prisoner = Заключенный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl index 6f1d942a454..caaec8c75b7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl @@ -1,2 +1,2 @@ -ent-LPPSpawnPointSecurityEngineer = Полевой инженер +ent-LPPSpawnPointSecurityEngineer = Полевой Инженер .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl index c78a20fd341..6acb8899083 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl @@ -2,7 +2,7 @@ ent-SpawnPointGladiator = Гладиатор .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointPrisoner = Заключенный .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPrisonGuard = Охранник тюрьмы +ent-SpawnPointPrisonGuard = Охранник Тюрьмы .desc = { ent-SpawnPointJobBase.desc } ent-SpawnPointMailCarrier = Курьер .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9fe0e0e62ba..e8d7925082d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -754,6 +754,7 @@ - MagazineBoxRifle - MagazineBoxLightRifle - SpeedLoaderMagnum + - MagazineUniversalMagnum - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour - TargetHuman diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 7eea7064b0c..4109eb4b21f 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -292,6 +292,14 @@ materials: Steel: 100 +- type: latheRecipe + id: MagazineUniversalMagnum + result: MagazineUniversalMagnum + category: Ammo + completetime: 5 + materials: + Steel: 200 + - type: latheRecipe id: MagazinePistolSubMachineGun result: MagazinePistolSubMachineGun From eaaa4e0741f605e906d22ae2adb0564d6b4d4eb2 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 20:18:21 +0300 Subject: [PATCH 07/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D0=BC...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl | 2 +- Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl | 2 +- Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl | 2 +- Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl | 2 +- .../entities/markers/spawners/random/spawnMarker.ftl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index 09dc0b4a028..5ab0575e484 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -37,4 +37,4 @@ job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! LPPJobSecurityEnginer = Полевой Инженер job-name-security-enginer = Полевой Инженер -job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! +job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl index 037f2a5d674..5debca9dbb7 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl @@ -1,2 +1,2 @@ job-name-secpilot = Пилот СБ -job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. +job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl index 037f2a5d674..5debca9dbb7 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl @@ -1,2 +1,2 @@ job-name-secpilot = Пилот СБ -job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. +job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl b/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl index 8bb01a16f03..8825bc9fbe9 100644 --- a/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl +++ b/Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl @@ -6,4 +6,4 @@ job-name-prisoner = Заключенный job-name-mantis = Мантис # Role timers JobMailCarrier = Курьер -JobForensicMantis = Мантис +JobForensicMantis = Мантис \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl index caaec8c75b7..9cd3e97c631 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/markers/spawners/random/spawnMarker.ftl @@ -1,2 +1,2 @@ ent-LPPSpawnPointSecurityEngineer = Полевой Инженер - .desc = { ent-SpawnPointJobBase.desc } + .desc = { ent-SpawnPointJobBase.desc } \ No newline at end of file From 1d6c45d336bf0cff58de1986b605097e055a5c08 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 20:29:20 +0300 Subject: [PATCH 08/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B5?= =?UTF-8?q?=D1=89=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl | 6 +++--- Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 6 +++--- .../Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml | 6 +++--- .../Prototypes/_LostParadise/Roles/play_time_trackers.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index 5ab0575e484..03ad3b48695 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -35,6 +35,6 @@ JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEnginer = Полевой Инженер -job-name-security-enginer = Полевой Инженер -job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file +LPPJobSecurityEngineer = Полевой Инженер +job-name-security-engineer = Полевой Инженер +job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 09dc0b4a028..68ddb658e1b 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -35,6 +35,6 @@ JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEnginer = Полевой Инженер -job-name-security-enginer = Полевой Инженер -job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! +LPPJobSecurityEngineer = Полевой Инженер +job-name-security-engineer = Полевой Инженер +job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index 30034e058fb..dabc59cf941 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -1,8 +1,8 @@ - type: job id: LPPSecurityEngineer - name: job-name-security-enginer - description: job-description-security-enginer - playTimeTracker: LPPJobSecurityEnginer + name: job-name-security-engineer + description: job-description-security-engineer + playTimeTracker: LPPJobSecurityEngineer requirements: - !type:CharacterDepartmentTimeRequirement department: Security diff --git a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml index f34175385e4..a428ebd4cc5 100644 --- a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml @@ -14,4 +14,4 @@ id: JobPilot - type: playTimeTracker - id: LPPJobSecurityEnginer \ No newline at end of file + id: LPPJobSecurityEngineer \ No newline at end of file From 3611784b269612953f49c7a519d026c08686c4a3 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 22:47:55 +0300 Subject: [PATCH 09/12] =?UTF-8?q?=D0=97=D0=B0=D0=B1=D1=8B=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Loadouts/Jobs/security.yml | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml index 819096e24b6..5ac2a35816e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/security.yml @@ -329,57 +329,6 @@ items: - ClothingBackpackDuffelSecurity -- type: loadout - id: LoadoutClothingBackpackSecurityEngineer - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - - !type:CharacterJobRequirement - jobs: - - LPPSecurityEngineer - items: - - LPPClothingBackpackSecurityEngineer - -- type: loadout - id: LoadoutClothingSatchelSecurityEngineer - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - - !type:CharacterJobRequirement - jobs: - - LPPSecurityEngineer - items: - - LPPClothingSatchelSecurityEngineer - -- type: loadout - id: LoadoutClothingBackpackDuffelSecurityEngineer - category: JobsSecurity - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutBackSecurity - - !type:CharacterDepartmentRequirement - departments: - - Security - - !type:CharacterJobRequirement - jobs: - - LPPSecurityEngineer - items: - - LPPClothingBackpackDuffelSecurityEngineer - # Head - type: loadout id: LoadoutSecurityHeadHatBeret From f8b0b3296e822afa432456ed1e20d1ec40fa3420 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Fri, 18 Oct 2024 23:18:39 +0300 Subject: [PATCH 10/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B0=D0=B9?= =?UTF-8?q?=D0=B4=D0=B8=20=D0=9F=D0=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl | 2 +- Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 2 +- .../Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml | 2 +- Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index 03ad3b48695..0652a908327 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -35,6 +35,6 @@ JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEngineer = Полевой Инженер +LPPJobSecurityEnginer = Полевой Инженер job-name-security-engineer = Полевой Инженер job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 68ddb658e1b..7e629a9cffd 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -35,6 +35,6 @@ JobRoboticist = Робототехник JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEngineer = Полевой Инженер +LPPJobSecurityEnginer = Полевой Инженер job-name-security-engineer = Полевой Инженер job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index dabc59cf941..d70947ad15f 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -2,7 +2,7 @@ id: LPPSecurityEngineer name: job-name-security-engineer description: job-description-security-engineer - playTimeTracker: LPPJobSecurityEngineer + playTimeTracker: LPPJobSecurityEnginer requirements: - !type:CharacterDepartmentTimeRequirement department: Security diff --git a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml index a428ebd4cc5..f34175385e4 100644 --- a/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_LostParadise/Roles/play_time_trackers.yml @@ -14,4 +14,4 @@ id: JobPilot - type: playTimeTracker - id: LPPJobSecurityEngineer \ No newline at end of file + id: LPPJobSecurityEnginer \ No newline at end of file From 689098bb76f7d38c6864a3044501b6090173beba Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sat, 19 Oct 2024 00:19:26 +0300 Subject: [PATCH 11/12] =?UTF-8?q?=D0=A1=D1=80=D0=B0=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=9F=D0=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl | 4 ++-- Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 4 ++-- .../Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index 0652a908327..5ab0575e484 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -36,5 +36,5 @@ JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! LPPJobSecurityEnginer = Полевой Инженер -job-name-security-engineer = Полевой Инженер -job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file +job-name-security-enginer = Полевой Инженер +job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 7e629a9cffd..09dc0b4a028 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -36,5 +36,5 @@ JobExpeditor = Исследователь job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! LPPJobSecurityEnginer = Полевой Инженер -job-name-security-engineer = Полевой Инженер -job-description-security-engineer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! +job-name-security-enginer = Полевой Инженер +job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index d70947ad15f..2faa89c15f8 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -1,7 +1,7 @@ - type: job - id: LPPSecurityEngineer - name: job-name-security-engineer - description: job-description-security-engineer + id: LPPSecurityEnginer + name: job-name-security-enginer + description: job-description-security-enginer playTimeTracker: LPPJobSecurityEnginer requirements: - !type:CharacterDepartmentTimeRequirement From 33769882f7dd246b0650e44571275183e7204640 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sat, 19 Oct 2024 00:29:20 +0300 Subject: [PATCH 12/12] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml index 2faa89c15f8..30034e058fb 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/SecEng.yml @@ -1,5 +1,5 @@ - type: job - id: LPPSecurityEnginer + id: LPPSecurityEngineer name: job-name-security-enginer description: job-description-security-enginer playTimeTracker: LPPJobSecurityEnginer