Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
192 changed files with 7436 additions and 5475 deletions

View File

@@ -175,7 +175,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
message_admins("<font color='blue'>Ticket [TicketHref("#[id]")] created</font>")
else
MessageNoRecipient(parsed_message)
send2adminchat() //VOREStation Add
//show it to the person adminhelping too
to_chat(C, "<span class='adminnotice'>PM to-<b>Admins</b>: [name]</span>")