cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes ban / kick messages not showing (#11083)

Browse Source
This commit is contained in:
Karolis
2021-01-28 12:20:37 +02:00
committed by GitHub
parent 0c636cf27a
commit dd42356c4e
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+6 -6
View File
@@ -327,9 +327,9 @@
return
var/reason = sanitize(input("Please enter reason"))
if(!reason)
to_chat(M, "<span class='danger'>You have been kicked from the server</span>")
to_chat_immediate(M, "<span class='danger'>You have been kicked from the server</span>")
else
to_chat(M, "<span class='danger'>You have been kicked from the server: [reason]</span>")
to_chat_immediate(M, "<span class='danger'>You have been kicked from the server: [reason]</span>")
log_admin("[key_name(usr)] booted [key_name(M)].",admin_key=key_name(usr),ckey=key_name(M))
message_admins("<span class='notice'>[key_name_admin(usr)] booted [key_name_admin(M)].</span>", 1)
//M.client = null
@@ -367,15 +367,15 @@
notes_add(M.ckey,"[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.",usr)
else
notes_add_sql(M.ckey, "[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.", usr, M.lastKnownIP, M.computer_id)
to_chat(M, "<span class='danger'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason].</BIG></span>")
to_chat(M, "<span class='danger'>This is a temporary ban, it will be removed in [mins] minutes.</span>")
to_chat_immediate(M, "<span class='danger'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason].</BIG></span>")
to_chat_immediate(M, "<span class='danger'>This is a temporary ban, it will be removed in [mins] minutes.</span>")
feedback_inc("ban_tmp",1)
DB_ban_record(BANTYPE_TEMP, M, mins, reason)
feedback_inc("ban_tmp_mins",mins)
if(config.banappeals)
to_chat(M, "<span class='warning'>To try to resolve this matter head to [config.banappeals]</span>")
to_chat_immediate(M, "<span class='warning'>To try to resolve this matter head to [config.banappeals]</span>")
else
to_chat(M, "<span class='warning'>No ban appeals URL has been set.</span>")
to_chat_immediate(M, "<span class='warning'>No ban appeals URL has been set.</span>")
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.",admin_key=key_name(usr),ckey=key_name(M))
message_admins("<span class='notice'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.</span>")
code/modules/admin/verbs/warning.dm
+1 -1
View File
@@ -79,7 +79,7 @@
ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.")
if(C)
message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban.")
to_chat(C, "<span class='warning'><BIG><B>You have been autobanned due to a warning by [ckey].</B></BIG><br>This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.</span>")
to_chat_immediate(C, "<span class='warning'><BIG><B>You have been autobanned due to a warning by [ckey].</B></BIG><br>This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.</span>")
qdel(C)
else
message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.")
code/modules/mob/abstract/unauthed/login.dm
+4 -4
View File
@@ -28,7 +28,7 @@
/mob/abstract/unauthed/proc/timeout()
if (client)
to_chat(client, "Your login time has expired. Please relog and try again.")
to_chat_immediate(client, "Your login time has expired. Please relog and try again.")
qdel(client)
qdel(src)
@@ -45,9 +45,9 @@
// Check for bans
var/list/ban_data = world.IsBanned(ckey(newkey), c.address, c.computer_id, 1, TRUE)
if(ban_data)
to_chat(c, "You are banned for this server.")
to_chat(c, "Reason: [ban_data["reason"]]")
to_chat(c, "Description: [ban_data["desc"]]")
to_chat_immediate(c, "You are banned for this server.")
to_chat_immediate(c, "Reason: [ban_data["reason"]]")
to_chat_immediate(c, "Description: [ban_data["desc"]]")
del(c)
return