Skip to content

Commit

Permalink
Swaps MOTD and TM load order in chatbox, nukes no admin event message (
Browse files Browse the repository at this point in the history
…#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:
  • Loading branch information
GrrrKitten committed Jul 6, 2024
1 parent a86f1c0 commit d15dc88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion code/datums/event_info_text.dm
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
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>")

0 comments on commit d15dc88

Please sign in to comment.