From 4b0cf371eebffb66ff8069c1ff0101908264d587 Mon Sep 17 00:00:00 2001 From: Tea2283 Date: Mon, 16 Feb 2026 20:44:17 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8F=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit она выглядела старше 12-ти --- .../CommunicationsConsoleSystem.cs | 19 +++++++++++++++++-- .../communications-console-component.ftl | 3 +++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 74880884a5ee3..5a397ab21d088 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -275,8 +275,23 @@ private void OnAnnounceMessage(EntityUid uid, CommunicationsConsoleComponent com // DS14-Languages-end if (comp.AnnounceSentBy) - msg += "\n" + Loc.GetString("comms-console-announcement-sent-by") + " " + author; - + // DS14-Start + { + var sentByStrings = new[] + { + "comms-console-announcement-sent-by", + "comms-console-announcement-sent-by2", + "comms-console-announcement-sent-by3", + "comms-console-announcement-sent-by4" + }; + + var random = new Random(); + var randomIndex = random.Next(sentByStrings.Length); + var selectedSentByString = sentByStrings[randomIndex]; + + msg += "\n" + Loc.GetString(selectedSentByString) + " " + author; + } + // DS14-End if (comp.Global) { _chatSystem.DispatchGlobalAnnouncement(msg, title, announcementSound: comp.Sound, colorOverride: comp.Color, originalMessage: originalMessage, author: message.Actor, languageId: languageId); // DS14-TTS diff --git a/Resources/Locale/ru-RU/communications/communications-console-component.ftl b/Resources/Locale/ru-RU/communications/communications-console-component.ftl index 3f28f66dbc8c3..cd5e82f5bbccb 100644 --- a/Resources/Locale/ru-RU/communications/communications-console-component.ftl +++ b/Resources/Locale/ru-RU/communications/communications-console-component.ftl @@ -12,6 +12,9 @@ comms-console-shuttle-unavailable = В настоящее время шаттл comms-console-message-too-long = Сообщение слишком длинное # Placeholder values comms-console-announcement-sent-by = Отправитель +comms-console-announcement-sent-by3 = Высказался +comms-console-announcement-sent-by2 = Сообщение передал +comms-console-announcement-sent-by4 = Ваш любимый comms-console-announcement-unknown-sender = Неизвестный # User interface comms-console-menu-title = Консоль связи From dc2e0619b1aa4c2381589f71511d385b6e79e020 Mon Sep 17 00:00:00 2001 From: Tea2283 Date: Tue, 17 Feb 2026 09:02:11 +0500 Subject: [PATCH 2/3] =?UTF-8?q?=D0=AD=D1=8D=D1=8D=20=D0=B1=D0=B0=D0=B1?= =?UTF-8?q?=D1=83=D1=88=D0=BA=D0=B0=20=D1=8D=D1=82=D0=BE=D1=82=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=85=D1=83=D0=B9=20=D0=BD=D0=B5=20=D0=BD=D1=83=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit говно голимое но да лан, нахуй переделал весь код и адаптировал его под полы --- .../CommunicationsConsoleSystem.cs | 62 ++++++++++++++++--- .../communications-console-component.ftl | 16 +++-- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 5a397ab21d088..06dacf11e23fe 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -22,6 +22,8 @@ using Content.Shared.DeadSpace.Languages.Components; using Content.Server.DeadSpace.Languages; using Content.Shared.Corvax.TTS; +using Content.Shared.Humanoid; // для HumanoidAppearanceComponent +using Content.Shared.Humanoid.Prototypes; // для Sex namespace Content.Server.Communications { @@ -277,17 +279,59 @@ private void OnAnnounceMessage(EntityUid uid, CommunicationsConsoleComponent com if (comp.AnnounceSentBy) // DS14-Start { - var sentByStrings = new[] + Sex sex = Sex.Unsexed; + string selectedSentByString; + + if (TryComp(message.Actor, out var humanoid)) { - "comms-console-announcement-sent-by", - "comms-console-announcement-sent-by2", - "comms-console-announcement-sent-by3", - "comms-console-announcement-sent-by4" - }; + sex = humanoid.Sex; + } - var random = new Random(); - var randomIndex = random.Next(sentByStrings.Length); - var selectedSentByString = sentByStrings[randomIndex]; + if (sex == Sex.Female) + { + // Female + var femaleSentByStrings = new[] + { + "comms-console-announcement-sent-by-female1", + "comms-console-announcement-sent-by-female2", + "comms-console-announcement-sent-by-female3", + "comms-console-announcement-sent-by-female4" + }; + + var random = new Random(); + var randomIndex = random.Next(femaleSentByStrings.Length); + selectedSentByString = femaleSentByStrings[randomIndex]; + } + else if (sex == Sex.Male) + { + // Male + var maleSentByStrings = new[] + { + "comms-console-announcement-sent-by-male1", + "comms-console-announcement-sent-by-male2", + "comms-console-announcement-sent-by-male3", + "comms-console-announcement-sent-by-male4" + }; + + var random = new Random(); + var randomIndex = random.Next(maleSentByStrings.Length); + selectedSentByString = maleSentByStrings[randomIndex]; + } + else + { + // Nonsexed + var unsexedSentByStrings = new[] + { + "comms-console-announcement-sent-by-nonsexed1", + "comms-console-announcement-sent-by-nonsexed2", + "comms-console-announcement-sent-by-nonsexed3", + "comms-console-announcement-sent-by-nonsexed4" + }; + + var random = new Random(); + var randomIndex = random.Next(unsexedSentByStrings.Length); + selectedSentByString = unsexedSentByStrings[randomIndex]; + } msg += "\n" + Loc.GetString(selectedSentByString) + " " + author; } diff --git a/Resources/Locale/ru-RU/communications/communications-console-component.ftl b/Resources/Locale/ru-RU/communications/communications-console-component.ftl index cd5e82f5bbccb..4c148b7b17001 100644 --- a/Resources/Locale/ru-RU/communications/communications-console-component.ftl +++ b/Resources/Locale/ru-RU/communications/communications-console-component.ftl @@ -11,10 +11,18 @@ comms-console-permission-denied = В доступе отказано comms-console-shuttle-unavailable = В настоящее время шаттл недоступен comms-console-message-too-long = Сообщение слишком длинное # Placeholder values -comms-console-announcement-sent-by = Отправитель -comms-console-announcement-sent-by3 = Высказался -comms-console-announcement-sent-by2 = Сообщение передал -comms-console-announcement-sent-by4 = Ваш любимый +comms-console-announcement-sent-by-female1 = Передала сообщение +comms-console-announcement-sent-by-female2 = Высказалась +comms-console-announcement-sent-by-female3 = Сообщила +comms-console-announcement-sent-by-female4 = Ваша любимая +comms-console-announcement-sent-by-male1 = Передал сообщение +comms-console-announcement-sent-by-male2 = Высказался +comms-console-announcement-sent-by-male3 = Сообщил +comms-console-announcement-sent-by-male4 = Ваш любимый +comms-console-announcement-sent-by-nonsexed1 = Передали сообщение +comms-console-announcement-sent-by-nonsexed2 = Высказались +comms-console-announcement-sent-by-nonsexed3 = Сообщили +comms-console-announcement-sent-by-nonsexed4 = Ваши любимые comms-console-announcement-unknown-sender = Неизвестный # User interface comms-console-menu-title = Консоль связи From c7e80a8f21a469cf955d19ef5f88825ed008a812 Mon Sep 17 00:00:00 2001 From: Tea2283 Date: Tue, 17 Feb 2026 09:40:32 +0500 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Communications/CommunicationsConsoleSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 06dacf11e23fe..09cbc8bc3d684 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -22,8 +22,8 @@ using Content.Shared.DeadSpace.Languages.Components; using Content.Server.DeadSpace.Languages; using Content.Shared.Corvax.TTS; -using Content.Shared.Humanoid; // для HumanoidAppearanceComponent -using Content.Shared.Humanoid.Prototypes; // для Sex +using Content.Shared.Humanoid; // DS14 +using Content.Shared.Humanoid.Prototypes; // DS14 namespace Content.Server.Communications {