diff --git a/Content.Client/Administration/Systems/AdminSystem.Menu.cs b/Content.Client/Administration/Systems/AdminSystem.Menu.cs index ded24fcd44..c93d0cad94 100644 --- a/Content.Client/Administration/Systems/AdminSystem.Menu.cs +++ b/Content.Client/Administration/Systems/AdminSystem.Menu.cs @@ -155,7 +155,7 @@ namespace Content.Client.Administration.Systems if (function == EngineKeyFunctions.UIClick) _clientConsoleHost.ExecuteCommand($"vv {uid}"); - else if (function == EngineKeyFunctions.AltUse) + else if (function == EngineKeyFunctions.UseSecondary) _verbSystem.VerbMenu.OpenVerbMenu(uid, true); else return; @@ -173,7 +173,7 @@ namespace Content.Client.Administration.Systems if (function == EngineKeyFunctions.UIClick) _clientConsoleHost.ExecuteCommand($"vv {uid}"); - else if (function == EngineKeyFunctions.AltUse) + else if (function == EngineKeyFunctions.UseSecondary) _verbSystem.VerbMenu.OpenVerbMenu(uid, true); else return; diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index e21646e61f..e3b8c95ebb 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -54,7 +54,7 @@ namespace Content.Client.Administration.UI.CustomControls if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label) label.Text = GetText(selectedPlayer); } - else if (args.Event.Function == EngineKeyFunctions.AltUse) + else if (args.Event.Function == EngineKeyFunctions.UseSecondary) { _verbSystem.VerbMenu.OpenVerbMenu(selectedPlayer.EntityUid); } diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs index 1b9c13014b..33da153343 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs @@ -68,7 +68,7 @@ namespace Content.Client.ContextMenu.UI _cfg.OnValueChanged(CCVars.EntityMenuGroupingType, OnGroupingChanged, true); CommandBinds.Builder - .Bind(EngineKeyFunctions.AltUse, new PointerInputCmdHandler(HandleOpenEntityMenu, outsidePrediction: true)) + .Bind(EngineKeyFunctions.UseSecondary, new PointerInputCmdHandler(HandleOpenEntityMenu, outsidePrediction: true)) .Register(); } @@ -113,7 +113,7 @@ namespace Content.Client.ContextMenu.UI return; // open verb menu? - if (args.Function == EngineKeyFunctions.AltUse) + if (args.Function == EngineKeyFunctions.UseSecondary) { _verbSystem.VerbMenu.OpenVerbMenu(entity.Value); args.Handle(); diff --git a/Content.Client/Items/Managers/ItemSlotManager.cs b/Content.Client/Items/Managers/ItemSlotManager.cs index 78d6842584..323fa228a8 100644 --- a/Content.Client/Items/Managers/ItemSlotManager.cs +++ b/Content.Client/Items/Managers/ItemSlotManager.cs @@ -71,7 +71,7 @@ namespace Content.Client.Items.Managers _entitySystemManager.GetEntitySystem() .DoExamine(item.Value); } - else if (args.Function == EngineKeyFunctions.AltUse) + else if (args.Function == EngineKeyFunctions.UseSecondary) { _entitySystemManager.GetEntitySystem().VerbMenu.OpenVerbMenu(item.Value); } diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 912fe28395..93f5f8f34b 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -105,7 +105,7 @@ namespace Content.Client.Options.UI.Tabs AddHeader("ui-options-header-interaction-basic"); AddButton(EngineKeyFunctions.Use); - AddButton(EngineKeyFunctions.AltUse); + AddButton(EngineKeyFunctions.UseSecondary); AddButton(ContentKeyFunctions.UseItemInHand); AddButton(ContentKeyFunctions.AltUseItemInHand); AddButton(ContentKeyFunctions.ActivateItemInWorld); diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs index c34aea2e5b..ff04d3fc41 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs @@ -80,7 +80,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem } var useDown = _inputSystem.CmdStates.GetState(EngineKeyFunctions.Use); - var altDown = _inputSystem.CmdStates.GetState(EngineKeyFunctions.AltUse); + var altDown = _inputSystem.CmdStates.GetState(EngineKeyFunctions.UseSecondary); var currentTime = Timing.CurTime; // Heavy attack. diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index d33c0b5205..6eae21942d 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -17,7 +17,7 @@ binds: type: State key: MouseLeft canFocus: true -- function: AltUse +- function: UseSecondary type: State key: MouseRight canFocus: true