Fixes merge conflict in admin_verbs.dm

code/modules/client/preference/loadout/loadout_cosmetics.dm

@@ -17,4 +17,8 @@
 
 /datum/gear/monocle
 	display_name = "monocle"
-	path = /obj/item/clothing/glasses/monocle
+	path = /obj/item/clothing/glasses/monocle
+
+/datum/gear/sunglasses
+	display_name = "cheap sunglasses"
+	path = /obj/item/clothing/glasses/sunglasses/fake

code/modules/client/preference/loadout/loadout_general.dm

@@ -39,6 +39,10 @@
 	display_name = "a deck of cards"
 	path = /obj/item/toy/cards/deck
 
+/datum/gear/headphones
+	display_name = "a pair of headphones"
+	path = /obj/item/clothing/ears/headphones
+
 /datum/gear/blackbandana
 	display_name = "bandana, black"
 	path = /obj/item/clothing/mask/bandana/black

code/modules/client/preference/loadout/loadout_hat.dm

@@ -112,3 +112,8 @@
 /datum/gear/hat/red_beret
 	display_name = "beret, red"
 	path = /obj/item/clothing/head/beret
+
+/datum/gear/hat/sci_beret
+	display_name = "science beret"
+	path = /obj/item/clothing/head/beret/sci
+	allowed_roles = list("Research Director", "Scientist")

code/modules/client/preference/preferences.dm

@@ -23,8 +23,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 // 	ROLE_GANG = 21,
 	ROLE_BORER = 21,
 	ROLE_NINJA = 21,
-	ROLE_MUTINEER = 21,
-	ROLE_MALF = 30,
 	ROLE_ABDUCTOR = 30,
 )
 
@@ -248,9 +246,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "</td><td width='405px' height='25px' valign='left'>"
 			dat += "<center>"
 			dat += "Slot <b>[slot_name]</b> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=open_load_dialog\">Load slot</a> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=save\">Save slot</a> - "
-			dat += "<a href=\"byond://?src=\ref[user];preference=reload\">Reload slot</a>"
+			dat += "<a href=\"byond://?src=[user.UID()];preference=open_load_dialog\">Load slot</a> - "
+			dat += "<a href=\"byond://?src=[user.UID()];preference=save\">Save slot</a> - "
+			dat += "<a href=\"byond://?src=[user.UID()];preference=reload\">Reload slot</a>"
 			dat += "</center>"
 			dat += "</td></tr></table>"
 			dat += "<table width='100%'><tr><td width='405px' height='200px' valign='top'>"
@@ -271,7 +269,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				dat += "<b>Skin Tone:</b> <a href='?_src_=prefs;preference=s_tone;task=input'>[species == "Vox" ? "[s_tone]" : "[-s_tone + 35]/220"]</a><br>"
 			dat += "<b>Disabilities:</b> <a href='?_src_=prefs;preference=disabilities'>\[Set\]</a><br>"
 			dat += "<b>Nanotrasen Relation:</b> <a href ='?_src_=prefs;preference=nt_relation;task=input'>[nanotrasen_relation]</a><br>"
-			dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'>Set Flavor Text</a><br>"
+			dat += "<a href='byond://?src=[user.UID()];preference=flavor_text;task=input'>Set Flavor Text</a><br>"
 			if(lentext(flavor_text) <= 40)
 				if(!lentext(flavor_text))	dat += "\[...\]<br>"
 				else						dat += "[flavor_text]<br>"
@@ -318,7 +316,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			if(jobban_isbanned(user, "Records"))
 				dat += "<b>You are banned from using character records.</b><br>"
 			else
-				dat += "<a href=\"byond://?src=\ref[user];preference=records;record=1\">Character Records</a><br>"
+				dat += "<a href=\"byond://?src=[user.UID()];preference=records;record=1\">Character Records</a><br>"
 
 			dat += "<h2>Limbs</h2>"
 			dat += "<b>Limbs and Parts:</b> <a href='?_src_=prefs;preference=limbs;task=input'>Adjust</a><br>"
@@ -607,7 +605,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			else
 				HTML += " <font color=red>\[No]</font></a>"
 			if(job.alt_titles)
-				HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+				HTML += "<br><b><a class='white' href=\"byond://?src=[user.UID()];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
 			HTML += "</td></tr>"
 			continue
 /*
@@ -623,7 +621,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		HTML += "<font color=[prefLevelColor]>[prefLevelLabel]</font></a>"
 
 		if(job.alt_titles)
-			HTML += "<br><b><a class='white' href=\"byond://?src=\ref[user];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+			HTML += "<br><b><a class='white' href=\"byond://?src=[user.UID()];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
 
 
 		HTML += "</td></tr>"
@@ -791,21 +789,21 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	HTML += "<tt><center>"
 	HTML += "<b>Set Character Records</b><br>"
 
-	HTML += "<a href=\"byond://?src=\ref[user];preference=records;task=med_record\">Medical Records</a><br>"
+	HTML += "<a href=\"byond://?src=[user.UID()];preference=records;task=med_record\">Medical Records</a><br>"
 
 	if(lentext(med_record) <= 40)
 		HTML += "[med_record]"
 	else
 		HTML += "[copytext(med_record, 1, 37)]..."
 
-	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=gen_record\">Employment Records</a><br>"
+	HTML += "<br><br><a href=\"byond://?src=[user.UID()];preference=records;task=gen_record\">Employment Records</a><br>"
 
 	if(lentext(gen_record) <= 40)
 		HTML += "[gen_record]"
 	else
 		HTML += "[copytext(gen_record, 1, 37)]..."
 
-	HTML += "<br><br><a href=\"byond://?src=\ref[user];preference=records;task=sec_record\">Security Records</a><br>"
+	HTML += "<br><br><a href=\"byond://?src=[user.UID()];preference=records;task=sec_record\">Security Records</a><br>"
 
 	if(lentext(sec_record) <= 40)
 		HTML += "[sec_record]<br>"
@@ -813,7 +811,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		HTML += "[copytext(sec_record, 1, 37)]...<br>"
 
 	HTML += "<br>"
-	HTML += "<a href=\"byond://?src=\ref[user];preference=records;records=-1\">\[Done\]</a>"
+	HTML += "<a href=\"byond://?src=[user.UID()];preference=records;records=-1\">\[Done\]</a>"
 	HTML += "</center></tt>"
 
 	user << browse(null, "window=preferences")
@@ -1762,12 +1760,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 				if("be_special")
 					var/r = href_list["role"]
-					if(!(r in special_roles))
-						var/cleaned_r = sql_sanitize_text(r)
-						if(r != cleaned_r) // up to no good
-							message_admins("[user] attempted an href exploit! (This could have possibly lead to a \"Bobby Tables\" exploit, so they're probably up to no good). String: [r] ID: [last_id] IP: [last_ip]")
-							to_chat(user, "<span class='userdanger'>Stop right there, criminal scum</span>")
-					else
+					if(r in special_roles)
 						be_special ^= r
 
 				if("name")
@@ -1857,10 +1850,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	character.age = age
 	character.b_type = b_type
 
-	character.r_eyes = r_eyes
-	character.g_eyes = g_eyes
-	character.b_eyes = b_eyes
-
 	//Head-specific
 	var/obj/item/organ/external/head/H = character.get_organ("head")
 	H.r_hair = r_hair
@@ -1980,6 +1969,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
 			character.change_gender(MALE)
 
+	character.change_eye_color(r_eyes, g_eyes, b_eyes)
+
 	character.dna.ready_dna(character, flatten_SE = 0)
 	character.sync_organ_dna(assimilate=1)
 	character.UpdateAppearance()
@@ -2014,7 +2005,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		name = null
 
 	dat += "<hr>"
-	dat += "<a href='byond://?src=\ref[user];preference=close_load_dialog'>Close</a><br>"
+	dat += "<a href='byond://?src=[user.UID()];preference=close_load_dialog'>Close</a><br>"
 	dat += "</center></tt>"
 //		user << browse(dat, "window=saves;size=300x390")
 	var/datum/browser/popup = new(user, "saves", "<div align='center'>Character Saves</div>", 300, 390)
@@ -2022,4 +2013,4 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	popup.open(0)
 
 /datum/preferences/proc/close_load_dialog(mob/user)
-	user << browse(null, "window=saves")
+	user << browse(null, "window=saves")

code/modules/client/preference/preferences_mysql.dm

@@ -64,7 +64,7 @@
 	// Might as well scrub out any malformed be_special list entries while we're here
 	for(var/role in be_special)
 		if(!(role in special_roles))
-			log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
+			log_runtime(EXCEPTION("[C.key] had a malformed role entry: '[role]'. Removing!"), src)
 			be_special -= role
 
 	var/DBQuery/query = dbcon.NewQuery({"UPDATE [format_table_name("player")]
@@ -73,7 +73,7 @@
 					UI_style='[UI_style]',
 					UI_style_color='[UI_style_color]',
 					UI_style_alpha='[UI_style_alpha]',
-					be_role='[list2params(sql_sanitize_text_list(be_special))]',
+					be_role='[sanitizeSQL(list2params(be_special))]',
 					default_slot='[default_slot]',
 					toggles='[toggles]',
 					sound='[sound]',
@@ -230,6 +230,15 @@
 		med_record = query.item[49]
 		sec_record = query.item[50]
 		gen_record = query.item[51]
+		// Apparently, the preceding vars weren't always encoded properly...
+		if(findtext(flavor_text, "<")) // ... so let's clumsily check for tags!
+			flavor_text = html_encode(flavor_text)
+		if(findtext(med_record, "<"))
+			med_record = html_encode(med_record)
+		if(findtext(sec_record, "<"))
+			sec_record = html_encode(sec_record)
+		if(findtext(gen_record, "<"))
+			gen_record = html_encode(gen_record)
 		disabilities = text2num(query.item[52])
 		player_alt_titles = params2list(query.item[53])
 		organ_data = params2list(query.item[54])
@@ -325,13 +334,13 @@
 	firstquery.Execute()
 	while(firstquery.NextRow())
 		if(text2num(firstquery.item[1]) == default_slot)
-			var/DBQuery/query = dbcon.NewQuery({"UPDATE [format_table_name("characters")] SET OOC_Notes='[sql_sanitize_text(metadata)]',
-												real_name='[sql_sanitize_text(real_name)]',
+			var/DBQuery/query = dbcon.NewQuery({"UPDATE [format_table_name("characters")] SET OOC_Notes='[sanitizeSQL(metadata)]',
+												real_name='[sanitizeSQL(real_name)]',
 												name_is_always_random='[be_random_name]',
 												gender='[gender]',
 												age='[age]',
-												species='[sql_sanitize_text(species)]',
-												language='[sql_sanitize_text(language)]',
+												species='[sanitizeSQL(species)]',
+												language='[sanitizeSQL(language)]',
 												hair_red='[r_hair]',
 												hair_green='[g_hair]',
 												hair_blue='[b_hair]',
@@ -348,10 +357,10 @@
 												head_accessory_red='[r_headacc]',
 												head_accessory_green='[g_headacc]',
 												head_accessory_blue='[b_headacc]',
-												hair_style_name='[sql_sanitize_text(h_style)]',
-												facial_style_name='[sql_sanitize_text(f_style)]',
-												marking_style_name='[sql_sanitize_text(m_style)]',
-												head_accessory_style_name='[sql_sanitize_text(ha_style)]',
+												hair_style_name='[sanitizeSQL(h_style)]',
+												facial_style_name='[sanitizeSQL(f_style)]',
+												marking_style_name='[sanitizeSQL(m_style)]',
+												head_accessory_style_name='[sanitizeSQL(ha_style)]',
 												eyes_red='[r_eyes]',
 												eyes_green='[g_eyes]',
 												eyes_blue='[b_eyes]',
@@ -372,10 +381,10 @@
 												job_karma_high='[job_karma_high]',
 												job_karma_med='[job_karma_med]',
 												job_karma_low='[job_karma_low]',
-												flavor_text='[sql_sanitize_text(html_decode(flavor_text))]',
-												med_record='[sql_sanitize_text(html_decode(med_record))]',
-												sec_record='[sql_sanitize_text(html_decode(sec_record))]',
-												gen_record='[sql_sanitize_text(html_decode(gen_record))]',
+												flavor_text='[sanitizeSQL(flavor_text)]',
+												med_record='[sanitizeSQL(med_record)]',
+												sec_record='[sanitizeSQL(sec_record)]',
+												gen_record='[sanitizeSQL(gen_record)]',
 												player_alt_titles='[playertitlelist]',
 												disabilities='[disabilities]',
 												organ_data='[organlist]',
@@ -404,7 +413,10 @@
 											skin_tone, skin_red, skin_green, skin_blue,
 											markings_red, markings_green, markings_blue,
 											head_accessory_red, head_accessory_green, head_accessory_blue,
-											hair_style_name, facial_style_name, marking_style_name, head_accessory_style_name,
+											hair_style_name,
+											facial_style_name,
+											marking_style_name,
+											head_accessory_style_name,
 											eyes_red, eyes_green, eyes_blue,
 											underwear, undershirt,
 											backbag, b_type, alternate_option,
@@ -412,20 +424,26 @@
 											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,
-											flavor_text, med_record, sec_record, gen_record,
+											flavor_text,
+											med_record,
+											sec_record,
+											gen_record,
 											player_alt_titles,
 											disabilities, organ_data, rlimb_data, nanotrasen_relation, speciesprefs,
 											socks, body_accessory, gear)
 
 					VALUES
-											('[C.ckey]', '[default_slot]', '[sql_sanitize_text(metadata)]', '[sql_sanitize_text(real_name)]', '[be_random_name]','[gender]',
-											'[age]', '[sql_sanitize_text(species)]', '[sql_sanitize_text(language)]',
+											('[C.ckey]', '[default_slot]', '[sanitizeSQL(metadata)]', '[sanitizeSQL(real_name)]', '[be_random_name]','[gender]',
+											'[age]', '[sanitizeSQL(species)]', '[sanitizeSQL(language)]',
 											'[r_hair]', '[g_hair]', '[b_hair]',
 											'[r_facial]', '[g_facial]', '[b_facial]',
 											'[s_tone]', '[r_skin]', '[g_skin]', '[b_skin]',
 											'[r_markings]', '[g_markings]', '[b_markings]',
 											'[r_headacc]', '[g_headacc]', '[b_headacc]',
-											'[sql_sanitize_text(h_style)]', '[sql_sanitize_text(f_style)]', '[sql_sanitize_text(m_style)]', '[sql_sanitize_text(ha_style)]',
+											'[sanitizeSQL(h_style)]',
+											'[sanitizeSQL(f_style)]',
+											'[sanitizeSQL(m_style)]',
+											'[sanitizeSQL(ha_style)]',
 											'[r_eyes]', '[g_eyes]', '[b_eyes]',
 											'[underwear]', '[undershirt]',
 											'[backbag]', '[b_type]', '[alternate_option]',
@@ -433,7 +451,10 @@
 											'[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]',
-											'[sql_sanitize_text(html_encode(flavor_text))]', '[sql_sanitize_text(html_encode(med_record))]', '[sql_sanitize_text(html_encode(sec_record))]', '[sql_sanitize_text(html_encode(gen_record))]',
+											'[sanitizeSQL(flavor_text)]',
+											'[sanitizeSQL(med_record)]',
+											'[sanitizeSQL(sec_record)]',
+											'[sanitizeSQL(gen_record)]',
 											'[playertitlelist]',
 											'[disabilities]', '[organlist]', '[rlimblist]', '[nanotrasen_relation]', '[speciesprefs]',
 											'[socks]', '[body_accessory]', '[gearlist]')

code/modules/client/preference/preferences_toggles.dm

@@ -194,20 +194,6 @@
 		to_chat(src, "You will no longer hear musical instruments.")
 	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/verb/toggle_media()
-	set name = "Hear/Silence Streaming"
-	set category = "Preferences"
-	set desc = "Toggle hearing streaming media (radios, jukeboxes, etc)"
-
-	prefs.sound ^= SOUND_STREAMING
-	prefs.save_preferences(src)
-	to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.")
-	if(!media) return
-	if(prefs.sound & SOUND_STREAMING)
-		media.update_music()
-	else
-		media.stop_music()
-
 /client/verb/setup_character()
 	set name = "Game Preferences"
 	set category = "Preferences"