From d15dc8848720b256f6756e8082367a7dabe7e74e Mon Sep 17 00:00:00 2001
From: Grrr kitten <158611449+GrrrKitten@users.noreply.github.com>
Date: Sat, 6 Jul 2024 05:02:30 -0400
Subject: [PATCH] Swaps MOTD and TM load order in chatbox, nukes no admin event
 message (#6534)

# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

Removes the

![image](https://github.com/cmss13-devs/cmss13/assets/158611449/d0f5e2e1-1186-431a-a504-cd57579e4bfe)
message from showing up

Also swaps MOTD and TM message so people actually see the MOTD instead
of 10 TM's

# Explain why it's good for the game

pt 1) if there isnt a message set for admin events, you can easily
intuit that admins arent running an event or they didnt think it was
necessary

pt 2) people werent seeing the MOTD cause it would get pushed up by 10
tm's, meaning people weren't seeing potentially important info

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl:
ui: Swaps TM and MOTD order so that people actually see the MOTD
admin: Removes the message for when no event info is input
/:cl:
---
 code/datums/event_info_text.dm       | 1 -
 code/modules/mob/new_player/login.dm | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/datums/event_info_text.dm b/code/datums/event_info_text.dm
index 5336c5abed9d..21469ed379cd 100644
--- a/code/datums/event_info_text.dm
+++ b/code/datums/event_info_text.dm
@@ -15,7 +15,6 @@
 			return
 
 	if(msg == "")
-		to_chat(user, SPAN_WARNING("No [faction] custom event message has been found. Either no custom event is taking place, admin hasn't properly set this or deemed it unnecessary to be set."))
 		return
 
 	var/dat
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 4b25d7a2ae39..7ec4a7f2781c 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -32,7 +32,7 @@
 		var/author = lobby_authors[GLOB.displayed_lobby_art]
 		if(author != "Unknown")
 			to_chat(src, SPAN_ROUNDBODY("<hr>This round's lobby art is brought to you by [author]<hr>"))
-	if(GLOB.join_motd)
-		to_chat(src, "<div class=\"motd\">[GLOB.join_motd]</div>")
 	if(GLOB.current_tms)
 		to_chat(src, SPAN_BOLDANNOUNCE(GLOB.current_tms))
+	if(GLOB.join_motd)
+		to_chat(src, "<div class=\"motd\">[GLOB.join_motd]</div>")