From dee0339b0feaa3beb350da97776c11311bcdaab7 Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Sat, 22 Jun 2024 13:07:41 -0400 Subject: [PATCH 1/3] nukes stupid event message --- code/datums/event_info_text.dm | 1 - 1 file changed, 1 deletion(-) 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 From 3bc504e3cd9fde9547e44e8e89e1a7d4a5524d5c Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Sat, 22 Jun 2024 13:07:55 -0400 Subject: [PATCH 2/3] swaps MOTD and TM message order --- code/game/world.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/world.dm b/code/game/world.dm index 350117eccf7b..3c61902f8ebe 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -44,8 +44,8 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) load_admins() jobban_loadbanfile() LoadBans() - load_motd() load_tm_message() + load_motd() populate_gear_list() initialize_global_regex() From 3cbf83849210387da99e32142f437b6a217e41c7 Mon Sep 17 00:00:00 2001 From: GrrrKitten Date: Sun, 23 Jun 2024 14:21:30 -0400 Subject: [PATCH 3/3] whoopsies, fixes MOTD thing --- code/game/world.dm | 2 +- code/modules/mob/new_player/login.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/world.dm b/code/game/world.dm index 3c61902f8ebe..350117eccf7b 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -44,8 +44,8 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt")) load_admins() jobban_loadbanfile() LoadBans() - load_tm_message() load_motd() + load_tm_message() populate_gear_list() initialize_global_regex() 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("
This round's lobby art is brought to you by [author]
")) - if(GLOB.join_motd) - to_chat(src, "
[GLOB.join_motd]
") if(GLOB.current_tms) to_chat(src, SPAN_BOLDANNOUNCE(GLOB.current_tms)) + if(GLOB.join_motd) + to_chat(src, "
[GLOB.join_motd]
")