[Fix, Feature] Some Fixes, sponsor traits

Content.Client/Access/UI/AccessOverriderWindow.xaml.cs

@@ -88,8 +88,8 @@ public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUser
                 button.Disabled = !interfaceEnabled;
                 if (interfaceEnabled)
                 {
-                    button.Pressed = state.TargetAccessReaderIdAccessList?.Contains(accessName) ?? false;
-                    button.Disabled = (!state.AllowedModifyAccessList?.Contains(accessName)) ?? true;
+                    button.Pressed = state.TargetAccessReaderIdAccessList?.Select(x => x.Id).Contains(accessName) ?? false;
+                    button.Disabled = (!state.AllowedModifyAccessList?.Select(x => x.Id).Contains(accessName)) ?? true;
                 }
             }
         }

Content.Client/Input/ContentContexts.cs

@@ -89,7 +89,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.ToggleStanding); // Ataraxia
             human.AddFunction(ContentKeyFunctions.LookUp); // BACKMEN EDIT
             human.AddFunction(CMKeyFunctions.CMUniqueAction); // BACKMEN EDIT
-            human.AddFunction(ContentKeyFunctions.OfferItem); // Ataraxia
             human.AddFunction(ContentKeyFunctions.TargetHead);
             human.AddFunction(ContentKeyFunctions.TargetTorso);
             human.AddFunction(ContentKeyFunctions.TargetLeftArm);

Content.Client/Lobby/LobbyUIController.cs

@@ -6,6 +6,8 @@
 using Content.Client.Lobby.UI;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Station;
+using Content.Corvax.Interfaces.Client;
+using Content.Corvax.Interfaces.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -40,6 +42,7 @@ public sealed partial class LobbyUIController : UIController, IOnStateEntered<Lo
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly JobRequirementsManager _requirements = default!;
     [Dependency] private readonly MarkingManager _markings = default!;
+    [Dependency] private readonly ISharedSponsorsManager _clientSponsorsManager = default!;
     [UISystemDependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
     [UISystemDependency] private readonly StationSpawningSystem _spawn = default!;
@@ -273,7 +276,8 @@ private void OpenSavePanel()
             _prototypeManager,
             _resourceCache,
             _requirements,
-            _markings);
+            _markings,
+            _clientSponsorsManager);
 
         _profileEditor.OnOpenGuidebook += _guide.OpenHelp;
 

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -9,6 +9,8 @@
 using Content.Client.Sprite;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Guidebook;
+using Content.Corvax.Interfaces.Client;
+using Content.Corvax.Interfaces.Shared;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.Corvax.CCCVars;
@@ -50,6 +52,7 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
         private readonly LobbyUIController _controller;
+        private readonly ISharedSponsorsManager _clientSponsorsManager;
 
         private FlavorText.FlavorText? _flavorText;
         private TextEdit? _flavorTextEdit;
@@ -114,7 +117,8 @@ public HumanoidProfileEditor(
             IPrototypeManager prototypeManager,
             IResourceManager resManager,
             JobRequirementsManager requirements,
-            MarkingManager markings)
+            MarkingManager markings,
+            ISharedSponsorsManager clientSponsorsManager)
         {
             RobustXamlLoader.Load(this);
             _sawmill = logManager.GetSawmill("profile.editor");
@@ -124,6 +128,7 @@ public HumanoidProfileEditor(
             _playerManager = playerManager;
             _prototypeManager = prototypeManager;
             _markingManager = markings;
+            _clientSponsorsManager = clientSponsorsManager;
             _preferencesManager = preferencesManager;
             _resManager = resManager;
             _requirements = requirements;
@@ -590,6 +595,15 @@ public void RefreshTraits()
                     if (selector == null)
                         continue;
 
+                    //backmen-start: sponsor traits
+                    if (selector.Trait.SponsorOnly && !_clientSponsorsManager.GetClientPrototypes().Contains(selector.Trait.ID))
+                    {
+                        selector.Checkbox.Label.FontColorOverride = Color.Gray;
+                        selector.Checkbox.Disabled = true;
+                        selector.Checkbox.Pressed = false;
+                    }
+                    //backmen-end: sponsor traits
+
                     if (category is { MaxTraitPoints: >= 0 } &&
                         selector.Cost + selectionCount > category.MaxTraitPoints)
                     {

Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs

@@ -10,6 +10,7 @@ namespace Content.Client.Lobby.UI.Roles;
 public sealed partial class TraitPreferenceSelector : Control
 {
     public int Cost;
+    public readonly TraitPrototype Trait;
 
     public bool Preference
     {
@@ -23,6 +24,7 @@ public TraitPreferenceSelector(TraitPrototype trait)
     {
         RobustXamlLoader.Load(this);
 
+        Trait = trait;
         var text = trait.Cost != 0 ? $"[{trait.Cost}] " : "";
         text += Loc.GetString(trait.Name);
 

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -208,7 +208,6 @@ void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args) // BACKMEN ED
             AddButton(ContentKeyFunctions.SaveItemLocation);
             AddButton(ContentKeyFunctions.ToggleStanding); // backmen: Laying System
             AddButton(ContentKeyFunctions.LookUp); // BACKMEN EDIT
-            AddButton(ContentKeyFunctions.OfferItem); // Ataraxia
             AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(BackmenCCvars.CCVars.HoldLookUp), HandleHoldLookUp); // WD EDIT
 
             AddHeader("ui-options-header-interaction-adv");