Merge pull request #14 from Corvax-Frontier/CorvaxFrontierRu

Ужас, страшно

.github/workflows/rsi-diff.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Diff changed RSIs
         id: diff
-        uses: space-wizards/[email protected]
+        uses: mirrorcult/[email protected]
         with:
           modified: ${{ steps.files.outputs.modified }}
           removed: ${{ steps.files.outputs.removed }}

Content.Server/Chat/Managers/ChatSanitizationManager.cs

@@ -11,6 +11,32 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
 
     private static readonly Dictionary<string, string> SmileyToEmote = new()
     {
+        // Corvax-Localization-Start
+        { "хд", "chatsan-laughs" },
+        { "о-о", "chatsan-wide-eyed" }, // cyrillic о
+        { "о.о", "chatsan-wide-eyed" }, // cyrillic о
+        { "0_о", "chatsan-wide-eyed" }, // cyrillic о
+        { "о/", "chatsan-waves" }, // cyrillic о
+        { "о7", "chatsan-salutes" }, // cyrillic о
+        { "0_o", "chatsan-wide-eyed" },
+        { "лмао", "chatsan-laughs" },
+        { "рофл", "chatsan-laughs" },
+        { "яхз", "chatsan-shrugs" },
+        { ":0", "chatsan-surprised" },
+        { ":р", "chatsan-stick-out-tongue" }, // cyrillic р
+        { "кек", "chatsan-laughs" },
+        { "T_T", "chatsan-cries" },
+        { "Т_Т", "chatsan-cries" }, // cyrillic T
+        { "=_(", "chatsan-cries" },
+        { "!с", "chatsan-laughs" },
+        { "!в", "chatsan-sighs" },
+        { "!х", "chatsan-claps" },
+        { "!щ", "chatsan-snaps" },
+        { "))", "chatsan-smiles-widely" },
+        { ")", "chatsan-smiles" },
+        { "((", "chatsan-frowns-deeply" },
+        { "(", "chatsan-frowns" },
+        // Corvax-Localization-End
         // I could've done this with regex, but felt it wasn't the right idea.
         { ":)", "chatsan-smiles" },
         { ":]", "chatsan-smiles" },
@@ -78,7 +104,6 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { "kek.", "chatsan-laughs" },
         { "rofl", "chatsan-laughs" },
         { "o7", "chatsan-salutes" },
-        { "07", "chatsan-salutes" },
         { ";_;7", "chatsan-tearfully-salutes"},
         { "idk", "chatsan-shrugs" },
         { "idk.", "chatsan-shrugs" },

Content.Server/Corvax/Speech/Components/GrowlingAccentComponent.cs

@@ -0,0 +1,10 @@
+namespace Content.Server.Corvax.Speech.Components;
+
+/// <summary>
+///     Rrrr!
+/// </summary>
+[RegisterComponent]
+public sealed partial class GrowlingAccentComponent : Component
+{
+
+}

Content.Server/Corvax/Speech/EntitySystems/GrowlingAccentSystem.cs

@@ -0,0 +1,50 @@
+using System.Text.RegularExpressions;
+using Content.Server.Corvax.Speech.Components;
+using Content.Server.Speech;
+using Robust.Shared.Random;
+
+namespace Content.Server.Corvax.Speech.EntitySystems;
+
+public sealed class GrowlingAccentSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<GrowlingAccentComponent, AccentGetEvent>(OnAccent);
+    }
+
+    private void OnAccent(EntityUid uid, GrowlingAccentComponent component, AccentGetEvent args)
+    {
+        var message = args.Message;
+
+        // r => rrr
+        message = Regex.Replace(
+            message,
+            "r+",
+            _random.Pick(new List<string> { "rr", "rrr" })
+        );
+        // R => RRR
+        message = Regex.Replace(
+            message,
+            "R+",
+            _random.Pick(new List<string> { "RR", "RRR" })
+        );
+
+        // р => ррр
+        message = Regex.Replace(
+            message,
+            "р+",
+            _random.Pick(new List<string> { "рр", "ррр" })
+        );
+        // Р => РРР
+        message = Regex.Replace(
+            message,
+            "Р+",
+            _random.Pick(new List<string> { "РР", "РРР" })
+        );
+
+        args.Message = message;
+    }
+}

Content.Server/Doors/Systems/AirlockSystem.cs

@@ -29,6 +29,7 @@ private void OnAirlockInit(EntityUid uid, AirlockComponent component, ComponentI
         if (TryComp<ApcPowerReceiverComponent>(uid, out var receiverComponent))
         {
             Appearance.SetData(uid, DoorVisuals.Powered, receiverComponent.Powered);
+            Appearance.SetData(uid, DoorVisuals.ClosedLights, true); // Corvax-Resprite-Airlocks
         }
     }
 

Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs

@@ -64,7 +64,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
             grammar.Gender = sourceHumanoid.Gender;
         }
 
-        Dirty(targetHumanoid);
+        Dirty(target, targetHumanoid);
     }
 
     /// <summary>
@@ -85,7 +85,7 @@ public void RemoveMarking(EntityUid uid, string marking, bool sync = true, Human
         humanoid.MarkingSet.Remove(prototype.MarkingCategory, marking);
 
         if (sync)
-            Dirty(humanoid);
+            Dirty(uid, humanoid);
     }
 
     /// <summary>
@@ -106,7 +106,7 @@ public void RemoveMarking(EntityUid uid, MarkingCategories category, int index,
         }
 
         humanoid.MarkingSet.Remove(category, index);
-        Dirty(humanoid);
+        Dirty(uid, humanoid);
     }
 
     /// <summary>
@@ -135,7 +135,7 @@ public void SetMarkingId(EntityUid uid, MarkingCategories category, int index, s
         }
 
         humanoid.MarkingSet.Replace(category, index, marking);
-        Dirty(humanoid);
+        Dirty(uid, humanoid);
     }
 
     /// <summary>
@@ -162,7 +162,7 @@ public void SetMarkingColor(EntityUid uid, MarkingCategories category, int index
             markings[index].SetColor(i, colors[i]);
         }
 
-        Dirty(humanoid);
+        Dirty(uid, humanoid);
     }
 
     /// <summary>
@@ -186,7 +186,7 @@ public string GetAgeRepresentation(string species, int age)
 
         if (speciesPrototype == null)
         {
-            Logger.Error("Tried to get age representation of species that couldn't be indexed: " + species);
+            Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
             return Loc.GetString("identity-age-young");
         }
 

Content.Shared/Preferences/HumanoidCharacterProfile.cs

@@ -430,15 +430,7 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
 
             if (configManager.GetCVar(CCVars.RestrictedNames))
             {
-                name = Regex.Replace(name, @"[^\u0041-\u005A,\u0061-\u007A,\u00C0-\u00D6,\u00D8-\u00F6,\u00F8-\u00FF,\u0100-\u017F, -]", string.Empty);
-                /*
-                 * 0041-005A  Basic Latin: Uppercase Latin Alphabet
-                 * 0061-007A  Basic Latin: Lowercase Latin Alphabet
-                 * 00C0-00D6  Latin-1 Supplement: Letters I
-                 * 00D8-00F6  Latin-1 Supplement: Letters II
-                 * 00F8-00FF  Latin-1 Supplement: Letters III
-                 * 0100-017F  Latin Extended A: European Latin
-                 */
+                name = Regex.Replace(name, @"[^А-Яа-яёЁ0-9' -]", string.Empty); // Corvax: Only cyrillic names
             }
 
             if (configManager.GetCVar(CCVars.ICNameCase))

Resources/Locale/en-US/markings/oni.ftl

@@ -0,0 +1,13 @@
+marking-OniHornAngular = marking-OniHornAngular
+marking-OniHornCurled = marking-OniHornCurled
+marking-OniHornDoubleCurved = marking-OniHornDoubleCurved
+marking-OniHornDoubleCurvedOutwards = marking-OniHornDoubleCurvedOutwards
+marking-OniHornDoubleLeftBrokeCurved = marking-OniHornDoubleLeftBrokeCurved
+marking-OniHornDoubleRightBrokeCurved = marking-OniHornDoubleRightBrokeCurved
+marking-OniHornRam = marking-OniHornRam
+marking-OniHornShort = marking-OniHornShort
+marking-OniHornSimple = marking-OniHornSimple
+marking-OniHornSingleCurved = marking-OniHornSingleCurved
+marking-OniHornSingleLeftCurved = marking-OniHornSingleLeftCurved
+marking-OniHornSingleRightCurved = marking-OniHornSingleRightCurved
+marking-OniTail = marking-OniTail

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/backpack.ftl

@@ -12,3 +12,5 @@ ent-ClothingBackpackPilotFilled = { ent-ClothingBackpackPilot }
     .desc = { ent-ClothingBackpackPilot.desc }
 ent-ClothingBackpackOfficerFilled = { ent-ClothingBackpackSecurity }
     .desc = { ent-ClothingBackpackSecurity.desc }
+ent-ClothingBackpackERTMailCarrierFilled = { ent-ClothingBackpackERTMailCarrier }
+    .desc = { ent-ClothingBackpackERTMailCarrier.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/backpacks/startergear/messenger.ftl

@@ -65,4 +65,4 @@ ent-ClothingBackpackMessengerJanitorFilled = { ent-ClothingBackpackMessengerJani
 ent-ClothingBackpackMessengerMailmanFilled = { ent-ClothingBackpackMessengerMailman }
     .desc = { ent-ClothingBackpackMessengerMailman.desc }
 ent-ClothingBackpackMessengerOfficerFilled = { ent-ClothingBackpackMessengerSecurity }
-    .desc = { ent-ClothingBackpackMessengerSecurity.desc }
+    .desc = { ent-ClothingBackpackMessengerSecurity.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/belt.ftl

@@ -1,3 +1,11 @@
 ent-ClothingBeltPilotFilled = { ent-ClothingBeltPilot }
     .suffix = Filled
     .desc = { ent-ClothingBeltPilot.desc }
+ent-ClothingBeltNfsdFilled = { ent-ClothingBeltNfsd }
+  .desc = { ent-ClothingBeltNfsd.desc }
+ent-ClothingBeltNfsdWebbingFilledBrigmedic = { ent-ClothingBeltNfsdWebbing }
+    .suffix = Filled, Brigmedic
+    .desc = { ent-ClothingBeltNfsdWebbing.desc }
+ent-ClothingBeltNfsdWebbingFilled = { ent-ClothingBeltNfsdWebbing }
+    .suffix = Filled
+    .desc = { ent-ClothingBeltNfsdWebbing.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/gas_tanks.ftl

@@ -0,0 +1,3 @@
+ent-DoubleEmergencyAirTankFilled = { ent-DoubleEmergencyAirTank }
+    .suffix = Filled
+    .desc = { ent-DoubleEmergencyAirTank.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/items/misc.ftl

@@ -1,9 +1,8 @@
 ent-ClothingShoesBootsMagCombatFilled = { ent-ClothingShoesBootsMagCombat }
-    .suffix = Filled
-    .desc = { ent-ClothingShoesBootsMagCombat.desc }
-ent-ClothingShoesBootsMagMercenaryFilled = { ent-ClothingShoesBootsMagMercenary }
-    .suffix = Filled
-    .desc = { ent-ClothingShoesBootsMagMercenary.desc }
+  .desc = { ent-lothingShoesBootsMagCombat.desc }
+ent-ClothingShoesBootsMagNfsdFilled = { ent-ClothingShoesBootsMagNfsd }
+  .desc = { ent-ClothingShoesBootsMagNfsd.desc }
 ent-ClothingShoesBootsMagPirateFilled = { ent-ClothingShoesBootsMagPirate }
-    .suffix = Filled
-    .desc = { ent-ClothingShoesBootsMagPirate.desc }
+  .desc = { ent-ClothingShoesBootsMagPirate.desc }
+ent-ClothingShoesBootsMagMercenaryFilled = { ent-ClothingShoesBootsMagMercenary }
+  .desc = { ent-ClothingShoesBootsMagMercenary.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/catalog/fills/lockers/mail.ftl

@@ -0,0 +1,3 @@
+ent-LockerMailCarrierFilled = { ent-LockerMailCarrier }
+    .suffix = Filled
+    .desc = { ent-LockerMailCarrier.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/backpacks.ftl

@@ -2,3 +2,22 @@ ent-ClothingBackpackArcadia = arcadia backpack
     .desc = A backpack produced by Arcadia Industries
 ent-ClothingBackpackPilot = pilot backpack
     .desc = A backpack for a True Ace.
+ent-ClothingBackpackERTMailCarrier = ERT mail carrier backpack
+    .desc = A spacious backpack with lots of pockets, worn by Mail Carrier's of an Emergency Response Team.
+ent-ClothingBackpackClippy = Clippy's backpack
+    .desc = Made from a real Clippy.
+ent-ClothingBackpacknfsdFilled = nfsd backpack
+    .desc = A backpack for Deputy Sheriff.
+    .suffix = Filled
+ent-ClothingBackpacknfsd = nfsd backpack
+    .desc = A backpack for Deputy Sheriff.
+ent-ClothingBackpacknfsdsheriffFilled = nfsd backpack
+    .desc = A backpack for the Sheriff.
+    .suffix = Filled - Sheriff
+ent-ClothingBackpacknfsdsheriff = nfsd backpack
+    .desc = A backpack for the Sheriff.
+ent-ClothingBackpacknfsdBrigmedFilled = nfsd brigmedic backpack
+    .desc = A backpack for Deputized Physician.
+    .suffix = Filled
+ent-ClothingBackpacknfsdBrigmed = nfsd brigmedic backpack
+    .desc = A backpack for Deputized Physician.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/duffel.ftl

@@ -4,3 +4,16 @@ ent-ClothingBackpackDuffelArcadia = arcadia duffel
     .desc = A duffelbag produced by Arcadia Industries
 ent-ClothingBackpackDuffelPilot = pilot duffel
     .desc = A duffelbag produced for a True Ace.
+ent-ClothingBackpackDuffelnfsdFilled = nfsd duffel
+    .desc = A duffelbag produced for a Deputy Sheriff.
+    .suffix = Filled
+ent-ClothingBackpackDuffelnfsd = nfsd duffel
+    .desc = A duffelbag produced for a Deputy Sheriff.
+ent-ClothingBackpackDuffelnfsdsheriffFilled = nfsd duffel
+    .desc = A duffelbag produced for a Deputy Sheriff.
+    .suffix = Filled - Sheriff
+ent-ClothingBackpackDuffelnfsdBrigmed = nfsd brigmedic duffel
+    .desc = A duffelbag produced for a Deputized Physician.
+ent-ClothingBackpackDuffelnfsdBrigmedFilled = nfsd brigmedic duffel
+    .desc = A duffelbag produced for a Deputized Physician.
+    .suffix = Filled

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/messenger.ftl

@@ -36,7 +36,7 @@ ent-ClothingBackpackMessengerSyndicate = syndicate messenger bag
     .desc = A robust messenger bag for waging war against oppressors.
 ent-ClothingBackpackMessengerHolding = messenger bag of holding
     .desc = A messenger bag that opens into a localized pocket of bluespace.
-ent-ClothingBackpackMessengerMailman = mailman messenger bag
+ent-ClothingBackpackMessengerMailCarrier = mail carrier messenger bag
     .desc = A robust messenger bag for waging war against mail.
 ent-ClothingBackpackMessengerJanitor = janitor messenger bag
     .desc = A robust messenger bag for waging war against dirt.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/back/satchel.ftl

@@ -4,3 +4,18 @@ ent-ClothingBackpackSatchelArcadia = arcadia satchel
     .desc = A satchel produced by Arcadia Industries.
 ent-ClothingBackpackSatchelPilot = pilot satchel
     .desc = A satchel produced for a True Ace.
+ent-ClothingBackpackSatchelnfsdFilled = nfsd satchel
+    .desc = A satchel produced for a Deputy Sheriff.
+    .suffix = Filled
+ent-ClothingBackpackSatchelnfsd = nfsd satchel
+    .desc = A satchel produced for a Deputy Sheriff.
+ent-ClothingBackpackSatchelnfsdsheriffFilled = nfsd satchel
+    .desc = A satchel produced for the Sheriff.
+    .suffix = Filled - Sheriff
+ent-ClothingBackpackSatchelnfsdsheriff = nfsd satchel
+    .desc = A satchel produced for the Sheriff.
+ent-ClothingBackpackSatchelnfsdBrigmedFilled = nfsd brigmedic satchel
+    .desc = A satchel produced for a Deputized Physician.
+    .suffix = Filled
+ent-ClothingBackpackSatchelnfsdBrigmed = nfsd brigmedic satchel
+    .desc = A satchel produced for a Deputized Physician.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/belt/belts.ftl

@@ -4,3 +4,7 @@ ent-ClothingBeltChaplainSash = chaplain sash
     .desc = Who knew that scarves can be also tied around your waist?
 ent-ClothingBeltPilot = pilot webbing
     .desc = A webbing designed for someone seating a lot.
+ent-ClothingBeltNfsd = nfsd belt
+    .desc = A tactical assault belt.
+ent-ClothingBeltNfsdWebbing = nfsd webbing
+    .desc = A tactical assault webbing.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets.ftl

@@ -1,3 +1,11 @@
 ent-ClothingHeadsetSecuritySafe = { ent-ClothingHeadsetSecurity }
     .suffix = Safe
     .desc = { ent-ClothingHeadsetSecurity.desc }
+ent-ClothingHeadsetMailCarrier = mail carrier headset
+    .desc = A headset used by mail carrier employees.
+ent-ClothingHeadsetNFSDgreen = nfsd headset
+    .desc = A headset for deputy sheriff's.
+ent-ClothingHeadsetNFSDbrown = nfsd headset
+    .desc = A headset for deputy sheriff's.
+ent-ClothingHeadsetNFSDcb = nfsd headset
+    .desc = A headset for deputy sheriff's.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/ears/headsets_alt.ftl

@@ -4,3 +4,9 @@ ent-ClothingHeadsetAltMercenary = mercenary over-ear headset
     .desc = { ent-ClothingHeadsetAlt.desc }
 ent-ClothingHeadsetAltPilot = pilot over-ear headset
     .desc = { ent-ClothingHeadsetAlt.desc }
+ent-ClothingHeadsetAltNFSDgreen = nfsd over-ear headset
+    .desc = { ent-ClothingHeadsetAlt.desc }
+ent-ClothingHeadsetAltNFSDbrown = nfsd over-ear headset
+    .desc = { ent-ClothingHeadsetAlt.desc }
+ent-ClothingHeadsetAltNFSDCreamandBrown = sheriff's over-ear headset
+    .desc = { ent-ClothingHeadsetAltSecurity.desc }

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/glasses.ftl

@@ -2,3 +2,5 @@ ent-ClothingEyesArcadiaVisor = arcadia visor
     .desc = A visor produced by Arcadia Industries, with some high tech optics systems built in.
 ent-ClothingEyesGlassesPilot = pilot goggles
     .desc = I'm sorry, but you can't pilot a ship without cool glasses. Those are the Rules. Has a GPS built in them too.
+ent-ClothingEyesGlassesNFSD = nfsd glasses
+    .desc = Upgraded sunglasses that provide flash immunity and a security HUD.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/eyes/hud.ftl

@@ -0,0 +1,4 @@
+ent-ClothingEyesHudNfsd = nfsd hud
+    .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records.
+ent-ClothingEyesHudMail = mail hud
+    .desc = A heads-up display that scans mail in view and provides accurate mail data.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/hands/gloves.ftl

@@ -2,3 +2,7 @@ ent-ClothingHandsGlovesArcadiaCombat = arcadia combat gloves
     .desc = Combat gloves produced by Arcadia Industries.
 ent-ClothingHandsGlovesPilot = pilot gloves
     .desc = Driving gloves, but for spaceships!
+ent-ClothingHandsGlovesCombatNfsdBrown = nfsd combat gloves
+    .desc = Insulated gloves for a deputy sheriff.
+ent-ClothingHandsGlovesCombatNfsdCream = nfsd combat gloves
+    .desc = Insulated gloves for a deputy sheriff.

Resources/Locale/en-US/ss14-ru/prototypes/_nf/entities/clothing/head/hardsuit-helmets.ftl

@@ -4,7 +4,19 @@ ent-ClothingHeadHelmetHardsuitMercenary = mercenary hardsuit helmet
     .desc = Lightly armored hardsuit helmet for mercenary needs.
 ent-ClothingHeadHelmetHardsuitPilot = pilot hardsuit helmet
     .desc = Light hardsuit helmet for pilots.
+ent-ClothingHeadHelmetHardsuitERTMailCarrier = ERT mail carrier hardsuit helmet
+    .desc = A special hardsuit helmet worn by members of an emergency response team.
 ent-ClothingHeadHelmetHardsuitMaximPrototype = experimental salvager helmet
     .desc = A predication of decay washes over your mind.
 ent-ClothingHeadHelmetHardsuitSundie = sundicate crimson-red hardsuit helmet
     .desc = A heavily armored helmet designed for work in special operations. Manufactored in Twinwine Colony by Goreblox Looters LLC.
+ent-ClothingHeadHelmetHardsuitNfsdBronze = nfsd patrol hardsuit helmet
+    .desc = Lightly armored hardsuit helmet for beat-cop needs.
+ent-ClothingHeadHelmetHardsuitNfsdSilver = nfsd patrol hardsuit helmet
+    .desc = Lightly armored hardsuit helmet for beat-cop needs.
+ent-ClothingHeadHelmetHardsuitNfsdGold = nfsd patrol hardsuit helmet
+    .desc = Lightly armored hardsuit helmet for beat-cop needs.
+ent-ClothingHeadHelmetHardsuitNfsdBrigmed = nfsd patrol hardsuit helmet
+    .desc = Lightly armored hardsuit helmet for beat-cop needs.
+ent-ClothingHeadHelmetHardsuitNfsdSheriff = nfsd sheriff hardsuit helmet
+    .desc = Lightly armored hardsuit helmet for beat-cop-cop needs.