Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

This commit is contained in:
AffectedArc07
2021-07-09 11:42:23 +01:00
210 changed files with 1803 additions and 2434 deletions
+6 -2
View File
@@ -166,7 +166,12 @@ GLOBAL_LIST_INIT(admin_verbs_debug, list(
/client/proc/toggle_medal_disable,
/client/proc/uid_log,
/client/proc/visualise_active_turfs,
/client/proc/reestablish_db_connection
/client/proc/reestablish_db_connection,
#ifdef REFERENCE_TRACKING
/datum/proc/find_refs,
/datum/proc/qdel_then_find_references,
/datum/proc/qdel_then_if_fail_find_references,
#endif
))
GLOBAL_LIST_INIT(admin_verbs_possess, list(
/proc/possess,
@@ -507,7 +512,6 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
return
if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:)
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")
log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban")