Fixes conflicts, conflicts.

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

@@ -13,4 +13,8 @@
 
 /datum/gear/lipstick/red
 	display_name = "lipstick, red"
-	path = /obj/item/weapon/lipstick
+	path = /obj/item/weapon/lipstick
+
+/datum/gear/monocle
+	display_name = "monocle"
+	path = /obj/item/clothing/glasses/monocle

code/modules/client/preference/preferences.dm

@@ -526,7 +526,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 	//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
 	var/datum/job/lastJob
-	if (!job_master)		return
+	if(!job_master)		return
 	for(var/datum/job/job in job_master.occupations)
 
 		if(job.admin_only)
@@ -650,10 +650,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	return
 
 /datum/preferences/proc/SetJobPreferenceLevel(var/datum/job/job, var/level)
-	if (!job)
+	if(!job)
 		return 0
 
-	if (level == 1) // to high
+	if(level == 1) // to high
 		// remove any other job(s) set to high
 		job_support_med |= job_support_high
 		job_engsec_med |= job_engsec_high
@@ -664,59 +664,59 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		job_medsci_high = 0
 		job_karma_high = 0
 
-	if (job.department_flag == SUPPORT)
+	if(job.department_flag == SUPPORT)
 		job_support_low &= ~job.flag
 		job_support_med &= ~job.flag
 		job_support_high &= ~job.flag
 
 		switch(level)
-			if (1)
+			if(1)
 				job_support_high |= job.flag
-			if (2)
+			if(2)
 				job_support_med |= job.flag
-			if (3)
+			if(3)
 				job_support_low |= job.flag
 
 		return 1
-	else if (job.department_flag == ENGSEC)
+	else if(job.department_flag == ENGSEC)
 		job_engsec_low &= ~job.flag
 		job_engsec_med &= ~job.flag
 		job_engsec_high &= ~job.flag
 
 		switch(level)
-			if (1)
+			if(1)
 				job_engsec_high |= job.flag
-			if (2)
+			if(2)
 				job_engsec_med |= job.flag
-			if (3)
+			if(3)
 				job_engsec_low |= job.flag
 
 		return 1
-	else if (job.department_flag == MEDSCI)
+	else if(job.department_flag == MEDSCI)
 		job_medsci_low &= ~job.flag
 		job_medsci_med &= ~job.flag
 		job_medsci_high &= ~job.flag
 
 		switch(level)
-			if (1)
+			if(1)
 				job_medsci_high |= job.flag
-			if (2)
+			if(2)
 				job_medsci_med |= job.flag
-			if (3)
+			if(3)
 				job_medsci_low |= job.flag
 
 		return 1
-	else if (job.department_flag == KARMA)
+	else if(job.department_flag == KARMA)
 		job_karma_low &= ~job.flag
 		job_karma_med &= ~job.flag
 		job_karma_high &= ~job.flag
 
 		switch(level)
-			if (1)
+			if(1)
 				job_karma_high |= job.flag
-			if (2)
+			if(2)
 				job_karma_med |= job.flag
-			if (3)
+			if(3)
 				job_karma_low |= job.flag
 
 		return 1
@@ -731,7 +731,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		ShowChoices(user)
 		return
 
-	if (!isnum(desiredLvl))
+	if(!isnum(desiredLvl))
 		to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!")
 		ShowChoices(user)
 		return
@@ -991,9 +991,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				else
 					return 0
 				SetChoices(user)
-			if ("alt_title")
+			if("alt_title")
 				var/datum/job/job = locate(href_list["job"])
-				if (job)
+				if(job)
 					var/choices = list(job.title) + job.alt_titles
 					var/choice = input("Pick a title for [job.title].", "Character Generation", GetPlayerAltTitle(job)) as anything in choices | null
 					if(choice)
@@ -1149,7 +1149,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			switch(href_list["preference"])
 				if("name")
 					var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
-					if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
+					if(!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
 						var/new_name = reject_bad_name(raw_name)
 						if(new_name)
 							real_name = new_name
@@ -1817,7 +1817,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 					close_load_dialog(user)
 
 				if("tab")
-					if (href_list["tab"])
+					if(href_list["tab"])
 						current_tab = text2num(href_list["tab"])
 
 	ShowChoices(user)

code/modules/client/preference/preferences_mysql.dm

@@ -59,7 +59,7 @@
 /datum/preferences/proc/save_preferences(client/C)
 
 	// Might as well scrub out any malformed be_special list entries while we're here
-	for (var/role in be_special)
+	for(var/role in be_special)
 		if(!(role in special_roles))
 			log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
 			be_special -= role