From 1fc7ba386b1e761b7c6c3548f087c7096c87cf5c Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 15 Mar 2025 20:48:19 -0700 Subject: [PATCH] [MIRROR] fix admin vote verb (#10437) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/vote/vote_verb.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/vote/vote_verb.dm b/code/modules/vote/vote_verb.dm index 6e18b9f89d..0df6b46add 100644 --- a/code/modules/vote/vote_verb.dm +++ b/code/modules/vote/vote_verb.dm @@ -5,18 +5,18 @@ if(SSvote.active_vote) SSvote.active_vote.tgui_interact(usr) else - to_chat(usr, span_warning("There is no active vote")) + to_chat(src, span_warning("There is no active vote")) /client/proc/start_vote() set category = "Admin.Game" // CHOMPEdit set name = "Start Vote" set desc = "Start a vote on the server" - if(!is_admin()) + if(!is_admin(usr)) return if(SSvote.active_vote) - to_chat(usr, span_warning("A vote is already in progress")) + to_chat(src, span_warning("A vote is already in progress")) return var/vote_types = subtypesof(/datum/vote) @@ -26,7 +26,7 @@ for(var/vtype in vote_types) votemap["[vtype]"] = vtype - var/choice = tgui_input_list(usr, "Select a vote type", "Vote", vote_types) + var/choice = tgui_input_list(src, "Select a vote type", "Vote", vote_types) if(choice == null) return @@ -36,19 +36,19 @@ SSvote.start_vote(new votetype(usr.ckey)) return - var/question = tgui_input_text(usr, "What is the vote for?", "Create Vote", encode = FALSE) + var/question = tgui_input_text(src, "What is the vote for?", "Create Vote", encode = FALSE) if(isnull(question)) return var/list/choices = list() for(var/i in 1 to 10) - var/option = tgui_input_text(usr, "Please enter an option or hit cancel to finish", "Create Vote", encode = FALSE) + var/option = tgui_input_text(src, "Please enter an option or hit cancel to finish", "Create Vote", encode = FALSE) if(isnull(option) || !usr.client) break choices |= option - var/c2 = tgui_alert(usr, "Show counts while vote is happening?", "Counts", list("Yes", "No")) - var/c3 = tgui_input_list(usr, "Select a result calculation type", "Vote", list(VOTE_RESULT_TYPE_MAJORITY)) + var/c2 = tgui_alert(src, "Show counts while vote is happening?", "Counts", list("Yes", "No")) + var/c3 = tgui_input_list(src, "Select a result calculation type", "Vote", list(VOTE_RESULT_TYPE_MAJORITY)) var/datum/vote/V = new /datum/vote(usr.ckey, question, choices, TRUE) V.show_counts = (c2 == "Yes")