Merge branch 'master' into AFK-subsystem

code/modules/client/preference/preferences.dm

@@ -81,7 +81,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
 	var/exp
 	var/ooccolor = "#b82e00"
-	var/be_special = list()				//Special role selection
+	var/list/be_special = list()				//Special role selection
 	var/UI_style = "Midnight"
 	var/nanoui_fancy = TRUE
 	var/toggles = TOGGLES_DEFAULT
@@ -457,6 +457,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "<b>Ghost Ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</b></a><br>"
 			dat += "<b>Ghost Radio:</b> <a href='?_src_=prefs;preference=ghost_radio'><b>[(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]</b></a><br>"
 			dat += "<b>Ghost Sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]</b></a><br>"
+			dat += "<b>Ghost PDA:</b> <a href='?_src_=prefs;preference=ghost_pda'><b>[(toggles & CHAT_GHOSTPDA) ? "All PDA Messages" : "No PDA Messages"]</b></a><br>"
 			if(check_rights(R_ADMIN,0))
 				dat += "<b>OOC Color:</b> <span style='border: 1px solid #161616; background-color: [ooccolor ? ooccolor : normal_ooc_colour];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ooccolor;task=input'><b>Change</b></a><br>"
 			if(config.allow_Metadata)
@@ -2034,6 +2035,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 				if("ghost_radio")
 					toggles ^= CHAT_GHOSTRADIO
+				
+				if("ghost_pda")
+					toggles ^= CHAT_GHOSTPDA
 
 				if("ghost_anonsay")
 					ghost_anonsay = !ghost_anonsay
@@ -2285,3 +2289,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 /datum/preferences/proc/close_load_dialog(mob/user)
 	user << browse(null, "window=saves")
+
+//Check if the user has ANY job selected.
+/datum/preferences/proc/check_any_job()
+	return(job_support_high || job_support_med || job_support_low || job_medsci_high || job_medsci_med || job_medsci_low || job_engsec_high || job_engsec_med || job_engsec_low || job_karma_high || job_karma_med || job_karma_low)

code/modules/client/preference/preferences_toggles.dm

@@ -241,4 +241,36 @@
 		to_chat(usr, "<span class='notice'>You have enabled text popup limiting.")
 	else
 		to_chat(usr, "<span class='notice'>You have disabled text popup limiting.")
+	return
 
+/client/verb/numpad_target()
+	set name = "Toggle Numpad targetting"
+	set category = "Preferences"
+	set desc = "This button will allow you to enable or disable Numpad Targetting"
+	prefs.toggles ^= NUMPAD_TARGET
+	prefs.save_preferences(src)
+	if (prefs.toggles & NUMPAD_TARGET)
+		to_chat(usr, "<span class='notice'>You have enabled Numpad Targetting.")
+	else
+		to_chat(usr, "<span class='notice'>You have disabled Numpad Targetting.")
+	return
+
+/client/verb/azerty_toggle()
+	set name = "Toggle QWERTY/AZERTY"
+	set category = "Preferences"
+	set desc = "This button will switch you between QWERTY and AZERTY control sets"
+	prefs.toggles ^= AZERTY
+	prefs.save_preferences(src)
+	if (prefs.toggles & AZERTY)
+		to_chat(usr, "<span class='notice'>You are now in AZERTY mode.")
+	else
+		to_chat(usr, "<span class='notice'>You are now in QWERTY mode.")
+	return
+/client/verb/toggle_ghost_pda()
+	set name = "Show/Hide GhostPDA"
+	set category = "Preferences"
+	set desc = ".Toggle seeing PDA messages as an observer."
+	prefs.toggles ^= CHAT_GHOSTPDA
+	to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTPDA) ? "see all PDA messages" : "no longer see PDA messages"].")
+	prefs.save_preferences(src)
+	feedback_add_details("admin_verb","TGP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!