]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Store keybind priority (#26356)
authorWrexbe (Josh) <81056464+wrexbe@users.noreply.github.com>
Sun, 24 Mar 2024 18:25:04 +0000 (11:25 -0700)
committerGitHub <noreply@github.com>
Sun, 24 Mar 2024 18:25:04 +0000 (19:25 +0100)
* Fix saving keybind priority

* Change movestoreditem keybind priority to prevent bug

---------

Co-authored-by: wrexbe <wrexbe@protonmail.com>
Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
Resources/keybinds.yml

index ce5cf421aef1138b1e2df8881d0396a21717d856..f0537079b970381d79989f57157fba8e50e416cc 100644 (file)
@@ -403,7 +403,7 @@ namespace Content.Client.Options.UI.Tabs
                 Mod1 = mods[0],
                 Mod2 = mods[1],
                 Mod3 = mods[2],
-                Priority = 0,
+                Priority = _currentlyRebinding.Binding?.Priority ?? 0,
                 Type = bindType,
                 CanFocus = key == Keyboard.Key.MouseLeft
                            || key == Keyboard.Key.MouseRight
index b8cfc40c1c482d82d14faf68e65de32991d8967b..346156159a7e0c77b2d54a1bfbb94db98a8d32f9 100644 (file)
@@ -167,6 +167,7 @@ binds:
   type: State
   key: MouseLeft
   canFocus: true
+  priority: 10
 - function: RotateStoredItem
   type: State
   key: MouseRight