cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from Tastyfish/master

Browse Source 
fixed derp on vote announcement for custom vote
This commit is contained in:
Albert Iordache
2011-12-31 02:55:46 -08:00
parent a16c53ce7a a561862ef0
commit 18e6242dc8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/vote.dm
+6 -2
View File
@@ -397,8 +397,12 @@
spawn(config.vote_period*10)
vote.endvote()
world << "\red<B>*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key].</B>"
world << "\red You have [vote.timetext(config.vote_period)] to vote."
if(vote.mode == 2)
world << "\red<B>*** A custom vote has been initiated by [M.key].</B>"
world << "\red You have [vote.timetext(config.vote_period)] to vote."
else
world << "\red<B>*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key].</B>"
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]")
code/modules/admin/verbs/custom_event.dm
+3
View File
@@ -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 << "<h1 class='alert'>Custom Event</h1>"