cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voting cancelling clarification (#31556)

Browse Source 
* Voting cancelling clarification

* logs

* Update voting.dm
This commit is contained in:
ShiftyRail
2021-12-08 22:26:06 +00:00
committed by GitHub
parent e232a27767
commit 65ff225083
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/html_interface/voting/voting.dm
View File

@@ -467,6 +467,10 @@ var/global/datum/controller/vote/vote = new()
return 0
if("cancel")
if(usr.client.holder)
if(alert("Are you sure you want to cancel this vote? This will not display the results, and for a map vote, re-use the current map.","Confirm","Yes","No") != "Yes")
return
log_admin("[key_name(usr)] has cancelled a vote currently taking place. Vote type: [mode], question, [question].")
message_admins("[key_name(usr)] has cancelled a vote currently taking place. Vote type: [mode], question, [question].")
reset()
update()
currently_voting = FALSE

2
code/modules/html_interface/voting/voting.js
View File

@@ -13,7 +13,7 @@ function clearAll(){
clearallup += 1;
$("#vote_main").empty();
$("#vote_choices").empty();
$("#vote_admin").html("<br />(<a href='?src="+hSrc+";vote=cancel;'>Cancel Vote</a>)");
$("#vote_admin").html("<br />(<a href='?src="+hSrc+";vote=cancel;'>Abort the current vote.</a>)");
}