Implement AZERTY and numpad targetting options

code/modules/keybindings/bindings_atom.dm

@@ -4,8 +4,10 @@
 /atom/movable/keyLoop(client/user)
 	if(!user.keys_held["Ctrl"])
 		var/movement_dir = NONE
+		var/list/movement = SSinput.movement_keys
+		if (user.prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys
 		for(var/_key in user.keys_held)
-			movement_dir = movement_dir | SSinput.movement_keys[_key]
+			movement_dir = movement_dir | movement[_key]
 		if(user.next_move_dir_add)
 			movement_dir |= user.next_move_dir_add
 		if(user.next_move_dir_sub)

code/modules/keybindings/bindings_client.dm

@@ -5,6 +5,7 @@
 	set hidden = TRUE
 	keys_held[_key] = world.time
 	var/movement = SSinput.movement_keys[_key]
+	if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
 	if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"])
 		next_move_dir_add |= movement
 
@@ -35,6 +36,7 @@
 	set hidden = TRUE
 	keys_held -= _key
 	var/movement = SSinput.movement_keys[_key]
+	if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key]
 	if(!(next_move_dir_add & movement))
 		next_move_dir_sub |= movement
 

code/modules/keybindings/bindings_mob.dm

@@ -3,62 +3,112 @@
 // 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_hand()
-			if(!I)
-				to_chat(src, "<span class='warning'>You have nothing to drop in your hand!</span>")
-			else
-				drop_item(I)
-			return
-		if("E")
-			quick_equip()
-			return
-		if("Alt")
-			toggle_move_intent()
-			return
+	if(user.prefs.toggles & AZERTY)
+		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", "W", "Southeast")	// Southeast is Page-down
+				mode()					// attack_self(). No idea who came up with "mode()"
+				return
+			if("A", "Northwest") // Northwest is Home
+				var/obj/item/I = get_active_hand()
+				if(!I)
+					to_chat(src, "<span class='warning'>You have nothing to drop in your hand!</span>")
+				else
+					drop_item(I)
+				return
+			if("E")
+				quick_equip()
+				return
+			if("Alt")
+				toggle_move_intent()
+				return
+	else
+		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_hand()
+				if(!I)
+					to_chat(src, "<span class='warning'>You have nothing to drop in your hand!</span>")
+				else
+					drop_item(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.prefs.toggles & NUMPAD_TARGET)
+		switch(_key)
+			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"])
+	if(client.keys_held["Ctrl"] && client.prefs.toggles & AZERTY)
+		switch(SSinput.alt_movement_keys[_key])
+			if(NORTH)
+				northface()
+				return
+			if(SOUTH)
+				southface()
+				return
+			if(WEST)
+				westface()
+				return
+			if(EAST)
+				eastface()
+				return
+	else if(client.keys_held["Ctrl"])
 		switch(SSinput.movement_keys[_key])
 			if(NORTH)
 				northface()