From 0dea21f88e1d88a99c7d6eebb1968ba4ba1731fb Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Sat, 17 Jan 2026 17:58:14 -0700
Subject: [PATCH] [MIRROR] reorder some messages (#12284)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 code/modules/client/client procs.dm  | 12 ------------
 code/modules/mob/login.dm            |  5 +++++
 code/modules/mob/new_player/login.dm | 11 +++++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 195e9e95a2..8799a96074 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -358,12 +358,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	connection_realtime = world.realtime
 	connection_timeofday = world.timeofday
 
-	if(GLOB.custom_event_msg && GLOB.custom_event_msg != "")
-		to_chat(src, "<h1 class='alert'>Custom Event</h1>")
-		to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
-		to_chat(src, span_alert("[GLOB.custom_event_msg]"))
-		to_chat(src, "<br>")
-
 	if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
 		to_chat(src, span_warning("Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you."))
 
@@ -382,12 +376,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		void = new()
 	screen += void
 
-	if((prefs?.read_preference(/datum/preference/text/lastchangelog) != GLOB.changelog_hash) && isnewplayer(src.mob)) //bolds the changelog button on the interface so we know there are updates.
-		to_chat(src, span_info("You have unread updates in the changelog."))
-		winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
-		if(CONFIG_GET(flag/aggressive_changelog))
-			src.changes()
-
 	if(CONFIG_GET(flag/paranoia_logging))
 		var/alert = FALSE //VOREStation Edit start.
 		if(isnum(player_age) && player_age == 0)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 215d9b6689..53dd246dec 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -103,3 +103,8 @@
 
 	set_listening(LISTENING_PLAYER)
 	GLOB.tickets.ClientLogin(client, TRUE)
+
+	if(GLOB.custom_event_msg && GLOB.custom_event_msg != "")
+		to_chat(src, "<h1 class='alert'>Custom Event</h1>")
+		to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
+		to_chat(src, span_alert("[GLOB.custom_event_msg]") + "\n")
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index f3fc3e0a3d..0c1ac5d060 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -32,6 +32,17 @@
 
 		if(has_respawned)
 			to_chat(src, CONFIG_GET(string/respawn_message))
+
+		if((read_preference(/datum/preference/text/lastchangelog) != GLOB.changelog_hash)) //bolds the changelog button on the interface so we know there are updates.
+			to_chat(src, span_info("You have unread updates in the changelog."))
+			if(CONFIG_GET(flag/aggressive_changelog))
+				client.changes()
+
+		if(GLOB.custom_event_msg && GLOB.custom_event_msg != "")
+			to_chat(src, "<h1 class='alert'>Custom Event</h1>")
+			to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
+			to_chat(src, span_alert("[GLOB.custom_event_msg]") + "\n")
+
 		has_respawned = FALSE
 		handle_privacy_poll()
 		client.playtitlemusic()