Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/modules/client/preferences.dm

@@ -80,6 +80,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/ooccolor = "#b82e00"
 	var/be_special = list()				//Special role selection
 	var/UI_style = "Midnight"
+	var/nanoui_fancy = TRUE
 	var/toggles = TOGGLES_DEFAULT
 	var/sound = SOUND_DEFAULT
 	var/UI_style_color = "#ffffff"
@@ -389,6 +390,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<h2>General Settings</h2>"
 			dat += "<b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
+			dat += "<b>Fancy NanoUI:</b> <a href='?_src_=prefs;preference=nanoui'>[(nanoui_fancy) ? "Yes" : "No"]</a><br>"
 			dat += "<b>Custom UI settings:</b><br>"
 			dat += "<b>Color:</b> <a href='?_src_=prefs;preference=UIcolor'><b>[UI_style_color]</b></a> <table style='display:inline;' bgcolor='[UI_style_color]'><tr><td>__</td></tr></table><br>"
 			dat += "<b>Alpha (transparency):</b> <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
@@ -1488,6 +1490,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						else
 							UI_style = "Midnight"
 
+				if("nanoui")
+					nanoui_fancy = !nanoui_fancy
+
 				if("UIcolor")
 					var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null
 					if(!UI_style_color_new) return
@@ -1566,6 +1571,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	return 1
 
 /datum/preferences/proc/copy_to(mob/living/carbon/human/character)
+	character.change_species(species) // Yell at me if this causes everything to melt
 	if(be_random_name)
 		real_name = random_name(gender,species)
 
@@ -1641,7 +1647,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				else if(status == "mechanical")
 					I.robotize()
 
-	if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)//character.species.flags & CAN_BE_FAT)
+	if(disabilities & DISABILITY_FLAG_FAT && character.species.flags & CAN_BE_FAT)
 		character.mutations += FAT
 		character.mutations += OBESITY
 	if(disabilities & DISABILITY_FLAG_NEARSIGHTED)

code/modules/client/preferences_mysql.dm

@@ -10,7 +10,8 @@
 					toggles,
 					sound,
 					randomslot,
-					volume
+					volume,
+					nanoui_fancy
 					FROM [format_table_name("player")]
 					WHERE ckey='[C.ckey]'"}
 					)
@@ -34,6 +35,7 @@
 		sound = text2num(query.item[8])
 		randomslot = text2num(query.item[9])
 		volume = text2num(query.item[10])
+		nanoui_fancy = text2num(query.item[11])
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -46,6 +48,7 @@
 	UI_style_alpha	= sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha))
 	randomslot		= sanitize_integer(randomslot, 0, 1, initial(randomslot))
 	volume			= sanitize_integer(volume, 0, 100, initial(volume))
+	nanoui_fancy	= sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
 	return 1
 
 /datum/preferences/proc/save_preferences(client/C)
@@ -67,7 +70,8 @@
 					toggles='[toggles]',
 					sound='[sound]',
 					randomslot='[randomslot]',
-					volume='[volume]'
+					volume='[volume]',
+					nanoui_fancy='[nanoui_fancy]'
 					WHERE ckey='[C.ckey]'"}
 					)