diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm index b355d921016..bfdc745cba3 100644 --- a/code/modules/client/preference/preferences_mysql.dm +++ b/code/modules/client/preference/preferences_mysql.dm @@ -55,7 +55,7 @@ ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor)) UI_style = sanitize_inlist(UI_style, list("White", "Midnight"), initial(UI_style)) default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) - toggles = sanitize_integer(toggles, 0, 2097151, initial(toggles)) + toggles = sanitize_integer(toggles, 0, 4194304, initial(toggles)) sound = sanitize_integer(sound, 0, 65535, initial(sound)) UI_style_color = sanitize_hexcolor(UI_style_color, initial(UI_style_color)) UI_style_alpha = sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha)) diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index 703de37468e..c7a90a10fdf 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -243,3 +243,11 @@ else to_chat(usr, "You have disabled text popup limiting.") return +/client/verb/togglehotkeys() + set name = "Toggle Hotkey Mode" + set category = "Preferences" + set desc = "Toggles Hotkey Mode" + prefs.toggles ^= HOTKEYS + prefs.save_preferences(src) + to_chat(src, "You will [(prefs.toggles & HOTKEYS) ? "no longer" : "now"] use hotkey mode.") + feedback_add_details("admin_verb","HOTKEYS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index cbf3e1bf9f6..083104d5108 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -3,7 +3,7 @@ /client/verb/keyDown(_key as text) set instant = TRUE set hidden = TRUE - + to_chat(src,"You pressed:", _key) keys_held[_key] = world.time var/movement = SSinput.movement_keys[_key] if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"]) @@ -34,7 +34,7 @@ /client/verb/keyUp(_key as text) set instant = TRUE set hidden = TRUE - + to_chat(src, "You released:", _key) keys_held -= _key var/movement = SSinput.movement_keys[_key] if(!(next_move_dir_add & movement)) diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index d4420f6d7e9..270895826c9 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -46,5 +46,7 @@ if(prefs.toggles & HOTKEYS) winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default") + to_chat(src, "Using default macro") else winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default") + to_chat(src, "GOD HECKING HECK HECK") diff --git a/interface/skin.dmf b/interface/skin.dmf index 72643654aba..88e2fa46041 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1,3 +1,5 @@ +macro "default" + menu "menu" elem @@ -136,6 +138,7 @@ window "mainwindow" size = 640x440 anchor1 = none anchor2 = none + background-color = none is-default = true saved-params = "pos;size;is-minimized;is-maximized" title = "Paradise Station 13" @@ -149,6 +152,7 @@ window "mainwindow" size = 200x200 anchor1 = none anchor2 = none + background-color = none is-visible = false saved-params = "" elem "hotkey_toggle" @@ -157,6 +161,7 @@ window "mainwindow" size = 80x20 anchor1 = 100,100 anchor2 = none + background-color = none saved-params = "" text = "Hotkey Toggle" command = ".winset \"mainwindow.macro != macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\"" @@ -167,6 +172,7 @@ window "mainwindow" size = 634x416 anchor1 = 0,0 anchor2 = 100,100 + background-color = none saved-params = "splitter" left = "mapwindow" right = "rpane" @@ -187,6 +193,7 @@ window "mainwindow" size = 40x20 anchor1 = 100,100 anchor2 = none + background-color = none saved-params = "is-checked" text = "Chat" command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"\"saybutton.is-checked=true?mebutton.is-checked=false\"" @@ -197,6 +204,7 @@ window "mainwindow" size = 40x20 anchor1 = 100,100 anchor2 = none + background-color = none saved-params = "is-checked" text = "Me" command = ".winset \"mebutton.is-checked=true?input.command=\"!me \\\"\" macrobutton.is-checked=false:input.command=\"\"mebutton.is-checked=true?saybutton.is-checked=false\"" @@ -207,6 +215,7 @@ window "mainwindow" size = 999x999 anchor1 = none anchor2 = none + background-color = none is-visible = false saved-params = ""