правки (#880)

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",
+                                    _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same",
-                                    ("player", player.Name), ("try", false), ("oldName", mind.CharacterName), ("newName", character.Name)));
+                                        ("player", player.Name), ("try", false), ("oldName", mind.CharacterName), ("newName", character.Name)));
-                                checkAvoid = true;
+                                    checkAvoid = true;
-                                sameChar = true;
+                                    sameChar = true;
-                                break;
+                                    break;
-                            }
+                                }
                             case >= 50f:
-                            {
+                                {
-                                _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same",
+                                    _chatManager.SendAdminAlert(Loc.GetString("ghost-respawn-character-almost-same",
-                                    ("player", player.Name), ("try", true), ("oldName", mind.CharacterName),
+                                        ("player", player.Name), ("try", true), ("oldName", mind.CharacterName),
-                                    ("newName", character.Name)));
+                                        ("newName", character.Name)));
-                                break;
+                                    break;
-                            }
+                                }
                         }
                     }
                 }
@@ -286,7 +286,7 @@ namespace Content.Server.GameTicking
             _mind.SetUserId(newMind, data.UserId);
 
             var jobPrototype = _prototypeManager.Index<JobPrototype>(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);
             }
-
+            // WD Don't need this bullshit
-            if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}"))
+            // if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}"))
-            {
+            // {
-                EntityManager.AddComponent<OwOAccentComponent>(mob);
+            //     EntityManager.AddComponent<OwOAccentComponent>(mob);
-            }
+            // }
 
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
 

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 = Regex.Replace(
-        message = RussianRegexUpperZ.Replace(message, "ЗЗЗ");
+            message,
-
+            "ж+",
-        message = RussianRegexLowerZH.Replace(message, "жжж");
+            _random.Pick(new List<string>() { "жж", "жжж" })
-
+        );
-        message = RussianRegexUpperZH.Replace(message, "ЖЖЖ");
+        // Ж => ЖЖЖ
+        message = Regex.Replace(
+            message,
+            "Ж+",
+            _random.Pick(new List<string>() { "ЖЖ", "ЖЖЖ" })
+        );
+        // з => ззз
+        message = Regex.Replace(
+            message,
+            "з+",
+            _random.Pick(new List<string>() { "зз", "ззз" })
+        );
+        // З => ЗЗЗ
+        message = Regex.Replace(
+            message,
+            "З+",
+            _random.Pick(new List<string>() { "ЗЗ", "ЗЗЗ" })
+        );
         // WD EDIT END
 
         args.Message = message;

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;

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<RandomAccentAspectComponen
         Moth,
         French,
         Gnome,
+        Bomzh,
+        Frontallisp
     }
 
     private void ApplyRandomAccent(EntityUid uid)
@@ -100,7 +103,7 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
             case AccentType.Pirate:
                 EntityManager.EnsureComponent<PirateAccentComponent>(uid);
                 break;
-            case AccentType.Russian:
+            case AccentType.Russian: // Untranslated
                 EntityManager.EnsureComponent<RussianAccentComponent>(uid);
                 break;
             case AccentType.OwO:
@@ -127,12 +130,18 @@ public sealed class RandomAccentAspect : AspectSystem<RandomAccentAspectComponen
             case AccentType.Moth:
                 EntityManager.EnsureComponent<MothAccentComponent>(uid);
                 break;
-            case AccentType.French:
+            case AccentType.French: // Untranslated
                 EntityManager.EnsureComponent<FrenchAccentComponent>(uid);
                 break;
             case AccentType.Gnome:
                 EntityManager.EnsureComponent<GnomeAccentComponent>(uid);
                 break;
+            case AccentType.Bomzh:
+                EntityManager.EnsureComponent<BomzhAccentComponent>(uid);
+                break;
+            case AccentType.Frontallisp:
+                EntityManager.EnsureComponent<FrontalLispComponent>(uid);
+                break;
         }
     }
 

Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs

@@ -72,8 +72,16 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
     {
         base.Started(uid, component, gameRule, args);
 
-        if (component.TargetStation == null || component.IsBlocked || IsDisabled)
+        if (component.TargetStation == null)
         {
+            ForceEndSelf(uid, gameRule);
+            _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Target Station is missing");
+            return;
+        }
+
+        if (component.IsBlocked || IsDisabled)
+        {
+            DeclineERT(component.TargetStation.Value);
             ForceEndSelf(uid, gameRule);
             _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Event disabled");
             return;
@@ -82,6 +90,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
         if (_recruitment.GetEventSpawners(ERTRecruitmentRuleComponent.EventName).Count() < component.MinPlayers)
         {
             DeclineERT(component.TargetStation.Value);
+            ForceEndSelf(uid, gameRule);
             _adminLogger.Add(LogType.EventStarted, LogImpact.High, $"ERT Declined - Not enough spawners");
             return;
         }

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 = Полная коробка резиновых ружейных патронов.

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