Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds new Mentor Alert noise, toggle-able by admins #9071

Merged
merged 2 commits into from Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added sound/misc/nootnoot.ogg
Binary file not shown.
8 changes: 6 additions & 2 deletions yogstation/code/datums/world_topic.dm
@@ -1,3 +1,5 @@
GLOBAL_VAR_INIT(mentornoot, FALSE)

/datum/world_topic/asay
keyword = "asay"
require_comms_key = TRUE
Expand Down Expand Up @@ -75,8 +77,10 @@
var/client/C = GLOB.directory[ckey(whom)]
if(!C)
return 0

SEND_SOUND(C, sound('sound/items/bikehorn.ogg'))
if(GLOB.mentornoot)
SEND_SOUND(C, sound('sound/misc/nootnoot.ogg'))
else
SEND_SOUND(C, sound('sound/items/bikehorn.ogg'))
to_chat(C, "<font color='purple'>Mentor PM from-<b>[discord_mentor_link(from, from_id)]</b>: [msg]</font>")
var/show_char_recip = !C.is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
for(var/client/X in GLOB.mentors | GLOB.admins)
Expand Down
5 changes: 4 additions & 1 deletion yogstation/code/modules/mentor/mentor.dm
Expand Up @@ -97,10 +97,13 @@ GLOBAL_PROTECT(mentor_href_token)
new /datum/mentors(ckey)

qdel(query_load_mentors)

/proc/send_mentor_sound(client/C)
var/sound/pingsound = sound('yogstation/sound/misc/bikehorn_alert.ogg')
pingsound.volume = 90
if(GLOB.mentornoot)
pingsound = sound('sound/misc/nootnoot.ogg')
pingsound.volume = 100
pingsound.pan = 80
SEND_SOUND(C,pingsound)

Expand Down