diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 6a21b2dbadf..94e52ef3c9b 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -101,7 +101,8 @@ GLOBAL_PROTECT(Banlist) /proc/AddBan(key, computerid, reason, bannedby, temp, minutes, address) - + if(!CONFIG_GET(flag/ban_legacy_system)) + return var/bantimestamp var/ban_ckey = ckey(key) if (temp) @@ -124,10 +125,6 @@ GLOBAL_PROTECT(Banlist) WRITE_FILE(GLOB.Banlist["roundid"], GLOB.round_id) if (temp) WRITE_FILE(GLOB.Banlist["minutes"], bantimestamp) - if(!temp) - create_message("note", key, bannedby, "Permanently banned - [reason]", null, null, 0, 0, null, 0, 0) - else - create_message("note", key, bannedby, "Banned for [minutes] minutes - [reason]", null, null, 0, 0, null, 0, 0) return 1 /proc/RemoveBan(foldername) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 36dffac78e9..c24f8f6230e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1276,6 +1276,7 @@ to_chat(usr, "Failed to apply ban.") 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, 0) ban_unban_log_save("[key_name(usr)] has banned [key_name(M)]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "You have been banned by [usr.client.key].\nReason: [reason]") to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes. The round ID is [GLOB.round_id].") @@ -1302,6 +1303,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, 0) to_chat(M, "You have been banned by [usr.client.key].\nReason: [reason]") to_chat(M, "This is a permanent ban. The round ID is [GLOB.round_id].") var/bran = CONFIG_GET(string/banappeals)