Merge remote-tracking branch 'origin/master' into modular_computers

code/modules/client/client defines.dm

@@ -93,5 +93,9 @@
 
 	// Donator stuff.
 	var/donator_level = DONATOR_LEVEL_NONE
+	
+	// If set to true, this client can interact with atoms such as buttons and doors on top of regular machinery interaction
+	var/advanced_admin_interaction = FALSE
 
+	// Has the client been varedited by an admin?
 	var/var_edited = FALSE

code/modules/client/client procs.dm

@@ -111,6 +111,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Barber?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Barber",5)
 							return
 					if("2")
@@ -118,6 +120,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Brig Physician?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Brig Physician",5)
 							return
 					if("3")
@@ -125,6 +129,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Nanotrasen Representative?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Nanotrasen Representative",30)
 							return
 					if("5")
@@ -132,6 +138,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Blueshield?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Blueshield",30)
 							return
 					if("6")
@@ -139,6 +147,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Mechanic?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Mechanic",30)
 							return
 					if("7")
@@ -146,6 +156,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Magistrate?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Magistrate",45)
 							return
 					if("9")
@@ -153,6 +165,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Security Pod Pilot?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_job_unlock("Security Pod Pilot",30)
 							return
 			if(href_list["KarmaBuy2"])
@@ -163,6 +177,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Machine People?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Machine",15)
 							return
 					if("2")
@@ -170,6 +186,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Kidan?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Kidan",30)
 							return
 					if("3")
@@ -177,6 +195,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Grey?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Grey",30)
 							return
 					if("4")
@@ -184,6 +204,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Vox?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Vox",45)
 							return
 					if("5")
@@ -191,6 +213,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Slime People?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Slime People",45)
 							return
 					if("6")
@@ -198,6 +222,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Plasmaman?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Plasmaman",100)
 							return
 					if("7")
@@ -205,6 +231,8 @@
 							to_chat(usr, "You do not have enough karma!")
 							return
 						else
+							if(alert("Are you sure you want to unlock Drask?", "Confirmation", "No", "Yes") != "Yes")
+								return
 							DB_species_unlock("Drask",30)
 							return
 			if(href_list["KarmaRefund"])

code/modules/client/preference/preferences.dm

@@ -108,7 +108,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/underwear = "Nude"					//underwear type
 	var/undershirt = "Nude"					//undershirt type
 	var/socks = "Nude"					//socks type
-	var/backbag = 2						//backpack type
+	var/backbag = GBACKPACK				//backpack type
 	var/ha_style = "None"				//Head accessory style
 	var/r_headacc = 0					//Head accessory colour
 	var/g_headacc = 0					//Head accessory colour
@@ -414,7 +414,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "<b>Underwear:</b> <a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><BR>"
 			dat += "<b>Undershirt:</b> <a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
 			dat += "<b>Socks:</b> <a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
-			dat += "<b>Backpack Type:</b> <a href ='?_src_=prefs;preference=bag;task=input'>[backbaglist[backbag]]</a><br>"
+			dat += "<b>Backpack Type:</b> <a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><br>"
 
 			dat += "</td></tr></table>"
 
@@ -1240,7 +1240,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						g_skin = rand(0,255)
 						b_skin = rand(0,255)
 				if("bag")
-					backbag = rand(1,4)
+					backbag = pick(backbaglist)
 				/*if("skin_style")
 					h_style = random_skin_style(gender)*/
 				if("all")
@@ -1718,9 +1718,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						ooccolor = new_ooccolor
 
 				if("bag")
-					var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference")  as null|anything in backbaglist
+					var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in backbaglist
 					if(new_backbag)
-						backbag = backbaglist.Find(new_backbag)
+						backbag = new_backbag
 
 				if("nt_relation")
 					var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference")  as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
@@ -2150,8 +2150,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	if(body_accessory)
 		character.body_accessory = body_accessory_by_name["[body_accessory]"]
 
-	if(backbag > 4 || backbag < 1)
-		backbag = 1 //Same as above
 	character.backbag = backbag
 
 	//Debugging report to track down a bug, which randomly assigned the plural gender to people.

code/modules/client/preference/preferences_mysql.dm

@@ -224,7 +224,7 @@
 		b_eyes = text2num(query.item[35])
 		underwear = query.item[36]
 		undershirt = query.item[37]
-		backbag = text2num(query.item[38])
+		backbag = query.item[38]
 		b_type = query.item[39]
 
 
@@ -312,7 +312,7 @@
 	b_eyes			= sanitize_integer(b_eyes, 0, 255, initial(b_eyes))
 	underwear		= sanitize_text(underwear, initial(underwear))
 	undershirt		= sanitize_text(undershirt, initial(undershirt))
-	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
+	backbag			= sanitize_text(backbag, initial(backbag))
 	b_type			= sanitize_text(b_type, initial(b_type))
 
 	alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))