mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Made adminlog messages not visible to mods again.
Return of attacklog spam (now toggleable)
This commit is contained in:
@@ -226,6 +226,7 @@
|
|||||||
user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>"
|
user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>"
|
||||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>"
|
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>"
|
||||||
log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>" )
|
log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])</font>" )
|
||||||
|
msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") //BS12 EDIT ALG
|
||||||
|
|
||||||
//spawn(1800) // this wont work right
|
//spawn(1800) // this wont work right
|
||||||
// M.lastattacker = null
|
// M.lastattacker = null
|
||||||
|
|||||||
@@ -7,18 +7,19 @@ var/global/floorIsLava = 0
|
|||||||
/proc/message_admins(var/msg)
|
/proc/message_admins(var/msg)
|
||||||
msg = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
|
msg = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[msg]</span></span>"
|
||||||
log_adminwarn(msg)
|
log_adminwarn(msg)
|
||||||
admins << msg
|
for(var/client/C in admins)
|
||||||
|
if(R_ADMIN & C.holder.rights)
|
||||||
|
C << msg
|
||||||
|
|
||||||
/*
|
|
||||||
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
|
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
|
||||||
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[text]</span></span>"
|
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ADMIN LOG:</span> <span class=\"message\">[text]</span></span>"
|
||||||
log_adminwarn(rendered)
|
log_adminwarn(rendered)
|
||||||
for(var/client/C in admins)
|
for(var/client/C in admins)
|
||||||
if (C.holder.level >= 1)
|
if(R_ADMIN & C.holder.rights)
|
||||||
if(!C.STFU_atklog)
|
if(C.prefs.toggles & CHAT_ATTACKLOGS)
|
||||||
var/msg = rendered
|
var/msg = rendered
|
||||||
C << msg
|
C << msg
|
||||||
*/
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////Panels
|
///////////////////////////////////////////////////////////////////////////////////////////////Panels
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,8 @@ var/list/admin_verbs_admin = list(
|
|||||||
/datum/admins/proc/show_player_info,
|
/datum/admins/proc/show_player_info,
|
||||||
/client/proc/free_slot, /*frees slot for chosen job*/
|
/client/proc/free_slot, /*frees slot for chosen job*/
|
||||||
/client/proc/cmd_admin_change_custom_event,
|
/client/proc/cmd_admin_change_custom_event,
|
||||||
/client/proc/cmd_admin_rejuvenate
|
/client/proc/cmd_admin_rejuvenate,
|
||||||
|
/client/proc/toggleattacklogs
|
||||||
)
|
)
|
||||||
var/list/admin_verbs_ban = list(
|
var/list/admin_verbs_ban = list(
|
||||||
/client/proc/unban_panel,
|
/client/proc/unban_panel,
|
||||||
@@ -707,3 +708,13 @@ var/list/admin_verbs_mod = list(
|
|||||||
if (job)
|
if (job)
|
||||||
job_master.FreeRole(job)
|
job_master.FreeRole(job)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
/client/proc/toggleattacklogs()
|
||||||
|
set name = "Toggle Attack Log Messages"
|
||||||
|
set category = "Preferences"
|
||||||
|
|
||||||
|
prefs.toggles ^= CHAT_ATTACKLOGS
|
||||||
|
if (prefs.toggles & CHAT_ATTACKLOGS)
|
||||||
|
usr << "You now will get attack log messages"
|
||||||
|
else
|
||||||
|
usr << "You now won't get attack log messages"
|
||||||
@@ -95,10 +95,11 @@
|
|||||||
M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
|
M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
|
||||||
firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
|
firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
|
||||||
log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]</font>")
|
log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]</font>")
|
||||||
|
msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG
|
||||||
else
|
else
|
||||||
M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
|
M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
|
||||||
log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src.type]</font>")
|
log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src.type]</font>")
|
||||||
|
msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG
|
||||||
|
|
||||||
spawn(0)
|
spawn(0)
|
||||||
if(A)
|
if(A)
|
||||||
|
|||||||
@@ -620,8 +620,9 @@ var/list/TAGGERLOCATIONS = list("Disposals",
|
|||||||
#define CHAT_GHOSTSIGHT 128
|
#define CHAT_GHOSTSIGHT 128
|
||||||
#define CHAT_PRAYER 256
|
#define CHAT_PRAYER 256
|
||||||
#define CHAT_RADIO 512
|
#define CHAT_RADIO 512
|
||||||
|
#define CHAT_ATTACKLOGS 1024
|
||||||
|
|
||||||
#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO)
|
#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS)
|
||||||
|
|
||||||
#define BE_TRAITOR 1
|
#define BE_TRAITOR 1
|
||||||
#define BE_OPERATIVE 2
|
#define BE_OPERATIVE 2
|
||||||
|
|||||||
Reference in New Issue
Block a user