cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into updates

Browse Source
This commit is contained in:
Hawk_v3
2018-11-01 23:15:58 +00:00
parent bc71a0b8a7 096400b312
commit 30d6ee7801
32 changed files with 276 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/admin/verbs/adminhelp.dm
View File

@@ -329,7 +329,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return
if(initiator)
initiator << 'sound/effects/adminhelp.ogg'
if(initiator.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
initiator << 'sound/effects/adminhelp.ogg'
to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b></font>")