Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag

code/modules/client/client procs.dm

@@ -251,14 +251,21 @@
 		'nano/css/icons.css',
 		'nano/templates/chem_dispenser.tmpl',
 		'nano/templates/cryo.tmpl',
+		'nano/templates/geoscanner.tmpl',
 		'nano/templates/dna_modifier.tmpl',
+		'nano/templates/telescience_console.tmpl',
+		'nano/templates/pda.tmpl',
+		'nano/templates/smes.tmpl',
+		'nano/templates/uplink.tmpl',
 		'nano/images/uiBackground.png',
 		'nano/images/uiIcons16.png',
 		'nano/images/uiIcons24.png',
+		'nano/images/uiBackground-Syndicate.png',
 		'nano/images/uiLinkPendingIcon.gif',
 		'nano/images/uiMaskBackground.png',
 		'nano/images/uiNoticeBackground.jpg',
 		'nano/images/uiTitleFluff.png',
+		'nano/images/uiTitleFluff-Syndicate.png',
 		'html/search.js',
 		'html/panels.css',
 		'icons/pda_icons/pda_atmos.png',
@@ -298,9 +305,5 @@
 		'icons/spideros_icons/sos_11.png',
 		'icons/spideros_icons/sos_12.png',
 		'icons/spideros_icons/sos_13.png',
-		'icons/spideros_icons/sos_14.png',
-		'icons/xenoarch_icons/chart1.jpg',
-		'icons/xenoarch_icons/chart2.jpg',
-		'icons/xenoarch_icons/chart3.jpg',
-		'icons/xenoarch_icons/chart4.jpg'
+		'icons/spideros_icons/sos_14.png'
 		)

code/modules/client/preferences.dm

@@ -44,6 +44,8 @@ datum/preferences
 	var/be_special = 0					//Special role selection
 	var/UI_style = "Midnight"
 	var/toggles = TOGGLES_DEFAULT
+	var/UI_style_color = "#ffffff"
+	var/UI_style_alpha = 255
 
 	//character preferences
 	var/real_name						//our character's name
@@ -243,10 +245,14 @@ datum/preferences
 
 		dat += "<br>"
 		dat += "<b>UI Style:</b> <a href='?_src_=prefs;preference=ui'><b>[UI_style]</b></a><br>"
+		dat += "<b>Custom UI</b>(recommended for White UI):<br>"
+		dat += "-Color: <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 += "-Alpha(transparence): <a href='?_src_=prefs;preference=UIalpha'><b>[UI_style_alpha]</b></a><br>"
 		dat += "<b>Play admin midis:</b> <a href='?_src_=prefs;preference=hear_midis'><b>[(toggles & SOUND_MIDI) ? "Yes" : "No"]</b></a><br>"
 		dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'><b>[(toggles & SOUND_LOBBY) ? "Yes" : "No"]</b></a><br>"
 		dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
 		dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
+		dat += "<b>Ghost radio:</b> <a href='?_src_=prefs;preference=ghost_radio'><b>[(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]</b></a><br>"
 
 		if(config.allow_Metadata)
 			dat += "<b>OOC Notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'> Edit </a><br>"
@@ -264,6 +270,7 @@ datum/preferences
 		//dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
 		dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
 		dat += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust</a><br>"
+		dat += "Internal Organs: <a href='byond://?src=\ref[user];preference=organs;task=input'>Adjust</a><br>"
 
 		//display limbs below
 		var/ind = 0
@@ -288,6 +295,10 @@ datum/preferences
 					organ_name = "left hand"
 				if("r_hand")
 					organ_name = "right hand"
+				if("heart")
+					organ_name = "heart"
+				if("eyes")
+					organ_name = "eyes"
 
 			if(status == "cyborg")
 				++ind
@@ -299,6 +310,24 @@ datum/preferences
 				if(ind > 1)
 					dat += ", "
 				dat += "\tAmputated [organ_name]"
+			else if(status == "mechanical")
+				++ind
+				if(ind > 1)
+					dat += ", "
+				dat += "\tMechanical [organ_name]"
+			else if(status == "assisted")
+				++ind
+				if(ind > 1)
+					dat += ", "
+				switch(organ_name)
+					if("heart")
+						dat += "\tPacemaker-assisted [organ_name]"
+					if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
+						dat += "\tSurgically altered [organ_name]"
+					if("eyes")
+						dat += "\tRetinal overlayed [organ_name]"
+					else
+						dat += "\tMechanically assisted [organ_name]"
 		if(!ind)
 			dat += "\[...\]<br><br>"
 		else
@@ -1087,6 +1116,28 @@ datum/preferences
 								if(second_limb)
 									organ_data[second_limb] = "cyborg"
 
+					if("organs")
+						var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
+						if(!organ_name) return
+
+						var/organ = null
+						switch(organ_name)
+							if("Heart")
+								organ = "heart"
+							if("Eyes")
+								organ = "eyes"
+
+						var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal","Assisted","Mechanical")
+						if(!new_state) return
+
+						switch(new_state)
+							if("Normal")
+								organ_data[organ] = null
+							if("Assisted")
+								organ_data[organ] = "assisted"
+							if("Mechanical")
+								organ_data[organ] = "mechanical"
+
 					if("skin_style")
 						var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
 						if(!skin_style_name) return
@@ -1111,9 +1162,21 @@ datum/preferences
 								UI_style = "Orange"
 							if("Orange")
 								UI_style = "old"
+							if("old")
+								UI_style = "White"
 							else
 								UI_style = "Midnight"
 
+					if("UIcolor")
+						var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!") as color|null
+						if(!UI_style_color_new) return
+						UI_style_color = UI_style_color_new
+
+					if("UIalpha")
+						var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
+						if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+						UI_style_alpha = UI_style_alpha_new
+
 					if("be_special")
 						var/num = text2num(href_list["num"])
 						be_special ^= (1<<num)
@@ -1137,6 +1200,9 @@ datum/preferences
 					if("ghost_sight")
 						toggles ^= CHAT_GHOSTSIGHT
 
+					if("ghost_radio")
+						toggles ^= CHAT_GHOSTRADIO
+
 					if("save")
 						save_preferences()
 						save_character()
@@ -1206,19 +1272,27 @@ datum/preferences
 		character.skills = skills
 
 		// Destroy/cyborgize organs
+
 		for(var/name in organ_data)
 			var/datum/organ/external/O = character.organs_by_name[name]
-			if(!O) continue
-
+			var/datum/organ/internal/I = character.internal_organs_by_name[name]
 			var/status = organ_data[name]
+
 			if(status == "amputated")
 				O.amputated = 1
 				O.status |= ORGAN_DESTROYED
 				O.destspawn = 1
-			else if(status == "cyborg")
+			if(status == "cyborg")
 				O.status |= ORGAN_ROBOT
+			if(status == "assisted")
+				I.mechassist()
+			else if(status == "mechanical")
+				I.mechanize()
+
+			else continue
+
 		if(underwear > underwear_m.len || underwear < 1)
-			underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me.
+			underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES
 		character.underwear = underwear
 
 		if(backbag > 4 || backbag < 1)

code/modules/client/preferences_savefile.dm

@@ -1,5 +1,5 @@
 #define SAVEFILE_VERSION_MIN	8
-#define SAVEFILE_VERSION_MAX	10
+#define SAVEFILE_VERSION_MAX	11
 
 //handles converting savefiles to new formats
 //MAKE SURE YOU KEEP THIS UP TO DATE!
@@ -54,14 +54,18 @@
 	S["be_special"]			>> be_special
 	S["default_slot"]		>> default_slot
 	S["toggles"]			>> toggles
+	S["UI_style_color"]		>> UI_style_color
+	S["UI_style_alpha"]		>> UI_style_alpha
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
 	lastchangelog	= sanitize_text(lastchangelog, initial(lastchangelog))
-	UI_style		= sanitize_inlist(UI_style, list("Midnight","Orange","old"), initial(UI_style))
+	UI_style		= sanitize_inlist(UI_style, list("White", "Midnight","Orange","old"), initial(UI_style))
 	be_special		= sanitize_integer(be_special, 0, 65535, initial(be_special))
 	default_slot	= sanitize_integer(default_slot, 1, MAX_SAVE_SLOTS, initial(default_slot))
 	toggles			= sanitize_integer(toggles, 0, 65535, initial(toggles))
+	UI_style_color	= sanitize_hexcolor(UI_style_color, initial(UI_style_color))
+	UI_style_alpha	= sanitize_integer(UI_style_alpha, 0, 255, initial(UI_style_alpha))
 
 	return 1
 
@@ -80,6 +84,8 @@
 	S["be_special"]			<< be_special
 	S["default_slot"]		<< default_slot
 	S["toggles"]			<< toggles
+	S["UI_style_color"]		<< UI_style_color
+	S["UI_style_alpha"]		<< UI_style_alpha
 
 	return 1
 

code/modules/client/preferences_toggles.dm

@@ -17,14 +17,23 @@
 	prefs.save_preferences()
 	feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/verb/toggle_ghost_radio()
+	set name = "Enable/Disable GhostRadio"
+	set category = "Preferences"
+	set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers"
+	prefs.toggles ^= CHAT_GHOSTRADIO
+	src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]."
+	prefs.save_preferences()
+	feedback_add_details("admin_verb","TGR")
+	
 /client/proc/toggle_hear_radio()
 	set name = "Show/Hide RadioChatter"
 	set category = "Preferences"
-	set desc = "Toggle seeing radiochatter from nearby radios and speakers"
+	set desc = "Toggle seeing radiochatter from radios and speakers"
 	if(!holder) return
 	prefs.toggles ^= CHAT_RADIO
 	prefs.save_preferences()
-	usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from nearby radios or speakers"
+	usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers"
 	feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/toggleadminhelpsound()
@@ -107,10 +116,12 @@
 	set desc = "Toggles seeing Local OutOfCharacter chat"
 	prefs.toggles ^= CHAT_LOOC
 	prefs.save_preferences()
+
 	src << "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel."
 	feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
+
 /client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
 	set name = "Hear/Silence Ambience"
 	set category = "Preferences"
@@ -135,4 +146,42 @@
 	prefs.be_special ^= role_flag
 	prefs.save_preferences()
 	src << "You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible)."
-	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+
+/client/verb/change_ui()
+	set name = "Change UI"
+	set category = "Preferences"
+	set desc = "Configure your user interface"
+
+	if(!ishuman(usr))
+		usr << "This only for human"
+		return
+
+	var/UI_style_new = input(usr, "Select a style, we recommend White for customization") in list("White", "Midnight", "Orange", "old")
+	if(!UI_style_new) return
+
+	var/UI_style_alpha_new = input(usr, "Select a new alpha(transparence) parametr for UI, between 50 and 255") as num
+	if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+
+	var/UI_style_color_new = input(usr, "Choose your UI color, dark colors are not recommended!") as color|null
+	if(!UI_style_color_new) return
+
+	//update UI
+	var/list/icons = usr.hud_used.adding + usr.hud_used.other +usr.hud_used.hotkeybuttons
+	icons.Add(usr.zone_sel)
+
+	for(var/obj/screen/I in icons)
+		if(I.color && I.alpha)
+			I.icon = ui_style2icon(UI_style_new)
+			I.color = UI_style_color_new
+			I.alpha = UI_style_alpha_new
+
+
+
+	if(alert("Like it? Save changes?",,"Yes", "No") == "Yes")
+		prefs.UI_style = UI_style_new
+		prefs.UI_style_alpha = UI_style_alpha_new
+		prefs.UI_style_color = UI_style_color_new
+		prefs.save_preferences()
+		usr << "UI was saved"