diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index c567ba7adb2..aaf33820840 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -298,8 +298,12 @@ This is always put in the attack log. loglevel = ATKLOG_FEW else if(istype(user) && !user.ckey && !target.ckey) // Attacks between NPCs are only shown to admins with ATKLOG_ALL loglevel = ATKLOG_ALL - else if(!target.ckey) // Attacks by players on NPCs are only shown to admins with ATKLOG_ALL or ATKLOG_ALMOSTALL + else if(!user.ckey || !target.ckey) // Player v NPC combat is de-prioritized. loglevel = ATKLOG_ALMOSTALL + else + var/area/A = get_area(target) + if(A && A.hide_attacklogs) + loglevel = ATKLOG_ALMOSTALL msg_admin_attack("[key_name_admin(user)] vs [key_name_admin(target)]: [what_done]", loglevel) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 91af56437cf..75fe6030714 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -50,6 +50,7 @@ var/list/ghostteleportlocs = list() icon_state = "start" requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + hide_attacklogs = TRUE /area/adminconstruction @@ -57,6 +58,7 @@ var/list/ghostteleportlocs = list() icon_state = "start" requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + hide_attacklogs = TRUE /area/space icon_state = "space" @@ -522,6 +524,7 @@ var/list/ghostteleportlocs = list() icon_state = "thunder" requires_power = FALSE dynamic_lighting = DYNAMIC_LIGHTING_DISABLED + hide_attacklogs = TRUE /area/tdome/arena_source diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 638fe29ab6d..4b97e15a676 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -33,7 +33,7 @@ var/static_equip var/static_light = FALSE var/static_environ - + var/has_gravity = TRUE var/list/apc = list() var/no_air = null @@ -64,6 +64,7 @@ 'sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg') var/fast_despawn = FALSE + var/hide_attacklogs = FALSE // For areas such as thunderdome, lavaland syndiebase, etc which generate a lot of spammy attacklogs. Reduces log priority. /area/Initialize(mapload) GLOB.all_areas += src diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 450470c8c61..84df75d01b1 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -37,6 +37,7 @@ icon_state = "dk_yellow" ambientsounds = list('sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg') report_alerts = FALSE + hide_attacklogs = TRUE /area/ruin/unpowered/syndicate_lava_base/engineering name = "Syndicate Lavaland Engineering" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 06c2361b90a..2701a213976 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -889,7 +889,7 @@ var/list/admin_verbs_ticket = list( to_chat(usr, "Your attack logs preference is now: show ALMOST ALL attack logs (notable exceptions: NPCs attacking other NPCs, vampire bites, equipping/stripping, people pushing each other over)") else if(prefs.atklog == ATKLOG_ALMOSTALL) prefs.atklog = ATKLOG_MOST - to_chat(usr, "Your attack logs preference is now: show MOST attack logs (like ALMOST ALL, except that it also hides attacks by players on NPCs)") + to_chat(usr, "Your attack logs preference is now: show MOST attack logs (like ALMOST ALL, except that it also hides player v. NPC combat, and certain areas like lavaland syndie base and thunderdome)") else if(prefs.atklog == ATKLOG_MOST) prefs.atklog = ATKLOG_FEW to_chat(usr, "Your attack logs preference is now: show FEW attack logs (only the most important stuff: attacks on SSDs, use of explosives, messing with the engine, gibbing, AI wiping, forcefeeding, acid sprays, and organ extraction)")