Fixes conflicts yet again.

This commit is contained in:
Neerti
2018-11-02 21:09:56 -04:00
34 changed files with 632 additions and 460 deletions
+2 -1
View File
@@ -323,7 +323,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>")