From add99533fca5b861e8088c77eadc198fb518eea8 Mon Sep 17 00:00:00 2001 From: DZD Date: Thu, 22 Jan 2015 12:06:30 -0500 Subject: [PATCH] Practice and Lasertag Logs - Adds ability to turn off admin chat logging for specific projectiles. - Turns off admin chat logging for practice laser and lasertag beams. --- code/modules/projectiles/projectile.dm | 5 +++-- code/modules/projectiles/projectile/beams.dm | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 970a5c1ea1a..5f5eef7c03d 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -58,6 +58,7 @@ var/range = 0 var/proj_hit = 0 + var/chatlog_attacks = 1 proc/delete() // Garbage collect the projectiles @@ -126,7 +127,7 @@ if(istype(firer, /mob)) M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" - if(M.ckey) + if(M.ckey && chatlog_attacks) msg_admin_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG if(!iscarbon(firer)) M.LAssailant = null @@ -134,7 +135,7 @@ M.LAssailant = firer else M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" - if(M.ckey) + if(M.ckey && chatlog_attacks) msg_admin_attack("UNKNOWN shot [M] ([M.ckey]) with a [src] (JMP)") //BS12 EDIT ALG spawn(0) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index f8bc862a18d..c6e28f4cf46 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -17,6 +17,7 @@ damage_type = BURN flag = "laser" eyeblur = 2 + chatlog_attacks = 0 /obj/item/projectile/beam/scatter name = "laser pellet" @@ -80,6 +81,7 @@ flag = "laser" pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag) + chatlog_attacks = 0 /obj/item/projectile/lasertag/on_hit(var/atom/target, var/blocked = 0) if(istype(target, /mob/living/carbon/human))