Version: 162.2.3

(cherry picked from commit 6211cf2e03)

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
 
-    <!-- This file automatically reset by Tools/version.py -->
+    <!-- This file automatically reset by Tools/version.py -->
 

RELEASE-NOTES.md

@@ -54,6 +54,15 @@ END TEMPLATE-->
 *None yet*
 
 
+## 162.2.3
+
+
+## 162.2.2
+
+
+## 162.2.1
+
+
 ## 162.2.0
 
 ### New features

Robust.Client/Robust.Client.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.2" Condition="'$(UseSystemSqlite)' != 'True'" PrivateAssets="compile" />
     <PackageReference Include="SpaceWizards.NFluidsynth" Version="0.1.1" PrivateAssets="compile" />
     <PackageReference Include="NVorbis" Version="0.10.1" PrivateAssets="compile" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
     <PackageReference Include="OpenToolkit.Graphics" Version="4.0.0-pre9.1" PrivateAssets="compile" />
     <PackageReference Include="OpenTK.OpenAL" Version="4.7.5" PrivateAssets="compile" />
     <PackageReference Include="SpaceWizards.SharpFont" Version="1.0.1" PrivateAssets="compile" />

Robust.Client/UserInterface/Controls/LineEdit.cs

@@ -98,6 +98,11 @@ namespace Robust.Client.UserInterface.Controls
                 OnTextChanged?.Invoke(new LineEditEventArgs(this, _text));
         }
 
+        public void ForceSubmitText()
+        {
+            OnTextEntered?.Invoke(new LineEditEventArgs(this, _text));
+        }
+
         /// <summary>
         ///     The text
         /// </summary>
@@ -607,7 +612,7 @@ namespace Robust.Client.UserInterface.Controls
                 {
                     if (Editable)
                     {
-                        OnTextEntered?.Invoke(new LineEditEventArgs(this, _text));
+                        ForceSubmitText();
                     }
 
                     args.Handle();

Robust.Client/UserInterface/Controls/ScrollContainer.cs

@@ -50,13 +50,13 @@ namespace Robust.Client.UserInterface.Controls
             Action<Range> ev = _scrollValueChanged;
             _hScrollBar = new HScrollBar
             {
-                Visible = false,
+                Visible = _hScrollEnabled,
                 VerticalAlignment = VAlignment.Bottom,
                 HorizontalAlignment = HAlignment.Stretch
             };
             _vScrollBar = new VScrollBar
             {
-                Visible = false,
+                Visible = _vScrollEnabled,
                 VerticalAlignment = VAlignment.Stretch,
                 HorizontalAlignment = HAlignment.Right
             };

Robust.Shared/Localization/LocId.cs

@@ -12,7 +12,7 @@ namespace Robust.Shared.Localization;
 ///     This will be automatically validated by <see cref="LocIdSerializer"/> if used in data fields.</remarks>
 /// <seealso cref="Loc.GetString(string)"/>
 [Serializable, NetSerializable]
-public readonly record struct LocId(string Id)
+public readonly record struct LocId(string Id) : IEquatable<string>, IComparable<LocId>
 {
     public static implicit operator string(LocId locId)
     {
@@ -23,4 +23,19 @@ public readonly record struct LocId(string Id)
     {
         return new LocId(id);
     }
+
+    public static implicit operator LocId?(string? id)
+    {
+        return id == null ? default(LocId?) : new LocId(id);
+    }
+
+    public bool Equals(string? other)
+    {
+        return Id == other;
+    }
+
+    public int CompareTo(LocId other)
+    {
+        return string.Compare(Id, other.Id, StringComparison.Ordinal);
+    }
 }

Robust.Shared/Prototypes/EntProtoId.cs

@@ -13,7 +13,7 @@ namespace Robust.Shared.Prototypes;
 /// </remarks>
 /// <remarks><seealso cref="ProtoId{T}"/> for a wrapper of other prototype kinds.</remarks>
 [Serializable, NetSerializable]
-public readonly record struct EntProtoId(string Id)
+public readonly record struct EntProtoId(string Id) : IEquatable<string>, IComparable<EntProtoId>
 {
     public static implicit operator string(EntProtoId protoId)
     {
@@ -34,4 +34,9 @@ public readonly record struct EntProtoId(string Id)
     {
         return Id == other;
     }
+
+    public int CompareTo(EntProtoId other)
+    {
+        return string.Compare(Id, other.Id, StringComparison.Ordinal);
+    }
 }

Robust.Shared/Prototypes/ProtoId.cs

@@ -13,7 +13,7 @@ namespace Robust.Shared.Prototypes;
 /// </remarks>
 /// <remarks><seealso cref="EntProtoId"/> for an <see cref="EntityPrototype"/> alias.</remarks>
 [Serializable]
-public readonly record struct ProtoId<T>(string Id) : IEquatable<string> where T : class, IPrototype
+public readonly record struct ProtoId<T>(string Id) : IEquatable<string>, IComparable<ProtoId<T>> where T : class, IPrototype
 {
     public static implicit operator string(ProtoId<T> protoId)
     {
@@ -34,4 +34,9 @@ public readonly record struct ProtoId<T>(string Id) : IEquatable<string> where T
     {
         return Id == other;
     }
+
+    public int CompareTo(ProtoId<T> other)
+    {
+        return string.Compare(Id, other.Id, StringComparison.Ordinal);
+    }
 }

Robust.Shared/Robust.Shared.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="Linguini.Bundle" Version="0.1.3" />
     <PackageReference Include="SharpZstd.Interop" Version="1.5.2-beta2" PrivateAssets="compile" />
     <PackageReference Include="SpaceWizards.Sodium" Version="0.2.1" PrivateAssets="compile" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
     <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.20348-rc2" PrivateAssets="compile" />
   </ItemGroup>
   <ItemGroup>

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "7.0.100",
+    "rollForward": "latestFeature"
+  }
+}