From 2ee8747bb063311999731230da10826cab63b3c5 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Thu, 9 Jan 2025 23:50:59 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_White/ERTRecruitment/ERTRecruitmentRule.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs index 66fc71ee4a..70d4c2b002 100644 --- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs +++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs @@ -72,8 +72,16 @@ public sealed class ERTRecruitmentRule : StationEventSystem Date: Sat, 11 Jan 2025 22:22:19 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl index 027b4bdfae..845be5e4be 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl @@ -16,5 +16,5 @@ ent-BoxShotgunPractice = коробка ружейных патронов (уч .desc = Полная коробка учебных ружейных патронов. ent-BoxShellTranquilizer = коробка ружейных патронов (транквилизаторы) .desc = Полная коробка ружейных патронов-транквилизаторов. -ent-BoxRubberShot = коробка ружейных патронов (резиновые). +ent-BoxRubberShot = коробка ружейных патронов (резиновые) .desc = Полная коробка резиновых ружейных патронов. From e70d9d33dcc60837829d049c19f9260663192d41 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 11 Jan 2025 23:17:22 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A7=D1=82=D0=BE=D0=B1=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B2=D1=82=D1=8B=D0=BA=D0=B0=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml index c7ce5d4b2b..a4e8105171 100644 --- a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml @@ -4,6 +4,6 @@ sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi state: icon product: CrateArmoryKLMG - cost: 10000 + cost: 14000 category: cargoproduct-category-name-armory group: market From 943b36169248f909d26022e8e5f1e36b6a4e2428 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 11 Jan 2025 23:59:36 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D1=81=D0=BC=D0=B5=D1=88=D0=BD=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameTicking/GameTicker.Spawning.cs | 38 +++++++++---------- .../Speech/EntitySystems/MothAccentSystem.cs | 38 +++++++++++++------ .../Speech/EntitySystems/SlurredSystem.cs | 8 +++- .../Aspects/RandomAccentAspect.cs | 13 ++++++- 4 files changed, 63 insertions(+), 34 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 17226aa8fa..351919337a 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -205,20 +205,20 @@ namespace Content.Server.GameTicking switch (similarity) { case >= 85f: - { - _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same", - ("player", player.Name), ("try", false), ("oldName", mind.CharacterName), ("newName", character.Name))); - checkAvoid = true; - sameChar = true; - break; - } + { + _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same", + ("player", player.Name), ("try", false), ("oldName", mind.CharacterName), ("newName", character.Name))); + checkAvoid = true; + sameChar = true; + break; + } case >= 50f: - { - _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same", - ("player", player.Name), ("try", true), ("oldName", mind.CharacterName), - ("newName", character.Name))); - break; - } + { + _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same", + ("player", player.Name), ("try", true), ("oldName", mind.CharacterName), + ("newName", character.Name))); + break; + } } } } @@ -286,7 +286,7 @@ namespace Content.Server.GameTicking _mind.SetUserId(newMind, data.UserId); var jobPrototype = _prototypeManager.Index(jobId); - var job = new JobComponent {Prototype = jobId}; + var job = new JobComponent { Prototype = jobId }; _roles.MindAddRole(newMind, job, silent: silent); var jobName = _jobs.MindTryGetJobName(newMind); @@ -337,11 +337,11 @@ namespace Content.Server.GameTicking Loc.GetString("latejoin-arrival-sender"), playDefaultSound: false); } - - if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}")) - { - EntityManager.AddComponent(mob); - } + // WD Don't need this bullshit + // if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}")) + // { + // EntityManager.AddComponent(mob); + // } _stationJobs.TryAssignJob(station, jobPrototype, player.UserId); diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs index de25f635b1..220ace3b37 100644 --- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs @@ -1,18 +1,15 @@ using System.Text.RegularExpressions; using Content.Server.Speech.Components; +using Robust.Shared.Random; namespace Content.Server.Speech.EntitySystems; public sealed class MothAccentSystem : EntitySystem { + [Dependency] private readonly IRobustRandom _random = default!; // WD private static readonly Regex RegexLowerBuzz = new Regex("z{1,3}"); private static readonly Regex RegexUpperBuzz = new Regex("Z{1,3}"); - private static readonly Regex RussianRegexLowerZ = new Regex("Z{1,3}"); // WD - private static readonly Regex RussianRegexUpperZ = new Regex("Z{1,3}"); // WD - private static readonly Regex RussianRegexLowerZH = new Regex("Z{1,3}"); // WD - private static readonly Regex RussianRegexUpperZH = new Regex("Z{1,3}"); // WD - public override void Initialize() { base.Initialize(); @@ -29,13 +26,30 @@ public sealed class MothAccentSystem : EntitySystem message = RegexUpperBuzz.Replace(message, "ZZZ"); // WD EDIT START - message = RussianRegexLowerZ.Replace(message, "ззз"); - - message = RussianRegexUpperZ.Replace(message, "ЗЗЗ"); - - message = RussianRegexLowerZH.Replace(message, "жжж"); - - message = RussianRegexUpperZH.Replace(message, "ЖЖЖ"); + // ж => жжж + message = Regex.Replace( + message, + "ж+", + _random.Pick(new List() { "жж", "жжж" }) + ); + // Ж => ЖЖЖ + message = Regex.Replace( + message, + "Ж+", + _random.Pick(new List() { "ЖЖ", "ЖЖЖ" }) + ); + // з => ззз + message = Regex.Replace( + message, + "з+", + _random.Pick(new List() { "зз", "ззз" }) + ); + // З => ЗЗЗ + message = Regex.Replace( + message, + "З+", + _random.Pick(new List() { "ЗЗ", "ЗЗЗ" }) + ); // WD EDIT END args.Message = message; diff --git a/Content.Server/Speech/EntitySystems/SlurredSystem.cs b/Content.Server/Speech/EntitySystems/SlurredSystem.cs index e396cd0b18..3b0c74fded 100644 --- a/Content.Server/Speech/EntitySystems/SlurredSystem.cs +++ b/Content.Server/Speech/EntitySystems/SlurredSystem.cs @@ -71,6 +71,12 @@ public sealed class SlurredSystem : SharedSlurredSystem 'a' => "ah", 'u' => "oo", 'c' => "k", + // WD EDIT START + 'о' => "а", + 'к' => "кх", + 'щ' => "шч", + 'ц' => "тс", + // WD EDIT END _ => $"{character}", }; @@ -90,7 +96,7 @@ public sealed class SlurredSystem : SharedSlurredSystem } } - if (!_random.Prob(scale * 3/20)) + if (!_random.Prob(scale * 3 / 20)) { sb.Append(character); continue; diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs index ab09d3aa27..a29b800a2a 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs @@ -7,6 +7,7 @@ using Content.Server._White.AspectsSystem.Base; using Content.Server.GameTicking.Components; using Content.Shared.Mind.Components; using Robust.Shared.Random; +using Content.Server._White.Accent.BomzhAccent; namespace Content.Server._White.AspectsSystem.Aspects; @@ -69,6 +70,8 @@ public sealed class RandomAccentAspect : AspectSystem(uid); break; - case AccentType.Russian: + case AccentType.Russian: // Untranslated EntityManager.EnsureComponent(uid); break; case AccentType.OwO: @@ -127,12 +130,18 @@ public sealed class RandomAccentAspect : AspectSystem(uid); break; - case AccentType.French: + case AccentType.French: // Untranslated EntityManager.EnsureComponent(uid); break; case AccentType.Gnome: EntityManager.EnsureComponent(uid); break; + case AccentType.Bomzh: + EntityManager.EnsureComponent(uid); + break; + case AccentType.Frontallisp: + EntityManager.EnsureComponent(uid); + break; } }