Merge pull request #2690 from yogstation13/upstream-merge-40458

[MIRROR] Fix banlist runtime not creating notes for server bans
This commit is contained in:
Ling
2018-09-26 19:55:48 +02:00
committed by GitHub
2 changed files with 4 additions and 7 deletions

View File

@@ -1314,6 +1314,7 @@
to_chat(usr, "<span class='danger'>Failed to apply ban.</span>")
return
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins)
create_message("note", ckey(M.ckey), usr.ckey, "Banned for [mins] minutes - [reason]", null, null, 0, 0, null, 0) // yogs - removed note severity
ban_unban_log_save("[key_name(usr)] has banned [key_name(M)]. - Reason: [reason] - This will be removed in [mins] minutes.")
to_chat(M, "<span class='boldannounce'><BIG>You have been banned by [usr.client.key].\nReason: [reason]</BIG></span>")
to_chat(M, "<span class='danger'>This is a temporary ban, it will be removed in [mins] minutes. The round ID is [GLOB.round_id].</span>")
@@ -1340,6 +1341,7 @@
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP)
if("No")
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0)
create_message("note", ckey(M.ckey), usr.ckey, "Permanently banned - [reason]", null, null, 0, 0, null, 0) // yogs - removed note severity
to_chat(M, "<span class='boldannounce'><BIG>You have been banned by [usr.client.key].\nReason: [reason]</BIG></span>")
to_chat(M, "<span class='danger'>This is a permanent ban. The round ID is [GLOB.round_id].</span>")
var/bran = CONFIG_GET(string/banappeals)