Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Лодаутики #285

Merged
merged 18 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Полевой инженер
job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма!
LPPJobSecurityEnginer = Полевой Инженер
job-name-security-enginer = Полевой Инженер
job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма!
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/_LostParadise/Jobs/sec-pilot.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
job-name-secpilot = пилот СБ
job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка.
job-name-secpilot = Пилот СБ
job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка.
16 changes: 8 additions & 8 deletions Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Полевой Инженер
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма!
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/_LostParadise/Jobs/sec-pilot.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
job-name-secpilot = пилот СБ
job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка.
job-name-secpilot = Пилот СБ
job-description-secpilot = Кружите вокруг станции, в надежде найти нарушителей космического порядка.
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -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 = Адвокат
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/deltav/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
job-supervisors-cj = верховный судья
job-supervisors-cj = Верховный Судья
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Прокурор
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/deltav/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -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 = Верховный Судья
Original file line number Diff line number Diff line change
@@ -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 = Полевой Врач
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/nyanotrasen/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
job-name-gladiator = Гладиатор
job-name-guard = Охранник тюрьмы
job-name-guard = Охранник Тюрьмы
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
job-name-mail-carrier = Курьер
job-name-martialartist = Мастер боевых искусств
job-name-prisoner = Заключенный
job-name-mantis = Мантис
# Role timers
JobMailCarrier = Курьер
JobForensicMantis = Мантис
JobForensicMantis = Мантис
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-LPPSpawnPointSecurityEngineer = Полевой инженер
.desc = { ent-SpawnPointJobBase.desc }
ent-LPPSpawnPointSecurityEngineer = Полевой Инженер
.desc = { ent-SpawnPointJobBase.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Судья, Закрыто
Expand All @@ -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 = Судья, Закрыто
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Судья, Закрыто
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/CharacterItemGroups/securityGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved

- type: characterItemGroup
maxItems: 1
id: LoadoutHoSWeapon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@
- MagazineBoxRifle
- MagazineBoxLightRifle
- SpeedLoaderMagnum
- MagazineUniversalMagnum
- ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour
- ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour
- TargetHuman
Expand Down
46 changes: 0 additions & 46 deletions Resources/Prototypes/Loadouts/Jobs/engineering.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
78 changes: 0 additions & 78 deletions Resources/Prototypes/Loadouts/Jobs/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading
Loading