Merge branch 'master' into upstream-merge-5735

This commit is contained in:
Spades
2019-01-14 11:20:55 -05:00
committed by GitHub
155 changed files with 5785 additions and 1586 deletions
+2 -2
View File
@@ -343,8 +343,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
return
var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue! -</b></font><br>"
msg += "<font color='red'><b>Losing is part of the game!</b></font><br>"
msg += "<font color='red'>Your AdminHelp may also be unabled to be answered due to ongoing events.</font>"
msg += "<font color='red'><b>This is something that can be solved ICly, and does not currently require admin intervention.</b></font><br>" //VOREStation Edit
msg += "<font color='red'>Your AdminHelp may also be unable to be answered due to ongoing events.</font>" //VOREStation Edit
if(initiator)
to_chat(initiator, msg)