From 12e422da12e127fd24321579939310b59c18fcad Mon Sep 17 00:00:00 2001 From: teasum Date: Tue, 4 Aug 2026 14:13:05 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20=D1=8D=D0=BC?= =?UTF-8?q?=D0=BE=D1=83=D1=82=D0=B0=D0=BC=20=D0=B8=20=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E=20chattriggers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_DV/voice/emotes.ftl | 22 +++++++++ .../ru-RU/_Mono/voice/speech_emotes.ftl | 2 + .../ru-RU/_StarLight/Voice/speech_emotes.ftl | 4 ++ .../ru-RU/nyanotrasen/voice/speech_emotes.ftl | 6 +++ .../Nyanotrasen/Voice/speech_emotes.yml | 15 ++++-- Resources/Prototypes/Voice/disease_emotes.yml | 5 +- Resources/Prototypes/Voice/speech_emotes.yml | 41 ++++++++++++++++ .../Prototypes/_DV/Voice/speech_emotes.yml | 48 +++++++++++++------ .../_EinsteinEngines/Voice/speech_emotes.yml | 6 ++- .../_Goobstation/Actions/emotes.yml | 6 +++ .../_Impstation/Voice/speech_emotes.yml | 6 +++ .../Prototypes/_Mono/Voice/speech_emotes.yml | 3 +- .../_StarLight/Voice/speech_emotes.yml | 7 ++- 13 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 Resources/Locale/ru-RU/_DV/voice/emotes.ftl create mode 100644 Resources/Locale/ru-RU/_Mono/voice/speech_emotes.ftl create mode 100644 Resources/Locale/ru-RU/_StarLight/Voice/speech_emotes.ftl create mode 100644 Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl diff --git a/Resources/Locale/ru-RU/_DV/voice/emotes.ftl b/Resources/Locale/ru-RU/_DV/voice/emotes.ftl new file mode 100644 index 00000000000..b3fa0c17b0f --- /dev/null +++ b/Resources/Locale/ru-RU/_DV/voice/emotes.ftl @@ -0,0 +1,22 @@ +delta-chat-emote-name-honk = Хонк +delta-chat-emote-msg-honk = хонкает +delta-chat-emote-name-ring = Звонить +delta-chat-emote-msg-ring = звонит +delta-chat-emote-name-pew = Пиу-Пиу! +delta-chat-emote-msg-pew = Пиу-Пиу! +delta-chat-emote-name-beep = Бип +delta-chat-emote-msg-beep = бипает +delta-chat-emote-name-rev = Реветь +delta-chat-emote-msg-rev = ревет +delta-chat-emote-name-caw = Каркать +delta-chat-emote-msg-caw = каркает +delta-chat-emote-name-bark = Гавкать +delta-chat-emote-msg-bark = гавкает +delta-chat-emote-name-snarl = Рычать +delta-chat-emote-msg-snarl = рычит +delta-chat-emote-name-whine = Скулить +delta-chat-emote-msg-whine = скулит +delta-chat-emote-name-howl = Выть +delta-chat-emote-msg-howl = воет +delta-chat-emote-name-awoo = Авууу! +delta-chat-emote-msg-awoo = авууу! diff --git a/Resources/Locale/ru-RU/_Mono/voice/speech_emotes.ftl b/Resources/Locale/ru-RU/_Mono/voice/speech_emotes.ftl new file mode 100644 index 00000000000..fcf92cc5e64 --- /dev/null +++ b/Resources/Locale/ru-RU/_Mono/voice/speech_emotes.ftl @@ -0,0 +1,2 @@ +chat-emote-name-reptilian-snicker = Хихикает +chat-emote-msg-reptilian-snicker = хихикает diff --git a/Resources/Locale/ru-RU/_StarLight/Voice/speech_emotes.ftl b/Resources/Locale/ru-RU/_StarLight/Voice/speech_emotes.ftl new file mode 100644 index 00000000000..a24768c5d33 --- /dev/null +++ b/Resources/Locale/ru-RU/_StarLight/Voice/speech_emotes.ftl @@ -0,0 +1,4 @@ +chat-emote-name-yip = Тявкать +chat-emote-msg-yip = тявкает +chat-emote-name-whine = Скулит +chat-emote-msg-whine = скулит diff --git a/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl b/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl new file mode 100644 index 00000000000..4a509b4e8fa --- /dev/null +++ b/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl @@ -0,0 +1,6 @@ +Meow = Мяу +chat-emote-msg-meow = мяукает +Growl = Скалиться +chat-emote-msg-growl = скалиться +Purr = Мурчать +chat-emote-msg-purr = мурчит diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml index c53a214dfd7..8b0b0ae26ed 100644 --- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml @@ -22,6 +22,7 @@ - hissed - hissing. - hissed. + - шипит #Forge-Change - type: emote id: Meow @@ -35,7 +36,7 @@ blacklist: components: - BorgChassis - chatMessages: [meows.] + chatMessages: ["chat-emote-msg-meow"] chatTriggers: - meow - meows @@ -64,6 +65,11 @@ - mraows. - mraows! - mraows~ + - мяу #Forge-Change + - мяу! #Forge-Change + - мяукает #Forge-Change + - мяукает! #Forge-Change + - ня #Forge-Change - type: emote id: Mew @@ -96,12 +102,14 @@ blacklist: components: - BorgChassis - chatMessages: [growls.] + chatMessages: ["chat-emote-msg-growl"] #Forge-Change chatTriggers: - growl - growls - growling - growled + - громко рычит #Forge-Change + - скалиться #Forge-Change - type: emote id: Purr @@ -115,9 +123,10 @@ blacklist: components: - BorgChassis - chatMessages: [purrs.] + chatMessages: ["chat-emote-msg-purr"] #Forge-Change chatTriggers: - purr - purrs - purring - purred + - мурчит #Forge-Change diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index eab4b0bc33e..233fd825c79 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -19,13 +19,15 @@ chatTriggers: - cough - coughs - - coughed + - coughed - cough. - coughs. - coughed. - cough! - coughs! - coughed! + - кашляет #Forge-Change + - кхм #Forge-Change - type: emote id: CatMeow @@ -66,6 +68,7 @@ chatTriggers: - yawn - yawns + - зевает #Forge-Change - type: emote id: Snore diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index d13b7a4b1fa..c4f9f0c8ace 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -25,6 +25,10 @@ - yells - yelled - yelling + - кричит + - кричит! + - орет + - орёт - type: emote id: Laugh @@ -52,6 +56,8 @@ - chortles - chortling - chortled # Frontier + - смеется #Forge-Change + - смеётся #Forge-Change - type: emote id: Honk @@ -69,6 +75,7 @@ - honks - honked - honking + - хокает #Forge-Change - type: emote id: Sigh @@ -87,6 +94,7 @@ - sighs - sighed - sighing # Frontier + - зевает #Forge-Change - type: emote id: Whistle @@ -105,6 +113,7 @@ - whistles - whistleblowing - whistled # Frontier + - свистит #Forge-Change - type: emote id: Crying @@ -127,6 +136,8 @@ - sobbing - sobbed # Frontier - cried # Frontier + - плачет #Forge-Change + - рыдает #Forge-Change - type: emote id: Squish @@ -146,6 +157,7 @@ - squishing - squishes - squished # Frontier + - хлюпает #Forge-Change - type: emote id: Chitter @@ -165,6 +177,7 @@ - chitters - chittered - chittering # Frontier + - щебетчет #Forge-Change - type: emote id: Squeak @@ -184,6 +197,7 @@ - squeaks - squeaked - squeaking # Frontier + - пищит #Forge-Change - type: emote id: Click @@ -203,6 +217,7 @@ - clicks - clicked # Frontier - clicking # Frontier + - кликает #Forge-Change # hand emotes - type: emote @@ -221,6 +236,7 @@ - claps - clapping - clapped + - хлопает #Forge-Change - type: emote id: ClapSingle @@ -240,6 +256,7 @@ - claps her hands together - claps his hands together - claps its hands together + - хлопоет один раз #Forge-Change - type: emote id: Snap @@ -266,6 +283,8 @@ - snaps its fingers - snapping fingers - snapped fingers + - щелкает #Forge-Change + - щелкает пальцами #Forge-Change - type: emote id: Thump @@ -291,6 +310,9 @@ - thumps her tail - thumps his tail - thumps its tail + - стучит #Forge-Change + - стучит хвостом #Forge-Change + - стучит своим хвостом #Forge-Change - type: emote id: Salute @@ -309,6 +331,9 @@ - salutes - saluted # Frontier - saluting # Frontier + - салютует #Forge-Change + - отдает честь #Forge-Change + - отдаёт честь #Forge-Change - type: emote id: Gasp @@ -322,6 +347,7 @@ - gasps - gasped - gasping # Frontier + - задыхается #Forge-Change - type: emote id: DefaultDeathgasp @@ -337,6 +363,8 @@ chatMessages: ["chat-emote-msg-deathgasp"] chatTriggers: # Mono - D-V ready for some more 1984 - Readds deathgasp - deathgasp + - издает предсмертный хрип #Forge-Change + - издаёт предсмертный хрип #Forge-Change - type: emote id: MonkeyDeathgasp @@ -359,6 +387,7 @@ - buzz - buzzed - buzzes + - жужжит #Forge-Change - type: emote id: Weh @@ -396,6 +425,7 @@ - chirps - chirped - chirping + - чирикает #Forge-Change # Machine Emotes - type: emote @@ -413,6 +443,9 @@ - beeps - beeped - beeping + - бипает #Forge-Change + - бип #Forge-Change + - издает бип #Forge-Change - type: emote id: Chime @@ -429,6 +462,8 @@ - chimes - chimed - chiming + - издает звон #Forge-Change + - дзынь #Forge-Change - type: emote id: Buzz-Two @@ -452,6 +487,10 @@ - buzzing twice - buzzed twice - buzzedtwice # Frontier + - бип-буп #Forge-Change + - бип буп #Forge-Change + - издает бип-буп #Forge-Change + - издает бип буп #Forge-Change - type: emote id: Ping @@ -468,3 +507,5 @@ - pings - pinged - pinging + - издает пинг #Forge-Change + - пинг #Forge-Change diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml index 907acb0e70d..925d518a8a0 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emotes.yml @@ -10,12 +10,13 @@ blacklist: components: - BorgChassis - chatMessages: [honks.] + chatMessages: ["delta-chat-emote-msg-honk"] # #Forge-Change chatTriggers: - honk - honks - honking - honked + - хонкает #Forge-Change - type: emote id: HarpyRing @@ -28,13 +29,14 @@ blacklist: components: - BorgChassis - chatMessages: [rings.] + chatMessages: ["delta-chat-emote-msg-ring"] #Forge-Change chatTriggers: - ring - rings - ringing - ringed - rang + - звонит #Forge-Change - type: emote id: HarpyPew @@ -47,11 +49,17 @@ blacklist: components: - BorgChassis - chatMessages: [pews.] + chatMessages: ["delta-chat-emote-msg-pew"] #Forge-Change chatTriggers: - pew - pews - pewpew + - пиу #Forge-Change + - пиупиу #Forge-Change + - пиу-пиу #Forge-Change + - пиу пиу #Forge-Change + - пивкает #Forge-Change + - пиукает #Forge-Change - type: emote id: HarpyBang @@ -64,12 +72,13 @@ blacklist: components: - BorgChassis - chatMessages: [bangs.] + chatMessages: ["delta-chat-emote-msg-bang"] #Forge-Change chatTriggers: - bang - bangs - banging - banged + #- хлопает #Forge-Change я хз как это перерводить, в игре оно издает рандомный набор звуков (гарпия) - type: emote id: HarpyBeep @@ -82,12 +91,14 @@ blacklist: components: - BorgChassis - chatMessages: [beeps.] + chatMessages: ["delta-chat-emote-msg-beep"] #Forge-Change chatTriggers: - beep - beeps - beeping - beeped + - бип #Forge-Change + - бипает #Forge-Change - type: emote id: HarpyRev @@ -100,12 +111,14 @@ blacklist: components: - BorgChassis - chatMessages: [revs.] + chatMessages: ["delta-chat-emote-msg-rev"] #Forge-Change chatTriggers: - rev - revs - revving - revved + - ревет #Forge-Change + - ревёт #Forge-Change - type: emote id: HarpyCaw @@ -118,12 +131,13 @@ blacklist: components: - BorgChassis - chatMessages: [caws.] + chatMessages: ["delta-chat-emote-msg-caw"] #Forge-Change chatTriggers: - caw - caws - cawing - cawed + - каркает #Forge-Change #Vulpkanin - type: emote @@ -137,12 +151,14 @@ blacklist: components: - BorgChassis - chatMessages: [barks.] + chatMessages: ["delta-chat-emote-msg-bark"] #Forge-Change chatTriggers: - bark - barks - barked - barking + - гавкает #Forge-Change + - гав #Forge-Change - type: emote id: Snarl @@ -155,16 +171,17 @@ blacklist: components: - BorgChassis - chatMessages: [snarls.] + chatMessages: ["delta-chat-emote-msg-snarl"] #Forge-Change chatTriggers: - snarl - snarls - snarled - snarling + - рычит #Forge-Change - type: emote id: Whimper # Starlight / Monolith: Renamed to whimper - name: delta-chat-emote-name-whine + name: delta-chat-emote-name-whine #Forge-Change category: Vocal available: false whitelist: @@ -173,12 +190,13 @@ blacklist: components: - BorgChassis - chatMessages: [whimper.] # Starlight / Monolith: Renamed to whimper + chatMessages: ["delta-chat-emote-msg-whimper"] # Starlight / Monolith: Renamed to whimper #Forge-Change chatTriggers: - whimper - whimpers - whimpered - whimpering + - скулит #Forge-Change - type: emote id: Howl @@ -191,12 +209,13 @@ blacklist: components: - BorgChassis - chatMessages: [howls.] + chatMessages: ["delta-chat-emote-msg-howl"] #Forge-Change chatTriggers: - howl - howls - howling - howled + - воет #Forge-Change - type: emote id: Awoo @@ -209,9 +228,10 @@ blacklist: components: - BorgChassis - chatMessages: [awoos.] + chatMessages: ["delta-chat-emote-msg-awoo"] #Forge-Change chatTriggers: - awoo - awoos - awooing - - awooed \ No newline at end of file + - awooed + - авуу #Forge-Change diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml index 1b8b56923d4..75d60ae99d2 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml @@ -8,7 +8,7 @@ - Silicon - BorgChassis chatTriggers: - - sdeathgasp + - sdeathgasp # я без понятия как это перевести и в игре оно ничего не делает - type: emote id: Whirr @@ -22,6 +22,8 @@ chatTriggers: - whirrs - rattles + - жужжит #Forge-Change + - гремит #Forge-Change - type: emote id: Boop @@ -34,3 +36,5 @@ - BorgChassis chatTriggers: - boops + - буп #Forge-Change + - бупает #Forge-Change diff --git a/Resources/Prototypes/_Goobstation/Actions/emotes.yml b/Resources/Prototypes/_Goobstation/Actions/emotes.yml index a7485248db2..f8b0b8e4641 100644 --- a/Resources/Prototypes/_Goobstation/Actions/emotes.yml +++ b/Resources/Prototypes/_Goobstation/Actions/emotes.yml @@ -8,6 +8,9 @@ - spins - spins. - spins! + - крутиться #Forge-Change + - крутиться. #Forge-Change + - крутиться! #Forge-Change event: !type:AnimationSpinEmoteEvent - type: emote @@ -24,4 +27,7 @@ - bounces - bounces. - bounces! + - прыгает #Forge-Change + - прыгает. #Forge-Change + - прыгает! #Forge-Change event: !type:AnimationJumpEmoteEvent diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml index 0b40ddc0d38..3e3aefd99b7 100644 --- a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml @@ -20,6 +20,7 @@ - bubbling - bubbled # End Frontier: emote consistency + - булькает #Forge-Change - type: emote id: Pop @@ -42,6 +43,7 @@ - popping - popped # End Frontier: emote consistency + - хлопает #Forge-Change - type: emote id: ReptilianHiss @@ -62,6 +64,7 @@ - hissing - hissed # End Frontier: emote consistency + - шипит #Forge-Change # hand emotes - type: emote @@ -85,3 +88,6 @@ - cracks her knuckles - cracks his knuckles - cracks its knuckles + - хрустит пальцами #Forge-Change + - хрустит своими пальцами #Forge-Change + - хрустит костяшками пальцев #Forge-Change diff --git a/Resources/Prototypes/_Mono/Voice/speech_emotes.yml b/Resources/Prototypes/_Mono/Voice/speech_emotes.yml index 7b92787cfe3..5cf9efcfda8 100644 --- a/Resources/Prototypes/_Mono/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_Mono/Voice/speech_emotes.yml @@ -12,4 +12,5 @@ chatMessages: ["chat-emote-msg-reptilian-snicker"] chatTriggers: - snicker - - snickers \ No newline at end of file + - snickers + - хихикает #Forge-Change diff --git a/Resources/Prototypes/_StarLight/Voice/speech_emotes.yml b/Resources/Prototypes/_StarLight/Voice/speech_emotes.yml index 96eccacbc00..fec199a3dda 100644 --- a/Resources/Prototypes/_StarLight/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_StarLight/Voice/speech_emotes.yml @@ -3,7 +3,7 @@ name: chat-emote-name-whine category: Vocal available: false - chatMessages: [whines.] + chatMessages: [chat-emote-msg-whine] #Forge-Change whitelist: components: - Vocal @@ -13,13 +13,15 @@ chatTriggers: - whine - whines + - ноет #Forge-Change + - скулит #Forge-Change - type: emote id: Yip name: chat-emote-name-yip category: Vocal available: false - chatMessages: [yips.] + chatMessages: [chat-emote-msg-yip] #Forge-Change whitelist: components: - Vocal @@ -29,3 +31,4 @@ chatTriggers: - yip - yips + - тявкает #Forge-Change From 4e566904bb4241d8e83a62733a19dd7b277bed6c Mon Sep 17 00:00:00 2001 From: teasum Date: Tue, 4 Aug 2026 14:59:44 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B0=D0=BA=D1=86=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=20=D1=83=D0=BD=D0=B0=D1=82=D1=85=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntitySystems/LizardAccentSystem.cs | 65 +++++++++++++++++-- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index 81a57cb848c..4719a94d914 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -1,6 +1,7 @@ -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using Content.Server.Speech.Components; - +using Content.Shared.Speech.EntitySystems; +using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems; public sealed class LizardAccentSystem : EntitySystem @@ -10,7 +11,42 @@ public sealed class LizardAccentSystem : EntitySystem private static readonly Regex RegexInternalX = new(@"(\w)x"); private static readonly Regex RegexLowerEndX = new(@"\bx([\-|r|R]|\b)"); private static readonly Regex RegexUpperEndX = new(@"\bX([\-|r|R]|\b)"); - + /* + // Corvax-Localization-Start + private static readonly Regex _regexLowerC = new Regex("с+"); + private static readonly Regex _regexUpperC = new Regex("С+"); + private static readonly Regex _regexLowerZ = new Regex("з+"); + private static readonly Regex _regexUpperZ = new Regex("З+"); + private static readonly Regex _regexLowerSh = new Regex("ш+"); + private static readonly Regex _regexUpperSh = new Regex("Ш+"); + private static readonly Regex _regexLowerCh = new Regex("ч+"); + private static readonly Regex _regexUpperCh = new Regex("Ч+"); + private static readonly List _replacementsSs = new List { "сс", "ссс" }; + private static readonly List _replacementsSsUpper = new List { "СС", "ССС" }; + private static readonly List _replacementsSh = new List { "шш", "шшш" }; + private static readonly List _replacementsShUpper = new List { "ШШ", "ШШШ" }; + private static readonly List _replacementsCh = new List { "щщ", "щщщ" }; + private static readonly List _replacementsChUpper = new List { "ЩЩ", "ЩЩЩ" }; + // Corvax-Localization-End + */ + //Forge-Localization-Start + private static readonly Regex RegexLowerC = new Regex("с+"); + private static readonly Regex RegexUpperC = new Regex("С+"); + private static readonly Regex RegexLowerZ = new Regex("з+"); + private static readonly Regex RegexUpperZ = new Regex("З+"); + private static readonly Regex RegexLowerSh = new Regex("ш+"); + private static readonly Regex RegexUpperSh = new Regex("Ш+"); + private static readonly Regex RegexLowerCh = new Regex("ч+"); + private static readonly Regex RegexUpperCh = new Regex("Ч+"); + /* + private static readonly List ReplacementsSs = new List { "сс", "ссс" }; + private static readonly List ReplacementsSsUpper = new List { "СС", "ССС" }; + private static readonly List ReplacementsSh = new List { "шш", "шшш" }; + private static readonly List ReplacementsShUpper = new List { "ШШ", "ШШШ" }; + private static readonly List ReplacementsCh = new List { "щщ", "щщщ" }; + private static readonly List ReplacementsChUpper = new List { "ЩЩ", "ЩЩЩ" }; + */ + //Forge-Localiztion-End public override void Initialize() { base.Initialize(); @@ -31,7 +67,28 @@ private void OnAccent(EntityUid uid, LizardAccentComponent component, AccentGetE message = RegexLowerEndX.Replace(message, "ecks$1"); // eckS message = RegexUpperEndX.Replace(message, "ECKS$1"); - + /* + // Corvax-Localization-Start + message = _regexLowerC.Replace(message, _random.Pick(_replacementsSs)); + message = _regexUpperC.Replace(message, _random.Pick(_replacementsSsUpper)); + message = _regexLowerZ.Replace(message, _random.Pick(_replacementsSs)); // для "з+" используются те же замены, что и для "с+" + message = _regexUpperZ.Replace(message, _random.Pick(_replacementsSsUpper)); // для "З+" используются те же замены, что и для "С+" + message = _regexLowerSh.Replace(message, _random.Pick(_replacementsSh)); + message = _regexUpperSh.Replace(message, _random.Pick(_replacementsShUpper)); + message = _regexLowerCh.Replace(message, _random.Pick(_replacementsCh)); + message = _regexUpperCh.Replace(message, _random.Pick(_replacementsChUpper)); + // Corvax-Localization-End + */ + //Forge-Localization-Start + message = RegexLowerC.Replace(message, "ссс"); + message = RegexUpperC.Replace(message, "ССС"); + message = RegexLowerZ.Replace(message, "ссс"); // для "з+" используются те же замены, что и для "с+" + message = RegexUpperZ.Replace(message, "ССС"); // для "З+" используются те же замены, что и для "С+" + message = RegexLowerSh.Replace(message, "шшш"); + message = RegexUpperSh.Replace(message, "ШШШ"); + message = RegexLowerCh.Replace(message, "щщщ"); + message = RegexUpperCh.Replace(message, "ЩЩЩ"); + //Forge-Localization-End args.Message = message; } } From db3699678247b132136e3b17c2974dbc6cbf79b4 Mon Sep 17 00:00:00 2001 From: teasum Date: Tue, 4 Aug 2026 15:01:01 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BC?= =?UTF-8?q?=D1=83=D1=81=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntitySystems/LizardAccentSystem.cs | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index 4719a94d914..f0deb75d9b4 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -1,7 +1,5 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; -using Content.Shared.Speech.EntitySystems; -using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems; public sealed class LizardAccentSystem : EntitySystem @@ -11,24 +9,6 @@ public sealed class LizardAccentSystem : EntitySystem private static readonly Regex RegexInternalX = new(@"(\w)x"); private static readonly Regex RegexLowerEndX = new(@"\bx([\-|r|R]|\b)"); private static readonly Regex RegexUpperEndX = new(@"\bX([\-|r|R]|\b)"); - /* - // Corvax-Localization-Start - private static readonly Regex _regexLowerC = new Regex("с+"); - private static readonly Regex _regexUpperC = new Regex("С+"); - private static readonly Regex _regexLowerZ = new Regex("з+"); - private static readonly Regex _regexUpperZ = new Regex("З+"); - private static readonly Regex _regexLowerSh = new Regex("ш+"); - private static readonly Regex _regexUpperSh = new Regex("Ш+"); - private static readonly Regex _regexLowerCh = new Regex("ч+"); - private static readonly Regex _regexUpperCh = new Regex("Ч+"); - private static readonly List _replacementsSs = new List { "сс", "ссс" }; - private static readonly List _replacementsSsUpper = new List { "СС", "ССС" }; - private static readonly List _replacementsSh = new List { "шш", "шшш" }; - private static readonly List _replacementsShUpper = new List { "ШШ", "ШШШ" }; - private static readonly List _replacementsCh = new List { "щщ", "щщщ" }; - private static readonly List _replacementsChUpper = new List { "ЩЩ", "ЩЩЩ" }; - // Corvax-Localization-End - */ //Forge-Localization-Start private static readonly Regex RegexLowerC = new Regex("с+"); private static readonly Regex RegexUpperC = new Regex("С+"); @@ -38,14 +18,6 @@ public sealed class LizardAccentSystem : EntitySystem private static readonly Regex RegexUpperSh = new Regex("Ш+"); private static readonly Regex RegexLowerCh = new Regex("ч+"); private static readonly Regex RegexUpperCh = new Regex("Ч+"); - /* - private static readonly List ReplacementsSs = new List { "сс", "ссс" }; - private static readonly List ReplacementsSsUpper = new List { "СС", "ССС" }; - private static readonly List ReplacementsSh = new List { "шш", "шшш" }; - private static readonly List ReplacementsShUpper = new List { "ШШ", "ШШШ" }; - private static readonly List ReplacementsCh = new List { "щщ", "щщщ" }; - private static readonly List ReplacementsChUpper = new List { "ЩЩ", "ЩЩЩ" }; - */ //Forge-Localiztion-End public override void Initialize() { @@ -67,18 +39,6 @@ private void OnAccent(EntityUid uid, LizardAccentComponent component, AccentGetE message = RegexLowerEndX.Replace(message, "ecks$1"); // eckS message = RegexUpperEndX.Replace(message, "ECKS$1"); - /* - // Corvax-Localization-Start - message = _regexLowerC.Replace(message, _random.Pick(_replacementsSs)); - message = _regexUpperC.Replace(message, _random.Pick(_replacementsSsUpper)); - message = _regexLowerZ.Replace(message, _random.Pick(_replacementsSs)); // для "з+" используются те же замены, что и для "с+" - message = _regexUpperZ.Replace(message, _random.Pick(_replacementsSsUpper)); // для "З+" используются те же замены, что и для "С+" - message = _regexLowerSh.Replace(message, _random.Pick(_replacementsSh)); - message = _regexUpperSh.Replace(message, _random.Pick(_replacementsShUpper)); - message = _regexLowerCh.Replace(message, _random.Pick(_replacementsCh)); - message = _regexUpperCh.Replace(message, _random.Pick(_replacementsChUpper)); - // Corvax-Localization-End - */ //Forge-Localization-Start message = RegexLowerC.Replace(message, "ссс"); message = RegexUpperC.Replace(message, "ССС"); From 22ba6af062189a7275ec4735dbf32902a68503c8 Mon Sep 17 00:00:00 2001 From: teasum Date: Tue, 4 Aug 2026 15:38:33 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Speech/EntitySystems/LizardAccentSystem.cs | 4 ++-- .../Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl | 4 +++- .../Prototypes/Nyanotrasen/Voice/speech_emotes.yml | 5 +++-- Resources/Prototypes/Voice/speech_emotes.yml | 12 ++++++------ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index f0deb75d9b4..70577f4fe5f 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -46,8 +46,8 @@ private void OnAccent(EntityUid uid, LizardAccentComponent component, AccentGetE message = RegexUpperZ.Replace(message, "ССС"); // для "З+" используются те же замены, что и для "С+" message = RegexLowerSh.Replace(message, "шшш"); message = RegexUpperSh.Replace(message, "ШШШ"); - message = RegexLowerCh.Replace(message, "щщщ"); - message = RegexUpperCh.Replace(message, "ЩЩЩ"); + message = RegexLowerCh.Replace(message, "ччч"); + message = RegexUpperCh.Replace(message, "ЧЧЧ"); //Forge-Localization-End args.Message = message; } diff --git a/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl b/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl index 4a509b4e8fa..0097957f4b9 100644 --- a/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl +++ b/Resources/Locale/ru-RU/nyanotrasen/voice/speech_emotes.ftl @@ -1,6 +1,8 @@ -Meow = Мяу +Meow = Мяу! chat-emote-msg-meow = мяукает Growl = Скалиться chat-emote-msg-growl = скалиться Purr = Мурчать chat-emote-msg-purr = мурчит +Mew = Миу! +chat-emote-msg-mew = миукает diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml index 8b0b0ae26ed..083001e8325 100644 --- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml @@ -36,7 +36,7 @@ blacklist: components: - BorgChassis - chatMessages: ["chat-emote-msg-meow"] + chatMessages: ["chat-emote-msg-meow"] #Forge-Change chatTriggers: - meow - meows @@ -83,12 +83,13 @@ blacklist: components: - BorgChassis - chatMessages: [mews.] + chatMessages: ["chat-emote-msg-mew"] #Forge-Change chatTriggers: - mew - mews - mewing - mewed + - миукает #Forge-Change - type: emote id: Growl diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index c4f9f0c8ace..a161ed4c6bf 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -25,10 +25,10 @@ - yells - yelled - yelling - - кричит - - кричит! - - орет - - орёт + - кричит #Forge-Change + - кричит! #Forge-Change + - орет #Forge-Change + - орёт #Forge-Change - type: emote id: Laugh @@ -75,7 +75,7 @@ - honks - honked - honking - - хокает #Forge-Change + - хонкает #Forge-Change - type: emote id: Sigh @@ -256,7 +256,7 @@ - claps her hands together - claps his hands together - claps its hands together - - хлопоет один раз #Forge-Change + - хлопает один раз #Forge-Change - type: emote id: Snap From 9fe11fc21c032d1afc60cf082d942ad526896f99 Mon Sep 17 00:00:00 2001 From: teasum Date: Tue, 4 Aug 2026 16:23:28 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B0=D0=BA=D1=86=D0=B5=D0=BD=D1=82=20=D0=B5=D0=B0=20=D1=89?= =?UTF-8?q?=20=D1=83=D0=BD=D0=B0=D1=82=D1=85=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Speech/EntitySystems/LizardAccentSystem.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index 70577f4fe5f..cef5d08ea15 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -18,6 +18,8 @@ public sealed class LizardAccentSystem : EntitySystem private static readonly Regex RegexUpperSh = new Regex("Ш+"); private static readonly Regex RegexLowerCh = new Regex("ч+"); private static readonly Regex RegexUpperCh = new Regex("Ч+"); + private static readonly Regex RegexLowerSch = new Regex("щ+"); + private static readonly Regex RegexUpperCh = new Regex("Щ+"); //Forge-Localiztion-End public override void Initialize() { @@ -48,6 +50,8 @@ private void OnAccent(EntityUid uid, LizardAccentComponent component, AccentGetE message = RegexUpperSh.Replace(message, "ШШШ"); message = RegexLowerCh.Replace(message, "ччч"); message = RegexUpperCh.Replace(message, "ЧЧЧ"); + message = RegexLowerSch.Replace(message, "щщщ"); + message = RegexUpperSch.Replace(message, "ЩЩЩ"); //Forge-Localization-End args.Message = message; }