Merge branch 'master' into upstream-merge-30056

code/modules/client/client_procs.dm

@@ -361,35 +361,34 @@ GLOBAL_LIST(external_rsc_urls)
 		holder.owner = null
 		GLOB.admins -= src
 		if (!GLOB.admins.len && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
-			if(!GLOB.admins.len) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
-				var/cheesy_message = pick(
-					"I have no admins online!",\
-					"I'm all alone... :(",\
-					"I'm feeling lonely. :(",\
-					"I'm so lonely. :(",\
-					"Why does nobody love me? :(",\
-					"I want a man. :(",\
-					"Where has everyone gone?",\
-					"I need a hug. :(",\
-					"Someone come hold me. :(",\
-					"I need someone on me :(",\
-					"What happened? Where has everyone gone?",\
-					"My nipples are so stiff, but Zelda ain't here. :(",\
-					"Leon senpai, play more Spessmans. :(",\
-					"If only Serdy were here...",\
-					"Panic bunker can't keep my love for you out.",\
-					"Cebu needs to Awoo herself back into my heart.",\
-					"I don't even have a Turry to snuggle viciously here.",\
-					"MOM, WHERE ARE YOU??? D:",\
-					"It's a beautiful day outside. Birds are singing, flowers are blooming. On days like this...kids like you...SHOULD BE BURNING IN HELL.",\
-					"Sometimes when I have sex, I think about putting an entire peanut butter and jelly sandwich in the VCR.",\
-					"Oh good, no-one around to watch me lick Goofball's nipples. :D",\
-					"I've replaced Beepsky with a fidget spinner, glory be autism abuse.",\
-					"i shure hop dere are no PRED arund!!!!",\
-					"NO PRED CAN eVER CATCH MI"\
-					)
+			var/cheesy_message = pick(
+				"I have no admins online!",\
+				"I'm all alone... :(",\
+				"I'm feeling lonely. :(",\
+				"I'm so lonely. :(",\
+				"Why does nobody love me? :(",\
+				"I want a man. :(",\
+				"Where has everyone gone?",\
+				"I need a hug. :(",\
+				"Someone come hold me. :(",\
+				"I need someone on me :(",\
+				"What happened? Where has everyone gone?",\
+				"My nipples are so stiff, but Zelda ain't here. :(",\
+				"Leon senpai, play more Spessmans. :(",\
+				"If only Serdy were here...",\
+				"Panic bunker can't keep my love for you out.",\
+				"Cebu needs to Awoo herself back into my heart.",\
+				"I don't even have a Turry to snuggle viciously here.",\
+				"MOM, WHERE ARE YOU??? D:",\
+				"It's a beautiful day outside. Birds are singing, flowers are blooming. On days like this...kids like you...SHOULD BE BURNING IN HELL.",\
+				"Sometimes when I have sex, I think about putting an entire peanut butter and jelly sandwich in the VCR.",\
+				"Oh good, no-one around to watch me lick Goofball's nipples. :D",\
+				"I've replaced Beepsky with a fidget spinner, glory be autism abuse.",\
+				"i shure hop dere are no PRED arund!!!!",\
+				"NO PRED CAN eVER CATCH MI"\
+				)
 
-				send2irc("Server", "[cheesy_message] (No admins online)")
+			send2irc("Server", "[cheesy_message] (No admins online)")
 
 	GLOB.ahelp_tickets.ClientLogout(src)
 	GLOB.directory -= ckey
@@ -447,7 +446,7 @@ GLOBAL_LIST(external_rsc_urls)
 
 		new_player = 1
 		account_join_date = sanitizeSQL(findJoinDate())
-		var/datum/DBQuery/query_add_player = SSdbcore.NewQuery("INSERT INTO [format_table_name("player")] (`ckey`, `firstseen`, `lastseen`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`) VALUES ('[sql_ckey]', Now(), Now(), INET_ATON('[sql_ip]'), '[sql_computerid]', '[sql_admin_rank]', [account_join_date ? "'[account_join_date]'" : "NULL"])")
+		var/datum/DBQuery/query_add_player = SSdbcore.NewQuery("INSERT INTO [format_table_name("player")] (`ckey`, `firstseen`, `firstseen_round_id`, `lastseen`, `lastseen_round_id`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`) VALUES ('[sql_ckey]', Now(), '[GLOB.round_id]', Now(), '[GLOB.round_id]', INET_ATON('[sql_ip]'), '[sql_computerid]', '[sql_admin_rank]', [account_join_date ? "'[account_join_date]'" : "NULL"])")
 		if(!query_add_player.Execute())
 			return
 		if(!account_join_date)
@@ -473,12 +472,12 @@ GLOBAL_LIST(external_rsc_urls)
 					if(query_datediff.NextRow())
 						account_age = text2num(query_datediff.item[1])
 	if(!new_player)
-		var/datum/DBQuery/query_log_player = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET lastseen = Now(), ip = INET_ATON('[sql_ip]'), computerid = '[sql_computerid]', lastadminrank = '[sql_admin_rank]', accountjoindate = [account_join_date ? "'[account_join_date]'" : "NULL"] WHERE ckey = '[sql_ckey]'")
+		var/datum/DBQuery/query_log_player = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET lastseen = Now(), lastseen_round_id = '[GLOB.round_id]', ip = INET_ATON('[sql_ip]'), computerid = '[sql_computerid]', lastadminrank = '[sql_admin_rank]', accountjoindate = [account_join_date ? "'[account_join_date]'" : "NULL"] WHERE ckey = '[sql_ckey]'")
 		if(!query_log_player.Execute())
 			return
 	if(!account_join_date)
 		account_join_date = "Error"
-	var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')),'[world.port]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')")
+	var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`round_id`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')),'[world.port]','[GLOB.round_id]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')")
 	query_log_connection.Execute()
 	if(new_player)
 		player_age = -1
@@ -578,13 +577,13 @@ GLOBAL_LIST(external_rsc_urls)
 	var/const/adminckey = "CID-Error"
 	var/sql_ckey = sanitizeSQL(ckey)
 	//check to see if we noted them in the last day.
-	var/datum/DBQuery/query_get_notes = SSdbcore.NewQuery("SELECT id FROM [format_table_name("messages")] WHERE type = 'note' AND targetckey = '[sql_ckey]' AND adminckey = '[adminckey]' AND timestamp + INTERVAL 1 DAY < NOW()")
+	var/datum/DBQuery/query_get_notes = SSdbcore.NewQuery("SELECT id FROM [format_table_name("messages")] WHERE type = 'note' AND targetckey = '[sql_ckey]' AND adminckey = '[adminckey]' AND timestamp + INTERVAL 1 DAY < NOW() AND deleted = 0")
 	if(!query_get_notes.Execute())
 		return
 	if(query_get_notes.NextRow())
 		return
 	//regardless of above, make sure their last note is not from us, as no point in repeating the same note over and over.
-	query_get_notes = SSdbcore.NewQuery("SELECT adminckey FROM [format_table_name("messages")] WHERE targetckey = '[sql_ckey]' ORDER BY timestamp DESC LIMIT 1")
+	query_get_notes = SSdbcore.NewQuery("SELECT adminckey FROM [format_table_name("messages")] WHERE targetckey = '[sql_ckey]' AND deleted = 0 ORDER BY timestamp DESC LIMIT 1")
 	if(!query_get_notes.Execute())
 		return
 	if(query_get_notes.NextRow())

code/modules/client/preferences.dm.rej

@@ -0,0 +1,14 @@
+diff a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm	(rejected hunks)
+@@ -130,12 +130,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
+ 	menuoptions = list()
+ 	return
+ 
+-/datum/preferences/vv_edit_var(var_name, var_value)
+-	var/static/list/banned_edits = list("exp")
+-	if(var_name in banned_edits)
+-		return FALSE
+-	return ..()
+-
+ /datum/preferences/proc/ShowChoices(mob/user)
+ 	if(!user || !user.client)
+ 		return

code/modules/client/preferences_toggles.dm

@@ -144,6 +144,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglemidis)()
 	else
 		to_chat(usr, "You will no longer hear sounds uploaded by admins")
 		usr.stop_sound_channel(CHANNEL_ADMIN)
+		var/client/C = usr.client
+		if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded)
+			C.chatOutput.sendMusic(" ")
 	SSblackbox.add_details("preferences_verb","Toggle Hearing Midis|[usr.client.prefs.toggles & SOUND_MIDI]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 /datum/verbs/menu/Settings/Sound/togglemidis/Get_checked(client/C)
 	return C.prefs.toggles & SOUND_MIDI
@@ -230,6 +233,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleprayersounds)()
 	set category = "Preferences"
 	set desc = "Stop Current Sounds"
 	SEND_SOUND(usr, sound(null))
+	var/client/C = usr.client
+	if(C && C.chatOutput && !C.chatOutput.broken && C.chatOutput.loaded)
+		C.chatOutput.sendMusic(" ")
 	SSblackbox.add_details("preferences_verb","Stop Self Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 

code/modules/client/verbs/ooc.dm

@@ -234,7 +234,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
 		to_chat(usr, "<span class='notice'>Sorry, that function is not enabled on this server.</span>")
 		return
 
-	browse_messages(null, usr.ckey, null, 1)
+	browse_messages(null, usr.ckey, null, TRUE)
 
 /client/proc/ignore_key(client)
 	var/client/C = client