From c654a3d8d8b48269398f2a2f297391b8bdd14ddb Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Fri, 30 Dec 2011 23:41:06 -0500 Subject: [PATCH 1/3] fixed derp on vote announcement for custom vote --- code/game/vote.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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]") From 2f6fc643533ef7b1ef7421be5b1527a54477b34c Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sat, 31 Dec 2011 00:35:44 -0500 Subject: [PATCH 2/3] admins cna see who set custom event now. --- code/modules/admin/verbs/custom_event.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index a0d6ecef102..3923666fa68 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -12,6 +12,8 @@ custom_event_msg = null return + log_admin("[usr.key] has changed the custom event text.") + custom_event_msg = input world << "

Custom Event

" From a561862ef006a3b9f85e4159c1b54055ffe37e26 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sat, 31 Dec 2011 01:51:06 -0500 Subject: [PATCH 3/3] and there too --- code/modules/admin/verbs/custom_event.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 3923666fa68..bab86aba450 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -10,6 +10,7 @@ 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.")