Conflict resolution.

code/modules/client/preference/preferences.dm

@@ -23,7 +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_ABDUCTOR = 30,
 )
 
@@ -1986,12 +1985,16 @@ 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
+	character.change_eye_color(r_eyes, g_eyes, b_eyes)
 
 	//Head-specific
 	var/obj/item/organ/external/head/H = character.get_organ("head")
+	var/obj/item/organ/internal/eyes/eyes_organ = character.get_int_organ(/obj/item/organ/internal/eyes)
+
+	eyes_organ.eye_colour[1] = r_eyes
+	eyes_organ.eye_colour[2] = g_eyes
+	eyes_organ.eye_colour[3] = b_eyes
+
 	H.r_hair = r_hair
 	H.g_hair = g_hair
 	H.b_hair = b_hair
@@ -2159,4 +2162,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_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"