Loadouts: add overrides for name, description, and preview entity

Content.Client/Preferences/UI/LoadoutContainer.xaml.cs

@@ -36,17 +36,28 @@ public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, Formatte
 
         if (_protoManager.TryIndex(proto, out var loadProto))
         {
-            var ent = _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);
+            // Frontier: overrideable prototype fields (description, name, icon [via entity])
             Price.Text = "$" + loadProto.Price;
-            if (ent != null)
+
+            bool hasDescription = !string.IsNullOrEmpty(loadProto.Description);
+            bool hasEntity = !string.IsNullOrEmpty(loadProto.PreviewEntity?.Id);
+
+            EntProtoId? ent = null;
+            if (!hasEntity || !hasDescription) {
+                ent = _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);
+            }
+            var finalEnt = hasEntity ? loadProto.PreviewEntity : ent;
+            if (finalEnt != null)
             {
-                _entity = _entManager.SpawnEntity(ent, MapCoordinates.Nullspace);
+                _entity = _entManager.SpawnEntity(finalEnt, MapCoordinates.Nullspace);
                 Sprite.SetEntity(_entity);
 
                 var spriteTooltip = new Tooltip();
-                spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(_entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription));
+                var description = hasDescription ? loadProto.Description : _entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription; 
+                spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(description));
                 Sprite.TooltipSupplier = _ => spriteTooltip;
             }
+            // End Frontier
         }
     }
 

Content.Client/Preferences/UI/LoadoutGroupContainer.xaml.cs

@@ -77,7 +77,7 @@ public void RefreshLoadouts(RoleLoadout loadout, ICommonSession session, IDepend
             var enabled = loadout.IsValid(session, loadoutProto, collection, out var reason);
             var loadoutContainer = new LoadoutContainer(loadoutProto, !enabled, reason);
             loadoutContainer.Select.Pressed = pressed;
-            loadoutContainer.Text = loadoutSystem.GetName(loadProto);
+            loadoutContainer.Text = string.IsNullOrEmpty(loadProto.Name) ? loadoutSystem.GetName(loadProto) : loadProto.Name; // Frontier: allow overriding loadout names
 
             loadoutContainer.Select.OnPressed += args =>
             {

Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Preferences.Loadouts.Effects;
 using Content.Shared.Roles;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Preferences.Loadouts;
 
@@ -29,4 +30,25 @@ public sealed partial class LoadoutPrototype : IPrototype
     /// </summary>
     [DataField]
     public int Price = 0;
+
+    /// <summary>
+    /// Frontier - optional name of the loadout as it appears in the menu
+    /// </summary>
+    [DataField]
+    public string Name = "";
+
+    /// <summary>
+    /// Frontier - optional description of the loadout as it appears in the menu
+    /// </summary>
+    [DataField]
+    public string Description = "";
+
+    /// <summary>
+    /// Frontier - optional entity to use for its sprite in the loadout as it appears in the menu
+    /// </summary>
+    /// <remarks>
+    /// Currently, if not defaulted, this will be the fallback entity used to get the description if an override is not provided here.
+    /// </remarks>
+    [DataField]
+    public EntProtoId? PreviewEntity = default!;
 }

Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml

@@ -11,6 +11,7 @@
 - type: loadout
   id: ContractorClothingBeltPlantFilled
   equipment: ContractorClothingBeltPlantFilled
+  name: botanical belt (filled)
   price: 1500
 
 - type: startingGear
@@ -31,6 +32,7 @@
 - type: loadout
   id: ContractorClothingBeltChefFilled
   equipment: ContractorClothingBeltChefFilled
+  name: chef belt (filled)
   price: 1500
 
 - type: startingGear
@@ -61,6 +63,7 @@
 - type: loadout
   id: ContractorClothingBeltMedicalFilled
   equipment: ContractorClothingBeltMedicalFilled
+  name: medical belt (filled)
   price: 2000
 
 - type: startingGear
@@ -81,6 +84,7 @@
 - type: loadout
   id: ContractorClothingBeltMedicalEMTFilled
   equipment: ContractorClothingBeltMedicalEMTFilled
+  name: EMT belt (filled)
   price: 2000
 
 - type: startingGear
@@ -101,6 +105,7 @@
 - type: loadout
   id: ContractorClothingBeltUtilityFilled
   equipment: ContractorClothingBeltUtilityFilled
+  name: utility belt (filled)
   price: 1500
 
 - type: startingGear
@@ -121,6 +126,7 @@
 - type: loadout
   id: ContractorClothingBeltSalvageWebbingFilledNF
   equipment: ContractorClothingBeltSalvageWebbingFilledNF
+  name: salvage rig (filled)
   price: 1500
 
 - type: startingGear
@@ -158,6 +164,7 @@
 - type: loadout
   id: ContractorClothingBeltPilotFilled
   equipment: ContractorClothingBeltPilotFilled
+  name: pilot webbing (filled)
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
@@ -210,6 +217,7 @@
 - type: loadout
   id: ContractorClothingBeltChaplainSashFilled
   equipment: ContractorClothingBeltChaplainSashFilled
+  name: chaplain sash (filled)
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1