From cf53a0cc7ab9d0f0118d8671f5111d96fe541a9f Mon Sep 17 00:00:00 2001 From: Miniature Date: Thu, 8 Mar 2012 15:16:54 +1030 Subject: [PATCH] Attack logging (finally) there might be some things I missed, and feel free to change the messages if you want --- code/game/gamemodes/wizard/soulstone.dm | 2 ++ code/game/magic/cultist/ritual.dm | 2 ++ code/game/objects/devices/aicard.dm | 2 ++ code/game/objects/devices/flash.dm | 2 ++ code/game/objects/devices/flashlight.dm | 2 ++ code/game/objects/items.dm | 5 ++++- code/game/objects/items/item.dm | 4 ++++ code/game/objects/items/robot_items.dm | 2 ++ code/game/objects/items/weapons/explosives.dm | 2 ++ code/game/objects/items/weapons/hydroponics.dm | 2 ++ .../game/objects/items/weapons/implants/implanter.dm | 2 ++ code/game/objects/items/weapons/kitchen.dm | 4 ++++ code/game/objects/items/weapons/papers_bins.dm | 2 ++ code/game/objects/items/weapons/surgery_tools.dm | 3 +++ code/game/objects/items/weapons/swords_axes_etc.dm | 4 ++++ code/game/objects/secstorage/sbriefcase.dm | 2 ++ code/game/objects/storage/bible.dm | 2 ++ code/game/objects/storage/briefcase.dm | 2 ++ code/modules/chemical/Chemistry-Tools.dm | 12 ++++++++++++ .../mob/living/carbon/human/human_attackhand.dm | 5 +++++ code/modules/mob/mob_grab.dm | 2 ++ code/modules/mob/organ/organ_external.dm | 2 ++ code/modules/projectiles/projectile.dm | 4 ++++ 23 files changed, 70 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 0045fefb4fb..7654c6a755d 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -16,6 +16,8 @@ return ..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to capture the soul of [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) captured the soul of [M] ([M.ckey]).") + message_admins("ATTACK: [user] ([user.ckey]) captured the soul of [M] ([M.ckey]).") transfer_soul("VICTIM", M, user) return diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 671cec059e5..91cda23916f 100644 --- a/code/game/magic/cultist/ritual.dm +++ b/code/game/magic/cultist/ritual.dm @@ -456,6 +456,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", attack(mob/living/M as mob, mob/living/user as mob) M.attack_log += text("\[[time_stamp()]\] Has had the [name] used on him by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used [name] on [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) used the [name] on [M] ([M.ckey]).") + message_admins("ATTACK: [user] ([user.ckey]) used the [name] on [M] ([M.ckey]).") if(istype(M,/mob/dead)) M.invisibility = 0 diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm index 11c7f1c7eda..faebd903ed1 100644 --- a/code/game/objects/devices/aicard.dm +++ b/code/game/objects/devices/aicard.dm @@ -15,6 +15,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been carded with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to card [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) carded [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) carded [M] ([M.ckey]) with [src].") transfer_ai("AICORE", "AICARD", M, user) return diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm index 20ec9617a85..6f3146ae993 100644 --- a/code/game/objects/devices/flash.dm +++ b/code/game/objects/devices/flash.dm @@ -25,6 +25,8 @@ attack(mob/living/M as mob, mob/user as mob) M.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) flashed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) flashed [M] ([M.ckey]) with [src].") if(!clown_check(user)) return if(broken) user.show_message("\red The [src.name] is broken", 2) diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 0ed8fc7172e..d28a7556703 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -94,6 +94,8 @@ // M << "\red You feel a tiny prick!" M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to stab [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) stabbed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) stabbed [M] ([M.ckey]) with [src].") ..() return diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 18d2e7c5d6f..5151f9b29e1 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -50,6 +50,7 @@ if(!M.handcuffed) M.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) handcuffed [M] ([M.ckey]).") var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human( ) O.source = user O.target = M @@ -172,6 +173,8 @@ // M << "\red You feel a tiny prick!" //Removed to make tritor pens stealthier M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to stab [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) used [src] on [M] ([M.ckey]).") + message_admins("ATTACK: [user] ([user.ckey]) used [src] on [M] ([M.ckey]).") return /obj/item/weapon/pen/sleepypen @@ -500,4 +503,4 @@ if(exposed_temperature >= 373.15) for(var/mob/M in viewers(5, src)) M << "\red \the [src] burns up." - del(src) + del(src) diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index dea189b4552..6abd5f12319 100755 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -261,6 +261,8 @@ mob/proc/flash_weak_pain() user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") //spawn(1800) // this wont work right // M.lastattacker = null @@ -396,6 +398,8 @@ mob/proc/flash_weak_pain() user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") src.add_fingerprint(user) //if((user.mutations & CLUMSY) && prob(50)) diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm index 43ddfc7fdcb..23fb752b312 100644 --- a/code/game/objects/items/robot_items.dm +++ b/code/game/objects/items/robot_items.dm @@ -10,6 +10,8 @@ attack(mob/M as mob, mob/living/silicon/robot/user as mob) M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") user.cell.charge -= 30 M.Weaken(5) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index ff360919317..f91ebfe2514 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -22,6 +22,8 @@ if (ismob(target)) target:attack_log += "\[[time_stamp()]\] Had the [name] planted on them by [user.real_name] ([user.ckey])" user.visible_message("\red [user.name] finished planting an explosive on [target.name]!") + log_admin("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).") + message_admins("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).") target.overlays += image('assemblies.dmi', "plastic-explosive2") user << "Bomb has been planted. Timer counting down from [timer]." spawn(timer*10) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 3f9e47750bb..51235f58b54 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -117,6 +117,8 @@ Deathnettle M << "\red You are stunned by the powerful acid of the Deathnettle!" M.attack_log += text("\[[time_stamp()]\] Had the [src.name] used on them by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] on [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") M.eye_blurry += force/7 if(prob(20)) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 90dff280ec1..2827279e4ed 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -52,6 +52,8 @@ O.show_message("\red [user] implants themself with [src.name]!", 1) M.attack_log += text("\[[time_stamp()]\] Implanted with [src.name] ([src.imp.name]) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) implanted [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) implanted [M] ([M.ckey]) with [src].") src.imp.loc = M src.imp.imp_in = M src.imp.implanted = 1 diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 17915b82ef9..1b4b32ef8de 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -97,6 +97,8 @@ KNIFE return M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if (M.stat < 2 && M.health < 50 && prob(90)) var/mob/H = M @@ -171,6 +173,8 @@ KNIFE M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if(prob(15)) M.Weaken(3) diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm index 6b3427f52aa..7fe4bf20007 100644 --- a/code/game/objects/items/weapons/papers_bins.dm +++ b/code/game/objects/items/weapons/papers_bins.dm @@ -430,6 +430,8 @@ NOTEBOOK target:loc = present target.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [target.name] ([target.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) wrapped up [target] ([target.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) wrapped up [target] ([target.ckey]) with [src].") else user << "/blue You need more paper." diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 967cc7e8179..dc6c7c0c05a 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -1046,6 +1046,8 @@ CIRCULAR SAW user.attack_log += "\[[time_stamp()]\] Debrained [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" M.attack_log += "\[[time_stamp()]\] Debrained by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" + log_admin("ATTACK: [user] ([user.ckey]) debrained [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) debrained [M] ([M.ckey]) with [src].") var/obj/item/brain/B = new(M.loc) B.transfer_identity(M) @@ -1266,6 +1268,7 @@ CIRCULAR SAW return M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) injected [M] ([M.ckey]) with [src].") if (user) for(var/mob/O in viewers(M, null)) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index aa9adb1aaf1..f8aeea6b84f 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -129,6 +129,8 @@ STUN BATON M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey]) (INTENT: [uppertext(user.a_intent)])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if(isrobot(M)) ..() @@ -200,6 +202,8 @@ STUN BATON M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if (user.a_intent == "hurt") if(!..()) return diff --git a/code/game/objects/secstorage/sbriefcase.dm b/code/game/objects/secstorage/sbriefcase.dm index 472d9b33fa7..08e33aea6f0 100644 --- a/code/game/objects/secstorage/sbriefcase.dm +++ b/code/game/objects/secstorage/sbriefcase.dm @@ -25,6 +25,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") var/t = user:zone_sel.selecting if (t == "head") diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 71232179582..d34001e15df 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -25,6 +25,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") user << "\red You don't have the dexterity to do this!" diff --git a/code/game/objects/storage/briefcase.dm b/code/game/objects/storage/briefcase.dm index 14cc898e66a..a031dad1215 100644 --- a/code/game/objects/storage/briefcase.dm +++ b/code/game/objects/storage/briefcase.dm @@ -20,6 +20,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") if (M.stat < 2 && M.health < 50 && prob(90)) var/mob/H = M diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index f6c919c7d94..b9e27eb96aa 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1247,6 +1247,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been injected with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to inject [M.name] ([M.ckey])") + log_admin("ATTACK: [user] ([user.ckey]) injected [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) injected [M] ([M.ckey]) with [src].") src.reagents.reaction(M, INGEST) if(M.reagents) var/trans = reagents.trans_to(M, amount_per_transfer_from_this) @@ -1372,6 +1374,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: \ref[reagents]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: \ref[reagents]") + log_admin("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] feeds [M] [src].", 1) @@ -1432,6 +1436,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: \ref[reagents]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: \ref[reagents]") + log_admin("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] feeds [M] [src].", 1) @@ -1594,6 +1600,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: \ref[reagents]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: \ref[reagents]") + log_admin("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") if(reagents.total_volume) @@ -1712,6 +1720,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: \ref[reagents]") user.attack_log += text("\[[time_stamp()]\] Fed [M.name] by [M.name] ([M.ckey]) Reagents: \ref[reagents]") + log_admin("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") if(reagents.total_volume) @@ -2371,6 +2381,8 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: \ref[reagents]") user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: \ref[reagents]") + log_admin("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) fed [M] ([M.ckey]) with [src].") if(reagents.total_volume) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 9b02e587c11..9f420b29927 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -17,6 +17,8 @@ visible_message("\red [src] has been touched with the stun gloves by [M]!") M.attack_log += text("\[[time_stamp()]\] Stungloved [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been stungloved by [M.name] ([M.ckey])") + log_admin("ATTACK: [src] ([src.ckey]) stungloved [M] ([M.ckey]).") + message_admins("ATTACK: [src] ([src.ckey]) stungloved [M] ([M.ckey]).") var/armorblock = run_armor_check(M.zone_sel.selecting, "energy") apply_effects(5,5,0,0,5,0,0,armorblock) return 1 @@ -72,6 +74,8 @@ if("hurt") M.attack_log += text("\[[time_stamp()]\] Punched [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been punched by [M.name] ([M.ckey])") + log_admin("ATTACK: [src] ([src.ckey]) punched [M] ([M.ckey]).") + message_admins("ATTACK: [src] ([src.ckey]) punched [M] ([M.ckey]).") var/attack_verb switch(M.mutantrace) @@ -105,6 +109,7 @@ if("disarm") M.attack_log += text("\[[time_stamp()]\] Disarmed [src.name] ([src.ckey])") src.attack_log += text("\[[time_stamp()]\] Has been disarmed by [M.name] ([M.ckey])") + log_admin("ATTACK: [src] ([src.ckey]) disarmed [M] ([M.ckey]).") if(w_uniform) w_uniform.add_fingerprint(M) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 7064dfd4723..bebe7db0328 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -176,6 +176,8 @@ O.show_message(text("\red [] has tightened his grip on []'s neck!", assailant, affecting), 1) affecting.attack_log += text("\[[time_stamp()]\] Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])") assailant.attack_log += text("\[[time_stamp()]\] Strangled (kill intent) [affecting.name] ([affecting.ckey])") + log_admin("ATTACK: [assailant] ([assailant.ckey]) strangled [affecting] ([affecting.ckey]).") + message_admins("ATTACK: [assailant] ([assailant.ckey]) strangled [affecting] ([affecting.ckey]).") assailant.next_move = world.time + 10 affecting.losebreath += 1 hud1.icon_state = "disarm/kill1" diff --git a/code/modules/mob/organ/organ_external.dm b/code/modules/mob/organ/organ_external.dm index cfa6502e723..49e47ec16df 100644 --- a/code/modules/mob/organ/organ_external.dm +++ b/code/modules/mob/organ/organ_external.dm @@ -157,6 +157,8 @@ obj/item/weapon/organ/head/attackby(obj/item/weapon/W as obj, mob/user as mob) user.attack_log += "\[[time_stamp()]\] Debrained [brainmob.name] ([brainmob.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" brainmob.attack_log += "\[[time_stamp()]\] Debrained by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" + log_admin("ATTACK: [brainmob] ([brainmob.ckey]) debrained [user] ([user.ckey]).") + message_admins("ATTACK: [brainmob] ([brainmob.ckey]) debrained [user] ([user.ckey]).") var/obj/item/brain/B = new(loc) B.transfer_identity(brainmob) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 2757b672231..9248c85e34c 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -76,8 +76,12 @@ if(istype(firer, /mob)) M.attack_log += text("\[[]\] []/[] shot []/[] with a []", time_stamp(), firer, firer.ckey, M, M.ckey, src) firer.attack_log += text("\[[]\] []/[] shot []/[] with a []", time_stamp(), firer, firer.ckey, M, M.ckey, src) + log_admin("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with [src].") else M.attack_log += text("\[[]\] UNKNOWN SUBJECT (No longer exists) shot []/[] with a []", time_stamp(), M, M.ckey, src) + log_admin("ATTACK: UNKNOWN (no longer exists) shot [M] ([M.ckey]) with [src].") + message_admins("ATTACK: UNKNOWN (no longer exists) shot [M] ([M.ckey]) with [src].") spawn(0) if(A)