Skip to content

Commit

Permalink
New vote sound, puts vote in examine blocks (#2579)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![image](https://github.com/shiptest-ss13/Shiptest/assets/81882910/5e6d52b9-7772-48d4-86c5-0e137836c03f)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
## Changelog

:cl:
add: Votes have a new look and new sound.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Dec 10, 2023
1 parent e95b8a4 commit 54adaa6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions code/controllers/subsystem/vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ SUBSYSTEM_DEF(vote)
text += "<b>Vote Result: Inconclusive - No Votes!</b>"
log_vote(text)
remove_action_buttons()
to_chat(world, "\n<font color='purple'>[text]</font>")
to_chat(world, span_purple(examine_block(text)))
return .

/datum/controller/subsystem/vote/proc/result()
Expand Down Expand Up @@ -218,10 +218,10 @@ SUBSYSTEM_DEF(vote)
log_vote(text)

var/vp = CONFIG_GET(number/vote_period)
var/vote_message = "\n<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>"
var/vote_message = "<font color='purple'><b>[text]</b>\nType <b>vote</b> or click <a href='?src=[REF(src)]'>here</a> to place your votes.\nYou have [DisplayTimeText(vp)] to vote.</font>"
if(observer_vote_allowed)
to_chat(world, vote_message)
SEND_SOUND(world, sound('sound/misc/vinethud.ogg'))
to_chat(world, examine_block(vote_message))
SEND_SOUND(world, sound('sound/misc/compiler-stage2.ogg'))
time_remaining = round(vp/10)
for(var/c in GLOB.clients)
var/client/C = c
Expand All @@ -240,8 +240,8 @@ SUBSYSTEM_DEF(vote)
valid_clients -= C
for(var/c in valid_clients)
var/client/C = c
SEND_SOUND(C, sound('sound/misc/vinethud.ogg'))
to_chat(C.mob, vote_message)
SEND_SOUND(C, sound('sound/misc/compiler-stage2.ogg'))
to_chat(C.mob, examine_block(vote_message))
var/datum/action/vote/V = new
if(question)
V.name = "Vote: [question]"
Expand Down

0 comments on commit 54adaa6

Please sign in to comment.