From 09447bbaf1045cb6c9442f8108521045620d2b37 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sun, 5 Jun 2011 21:43:52 +0000 Subject: [PATCH] Attack log now also logs whenever someone grabs to level 3 (when you get the disarm/kill button) and whenever someone tightens their grip (uses kill intent). git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1665 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/mob.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 91ee5ef60a0..5aa4bc6d2b4 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -460,6 +460,8 @@ proc/isobserver(A) icon_state = "grabbed+1" if (!( affecting.buckled )) affecting.loc = assailant.loc + affecting.attack_log += text("[world.time] - has had their neck grabbed by [assailant.name] ([assailant.ckey])") + assailant.attack_log += text("[world.time] - has grabbed the neck of [affecting.name] ([affecting.ckey])") hud1.icon_state = "disarm/kill" hud1.name = "disarm/kill" else @@ -468,6 +470,8 @@ proc/isobserver(A) if (killing) for(var/mob/O in viewers(assailant, null)) O.show_message(text("\red [] has tightened his grip on []'s neck!", assailant, affecting), 1) + affecting.attack_log += text("[world.time] - has been strangled (kill intent) by [assailant.name] ([assailant.ckey])") + assailant.attack_log += text("[world.time] - has attempted to strangle (kill intent) [affecting.name] ([affecting.ckey])") assailant.next_move = world.time + 10 affecting.stunned = max(2, affecting.stunned) affecting.paralysis = max(1, affecting.paralysis)