[Manual MIRROR] dmapi manual update port (#11138)

code/modules/client/client procs.dm

@@ -151,7 +151,10 @@
 			log_and_message_admins("[ckey] has registered their Discord ID. Their Discord snowflake ID is: [their_id]", src) //YW EDIT
 			admin_chat_message(message = "[ckey] has registered their Discord ID. Their Discord is: <@[their_id]>", color = "#4eff22") //YW EDIT
 			notes_add(ckey, "Discord ID: [their_id]")
-			world.VgsAddMemberRole(their_id)
+			var/port = CONFIG_GET(number/register_server_port)
+			if(port)
+				// Designed to be used with `tools/registration`
+				world.Export("http://127.0.0.1:[port]?member=[url_encode(json_encode(their_id))]")
 		else
 			to_chat(src, span_warning("There was an error registering your Discord ID in the database. Contact an administrator."))
 			log_and_message_admins("[ckey] failed to register their Discord ID. Their Discord snowflake ID is: [their_id]. Is the database connected?", src)
@@ -352,6 +355,8 @@
 			alert = TRUE
 		if(alert)
 			for(var/client/X in GLOB.admins)
+				if(!check_rights_for(X, R_HOLDER))
+					continue
 				if(X.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping))
 					X << 'sound/voice/bcriminal.ogg' //ChompEDIT - back to beepsky
 				window_flash(X)

code/modules/client/preferences.dm

@@ -402,8 +402,10 @@ var/list/preferences_datums = list()
 	if(tgui_alert(user, "Are you sure you want to override slot [slotnum], [choice]'s savedata?", "Confirm Override", list("No", "Yes")) == "Yes")
 		overwrite_character(slotnum)
 		sanitize_preferences()
-		save_character()
 		save_preferences()
+		save_character()
+		load_preferences(TRUE)
+		load_character()
 		attempt_vr(user.client?.prefs_vr,"load_vore","")
 		ShowChoices(user)
 

code/modules/client/preferences_tgui.dm

@@ -136,8 +136,8 @@
 	switch(action)
 		// Basic actions
 		if("load")
-			if(!IsGuestKey(usr.key))
-				open_load_dialog(usr)
+			if(!IsGuestKey(ui.user.key))
+				open_load_dialog(ui.user)
 			. = TRUE
 		if("save")
 			save_character()
@@ -146,22 +146,22 @@
 			VARSET_IN(src, saved_notification, FALSE, 1 SECONDS)
 			. = TRUE
 		if("reload")
-			load_preferences()
+			load_preferences(TRUE)
 			load_character()
 			attempt_vr(client.prefs_vr,"load_vore","") //VOREStation Edit
 			sanitize_preferences()
 			. = TRUE
 		if("resetslot")
-			if("Yes" != tgui_alert(usr, "This will reset the current slot. Continue?", "Reset current slot?", list("No", "Yes")))
+			if("Yes" != tgui_alert(ui.user, "This will reset the current slot. Continue?", "Reset current slot?", list("No", "Yes")))
 				return
-			if("Yes" != tgui_alert(usr, "Are you completely sure that you want to reset this character slot?", "Reset current slot?", list("No", "Yes")))
+			if("Yes" != tgui_alert(ui.user, "Are you completely sure that you want to reset this character slot?", "Reset current slot?", list("No", "Yes")))
 				return
 			reset_slot()
 			sanitize_preferences()
 			. = TRUE
 		if("copy")
-			if(!IsGuestKey(usr.key))
-				open_copy_dialog(usr)
+			if(!IsGuestKey(ui.user.key))
+				open_copy_dialog(ui.user)
 			. = TRUE
 		// More specific stuff
 		if("switch_category")
@@ -169,11 +169,11 @@
 			for(var/datum/category_group/player_setup_category/PS in player_setup.categories)
 				if(PS.name == new_category)
 					player_setup.selected_category = PS
-					update_tgui_static_data(usr, ui)
+					update_tgui_static_data(ui.user, ui)
 					break
 			. = TRUE
 		if("game_prefs")
-			usr.client.game_options()
+			ui.user.client.game_options()
 			. = TRUE
 		if("refresh_character_preview")
 			if(!COOLDOWN_FINISHED(src, ui_refresh_cooldown))
@@ -192,7 +192,7 @@
 	PMH.screen_loc = LAZYACCESS(preview_screen_locs, "PMH")
 
 /datum/preferences/tgui_close(mob/user)
-	save_character()
+	// save_character()
 	save_preferences()
 
 /datum/preferences/proc/create_character_profiles()

code/modules/client/verbs/ooc.dm

@@ -163,7 +163,7 @@
 	// Admins with RLOOC displayed who weren't already in
 	for(var/client/admin in GLOB.admins)
 		if(!(admin in receivers) && admin.prefs?.read_preference(/datum/preference/toggle/holder/show_rlooc))
-			if(check_rights_for(admin, R_ADMIN|R_SERVER)) //Stop rLOOC showing for retired staff //CHOMPEdit, admins should see LOOC
+			if(check_rights_for(admin, (R_SERVER|R_ADMIN))) //Stop rLOOC showing for retired staff
 				r_receivers |= admin
 
 	msg = GLOB.is_valid_url.Replace(msg,span_linkify("$1"))

code/modules/client/verbs/who.dm

@@ -1,3 +1,5 @@
+#define NO_ADMINS_ONLINE_MESSAGE "Adminhelps are also sent through TGS to services like Discord. If no admins are available in game, sending an adminhelp might still be noticed and responded to."
+
 /client/verb/who()
 	set name = "Who"
 	set category = "OOC.Resources"
@@ -58,6 +60,8 @@
 	set category = "Admin"
 	set name = "Staffwho"
 
+	var/header = GLOB.admins.len == 0 ? "No Admins Currently Online" : "Current Admins"
+
 	var/msg = ""
 	var/modmsg = ""
 	var/devmsg = ""
@@ -132,6 +136,8 @@
 	if(CONFIG_GET(flag/show_mentors))
 		msg += "\n" + span_bold(" Current Mentors ([num_mentors_online]):") + "\n" + mentormsg
 
-	msg += "\n" + span_info("Adminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond.")
+	msg += "\n" + span_info(NO_ADMINS_ONLINE_MESSAGE)
 
-	to_chat(src,span_filter_notice("[jointext(msg, "<br>")]"))
+	to_chat(src, fieldset_block(span_bold(header), span_filter_notice("[jointext(msg, "<br>")]"), "boxed_message"), type = MESSAGE_TYPE_INFO)
+
+#undef NO_ADMINS_ONLINE_MESSAGE