From d8e5e48b917d0990d4205cb6321fdb3a3cb44f7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:16:26 +0300 Subject: [PATCH 1/2] Auto CL update (#225) No cl, no fun Co-authored-by: github-actions[bot] --- Resources/Changelog/ChangelogADT.yml | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index c155709ec8..8f3c304674 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -2170,3 +2170,43 @@ Entries: - {message: Добавил кастомизацию Людям, type: Add} time: '2024-08-12T22:11:20Z' id: 234 + - author: Котя + changes: + - {message: 'Добавлена система барков. Вы можете переключить вид сопровождения + текста. ТТС - привычная говорилка, Барки - короткие звуки, имитирующие речь.', + type: Add} + time: '2024-08-13T08:19:59Z' + id: 235 + - author: Котя + changes: + - {message: Переведены черты персонажа на систему поинтов., type: Add} + - {message: Добавлена черты "Ловкий". Она позволяет быстро забираться в шкафы + без необходимости открывать их., type: Add} + - {message: 'Добавлена черты "Осторожный шаг". Она позволяет не получать урон, + проходя по осколкам без обуви.', type: Add} + - {message: Добавлена черты "Спринтер". Она слегка увеличивает скорость персонажа., + type: Add} + - {message: Добавлена черты "Сильный бросок". Она усиливает броски предметов., + type: Add} + - {message: Добавлена черты "Паркурщик". Она позволяет быстро забираться на + столы., type: Add} + time: '2024-08-13T08:20:42Z' + id: 236 + - author: jungarikjan + changes: + - {message: Изменил описание трейта "Немецкий акцент" на нормальный, type: Tweak} + time: '2024-08-13T12:50:42Z' + id: 237 + - author: FaDeOkno + changes: + - {message: Новый антагонист - Фантом!, type: Add} + - {message: Множество новых способностей Ревенанту!, type: Add} + - {message: Новая роль - Полтергейст!, type: Add} + time: '2024-08-13T16:14:20Z' + id: 238 + - author: jungarikjan + changes: + - {message: Исправлены грамматические и орфографические ошибки в правилах., + type: Fix} + time: '2024-08-13T18:21:15Z' + id: 239 From a33eb33d2faeb5c11bb2223e7d764fcebbfda7fb Mon Sep 17 00:00:00 2001 From: PyotrIgn <131798882+PyotrIgn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:23:33 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B8=D0=BB=20=D1=82=D1=82=D1=81=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=B2=D1=83=D1=85=D0=B0=20=D1=83=20=D0=BC=D0=BE=D0=B1?= =?UTF-8?q?=D0=BE=D0=B2=20(#237)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit закомментировал те ттс корвакса. которые были убраны кэшем Co-authored-by: PyotrIgn --- .../Entities/Mobs/Cyborgs/base_borg_chassis.yml | 4 ++-- .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml | 6 +++--- Resources/Prototypes/Entities/Objects/Fun/pai.yml | 4 ++-- Resources/Prototypes/Entities/Objects/Fun/puppet.yml | 8 ++++---- .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- Resources/Prototypes/Entities/Structures/hydro_tray.yml | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 9bb368e8d9..24a7f913c4 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -230,8 +230,8 @@ guides: - Cyborgs - type: StepTriggerImmune - - type: TTS # Corvax-TTS - voice: TrainingRobot + # - type: TTS # Corvax-TTS + # voice: TrainingRobot - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 7919f753fb..64b76e91dd 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -274,8 +274,8 @@ interactFailureString: petting-failure-medical-cyborg interactSuccessSound: path: /Audio/Ambience/Objects/periodic_beep.ogg - - type: TTS # Corvax-TTS - voice: TrainingRobot + # - type: TTS # Corvax-TTS + # voice: TrainingRobot - type: entity id: BorgChassisService diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 83817e89a8..f688e66203 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -795,8 +795,8 @@ attributes: proper: true gender: female - - type: TTS # Corvax-TTS - voice: Dryad + # - type: TTS # Corvax-TTS + # voice: Dryad - type: entity name: Pun Pun diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index cf334c5be5..3fd826cbd6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -120,8 +120,8 @@ - type: Grammar attributes: gender: male - - type: TTS # Corvax-TTS - voice: Rat + # - type: TTS # Corvax-TTS + # voice: Rat - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 55f041eb8f..cd6be0ee95 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: basic slime id: BaseMobAdultSlimes parent: [ SimpleMobBase, MobCombat ] @@ -147,8 +147,8 @@ - type: HTN rootTask: task: SimpleHostileCompound - - type: TTS # Corvax-TTS - voice: Chen + # - type: TTS # Corvax-TTS + # voice: Chen - type: entity name: geras diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 3655ad4a07..a3eb7ea3ce 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -55,8 +55,8 @@ - type: Actions - type: TypingIndicator proto: robot - - type: TTS # Corvax-TTS - voice: TrainingRobot + # - type: TTS # Corvax-TTS + # voice: TrainingRobot - type: Speech speechVerb: Robotic speechSounds: Pai diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml index eaa0eb42ae..3d47a5b21b 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml @@ -18,8 +18,8 @@ - type: Muted - type: TypingIndicator proto: robot - - type: TTS # Corvax-TTS - voice: Meepo + # - type: TTS # Corvax-TTS + # voice: Meepo - type: Actions - type: MobState allowedStates: @@ -42,5 +42,5 @@ sprite: Objects/Fun/mrdips.rsi layers: - state: icon - - type: TTS # Corvax-TTS - voice: Zibb + # - type: TTS # Corvax-TTS + # voice: Zibb diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 1af0cb96cd..4c464d5210 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -71,8 +71,8 @@ - type: Anchorable - type: TypingIndicator proto: robot - - type: TTS # Corvax-TTS - voice: TrainingRobot + # - type: TTS # Corvax-TTS + # voice: TrainingRobot - type: Speech speechVerb: Robotic speechSounds: Vending diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml index 5f8642ca15..f7fb7ff289 100644 --- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -82,8 +82,8 @@ acts: ["Destruction"] - type: Machine board: HydroponicsTrayMachineCircuitboard - - type: TTS # Corvax-TTS - voice: TrainingRobot + # - type: TTS # Corvax-TTS + # voice: TrainingRobot - type: WiresPanel - type: AmbientSound volume: -9