diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 839292871ca..c3d7d6d7a39 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -105,11 +105,11 @@
continue
var/expires = ""
if(text2num(duration) > 0)
- expires = " The ban is for [duration] minutes and expires on [expiration] (server time)."
+ expires = "\nThe ban is for [DisplayTimeText(duration MINUTES)] and expires on [expiration] (server time)." //convert from minutes into deciseconds to display the amount of time in days, hours, minutes, ect.
else
- expires = " The is a permanent ban."
+ expires = "\nThis is a permanent ban."
- var/desc = "\nReason: You, or another user of this computer or connection ([pkey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban (BanID #[banid]) was applied by [akey] on [bantime] during round ID [ban_round_id], [expires]"
+ var/desc = "\nReason: You, or another user of this computer or connection ([pkey]) is banned from playing here. The ban reason is:\n[reason]\nThis ban (BanID #[banid]) was applied by [akey] on [bantime] during round ID [ban_round_id]. [expires]"
. = list("reason"="[bantype]", "desc"="[desc]")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 12a6c639868..bec7767c1ae 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1278,17 +1278,18 @@
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.")
+ var/ban_duration = "[DisplayTimeText(mins MINUTES)]" //convert from minutes into deciseconds to display the amount of time in days, hours, minutes.
+ create_message("note", ckey(M.ckey), usr.ckey, "Banned for [ban_duration] - [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 [ban_duration].")
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].")
+ to_chat(M, "This is a temporary ban, it will be removed in [ban_duration]. The round ID is [GLOB.round_id].")
var/bran = CONFIG_GET(string/banappeals)
if(bran)
to_chat(M, "To try to resolve this matter head to [bran]")
else
to_chat(M, "No ban appeals URL has been set.")
- log_admin_private("[key_name(usr)] has banned [key_name(M)]. - Reason: [key_name(M)] - This will be removed in [mins] minutes.")
- var/msg = "[key_name_admin(usr)] has banned [key_name_admin(M)]. - Reason: [reason] - This will be removed in [mins] minutes."
+ log_admin_private("[key_name(usr)] has banned [key_name(M)]. - Reason: [key_name(M)] - This will be removed in [ban_duration].")
+ var/msg = "[key_name_admin(usr)] has banned [key_name_admin(M)]. - Reason: [reason] - This will be removed in [ban_duration]."
message_admins(msg)
var/datum/admin_help/AH = M.client ? M.client.current_ticket : null
if(AH)
@@ -2520,7 +2521,7 @@
if(!check_rights(R_ADMIN))
return
check_teams()
-
+
else if(href_list["team_command"])
if(!check_rights(R_ADMIN))
return