sigh

code/modules/keybindings/keybind/_keybind.dm

@@ -7,6 +7,10 @@
 	var/category = CATEGORY_MISC
 	var/weight = WEIGHT_LOWEST
 	var/keybind_signal
+	/// Is this a clientside verb trigger? If so, this should be set to the name of the verb.
+	var/clientside
+	/// Special - Needs to update special keys on update. clientside implis special.
+	var/special = FALSE
 
 /datum/keybinding/New()
 

code/modules/keybindings/keybind/communication.dm

@@ -5,16 +5,19 @@
 	hotkey_keys = list("CtrlT")
 	name = "Say"
 	full_name = "IC Say"
+	clientside = "say"
 
 /datum/keybinding/client/communication/ooc
 	hotkey_keys = list("O")
 	name = "OOC"
 	full_name = "Out Of Character Say (OOC)"
+	clientside = "ooc"
 
 /datum/keybinding/client/communication/me
 	hotkey_keys = list("CtrlM")
 	name = "Me"
 	full_name = "Me (emote)"
+	clientside = "me"
 
 //indicators
 /datum/keybinding/client/communication/say_with_indicator
@@ -44,21 +47,25 @@
 	classic_keys = list()
 	name = "Subtle"
 	full_name = "Subtle Emote"
+	clientside = "subtle"
 
 /datum/keybinding/client/communication/subtler
 	hotkey_keys = list("6")
 	classic_keys = list()
 	name = "Subtler"
 	full_name = "Subtler Anti-Ghost Emote"
+	clientside = "subtler-anti-ghost"
 
 /datum/keybinding/client/communication/whisper
 	hotkey_keys = list("Y")
 	classic_keys = list()
 	name = "Whisper"
 	full_name = "Whisper"
+	clientside = "whisper"
 
 /datum/keybinding/client/communication/looc
 	hotkey_keys = list("L")
 	classic_keys = list()
 	name = "LOOC"
 	full_name = "Local Out of Character chat"
+	clientside = "looc"

code/modules/keybindings/keybind/movement.dm

@@ -1,6 +1,7 @@
 /datum/keybinding/movement
 	category = CATEGORY_MOVEMENT
 	weight = WEIGHT_HIGHEST
+	special = TRUE
 
 /datum/keybinding/movement/north
 	hotkey_keys = list("W", "North")

code/modules/keybindings/setup.dm

@@ -7,12 +7,28 @@
 /datum/proc/keyLoop(client/user) // Called once every frame
 	//SHOULD_NOT_SLEEP(TRUE)
 
+/client/verb/fix_macros()
+	set name = "Fix Keybindings"
+	set desc = "Re-assert all your macros/keybindings."
+	set category = "OOC"
+	if(last_macro_fix > (world.time - 10 SECONDS))
+		to_chat(src, "<span class='warning'>It's been too long since the last reset. Wait a while.</span>")
+		return
+	if(!SSinput.initialized)
+		to_chat(src, "<span class='warning'>Input hasn't been initialized yet. Wait a while.</span>")
+		return
+	to_chat(src, "<span class='danger'>Force-reasserting all macros.</span>")
+	last_macro_fix = world.time
+	full_macro_assert()
+
 // removes all the existing macros
 /client/proc/erase_all_macros()
 	var/erase_output = ""
-	var/list/macro_set = list()
-	for(var/macroset in SSinput.all_macrosets)		// WE HAVE THREE AAAAAAAA
-		macro_set |= params2list(winget(src, "[macroset].*", "command")) // The third arg doesnt matter here as we're just removing them all
+	var/list/set_text = list()
+	for(var/macroset in SSinput.all_macrosets)
+		set_text += "[macroset].*"
+	set_text = set_text.Join(";")
+	var/list/macro_set = params2list(winget(src, "[set_text]", "command"))
 	for(var/k in 1 to length(macro_set))
 		var/list/split_name = splittext(macro_set[k], ".")
 		var/macro_name = "[split_name[1]].[split_name[2]]" // [3] is "command"
@@ -29,31 +45,30 @@
 		winset(src, "[name]-[REF(key)]", "parent=[name];name=[key];command=[command]")
 
 /client/proc/set_macros(datum/preferences/prefs_override = prefs)
-	set waitfor = FALSE
-
 	keys_held.Cut()
 
-	erase_all_macros()
-
 	apply_macro_set(SKIN_MACROSET_HOTKEYS, SSinput.macroset_hotkey)
 	apply_macro_set(SKIN_MACROSET_CLASSIC_HOTKEYS, SSinput.macroset_classic_hotkey)
 	apply_macro_set(SKIN_MACROSET_CLASSIC_INPUT, SSinput.macroset_classic_input)
 
-	set_hotkeys_preference(prefs_override)
-
 /client/proc/set_hotkeys_preference(datum/preferences/prefs_override = prefs)
 	if(prefs_override.hotkeys)
 		winset(src, null, "map.focus=true input.background-color=[COLOR_INPUT_DISABLED] mainwindow.macro=[SKIN_MACROSET_HOTKEYS]")
 	else
 		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=[SKIN_MACROSET_CLASSIC_INPUT]")
 
-/client/proc/ensure_keys_set()
+/client/proc/ensure_keys_set(datum/preferences/prefs_override = prefs)
 	if(SSinput.initialized)
-		full_macro_assert()
+		full_macro_assert(prefs_override)
 
 /client/proc/full_macro_assert(datum/preferences/prefs_override = prefs)
+	INVOKE_ASYNC(src, .proc/do_full_macro_assert, prefs_override)		// winget sleeps.
+
+/client/proc/do_full_macro_assert(datum/preferences/prefs_override = prefs)
+	erase_all_macros()
 	set_macros(prefs_override)
 	update_special_keybinds(prefs_override)
+	set_hotkeys_preference(prefs_override)
 
 /client/proc/do_special_keybind(key, command, datum/preferences/prefs_override = prefs)
 	var/alt = findtext(key, "Alt")
@@ -96,17 +111,8 @@
 					movement_keys[key] = WEST
 				if("South")
 					movement_keys[key] = SOUTH
-				if("Say")
-					do_special_keybind(key, "say", D)
-				if("OOC")
-					do_special_keybind(key, "ooc", D)
-				if("Me")
-					do_special_keybind(key, "me", D)
-				if("Subtle")
-					do_special_keybind(key, "subtle", D)
-				if("Subtler")
-					do_special_keybind(key, "subtler-anti-ghost", D)
-				if("Whisper")
-					do_special_keybind(key, "whisper", D)
-				if("LOOC")
-					do_special_keybind(key, "looc", D)
+				else
+					var/datum/keybinding/KB = GLOB.keybindings_by_name[kb_name]
+					if(!KB.clientside)
+						continue
+					do_special_keybind(key, KB.clientside, D)