diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 69915279a8..c8336d85f2 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -165,7 +165,7 @@ datum/controller/vote proc/initiate_vote(var/vote_type, var/initiator_key) if(!mode) - if(started_time != null) + if(started_time != null && !check_rights(R_ADMIN)) var/next_allowed_time = (started_time + config.vote_delay) if(next_allowed_time > world.time) return 0 @@ -200,7 +200,13 @@ datum/controller/vote log_vote(text) world << "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote." - world << sound('weapons/smg_empty_alarm.ogg') + switch(vote_type) + if("crew_transfer") + world << sound('sound/voice/Serithi/Shuttlehere.ogg') + if("gamemode") + world << sound('sound/voice/Serithi/pretenddemoc.ogg') + if("custom") + world << sound('sound/voice/Serithi/weneedvote.ogg') if(mode == "gamemode" && going) going = 0 world << "Round start has been delayed." diff --git a/sound/voice/Serithi/Shuttlehere.ogg b/sound/voice/Serithi/Shuttlehere.ogg new file mode 100644 index 0000000000..095d0eb433 Binary files /dev/null and b/sound/voice/Serithi/Shuttlehere.ogg differ diff --git a/sound/voice/Serithi/pretenddemoc.ogg b/sound/voice/Serithi/pretenddemoc.ogg new file mode 100644 index 0000000000..2265aeae4c Binary files /dev/null and b/sound/voice/Serithi/pretenddemoc.ogg differ diff --git a/sound/voice/Serithi/weneedvote.ogg b/sound/voice/Serithi/weneedvote.ogg new file mode 100644 index 0000000000..4bc18b70a6 Binary files /dev/null and b/sound/voice/Serithi/weneedvote.ogg differ