From 63e18267dce7d7a43ac0ad6c30c6078129898c5e Mon Sep 17 00:00:00 2001 From: bananchiki <87230164+Darkiich@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:47:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8=20(#?= =?UTF-8?q?436)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR **Ссылка на публикацию в Discord** - [Баги](https://discord.com/channels/901772674865455115/1282797190485643425) - [Баги](https://discord.com/channels/901772674865455115/1281901824034476044) - [Баги](https://discord.com/channels/901772674865455115/1283426929818730527) - [Баги](https://discord.com/channels/901772674865455115/1282863027103989780) - [Баги](https://discord.com/channels/901772674865455115/1281879247581089832) - [Баги](https://discord.com/channels/901772674865455115/1281931865405521981) **Медиа** **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: Дубик - tweak: Изменена локализация ИИ на русскую - tweak: Изменена первая буква роли робототехника на заглавную(да, это важно) - add: Добавлена зарплата для ведущих ролей - fix: Исправлена ошибка спавна аварийного запаса не в сумке у Офицер-Инструктора - fix: Исправлено отсутствие батареи у киборг-офицера - tweak: Изменено возрастное ограничение на роль ОСЩ до 21-ти года персонажа - fix: Исправлено отсутствие знаний двоичного и троичного языка у боргов - tweak: Теперь пуля энерго дробовика, станнера, станнер-пулемета, тренировочного станнера может проходить сквозь окна - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> --- Resources/Locale/ru-RU/ADT/Job/job-names.ftl | 5 ++++ Resources/Locale/ru-RU/job/job-names.ftl | 1 - .../Fills/Backpacks/StarterGear/satchel.yml | 1 - Resources/Prototypes/ADT/Economy/salary.yml | 4 +++ .../Entities/Mobs/Cyborgs/borg_chassis.yml | 5 ++++ .../Prototypes/ADT/Loadouts/role_loadouts.yml | 1 - .../Roles/Jobs/Command/blueshieldofficer.yml | 2 ++ .../Roles/Jobs/Security/senior_officer.yml | 1 + Resources/Prototypes/ADT/Traits/speech.yml | 17 +++++------ .../Mobs/Cyborgs/base_borg_chassis.yml | 11 ++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 28 +++++++++++++------ 11 files changed, 57 insertions(+), 19 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index eea590626e8..dc037030038 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -1,6 +1,7 @@ job-name-ADTPathologist = Патологоанатом JobADTPathologist = Патологоанатом +job-name-roboticist = Робототехник JobRoboticist = Робототехник job-name-magistrat = Магистрат @@ -27,5 +28,9 @@ job-name-ADTSpaceSecPilot = пилот SPACE SEC job-name-ADTSpaceSecCommander = командир SPACE SEC job-name-ADTSpaceSecService = сотрудник SPACE SEC + +job-name-station-ai = ИИ Станции +JobStationAi = ИИ Станции + job-name-ADTSecBorg = Киборг службы безопасности JobADTSecBorg = Киборг службы безопасности diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 28065b39666..53dacc8ec0b 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -52,7 +52,6 @@ job-name-visitor = Посетитель job-name-geneticist = генетик job-name-no-id = нет ID job-name-prisoner = заключённый -job-name-roboticist = робототехник job-name-syndicate = синдикат job-name-unknown = неизвестно job-name-virologist = вирусолог diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ba7f9e89c9c..b53b7a9c266 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -38,7 +38,6 @@ components: - type: StorageFill contents: - - id: SpeedLoaderMagnum - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Economy/salary.yml b/Resources/Prototypes/ADT/Economy/salary.yml index 0fa93ee58a8..502ddc9c6a2 100644 --- a/Resources/Prototypes/ADT/Economy/salary.yml +++ b/Resources/Prototypes/ADT/Economy/salary.yml @@ -47,3 +47,7 @@ Scientist: 300 ResearchAssistant: 200 Brigmedic: 400 + ADTSeniorEngineer: 450 + ADTSeniorPhysician: 450 + ADTSeniorResearcher: 450 + ADTSeniorOfficer: 450 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml index 96ac75929bc..ddb6ca04d25 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -24,6 +24,11 @@ - ADTBorgModuleSecurity hasMindState: sec_e noMindState: sec_e_r + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium - type: BorgTransponder sprite: sprite: ADT/Mobs/Cyborg/chassis.rsi diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index d508dd6d1f5..e1635ca682b 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -69,7 +69,6 @@ - MedicalGloves - MedicalBackpack - MedicalDoctorOuterClothing - - MedicalDoctorJumpsuit - Trinkets - SurvivalMedical - GroupSpeciesBreathToolMedical diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml index 098800c0b76..1cfb730aff8 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Command/blueshieldofficer.yml @@ -13,6 +13,8 @@ - !type:RoleTimeRequirement role: JobChiefMedicalOfficer time: 18000 #5 hrs + - !type:AgeRequirement + requiredAge: 21 weight: 15 startingGear: ADTBlueShieldOfficerGear icon: "JobIconADTBlueShieldOfficer" diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/senior_officer.yml index 54007ef54f9..3a626461c03 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Security/senior_officer.yml @@ -38,4 +38,5 @@ id: SeniorOfficerPDA ears: ClothingHeadsetSecurity pocket1: WeaponRevolverDeckard + pocket2: SpeedLoaderMagnum # neck: ADTClothingNeckSecBadge # TODO: Вернуть жетоны СБ diff --git a/Resources/Prototypes/ADT/Traits/speech.yml b/Resources/Prototypes/ADT/Traits/speech.yml index ec03739e0d4..b8afc45dc29 100644 --- a/Resources/Prototypes/ADT/Traits/speech.yml +++ b/Resources/Prototypes/ADT/Traits/speech.yml @@ -7,12 +7,13 @@ components: - type: MothAccent -- type: trait - id: ADTDeutscAccent - name: trait-deutsch-name - description: trait-deutsch-desc - category: SpeechTraits - cost: 1 - components: - - type: DeutschAccent +# Визарды добавили свой немецкий язык +# - type: trait +# id: ADTDeutscAccent +# name: trait-deutsch-name +# description: trait-deutsch-desc +# category: SpeechTraits +# cost: 1 +# components: +# - type: DeutschAccent diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index d9c073b133c..27c6c0261cc 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -158,6 +158,17 @@ - type: Vocal sounds: Unsexed: UnisexSilicon +# Start ADT Tweak + - type: LanguageSpeaker + speaks: + - GalacticCommon + - BorgTalk + - RobotTalk + understands: + - GalacticCommon + - BorgTalk + - RobotTalk +# End ADT Tweak - type: UnblockableSpeech - type: Construction graph: Cyborg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 618dc298d63..18ad2edabca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -224,8 +224,11 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable +# Start ADT Tweak + # - Impassable + # - BulletImpassable + - Opaque # ADT add +# End ADT Tweak fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide @@ -264,8 +267,11 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable +# Start ADT Tweak + # - Impassable + # - BulletImpassable + - Opaque # ADT add +# End ADT Tweak fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide @@ -934,8 +940,11 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable +# Start ADT Tweak + # - Impassable + # - BulletImpassable + - Opaque # ADT add +# End ADT Tweak fly-by: *flybyfixture - type: Ammo - type: StaminaDamageOnCollide @@ -1010,8 +1019,11 @@ bounds: "-0.15,-0.3,0.15,0.3" hard: false mask: - - Impassable - - BulletImpassable +# Start ADT Tweak + # - Impassable + # - BulletImpassable + - Opaque # ADT add +# End ADT Tweak fly-by: *flybyfixture - type: Ammo - type: Projectile