From 0bf6167c0e1f61c6edc9426888a9e33ee98be483 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Thu, 2 May 2024 20:51:20 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=90=D0=BA=D1=86=D0=B5=D0=BD=D1=82=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=BB=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Speech/EntitySystems/MothAccentSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs index 3de4651b4af..dbe90ddeea6 100644 --- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs @@ -16,9 +16,9 @@ private void OnAccent(EntityUid uid, MothAccentComponent component, AccentGetEve var message = args.Message; // buzzz - message = Regex.Replace(message, "z{1,3}", "zzz"); + message = Regex.Replace(message, "з{1,3}", "ззз"); // buZZZ - message = Regex.Replace(message, "Z{1,3}", "ZZZ"); + message = Regex.Replace(message, "З{1,3}", "ЗЗЗ"); args.Message = message; } From cc9f2204269a2b08c7bec2cfba6a3caf6c8757ea Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Thu, 2 May 2024 21:40:12 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B0=D0=BA=D1=86=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Speech/EntitySystems/MothAccentSystem.cs | 19 +++++++++++++++++-- Resources/Locale/ru-RU/ADT/traits/neutral.ftl | 3 +++ Resources/Prototypes/ADT/Traits/neutral.yml | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/ADT/Traits/neutral.yml diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs index dbe90ddeea6..65f998520e7 100644 --- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs @@ -15,10 +15,25 @@ private void OnAccent(EntityUid uid, MothAccentComponent component, AccentGetEve { var message = args.Message; - // buzzz + // Changed By 1Stepka1 Moth_speech start + message = Regex.Replace(message, "з{1,3}", "ззз"); - // buZZZ + + message = Regex.Replace(message, "с{1,3}", "зз"); + + message = Regex.Replace(message, "ц{1,3}", "зз"); + + message = Regex.Replace(message, "ж{1,3}", "жзж"); + message = Regex.Replace(message, "З{1,3}", "ЗЗЗ"); + + message = Regex.Replace(message, "С{1,3}", "ЗЗ"); + + message = Regex.Replace(message, "Ц{1,3}", "ЗЗ"); + + message = Regex.Replace(message, "Ж{1,3}", "ЖЗЖ"); + + // Changed By 1Stepka1 Moth_speech end args.Message = message; } diff --git a/Resources/Locale/ru-RU/ADT/traits/neutral.ftl b/Resources/Locale/ru-RU/ADT/traits/neutral.ftl index aece1597c1e..3d450bd9531 100644 --- a/Resources/Locale/ru-RU/ADT/traits/neutral.ftl +++ b/Resources/Locale/ru-RU/ADT/traits/neutral.ftl @@ -3,3 +3,6 @@ trait-tall-desc = Вы слегка выше других представите trait-short-name = Низкий trait-short-desc = Вы слегка ниже других представителей своего вида. + +trait-moth-accent-name = Жужжащий акцент +trait-moth-accent-desc = Вам либо нравятся моли, либо вы ботаник diff --git a/Resources/Prototypes/ADT/Traits/neutral.yml b/Resources/Prototypes/ADT/Traits/neutral.yml new file mode 100644 index 00000000000..79fa48c9573 --- /dev/null +++ b/Resources/Prototypes/ADT/Traits/neutral.yml @@ -0,0 +1,6 @@ +- type: trait + id: ADTMothAccent + name: trait-moth-accent-name + description: trait-moth-accent-desc + components: + - type: MothAccent \ No newline at end of file From b7c24f1e17305e14a9e2b9cc62e9ff33521b71d5 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Thu, 2 May 2024 21:45:59 +0300 Subject: [PATCH 3/3] changeloh --- Resources/Changelog/ChangelogADT.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 884e245b062..69c0bc64549 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1709,8 +1709,26 @@ Entries: id: 55738 time: '2024-04-27T18:20:00.0000000+00:00' +- author: Xelasto + changes: + - {message: "Сотрудники научно-экспериментального отдела NanoTrasen по работе с блюспейсом создали новую машину для добычи ресурсов. Блюспейс-сборщик — энергозатратная, экспериментальная разработка по добыче ресурсов из других измерений.", type: Add} + id: 55739 + time: '2024-04-30T16:20:00.0000000+00:00' + - author: Котя changes: - {message: "Структура организма генокрадов резко изменилась, в связи с чем неизвестным образом искусственно выведенные личинки стали бесполезны.", type: Remove} - id: 55739 + id: 55740 time: '2024-04-29T18:20:00.0000000+00:00' + +- author: 1Stepka1 + changes: + - {message: "Теперь книги можно разрезать, тем самым получая небольшой тайник", type: Add} + id: 55741 + time: '2024-05-02T16:00:00.0000000+00:00' + +- author: 1Stepka1 + changes: + - {message: "Добавлена новая черта: Жжужащий акцент. Локализззирован акззент молей", type: Add} + id: 55743 + time: '2024-05-02T16:00:00.0000000+00:00'