mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
merge master
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
var/vote_description = ""
|
||||
|
||||
var/list/voted //List of ID's that already voted.
|
||||
COOLDOWN_DECLARE(vote_print_cooldown)
|
||||
|
||||
/obj/structure/votebox/attackby(obj/item/I, mob/living/user, params)
|
||||
if(istype(I,/obj/item/card/id))
|
||||
@@ -60,6 +61,8 @@
|
||||
return
|
||||
|
||||
var/mob/user = usr
|
||||
if(!can_interact(user))
|
||||
return
|
||||
if(!is_operator(user))
|
||||
to_chat(user,"<span class='warning'>Voting box operator authorization required!</span>")
|
||||
return
|
||||
@@ -171,7 +174,9 @@
|
||||
else
|
||||
results[text] += 1
|
||||
sortTim(results, cmp=/proc/cmp_numeric_dsc, associative = TRUE)
|
||||
|
||||
if(!COOLDOWN_FINISHED(src, vote_print_cooldown))
|
||||
return
|
||||
COOLDOWN_START(src, vote_print_cooldown, 60 SECONDS)
|
||||
var/obj/item/paper/P = new(drop_location())
|
||||
var/list/tally = list()
|
||||
tally += {"
|
||||
|
||||
Reference in New Issue
Block a user