From 27b4fa00017baba06c5a5a4e9fc3ec47bb70314d Mon Sep 17 00:00:00 2001
From: Ccomp5950 <Ccomp5950@gmail.com>
Date: Wed, 5 Feb 2014 00:14:45 -0600
Subject: [PATCH] Mouse Attack_Logs disabled.  Admins rejoice.

No more mice in disposals spamming the hell out of admins everytime someone flushes items.

Conflicts:
	code/modules/mob/living/living_defense.dm
---
 code/modules/mob/living/living_defense.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3bc78fd382c..790b93dc1b6 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -87,7 +87,8 @@
 
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a thrown [O], last touched by [M.name] ([assailant.ckey])</font>")
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with a thrown [O]</font>")
-			msg_admin_attack("[src.name] ([src.ckey]) was hit by a thrown [O], last touched by [M.name] ([assailant.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
+			if(!istype(src,/mob/living/simple_animal/mouse))
+				msg_admin_attack("[src.name] ([src.ckey]) was hit by a thrown [O], last touched by [M.name] ([assailant.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
 			if(!iscarbon(M))
 				src.LAssailant = null
 			else
@@ -133,6 +134,7 @@
 	return 0
 
 // End BS12 momentum-transfer code.
+<<<<<<< HEAD
 
 //Mobs on Fire
 /mob/living/proc/IgniteMob()
@@ -170,4 +172,6 @@
 	if(fire_stacks > 9 && !on_fire)
 		IgniteMob()
 
-//Mobs on Fire end
\ No newline at end of file
+//Mobs on Fire end
+=======
+>>>>>>> 9665e8c... Mouse Attack_Logs disabled.  Admins rejoice.