Rebindable Hotkeys (#12138)

* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups

code/modules/keybindings/bindings_admin.dm

@@ -1,24 +0,0 @@
-/datum/admins/key_down(_key, client/user)
-	switch(_key)
-		if("F3")
-			user.get_admin_say()
-			return
-		if("F5")
-			user.admin_ghost()
-			return
-		if("F6")
-			player_panel_new()
-			return
-		if("F7")
-			user.togglebuildmodeself()
-			return
-		if("F8")
-			if(user.keys_held["Ctrl"])
-				user.stealth()
-			else
-				user.invisimin()
-			return
-		if("F10")
-			user.get_dead_say()
-			return
-	..()

code/modules/keybindings/bindings_atom.dm

@@ -5,7 +5,7 @@
 	if(!user.keys_held["Ctrl"])
 		var/movement_dir = NONE
 		for(var/_key in user.keys_held)
-			movement_dir = movement_dir | SSinput.movement_keys[_key]
+			movement_dir = movement_dir | user.movement_keys[_key]
 		if(user.next_move_dir_add)
 			movement_dir |= user.next_move_dir_add
 		if(user.next_move_dir_sub)

code/modules/keybindings/bindings_carbon.dm

@@ -1,9 +0,0 @@
-/mob/living/carbon/key_down(_key, client/user)
-	switch(_key)
-		if("R", "Southwest") // Southwest is End
-			toggle_throw_mode()
-			return
-		if("C")
-			user_toggle_intentional_combat_mode()
-			return
-	return ..()

code/modules/keybindings/bindings_client.dm

@@ -33,55 +33,69 @@
 		to_chat(src, "<span class='userdanger'>Invalid KeyDown detected! You have been disconnected from the server automatically.</span>")
 		log_admin("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.")
 		message_admins("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.")
-		QDEL_IN(src, 1)
+		qdel(src)
+		return
+
+	if(_key == "Tab")
+		ForceAllKeysUp()		//groan, more hacky kevcode
 		return
 
 	if(length(keys_held) > MAX_HELD_KEYS)
 		keys_held.Cut(1,2)
 	keys_held[_key] = TRUE
-	var/movement = SSinput.movement_keys[_key]
+	var/movement = movement_keys[_key]
 	if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"])
 		next_move_dir_add |= movement
 
 	// Client-level keybindings are ones anyone should be able to do at any time
 	// Things like taking screenshots, hitting tab, and adminhelps.
-
+	var/AltMod = keys_held["Alt"] ? "Alt" : ""
+	var/CtrlMod = keys_held["Ctrl"] ? "Ctrl" : ""
+	var/ShiftMod = keys_held["Shift"] ? "Shift" : ""
+	var/full_key
 	switch(_key)
-		if("F1")
-			if(keys_held["Ctrl"] && keys_held["Shift"]) // Is this command ever used?
-				winset(src, null, "command=.options")
-			else
-				get_adminhelp()
-			return
-		if("F2") // Screenshot. Hold shift to choose a name and location to save in
-			winset(src, null, "command=.screenshot [!keys_held["shift"] ? "auto" : ""]")
-			return
-		if("F12") // Toggles minimal HUD
-			mob.button_pressed_F12()
-			return
+		if("Alt", "Ctrl", "Shift")
+			full_key = "[AltMod][CtrlMod][ShiftMod]"
+		else
+			full_key = "[AltMod][CtrlMod][ShiftMod][_key]"
+	var/keycount = 0
+	for(var/kb_name in prefs.key_bindings[full_key])
+		keycount++
+		var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
+		if(kb.can_use(src) && kb.down(src) && keycount >= MAX_COMMANDS_PER_KEY)
+			break
 
-	if(holder)
-		holder.key_down(_key, src)
-	if(mob.focus)
-		mob.focus.key_down(_key, src)
+	holder?.key_down(_key, src)
+	mob.focus?.key_down(_key, src)
+
+/// Keyup's all keys held down.
+/client/proc/ForceAllKeysUp()
+	// simulate a user releasing all keys except for the mod keys. groan. i hate this. thanks, byond. why aren't keyups able to be forced to fire on macro change aoaoaoao.
+	// groan
+	for(var/key in keys_held)		// all of these won't be the 3 mod keys.
+		if((key == "Ctrl") || (key == "Alt") || (key == "Shift"))
+			continue
+		keyUp("[key]")
 
 /client/verb/keyUp(_key as text)
 	set instant = TRUE
 	set hidden = TRUE
 
 	keys_held -= _key
-	var/movement = SSinput.movement_keys[_key]
+	var/movement = movement_keys[_key]
 	if(!(next_move_dir_add & movement))
 		next_move_dir_sub |= movement
 
-	if(holder)
-		holder.key_up(_key, src)
-	if(mob.focus)
-		mob.focus.key_up(_key, src)
+	// We don't do full key for release, because for mod keys you
+	// can hold different keys and releasing any should be handled by the key binding specifically
+	for (var/kb_name in prefs.key_bindings[_key])
+		var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
+		if(kb.can_use(src) && kb.up(src))
+			break
+	holder?.key_up(_key, src)
+	mob.focus?.key_up(_key, src)
 
 // Called every game tick
 /client/keyLoop()
-	if(holder)
-		holder.keyLoop(src)
-	if(mob.focus)
-		mob.focus.keyLoop(src)
+	holder?.keyLoop(src)
+	mob.focus?.keyLoop(src)

code/modules/keybindings/bindings_human.dm

@@ -1,80 +0,0 @@
-/mob/living/carbon/human/key_down(_key, client/user)
-	if(client.keys_held["Shift"])
-		switch(_key)
-			if("E") // Put held thing in belt or take out most recent thing from belt
-				var/obj/item/thing = get_active_held_item()
-				var/obj/item/storage/equipped_belt = get_item_by_slot(SLOT_BELT)
-				if(!equipped_belt) // We also let you equip a belt like this
-					if(!thing)
-						to_chat(user, "<span class='notice'>You have no belt to take something out of.</span>")
-						return
-					equip_to_slot_if_possible(thing, SLOT_BELT)
-					return
-				if(!istype(equipped_belt)) // not a storage item
-					if(!thing)
-						to_chat(user, "<span class='notice'>You have no belt to take something out of.</span>")
-					else
-						to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
-					return
-				if(thing) // put thing in belt
-					if(!SEND_SIGNAL(equipped_belt, COMSIG_TRY_STORAGE_INSERT, thing, user.mob))
-						to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
-					return
-				if(!equipped_belt.contents.len) // nothing to take out
-					to_chat(user, "<span class='notice'>There's nothing in your belt to take out.</span>")
-					return
-				var/obj/item/stored = equipped_belt.contents[equipped_belt.contents.len]
-				if(!stored || stored.on_found(src))
-					return
-				stored.attack_hand(src) // take out thing from belt
-				return
-
-			if("B") // Put held thing in backpack or take out most recent thing from backpack
-				var/obj/item/thing = get_active_held_item()
-				var/obj/item/storage/equipped_backpack = get_item_by_slot(SLOT_BACK)
-				if(!equipped_backpack) // We also let you equip a backpack like this
-					if(!thing)
-						to_chat(user, "<span class='notice'>You have no backpack to take something out of.</span>")
-						return
-					equip_to_slot_if_possible(thing, SLOT_BACK)
-					return
-				if(!istype(equipped_backpack)) // not a storage item
-					if(!thing)
-						to_chat(user, "<span class='notice'>You have no backpack to take something out of.</span>")
-					else
-						to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
-					return
-				if(thing) // put thing in backpack
-					if(!SEND_SIGNAL(equipped_backpack, COMSIG_TRY_STORAGE_INSERT, thing, user.mob))
-						to_chat(user, "<span class='notice'>You can't fit anything in.</span>")
-					return
-				if(!equipped_backpack.contents.len) // nothing to take out
-					to_chat(user, "<span class='notice'>There's nothing in your backpack to take out.</span>")
-					return
-				var/obj/item/stored = equipped_backpack.contents[equipped_backpack.contents.len]
-				if(!stored || stored.on_found(src))
-					return
-				stored.attack_hand(src) // take out thing from backpack
-				return
-	switch(_key)
-		if("Shift")
-			if(!user.prefs.sprint_spacebar)
-				user.prefs.sprint_toggle ? default_toggle_sprint() : sprint_hotkey(TRUE) //Yes, this looks hacky. Yes, this works.
-			return
-		if("Space")
-			if(user.prefs.sprint_spacebar)
-				user.prefs.sprint_toggle ? default_toggle_sprint() : sprint_hotkey(TRUE)
-			return
-	return ..()
-
-/mob/living/carbon/human/key_up(_key, client/user)
-	switch(_key)
-		if("Shift")
-			if(!user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
-				sprint_hotkey(FALSE)
-			return
-		if("Space")
-			if(user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
-				sprint_hotkey(FALSE)
-			return
-	return ..()

code/modules/keybindings/bindings_living.dm

@@ -1,26 +0,0 @@
-/mob/living/key_down(_key, client/user)
-	switch(_key)
-		if("B")
-			resist()
-			return
-		if("1")
-			if(possible_a_intents)
-				a_intent_change(INTENT_HELP)
-				return
-		if("2")
-			if(possible_a_intents)
-				a_intent_change(INTENT_DISARM)
-				return
-		if("3")
-			if(possible_a_intents)
-				a_intent_change(INTENT_GRAB)
-				return
-		if("4")
-			if(possible_a_intents)
-				a_intent_change(INTENT_HARM)
-				return
-		if ("V")
-			lay_down()
-			return
-
-	return ..()

code/modules/keybindings/bindings_mob.dm

@@ -1,94 +0,0 @@
-// Technically the client argument is unncessary here since that SHOULD be src.client but let's not assume things
-// All it takes is one badmin setting their focus to someone else's client to mess things up
-// Or we can have NPC's send actual keypresses and detect that by seeing no client
-
-/mob/key_down(_key, client/user)
-	switch(_key)
-		if("Delete", "H")
-			if(!pulling)
-				to_chat(src, "<span class='notice'>You are not pulling anything.</span>")
-			else
-				stop_pulling()
-			return
-		if("Insert", "G")
-			a_intent_change(INTENT_HOTKEY_RIGHT)
-			return
-		if("F")
-			a_intent_change(INTENT_HOTKEY_LEFT)
-			return
-		if("X", "Northeast") // Northeast is Page-up
-			swap_hand()
-			return
-		if("Y", "Z", "Southeast")	// Southeast is Page-down
-			mode()					// attack_self(). No idea who came up with "mode()"
-			return
-		if("Q", "Northwest") // Northwest is Home
-			var/obj/item/I = get_active_held_item()
-			if(!I)
-				to_chat(src, "<span class='warning'>You have nothing to drop in your hand!</span>")
-			else
-				dropItemToGround(I)
-			return
-		if("E")
-			quick_equip()
-			return
-		if("Alt")
-			toggle_move_intent()
-			return
-		//Bodypart selections
-		if("Numpad8")
-			user.body_toggle_head()
-			return
-		if("Numpad4")
-			user.body_r_arm()
-			return
-		if("Numpad5")
-			user.body_chest()
-			return
-		if("Numpad6")
-			user.body_l_arm()
-			return
-		if("Numpad1")
-			user.body_r_leg()
-			return
-		if("Numpad2")
-			user.body_groin()
-			return
-		if("Numpad3")
-			user.body_l_leg()
-			return
-
-	if(client.keys_held["Ctrl"])
-		switch(SSinput.movement_keys[_key])
-			if(NORTH)
-				if(client.keys_held["Shift"])
-					northshift()
-				else
-					northface()
-				return
-			if(SOUTH)
-				if(client.keys_held["Shift"])
-					southshift()
-				else
-					southface()
-				return
-			if(WEST)
-				if(client.keys_held["Shift"])
-					westshift()
-				else
-					westface()
-				return
-			if(EAST)
-				if(client.keys_held["Shift"])
-					eastshift()
-				else
-					eastface()
-				return
-	return ..()
-
-/mob/key_up(_key, client/user)
-	switch(_key)
-		if("Alt")
-			toggle_move_intent()
-			return
-	return ..()

code/modules/keybindings/bindings_robot.dm

@@ -1,22 +0,0 @@
-/mob/living/silicon/robot/key_down(_key, client/user)
-	switch(_key)
-		if("1", "2", "3")
-			toggle_module(text2num(_key))
-			return
-		if("4")
-			a_intent_change(INTENT_HOTKEY_LEFT)
-			return
-		if("Q")
-			uneq_active()
-			return
-		if("Shift")
-			sprint_hotkey(TRUE)
-			return
-	return ..()
-
-/mob/living/silicon/robot/key_up(_key, client/user)
-	switch(_key)
-		if("Shift")
-			sprint_hotkey(FALSE)
-			return
-	return ..()

code/modules/keybindings/focus.dm

@@ -1,6 +1,3 @@
-/mob
-	var/datum/focus //What receives our keyboard inputs. src by default
-
 /mob/proc/set_focus(datum/new_focus)
 	if(focus == new_focus)
 		return

code/modules/keybindings/keybind/__defines.dm

@@ -0,0 +1,20 @@
+#define CATEGORY_CLIENT "CLIENT"
+#define CATEGORY_EMOTE "EMOTE"
+#define CATEGORY_ADMIN "ADMIN"
+#define CATEGORY_XENO "XENO"
+#define CATEGORY_CARBON "CARBON"
+#define CATEGORY_HUMAN "HUMAN"
+#define CATEGORY_ROBOT "ROBOT"
+#define CATEGORY_MISC "MISC"
+#define CATEGORY_MOVEMENT "MOVEMENT"
+#define CATEGORY_TARGETING "TARGETING"
+
+#define WEIGHT_HIGHEST 0
+#define WEIGHT_ADMIN 10
+#define WEIGHT_CLIENT 20
+#define WEIGHT_ROBOT 30
+#define WEIGHT_MOB 40
+#define WEIGHT_LIVING 50
+#define WEIGHT_DEAD 60
+#define WEIGHT_EMOTE 70
+#define WEIGHT_LOWEST 999

code/modules/keybindings/keybind/_keybind.dm

@@ -0,0 +1,24 @@
+/datum/keybinding
+	var/list/hotkey_keys
+	var/list/classic_keys
+	var/name
+	var/full_name
+	var/description = ""
+	var/category = CATEGORY_MISC
+	var/weight = WEIGHT_LOWEST
+	var/keybind_signal
+
+/datum/keybinding/New()
+
+	// Default keys to the master "hotkey_keys"
+	if(LAZYLEN(hotkey_keys) && !LAZYLEN(classic_keys))
+		classic_keys = hotkey_keys.Copy()
+
+/datum/keybinding/proc/down(client/user)
+    return FALSE
+
+/datum/keybinding/proc/up(client/user)
+	return FALSE
+
+/datum/keybinding/proc/can_use(client/user)
+	return TRUE

code/modules/keybindings/keybind/admin.dm

@@ -0,0 +1,96 @@
+/datum/keybinding/admin
+	category = CATEGORY_ADMIN
+	weight = WEIGHT_ADMIN
+
+/datum/keybinding/admin/can_use(client/user)
+	return user.holder ? TRUE : FALSE
+
+/datum/keybinding/admin/admin_say
+	hotkey_keys = list("F3")
+	name = "admin_say"
+	full_name = "Admin say"
+	description = "Talk with other admins."
+
+/datum/keybinding/admin/admin_say/down(client/user)
+	user.get_admin_say()
+	return TRUE
+
+/datum/keybinding/admin/admin_ghost
+	hotkey_keys = list("F5")
+	name = "admin_ghost"
+	full_name = "Aghost"
+	description = "Go ghost"
+
+/datum/keybinding/admin/admin_ghost/down(client/user)
+	user.admin_ghost()
+	return TRUE
+
+/datum/keybinding/admin/player_panel_new
+	hotkey_keys = list("F6")
+	name = "player_panel_new"
+	full_name = "Player Panel New"
+	description = "Opens up the new player panel"
+
+/datum/keybinding/admin/player_panel_new/down(client/user)
+	user.holder.player_panel_new()
+	return TRUE
+
+/datum/keybinding/admin/toggle_buildmode_self
+	hotkey_keys = list("F7")
+	name = "toggle_buildmode_self"
+	full_name = "Toggle Buildmode Self"
+	description = "Toggles buildmode"
+
+/datum/keybinding/admin/toggle_buildmode_self/down(client/user)
+	user.togglebuildmodeself()
+	return TRUE
+
+/datum/keybinding/admin/stealthmode
+	hotkey_keys = list("CtrlF8")
+	name = "stealth_mode"
+	full_name = "Stealth mode"
+	description = "Enters stealth mode"
+
+/datum/keybinding/admin/stealthmode/down(client/user)
+	user.stealth()
+	return TRUE
+
+/datum/keybinding/admin/invisimin
+	hotkey_keys = list("F8")
+	name = "invisimin"
+	full_name = "Admin invisibility"
+	description = "Toggles ghost-like invisibility (Don't abuse this)"
+
+/datum/keybinding/admin/invisimin/down(client/user)
+	user.invisimin()
+	return TRUE
+
+/datum/keybinding/admin/deadsay
+	hotkey_keys = list("F10")
+	name = "dsay"
+	full_name = "deadsay"
+	description = "Allows you to send a message to dead chat"
+
+/datum/keybinding/admin/deadsay/down(client/user)
+	user.get_dead_say()
+	return TRUE
+
+/datum/keybinding/admin/deadmin
+	hotkey_keys = list("Unbound")
+	name = "deadmin"
+	full_name = "Deadmin"
+	description = "Shed your admin powers"
+
+/datum/keybinding/admin/deadmin/down(client/user)
+	user.deadmin()
+	return TRUE
+
+/datum/keybinding/admin/readmin
+	hotkey_keys = list("Unbound")
+	name = "readmin"
+	full_name = "Readmin"
+	description = "Regain your admin powers"
+
+/datum/keybinding/admin/readmin/down(client/user)
+	user.readmin()
+	return TRUE

code/modules/keybindings/keybind/carbon.dm

@@ -0,0 +1,62 @@
+/datum/keybinding/carbon
+	category = CATEGORY_CARBON
+	weight = WEIGHT_MOB
+
+/datum/keybinding/carbon/can_use(client/user)
+	return iscarbon(user.mob)
+
+/datum/keybinding/carbon/toggle_throw_mode
+	hotkey_keys = list("R", "Southwest") // END
+	name = "toggle_throw_mode"
+	full_name = "Toggle throw mode"
+	description = "Toggle throwing the current item or not."
+	category = CATEGORY_CARBON
+
+/datum/keybinding/carbon/toggle_throw_mode/down(client/user)
+	var/mob/living/carbon/C = user.mob
+	C.toggle_throw_mode()
+	return TRUE
+
+/datum/keybinding/carbon/select_help_intent
+	hotkey_keys = list("1")
+	name = "select_help_intent"
+	full_name = "Select help intent"
+	description = ""
+	category = CATEGORY_CARBON
+
+/datum/keybinding/carbon/select_help_intent/down(client/user)
+	user.mob?.a_intent_change(INTENT_HELP)
+	return TRUE
+
+/datum/keybinding/carbon/select_disarm_intent
+	hotkey_keys = list("2")
+	name = "select_disarm_intent"
+	full_name = "Select disarm intent"
+	description = ""
+	category = CATEGORY_CARBON
+
+/datum/keybinding/carbon/select_disarm_intent/down(client/user)
+	user.mob?.a_intent_change(INTENT_DISARM)
+	return TRUE
+
+/datum/keybinding/carbon/select_grab_intent
+	hotkey_keys = list("3")
+	name = "select_grab_intent"
+	full_name = "Select grab intent"
+	description = ""
+	category = CATEGORY_CARBON
+
+/datum/keybinding/carbon/select_grab_intent/down(client/user)
+	user.mob?.a_intent_change(INTENT_GRAB)
+	return TRUE
+
+/datum/keybinding/carbon/select_harm_intent
+	hotkey_keys = list("4")
+	name = "select_harm_intent"
+	full_name = "Select harm intent"
+	description = ""
+	category = CATEGORY_CARBON
+
+/datum/keybinding/carbon/select_harm_intent/down(client/user)
+	user.mob?.a_intent_change(INTENT_HARM)
+	return TRUE

code/modules/keybindings/keybind/client.dm

@@ -0,0 +1,33 @@
+/datum/keybinding/client
+	category = CATEGORY_CLIENT
+	weight = WEIGHT_HIGHEST
+
+/datum/keybinding/client/admin_help
+	hotkey_keys = list("F1")
+	name = "admin_help"
+	full_name = "Admin Help"
+	description = "Ask an admin for help."
+
+/datum/keybinding/client/admin_help/down(client/user)
+	user.get_adminhelp()
+	return TRUE
+
+/datum/keybinding/client/screenshot
+	hotkey_keys = list("F2")
+	name = "screenshot"
+	full_name = "Screenshot"
+	description = "Take a screenshot."
+
+/datum/keybinding/client/screenshot/down(client/user)
+	winset(user, null, "command=.screenshot [!user.keys_held["shift"] ? "auto" : ""]")
+	return TRUE
+
+/datum/keybinding/client/minimal_hud
+	hotkey_keys = list("F12")
+	name = "minimal_hud"
+	full_name = "Minimal HUD"
+	description = "Hide most HUD features"
+
+/datum/keybinding/client/minimal_hud/down(client/user)
+	user.mob.button_pressed_F12()
+	return TRUE

code/modules/keybindings/keybind/emote.dm

@@ -0,0 +1,15 @@
+/datum/keybinding/emote
+	category = CATEGORY_EMOTE
+	weight = WEIGHT_EMOTE
+	var/emote_key
+
+/datum/keybinding/emote/proc/link_to_emote(datum/emote/faketype)
+	hotkey_keys = list("Unbound")
+	emote_key = initial(faketype.key)
+	name = initial(faketype.key)
+	full_name = capitalize(initial(faketype.key))
+	description = "Do the emote '*[emote_key]'"
+
+/datum/keybinding/emote/down(client/user)
+	. = ..()
+	return user.mob.emote(emote_key, intentional=TRUE)

code/modules/keybindings/keybind/human.dm

@@ -0,0 +1,39 @@
+/datum/keybinding/human
+	category = CATEGORY_HUMAN
+	weight = WEIGHT_MOB
+
+/datum/keybinding/human/can_use(client/user)
+	return ishuman(user.mob)
+
+/datum/keybinding/human/quick_equip
+	hotkey_keys = list("E")
+	name = "quick_equip"
+	full_name = "Quick Equip"
+	description = "Quickly puts an item in the best slot available"
+
+/datum/keybinding/human/quick_equip/down(client/user)
+	var/mob/living/carbon/human/H = user.mob
+	H.quick_equip()
+	return TRUE
+
+/datum/keybinding/human/quick_equipbelt
+	hotkey_keys = list("ShiftE")
+	name = "quick_equipbelt"
+	full_name = "Quick equip belt"
+	description = "Put held thing in belt or take out most recent thing from belt"
+
+/datum/keybinding/human/quick_equipbelt/down(client/user)
+	var/mob/living/carbon/human/H = user.mob
+	H.smart_equipbelt()
+	return TRUE
+
+/datum/keybinding/human/bag_equip
+	hotkey_keys = list("ShiftB")
+	name = "bag_equip"
+	full_name = "Bag equip"
+	description = "Put held thing in backpack or take out most recent thing from backpack"
+
+/datum/keybinding/human/bag_equip/down(client/user)
+	var/mob/living/carbon/human/H = user.mob
+	H.smart_equipbag()
+	return TRUE

code/modules/keybindings/keybind/living.dm

@@ -0,0 +1,41 @@
+/datum/keybinding/living
+	category = CATEGORY_HUMAN
+	weight = WEIGHT_MOB
+
+/datum/keybinding/living/can_use(client/user)
+	return isliving(user.mob)
+
+/datum/keybinding/living/resist
+	hotkey_keys = list("B")
+	name = "resist"
+	full_name = "Resist"
+	description = "Break free of your current state. Handcuffed? on fire? Resist!"
+
+/datum/keybinding/living/resist/down(client/user)
+	var/mob/living/L = user.mob
+	L.resist()
+	return TRUE
+
+/datum/keybinding/living/toggle_combat_mode
+	hotkey_keys = list("C")
+	name = "toggle_combat_mode"
+	full_name = "Toggle combat mode"
+	description = "Toggles whether or not you're in combat mode."
+
+/datum/keybinding/living/toggle_combat_mode/can_use(client/user)
+	return iscarbon(user.mob)		// for now, only carbons should be using combat mode, although all livings have combat mode implemented.
+
+/datum/keybinding/living/toggle_combat_mode/down(client/user)
+	var/mob/living/carbon/C = user.mob
+	C.user_toggle_intentional_combat_mode()
+	return TRUE
+
+/datum/keybinding/living/toggle_resting
+	hotkey_keys = list("V")
+	name = "toggle_resting"
+	full_name = "Toggle Resting"
+	description = "Toggles whether or not you are intentionally laying down."
+
+/datum/keybinding/living/toggle_resting/down(client/user)
+	var/mob/living/L = user.mob
+	L.lay_down()

code/modules/keybindings/keybind/mob.dm

@@ -0,0 +1,123 @@
+/datum/keybinding/mob
+	category = CATEGORY_HUMAN
+	weight = WEIGHT_MOB
+
+/datum/keybinding/mob/stop_pulling
+	hotkey_keys = list("H", "Delete")
+	name = "stop_pulling"
+	full_name = "Stop pulling"
+	description = ""
+
+/datum/keybinding/mob/stop_pulling/down(client/user)
+	var/mob/M = user.mob
+	if(!M.pulling)
+		to_chat(user, "<span class='notice'>You are not pulling anything.</span>")
+	else
+		M.stop_pulling()
+	return TRUE
+
+/datum/keybinding/mob/cycle_intent_right
+	hotkey_keys = list("Northwest", "F") // HOME
+	name = "cycle_intent_right"
+	full_name = "Cycle Action Intent Right"
+	description = ""
+
+/datum/keybinding/mob/cycle_intent_right/down(client/user)
+	var/mob/M = user.mob
+	M.a_intent_change(INTENT_HOTKEY_RIGHT)
+	return TRUE
+
+/datum/keybinding/mob/cycle_intent_left
+	hotkey_keys = list("Insert", "G")
+	name = "cycle_intent_left"
+	full_name = "Cycle Action Intent Left"
+	description = ""
+
+/datum/keybinding/mob/cycle_intent_left/down(client/user)
+	var/mob/M = user.mob
+	M.a_intent_change(INTENT_HOTKEY_LEFT)
+	return TRUE
+
+/datum/keybinding/mob/swap_hands
+	hotkey_keys = list("X", "Northeast") // PAGEUP
+	name = "swap_hands"
+	full_name = "Swap hands"
+	description = ""
+
+/datum/keybinding/mob/swap_hands/down(client/user)
+	var/mob/M = user.mob
+	M.swap_hand()
+	return TRUE
+
+/datum/keybinding/mob/activate_inhand
+	hotkey_keys = list("Z", "Southeast") // PAGEDOWN
+	name = "activate_inhand"
+	full_name = "Activate in-hand"
+	description = "Uses whatever item you have inhand"
+
+/datum/keybinding/mob/activate_inhand/down(client/user)
+	var/mob/M = user.mob
+	M.mode()
+	return TRUE
+
+/datum/keybinding/mob/drop_item
+	hotkey_keys = list("Q")
+	name = "drop_item"
+	full_name = "Drop Item"
+	description = ""
+
+/datum/keybinding/mob/drop_item/down(client/user)
+	if(iscyborg(user.mob)) //cyborgs can't drop items
+		return FALSE
+	var/mob/M = user.mob
+	var/obj/item/I = M.get_active_held_item()
+	if(!I)
+		to_chat(user, "<span class='warning'>You have nothing to drop in your hand!</span>")
+	else
+		user.mob.dropItemToGround(I)
+	return TRUE
+
+/datum/keybinding/mob/say_with_indicator
+	hotkey_keys = list("CtrlT")
+	classic_keys = list()
+	name = "say_with_indicator"
+	full_name = "Say with Typing Indicator"
+
+/datum/keybinding/mob/say_with_indicator/down(client/user)
+	var/mob/M = user.mob
+	M.say_typing_indicator()
+	return TRUE
+
+/datum/keybinding/mob/me_with_indicator
+	hotkey_keys = list("CtrlM")
+	classic_keys = list()
+	name = "me_with_indicator"
+	full_name = "Me (emote) with Typing Indicator"
+
+/datum/keybinding/mob/me_with_indicator/down(client/user)
+	var/mob/M = user.mob
+	M.me_typing_indicator()
+	return TRUE
+
+/datum/keybinding/living/subtle
+	hotkey_keys = list("5")
+	classic_keys = list()
+	name = "subtle_emote"
+	full_name = "Subtle Emote"
+
+/datum/keybinding/living/subtle/down(client/user)
+	var/mob/living/L = user.mob
+	L.subtle_keybind()
+	return TRUE
+
+/datum/keybinding/mob/whisper
+	hotkey_keys = list("Y")
+	classic_keys = list()
+	name = "whisper"
+	full_name = "Whisper"
+
+/datum/keybinding/mob/whisper/down(client/user)
+	var/mob/M = user.mob
+	M.whisper_keybind()
+	return TRUE
+

code/modules/keybindings/keybind/movement.dm

@@ -0,0 +1,175 @@
+/datum/keybinding/movement
+	category = CATEGORY_MOVEMENT
+	weight = WEIGHT_HIGHEST
+
+/datum/keybinding/movement/north
+	hotkey_keys = list("W", "North")
+	name = "North"
+	full_name = "Move North"
+	description = "Moves your character north"
+
+/datum/keybinding/movement/south
+	hotkey_keys = list("S", "South")
+	name = "South"
+	full_name = "Move South"
+	description = "Moves your character south"
+
+/datum/keybinding/movement/west
+	hotkey_keys = list("A", "West")
+	name = "West"
+	full_name = "Move West"
+	description = "Moves your character left"
+
+/datum/keybinding/movement/east
+	hotkey_keys = list("D", "East")
+	name = "East"
+	full_name = "Move East"
+	description = "Moves your character east"
+
+/datum/keybinding/mob/face_north
+	hotkey_keys = list("CtrlW", "CtrlNorth")
+	name = "face_north"
+	full_name = "Face North"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/face_north/down(client/user)
+	var/mob/M = user.mob
+	M.northface()
+	return TRUE
+
+/datum/keybinding/mob/face_east
+	hotkey_keys = list("CtrlD", "CtrlEast")
+	name = "face_east"
+	full_name = "Face East"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/face_east/down(client/user)
+	var/mob/M = user.mob
+	M.eastface()
+	return TRUE
+
+/datum/keybinding/mob/face_south
+	hotkey_keys = list("CtrlS", "CtrlSouth")
+	name = "face_south"
+	full_name = "Face South"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/face_south/down(client/user)
+	var/mob/M = user.mob
+	M.southface()
+	return TRUE
+
+/datum/keybinding/mob/shift_north
+	hotkey_keys = list("CtrlShiftW", "CtrlShiftNorth")
+	name = "pixel_shift_north"
+	full_name = "Pixel Shift North"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/shift_north/down(client/user)
+	var/mob/M = user.mob
+	M.northshift()
+	return TRUE
+
+/datum/keybinding/mob/shift_east
+	hotkey_keys = list("CtrlShiftD", "CtrlShiftEast")
+	name = "pixel_shift_east"
+	full_name = "Pixel Shift East"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/shift_east/down(client/user)
+	var/mob/M = user.mob
+	M.eastshift()
+	return TRUE
+
+/datum/keybinding/mob/shift_south
+	hotkey_keys = list("CtrlShiftS", "CtrlShiftSouth")
+	name = "pixel_shift_south"
+	full_name = "Pixel Shift South"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/shift_south/down(client/user)
+	var/mob/M = user.mob
+	M.southshift()
+	return TRUE
+
+/datum/keybinding/mob/shift_west
+	hotkey_keys = list("CtrlShiftA", "CtrlShiftWest")
+	name = "pixel_shift_west"
+	full_name = "Pixel Shift West"
+	description = ""
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/shift_west/down(client/user)
+	var/mob/M = user.mob
+	M.westshift()
+	return TRUE
+
+/datum/keybinding/living/hold_sprint
+	hotkey_keys = list("Shift")
+	name = "hold_sprint"
+	full_name = "Sprint (hold down)"
+	description = "Hold down to sprint"
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/living/hold_sprint/can_use(client/user)
+	return ishuman(user.mob) || iscyborg(user.mob)
+
+/datum/keybinding/living/hold_sprint/down(client/user)
+	var/mob/living/L = user.mob
+	L.sprint_hotkey(TRUE)
+	return TRUE
+
+/datum/keybinding/living/hold_sprint/up(client/user)
+	var/mob/living/L = user.mob
+	L.sprint_hotkey(FALSE)
+	return TRUE
+
+/datum/keybinding/living/toggle_sprint
+	hotkey_keys = list()
+	name = "toggle_sprint"
+	full_name = "Sprint (toggle)"
+	description = "Press to toggle sprint"
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/living/toggle_sprint/can_use(client/user)
+	return ishuman(user.mob) || iscyborg(user.mob)
+
+/datum/keybinding/living/toggle_sprint/down(client/user)
+	var/mob/living/L = user.mob
+	L.default_toggle_sprint(TRUE)
+	return TRUE
+
+/datum/keybinding/mob/toggle_move_intent
+	hotkey_keys = list("Alt")
+	name = "toggle_move_intent"
+	full_name = "Hold to toggle move intent"
+	description = "Held down to cycle to the other move intent, release to cycle back"
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/toggle_move_intent/down(client/user)
+	var/mob/M = user.mob
+	M.toggle_move_intent()
+	return TRUE
+
+/datum/keybinding/mob/toggle_move_intent/up(client/user)
+	var/mob/M = user.mob
+	M.toggle_move_intent()
+	return TRUE
+
+/datum/keybinding/mob/toggle_move_intent_alternative
+	hotkey_keys = list("Unbound")
+	name = "toggle_move_intent_alt"
+	full_name = "press to cycle move intent"
+	description = "Pressing this cycle to the opposite move intent, does not cycle back"
+	category = CATEGORY_MOVEMENT
+
+/datum/keybinding/mob/toggle_move_intent_alternative/down(client/user)
+	var/mob/M = user.mob
+	M.toggle_move_intent()
+	return TRUE

code/modules/keybindings/keybind/robot.dm

@@ -0,0 +1,61 @@
+/datum/keybinding/robot
+	category = CATEGORY_ROBOT
+	weight = WEIGHT_ROBOT
+
+/datum/keybinding/robot/can_use(client/user)
+	return iscyborg(user.mob)
+
+/datum/keybinding/robot/moduleone
+	hotkey_keys = list("1")
+	name = "module_one"
+	full_name = "Toggle module 1"
+	description = "Equips or unequips the first module"
+
+/datum/keybinding/robot/moduleone/down(client/user)
+	var/mob/living/silicon/robot/R = user.mob
+	R.toggle_module(1)
+	return TRUE
+
+/datum/keybinding/robot/moduletwo
+	hotkey_keys = list("2")
+	name = "module_two"
+	full_name = "Toggle module 2"
+	description = "Equips or unequips the second module"
+
+/datum/keybinding/robot/moduletwo/down(client/user)
+	var/mob/living/silicon/robot/R = user.mob
+	R.toggle_module(2)
+	return TRUE
+
+/datum/keybinding/robot/modulethree
+	hotkey_keys = list("3")
+	name = "module_three"
+	full_name = "Toggle module 3"
+	description = "Equips or unequips the third module"
+
+/datum/keybinding/robot/modulethree/down(client/user)
+	var/mob/living/silicon/robot/R = user.mob
+	R.toggle_module(3)
+	return TRUE
+
+/datum/keybinding/robot/intent_cycle
+	hotkey_keys = list("4")
+	name = "cycle_intent"
+	full_name = "Cycle intent left"
+	description = "Cycles the intent left"
+
+/datum/keybinding/robot/intent_cycle/down(client/user)
+	var/mob/living/silicon/robot/R = user.mob
+	R.a_intent_change(INTENT_HOTKEY_LEFT)
+	return TRUE
+
+/datum/keybinding/robot/unequip_module
+	hotkey_keys = list("Q")
+	name = "unequip_module"
+	full_name = "Unequip module"
+	description = "Unequips the active module"
+
+/datum/keybinding/robot/unequip_module/down(client/user)
+	var/mob/living/silicon/robot/R = user.mob
+	R.uneq_active()
+	return TRUE

code/modules/keybindings/keybind/targeting.dm

@@ -0,0 +1,76 @@
+/datum/keybinding/mob/target_head_cycle
+	hotkey_keys = list("Numpad8")
+	name = "target_head_cycle"
+	full_name = "Target: Cycle head"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_head_cycle/down(client/user)
+	user.body_toggle_head()
+	return TRUE
+
+/datum/keybinding/mob/target_r_arm
+	hotkey_keys = list("Numpad4")
+	name = "target_r_arm"
+	full_name = "Target: right arm"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_r_arm/down(client/user)
+	user.body_r_arm()
+	return TRUE
+
+/datum/keybinding/mob/target_body_chest
+	hotkey_keys = list("Numpad5")
+	name = "target_body_chest"
+	full_name = "Target: Body"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_body_chest/down(client/user)
+	user.body_chest()
+	return TRUE
+
+/datum/keybinding/mob/target_left_arm
+	hotkey_keys = list("Numpad6")
+	name = "target_left_arm"
+	full_name = "Target: left arm"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_left_arm/down(client/user)
+	user.body_l_arm()
+	return TRUE
+
+/datum/keybinding/mob/target_right_leg
+	hotkey_keys = list("Numpad1")
+	name = "target_right_leg"
+	full_name = "Target: Right leg"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_right_leg/down(client/user)
+	user.body_r_leg()
+	return TRUE
+
+/datum/keybinding/mob/target_body_groin
+	hotkey_keys = list("Numpad2")
+	name = "target_body_groin"
+	full_name = "Target: Groin"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_body_groin/down(client/user)
+	user.body_groin()
+	return TRUE
+
+/datum/keybinding/mob/target_left_leg
+	hotkey_keys = list("Numpad3")
+	name = "target_left_leg"
+	full_name = "Target: left leg"
+	description = ""
+	category = CATEGORY_TARGETING
+
+/datum/keybinding/mob/target_left_leg/down(client/user)
+	user.body_l_leg()
+	return TRUE

code/modules/keybindings/setup.dm

@@ -1,55 +1,47 @@
-/client
-	/// Keys currently held
-	var/list/keys_held = list()
-	/// These next two vars are to apply movement for keypresses and releases made while move delayed.
-	/// Because discarding that input makes the game less responsive.
- 	/// On next move, add this dir to the move that would otherwise be done
-	var/next_move_dir_add
- 	/// On next move, subtract this dir from the move that would otherwise be done
-	var/next_move_dir_sub
-
-// Set a client's focus to an object and override these procs on that object to let it handle keypresses
-
 /datum/proc/key_down(key, client/user) // Called when a key is pressed down initially
 	return
+
 /datum/proc/key_up(key, client/user) // Called when a key is released
 	return
+
 /datum/proc/keyLoop(client/user) // Called once every frame
 	set waitfor = FALSE
 	return
 
 // removes all the existing macros
 /client/proc/erase_all_macros()
-	var/list/macro_sets = params2list(winget(src, null, "macros"))
 	var/erase_output = ""
-	for(var/i in 1 to macro_sets.len)
-		var/setname = macro_sets[i]
-		var/list/macro_set = params2list(winget(src, "[setname].*", "command")) // The third arg doesnt matter here as we're just removing them all
-		for(var/k in 1 to macro_set.len)
-			var/list/split_name = splittext(macro_set[k], ".")
-			var/macro_name = "[split_name[1]].[split_name[2]]" // [3] is "command"
-			erase_output = "[erase_output];[macro_name].parent=null"
+	var/list/macro_set = params2list(winget(src, "default.*", "command")) // The third arg doesnt matter here as we're just removing them all
+	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"
+		erase_output = "[erase_output];[macro_name].parent=null"
 	winset(src, null, erase_output)
 
-/client/proc/set_macros()
+/client/proc/apply_macro_set(name, list/macroset)
+	ASSERT(name)
+	ASSERT(islist(macroset))
+	winclone(src, "default", name)
+	for(var/i in 1 to length(macroset))
+		var/key = macroset[i]
+		var/command = macroset[key]
+		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()
 
-	var/list/macro_sets = SSinput.macro_sets
-	for(var/i in 1 to macro_sets.len)
-		var/setname = macro_sets[i]
-		if(setname != "default")
-			winclone(src, "default", setname)
-		var/list/macro_set = macro_sets[setname]
-		for(var/k in 1 to macro_set.len)
-			var/key = macro_set[k]
-			var/command = macro_set[key]
-			winset(src, "[setname]-[REF(key)]", "parent=[setname];name=[key];command=[command]")
+	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)
 
-	if(prefs.hotkeys)
-		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default")
+	set_hotkeys_preference()
+
+/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=old_default")
+		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=[SKIN_MACROSET_CLASSIC_INPUT]")