diff --git a/code/game/vote.dm b/code/game/vote.dm index 7741f2c1828..e38fc77c19e 100644 --- a/code/game/vote.dm +++ b/code/game/vote.dm @@ -397,8 +397,12 @@ spawn(config.vote_period*10) vote.endvote() - world << "\red*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key]." - world << "\red You have [vote.timetext(config.vote_period)] to vote." + if(vote.mode == 2) + world << "\red*** A custom vote has been initiated by [M.key]." + world << "\red You have [vote.timetext(config.vote_period)] to vote." + else + world << "\red*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key]." + world << "\red You have [vote.timetext(config.vote_period)] to vote." log_vote("Voting to [vote.mode ? "change mode" : "restart round"] started by [M.name]/[M.key]") diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index a0d6ecef102..bab86aba450 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -10,8 +10,11 @@ var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null if(!input || input == "") custom_event_msg = null + log_admin("[usr.key] has cleared the custom event text.") return + log_admin("[usr.key] has changed the custom event text.") + custom_event_msg = input world << "

Custom Event

"