Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swaps MOTD and TM load order in chatbox, nukes no admin event message #6534

Merged
merged 3 commits into from
Jul 6, 2024
Merged

Swaps MOTD and TM load order in chatbox, nukes no admin event message #6534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dee0339
nukes stupid event message
GrrrKitten Jun 22, 2024
3bc504e
swaps MOTD and TM message order
GrrrKitten Jun 22, 2024
3cbf838
whoopsies, fixes MOTD thing
GrrrKitten Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/datums/event_info_text.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/new_player/login.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>")
Loading