Fixes conflicts, conflicts.

code/modules/client/asset_cache.dm

@@ -46,10 +46,10 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 
 	client << browse_rsc(asset_cache[asset_name], asset_name)
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += asset_name
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 
 	client.sending |= asset_name
@@ -91,17 +91,17 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	var/list/unreceived = asset_list - (client.cache + client.sending)
 	if(!unreceived || !unreceived.len)
 		return 0
-	if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
+	if(unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
 		to_chat(client, "Sending Resources...")
 	for(var/asset in unreceived)
-		if (asset in asset_cache)
+		if(asset in asset_cache)
 			client << browse_rsc(asset_cache[asset], asset)
 
 	if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip.
-		if (client)
+		if(client)
 			client.cache += unreceived
 		return 1
-	if (!client)
+	if(!client)
 		return 0
 	client.sending |= unreceived
 	var/job = ++client.last_asset_job
@@ -129,9 +129,9 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 //The proc calls procs that sleep for long times.
 proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 	for(var/file in files)
-		if (!client)
+		if(!client)
 			break
-		if (register_asset)
+		if(register_asset)
 			register_asset(file,files[file])
 		send_asset(client,file)
 		sleep(-1) //queuing calls like this too quickly can cause issues in some client versions
@@ -159,7 +159,7 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 //get a assetdatum or make a new one
 /proc/get_asset_datum(var/type)
-	if (!(type in asset_datums))
+	if(!(type in asset_datums))
 		return new type()
 	return asset_datums[type]
 
@@ -240,14 +240,14 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 
 /datum/asset/nanoui/register()
 	// Crawl the directories to find files.
-	for (var/path in common_dirs)
+	for(var/path in common_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.
 				if(fexists(path + filename))
 					common[filename] = fcopy_rsc(path + filename)
 					register_asset(filename, common[filename])
-	for (var/path in uncommon_dirs)
+	for(var/path in uncommon_dirs)
 		var/list/filenames = flist(path)
 		for(var/filename in filenames)
 			if(copytext(filename, length(filename)) != "/") // Ignore directories.

code/modules/client/client procs.dm

@@ -210,7 +210,7 @@
 
 
 	switch(href_list["action"])
-		if ("openLink")
+		if("openLink")
 			src << link(href_list["link"])
 
 	..()	//redirect to hsrc.Topic()
@@ -321,8 +321,8 @@
 
 	log_client_to_db()
 
-	if (ckey in clientmessages)
-		for (var/message in clientmessages[ckey])
+	if(ckey in clientmessages)
+		for(var/message in clientmessages[ckey])
 			to_chat(src, message)
 		clientmessages.Remove(ckey)
 
@@ -362,7 +362,7 @@
 
 /client/proc/log_client_to_db()
 
-	if ( IsGuestKey(src.key) )
+	if( IsGuestKey(src.key) )
 		return
 
 	establish_db_connection()

code/modules/client/message.dm

@@ -2,8 +2,8 @@ var/list/clientmessages = list()
 
 proc/addclientmessage(var/ckey, var/message)
 	ckey = ckey(ckey)
-	if (!ckey || !message)
+	if(!ckey || !message)
 		return
-	if (!(ckey in clientmessages))
+	if(!(ckey in clientmessages))
 		clientmessages[ckey] = list()
 	clientmessages[ckey] += message

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