Merge remote-tracking branch 'upstream/master' into volume

code/modules/client/preferences.dm

@@ -24,6 +24,9 @@ datum/preferences
 	var/tooltipstyle = "Midnight"		//Style for popup tooltips
 	var/client_fps = 0
 
+	var/tgui_fancy = TRUE
+	var/tgui_lock = FALSE
+
 	//character preferences
 	var/real_name						//our character's name
 	var/be_random_name = 0				//whether we are a random name every round