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

Fixes admins softlocking via Nar'Sie (#32320)

Browse Source 
* Fix softlock

* Update voting.js

* Update voting.dm

* tweak

* Update gameticker.dm

* Update communications.dm
This commit is contained in:
adacovsk
2022-04-14 04:16:58 -04:00
committed by GitHub
parent 9a66689519
commit d29f1d38f0
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,6 @@ var/global/datum/controller/vote/vote = new()
if(config.vote_no_dead && user.stat == DEAD && !user.client.holder)
return 0
if (isnum(vote) && (1>vote) || (vote > choices.len))
to_chat(user, "<span class='warning'>Illegal vote.</span>")
return 0
if(mode == "map")
if(!user.client.holder)

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

@@ -35,7 +35,7 @@ function update_mode(newMode, newQuestion, newTimeleft, vrestart, vmode, vmap, v
allow_mode = parseInt(vmode) || 0;
allow_restart = parseInt(vrestart) || 0;
toggle_map = parseInt(vmap) || 0;
toggle_vote_method = parseInt(vmethod) || 0;
toggle_vote_method = parseInt(vmethod) || 1;
time_left = parseInt(newTimeleft) || 0;
$("#vote_choices").append($("<div class='item'></div>").append($("<div class='itemLabel'></div>").html("Time Left")).append($("<div class='itemContent'></div>").html(displayBar(time_left, 0, 60, (time_left >= 50) ? 'good' : (time_left >= 25) ? 'average' : 'bad', '<center>' + time_left + '</center>'))));
$("#vote_choices").append($("<div class='item'></div>").append($("<div class='itemLabel'></div>").html("<br />Question")).append($("<div class='itemContentMedium'></div>").append($("<div class='statusDisplay'></div>").text(question))));