Frontier-specific ion storm entries

Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs

@@ -32,10 +32,12 @@ public SiliconLawContainer()
             if (Corrupted.Pressed)
             {
                 _law!.LawIdentifierOverride = CorruptedString;
+                _law!.LawPrintOverride = Loc.GetString("silicon-law-print-error"); // Frontier
             }
             else
             {
                 _law!.LawIdentifierOverride = null;
+                _law!.LawPrintOverride = null; // Frontier
             }
         };
 

Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs

@@ -34,7 +34,8 @@ public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
         var identifier = law.LawIdentifierOverride ?? $"{law.Order}";
         var lawIdentifier = Loc.GetString("laws-ui-law-header", ("id", identifier));
         var lawDescription = Loc.GetString(law.LawString);
-        var lawIdentifierPlaintext = FormattedMessage.RemoveMarkupPermissive(lawIdentifier);
+        //var lawIdentifierPlaintext = FormattedMessage.RemoveMarkupPermissive(lawIdentifier); // Frontier
+        var lawIdentifierPlaintext = FormattedMessage.RemoveMarkupPermissive(law.LawPrintOverride != null ? Loc.GetString("laws-ui-law-header", ("id", law.LawPrintOverride)) : lawIdentifier); // Frontier
         var lawDescriptionPlaintext = FormattedMessage.RemoveMarkupPermissive(lawDescription);
 
         LawNumberLabel.SetMarkup(lawIdentifier);

Content.Server/Silicons/Laws/IonStormSystem.cs

@@ -129,7 +129,8 @@ public void IonStormTarget(Entity<SiliconLawBoundComponent, IonStormTargetCompon
             {
                 LawString = newLaw,
                 Order = -1,
-                LawIdentifierOverride = Loc.GetString("ion-storm-law-scrambled-number", ("length", _robustRandom.Next(5, 10)))
+                LawIdentifierOverride = Loc.GetString("ion-storm-law-scrambled-number", ("length", _robustRandom.Next(5, 10))),
+                LawPrintOverride = Loc.GetString("silicon-law-error") // Frontier
             });
         }
 
@@ -173,8 +174,8 @@ private string GenerateLaw()
         var verb = Pick(Verbs);
         var number = Pick(NumberBase) + " " + Pick(NumberMod);
         var area = Pick(Areas);
-        var feeling = Pick(Feelings);
-        var feelingPlural = Pick(FeelingsPlural);
+        var feeling = Pick(FeelingsPlural); // Frontier: Feelings < FeelingsPlural (not plural subjects, "with an S")
+        var feelingPlural = Pick(Feelings); // Frontier: FeelingsPlural < Feelings (not plural subjects, "with an S")
         var must = Pick(Musts);
         var require = Pick(Requires);
         var action = Pick(Actions);

Content.Shared/Silicons/Laws/SiliconLawPrototype.cs

@@ -31,6 +31,12 @@ public partial class SiliconLaw : IComparable<SiliconLaw>, IEquatable<SiliconLaw
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public string? LawIdentifierOverride;
 
+    /// <summary>
+    /// Frontier: an identifier that overrides <see cref="Order"/> when printing the stated law.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public string? LawPrintOverride;
+
     public int CompareTo(SiliconLaw? other)
     {
         if (other == null)
@@ -69,7 +75,8 @@ public SiliconLaw ShallowClone()
         {
             LawString = LawString,
             Order = Order,
-            LawIdentifierOverride = LawIdentifierOverride
+            LawIdentifierOverride = LawIdentifierOverride,
+            LawPrintOverride = LawPrintOverride, // Frontier
         };
     }
 }

Resources/Locale/en-US/_NF/silicons/silicon.ftl

@@ -0,0 +1 @@
+silicon-law-error = ERR@