Merge from upstream.

code/modules/client/client procs.dm

@@ -229,6 +229,11 @@ var/next_external_rsc = 0
 	while (query_cid.NextRow())
 		related_accounts_cid += "[query_cid.item[1]], "
 
+	var/DBQuery/query_watch = dbcon.NewQuery("SELECT ckey, reason FROM [format_table_name("watch")] WHERE (ckey = '[sql_ckey]')")
+	query_watch.Execute()
+	if(query_watch.NextRow())
+		message_admins("<font color='red'><B>Notice: </B></font><font color='blue'>[key_name_admin(src)] is flagged for watching and has just connected - Reason: [query_watch.item[2]]</font>")
+		send2irc_adminless_only("Watchlist", "[key_name_admin(src)] is flagged for watching and has just connected - Reason: [query_watch.item[2]]")
 
 	var/admin_rank = "Player"
 	if (src.holder && src.holder.rank)

code/modules/client/preferences.dm

@@ -61,7 +61,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	var/skin_tone = "caucasian1"		//Skin color
 	var/eye_color = "000"				//Eye color
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
-	var/mutant_color = "FFF"			//Mutant race skin color
+	var/list/features = list("mcolor" = "FFF", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None")
+
 	var/list/custom_names = list("clown", "mime", "ai", "cyborg", "religion", "deity")
 
 		//Mob preview
@@ -243,7 +244,61 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 
 					dat += "<h3>Alien Color</h3>"
 
-					dat += "<span style='border: 1px solid #161616; background-color: #[mutant_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
+					dat += "<span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
+
+					dat += "</td>"
+
+				if("tail" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Tail</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=tail;task=input'>[features["tail"]]</a><BR>"
+
+					dat += "</td>"
+
+				if("snout" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Snout</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=snout;task=input'>[features["snout"]]</a><BR>"
+
+					dat += "</td>"
+
+				if("horns" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Horns</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
+
+					dat += "</td>"
+
+				if("frills" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Frills</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=frills;task=input'>[features["frills"]]</a><BR>"
+
+					dat += "</td>"
+
+				if("spines" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Spines</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=spines;task=input'>[features["spines"]]</a><BR>"
+
+					dat += "</td>"
+
+				if("body_markings" in pref_species.mutant_bodyparts)
+					dat += "<td valign='top' width='7%'>"
+
+					dat += "<h3>Body Markings</h3>"
+
+					dat += "<a href='?_src_=prefs;preference=body_markings;task=input'>[features["body_markings"]]</a><BR>"
 
 					dat += "</td>"
 
@@ -264,7 +319,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 				dat += "<b>Pull requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(chat_toggles & CHAT_PULLR) ? "Yes" : "No"]</a><br>"
 				dat += "<b>Midround Antagonist:</b> <a href='?_src_=prefs;preference=allow_midround_antag'>[(toggles & MIDROUND_ANTAG) ? "Yes" : "No"]</a><br>"
 				if(config.allow_Metadata)
-					dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'> Edit </a><br>"
+					dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'>Edit </a><br>"
 
 				if(user.client)
 					if(user.client.holder)
@@ -736,19 +791,54 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 						if(result)
 							var/newtype = roundstart_species[result]
 							pref_species = new newtype()
-							if(mutant_color == "#000")
-								mutant_color = pref_species.default_color
+							if(features["mcolor"] == "#000")
+								features["mcolor"] = pref_species.default_color
 
 					if("mutant_color")
 						var/new_mutantcolor = input(user, "Choose your character's alien skin color:", "Character Preference") as color|null
 						if(new_mutantcolor)
 							var/temp_hsv = RGBtoHSV(new_mutantcolor)
 							if(new_mutantcolor == "#000000")
-								mutant_color = pref_species.default_color
+								features["mcolor"] = pref_species.default_color
 							else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright
-								mutant_color = sanitize_hexcolor(new_mutantcolor)
+								features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
 							else
 								user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
+					if("tail")
+						var/new_tail
+						new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in tails_list
+						if(new_tail)
+							features["tail"] = new_tail
+
+					if("snout")
+						var/new_snout
+						new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in snouts_list
+						if(new_snout)
+							features["snout"] = new_snout
+
+					if("horns")
+						var/new_horns
+						new_horns = input(user, "Choose your character's horns:", "Character Preference") as null|anything in horns_list
+						if(new_horns)
+							features["horns"] = new_horns
+
+					if("frills")
+						var/new_frills
+						new_frills = input(user, "Choose your character's frills:", "Character Preference") as null|anything in frills_list
+						if(new_frills)
+							features["frills"] = new_frills
+
+					if("spines")
+						var/new_spines
+						new_spines = input(user, "Choose your character's spines:", "Character Preference") as null|anything in spines_list
+						if(new_spines)
+							features["spines"] = new_spines
+
+					if("body_markings")
+						var/new_body_markings
+						new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in body_markings_list
+						if(new_body_markings)
+							features["body_markings"] = new_body_markings
 
 					if("s_tone")
 						var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference")  as null|anything in skin_tones
@@ -919,10 +1009,9 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 		if(character.dna)
 			character.dna.real_name = character.real_name
 			if(pref_species != /datum/species/human && config.mutant_races)
-				hardset_dna(character, null, null, null, null, pref_species.type)
+				hardset_dna(character, null, null, null, null, pref_species.type, features)
 			else
-				hardset_dna(character, null, null, null, null, /datum/species/human)
-			character.dna.mutant_color = mutant_color
+				hardset_dna(character, null, null, null, null, /datum/species/human, features)
 			character.update_mutcolor()
 
 		character.gender = gender
@@ -940,6 +1029,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 		character.undershirt = undershirt
 		character.socks = socks
 
+		character.features = features
+
 		if(backbag > 3 || backbag < 1)
 			backbag = 1 //Same as above
 		character.backbag = backbag

code/modules/client/preferences_savefile.dm

@@ -166,8 +166,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	else
 		pref_species = new /datum/species/human()
 
-	if(!S["mutant_color"] || S["mutant_color"] == "#000")
-		S["mutant_color"]	<< "#FFF"
+	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
+		S["features["mcolor"]"]	<< "#FFF"
 
 	//Character
 	S["OOC_Notes"]			>> metadata
@@ -186,7 +186,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["undershirt"]			>> undershirt
 	S["socks"]				>> socks
 	S["backbag"]			>> backbag
-	S["mutant_color"]		>> mutant_color
+	S["feature_mcolor"]					>> features["mcolor"]
+	S["feature_lizard_tail"]			>> features["tail"]
+	S["feature_lizard_snout"]			>> features["snout"]
+	S["feature_lizard_horns"]			>> features["horns"]
+	S["feature_lizard_frills"]			>> features["frills"]
+	S["feature_lizard_spines"]			>> features["spines"]
+	S["feature_lizard_body_markings"]	>> features["body_markings"]
 	S["clown_name"]			>> custom_names["clown"]
 	S["mime_name"]			>> custom_names["mime"]
 	S["ai_name"]			>> custom_names["ai"]
@@ -213,8 +219,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
 	real_name		= reject_bad_name(real_name)
-	if(!mutant_color || mutant_color == "#000")
-		mutant_color = "#FFF"
+	if(!features["mcolor"] || features["mcolor"] == "#000")
+		features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
 	if(!real_name)	real_name = random_name(gender)
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	be_random_body	= sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
@@ -238,7 +244,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	eye_color		= sanitize_hexcolor(eye_color, 3, 0)
 	skin_tone		= sanitize_inlist(skin_tone, skin_tones)
 	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
-	mutant_color	= sanitize_hexcolor(mutant_color, 3, 0)
+	features["mcolor"]	= sanitize_hexcolor(features["mcolor"], 3, 0)
+	features["tail"]	= sanitize_inlist(features["tail"], tails_list)
+	features["snout"]	= sanitize_inlist(features["snout"], snouts_list)
+	features["horns"] 	= sanitize_inlist(features["horns"], horns_list)
+	features["frills"] 	= sanitize_inlist(features["frills"], frills_list)
+	features["spines"] 	= sanitize_inlist(features["spines"], spines_list)
+	features["body_markings"] 	= sanitize_inlist(features["body_markings"], body_markings_list)
 
 	userandomjob	= sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -279,7 +291,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["socks"]				<< socks
 	S["backbag"]			<< backbag
 	S["species"]			<< pref_species.name
-	S["mutant_color"]		<< mutant_color
+	S["feature_mcolor"]					<< features["mcolor"]
+	S["feature_lizard_tail"]			<< features["tail"]
+	S["feature_lizard_snout"]			<< features["snout"]
+	S["feature_lizard_horns"]			<< features["horns"]
+	S["feature_lizard_frills"]			<< features["frills"]
+	S["feature_lizard_spines"]			<< features["spines"]
+	S["feature_lizard_body_markings"]	<< features["body_markings"]
 	S["clown_name"]			<< custom_names["clown"]
 	S["mime_name"]			<< custom_names["mime"]
 	S["ai_name"]			<< custom_names["ai"]

code/modules/client/preferences_toggles.dm

@@ -82,6 +82,18 @@
 	src << "You will [(prefs.chat_toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat."
 	feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/toggleprayersounds()
+	set name = "Hear/Silence Prayer Sounds"
+	set category = "Preferences"
+	set desc = "Toggles hearing pray sounds."
+	prefs.toggles ^= SOUND_PRAYERS
+	prefs.save_preferences()
+	if(prefs.toggles & SOUND_PRAYERS)
+		src << "You will now hear prayer sounds."
+	else
+		src << "You will no longer prayer sounds."
+	feedback_add_details("admin_verb", "PSounds")
+
 /client/verb/togglePRs()
 	set name = "Show/Hide Pull Request Announcements"
 	set category = "Preferences"
@@ -208,7 +220,8 @@
 var/list/ghost_forms = list("ghost","ghostking","ghostian2","skeleghost","ghost_red","ghost_black", \
 							"ghost_blue","ghost_yellow","ghost_green","ghost_pink", \
 							"ghost_cyan","ghost_dblue","ghost_dred","ghost_dgreen", \
-							"ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink")
+							"ghost_dcyan","ghost_grey","ghost_dyellow","ghost_dpink", "ghost_purpleswirl","ghost_funkypurp","ghost_pinksherbert","ghost_blazeit",\
+							"ghost_mellow","ghost_rainbow","ghost_camo","ghost_fire")
 /client/verb/pick_form()
 	set name = "Choose Ghost Form"
 	set category = "Preferences"