Conflicts galore

code/modules/client/client_procs.dm

@@ -267,6 +267,9 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 	else
 		prefs = new /datum/preferences(src)
 		GLOB.preferences_datums[ckey] = prefs
+	if(SSinput.initialized)
+		set_macros()
+	update_movement_keys(prefs)
 
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
@@ -330,9 +333,6 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 				qdel(src)
 				return
 
-	if(SSinput.initialized)
-		set_macros()
-
 	chatOutput.start() // Starts the chat
 
 	if(alert_mob_dupe_login)
@@ -894,6 +894,23 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 	y = clamp(y+change, min,max)
 	change_view("[x]x[y]")
 
+/client/proc/update_movement_keys(datum/preferences/direct_prefs)
+	var/datum/preferences/D = prefs || direct_prefs
+	if(!D?.key_bindings)
+		return
+	movement_keys = list()
+	for(var/key in D.key_bindings)
+		for(var/kb_name in D.key_bindings[key])
+			switch(kb_name)
+				if("North")
+					movement_keys[key] = NORTH
+				if("East")
+					movement_keys[key] = EAST
+				if("West")
+					movement_keys[key] = WEST
+				if("South")
+					movement_keys[key] = SOUTH
+
 /client/proc/change_view(new_size)
 	if (isnull(new_size))
 		CRASH("change_view called without argument.")
@@ -904,23 +921,27 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 			new_size = "15x15"
 //END OF CIT CHANGES
 
+	var/list/old_view = getviewsize(view)
 	view = new_size
-	apply_clickcatcher()
+	var/list/actualview = getviewsize(view)
+	apply_clickcatcher(actualview)
 	mob.reload_fullscreen()
 	if (isliving(mob))
 		var/mob/living/M = mob
 		M.update_damage_hud()
 	if (prefs.auto_fit_viewport)
 		fit_viewport()
+	SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_CHANGE_VIEW, src, old_view, actualview)
 
 /client/proc/generate_clickcatcher()
 	if(!void)
 		void = new()
 		screen += void
 
-/client/proc/apply_clickcatcher()
+/client/proc/apply_clickcatcher(list/actualview)
 	generate_clickcatcher()
-	var/list/actualview = getviewsize(view)
+	if(!actualview)
+		actualview = getviewsize(view)
 	void.UpdateGreed(actualview[1],actualview[2])
 
 /client/proc/AnnouncePR(announcement)