From a322e2ba7c9e5cdef4f8abb9b26be02c1bc2d789 Mon Sep 17 00:00:00 2001
From: cib <cib123@googlemail.com>
Date: Tue, 27 Mar 2012 08:30:38 -0800
Subject: [PATCH] Fixed self-murdering with heavy blunt objects.

---
 code/game/objects/items/item.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index c3f621de6b0..9cb9f2b2d4f 100755
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -274,7 +274,7 @@ mob/proc/flash_weak_pain()
 		spawn
 			unmoved = do_after(user, 4)
 		sleep(4)
-		if( (!unmoved && !prob(70)) || get_dist(user, M) != 1)
+		if( (!unmoved && !prob(70)) || (get_dist(user, M) != 1 && user != M))
 			user.visible_message("\red [user.name] misses with \the [src]!")
 			return