From e3b5ac4628fcd0e49c7e03c83ed73a3f153f4adb Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 30 Jul 2012 01:56:50 +0000
Subject: [PATCH] - Fixed the error which made coloring eggs display the text
 "You color the crayon rainbow." instead of "You color the egg rainbow." -
 Fixed the problem of mousetraps staying armed after a mouse triggered them -
 Fixed the problem which made the following text appear when runtime splats a
 mouse: "Runtime Runtime SPLATS the mouse."

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4225 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/weapons.dm                 | 8 +++++---
 code/modules/food/food.dm                    | 2 +-
 code/modules/mob/living/simple_animal/cat.dm | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm
index 7920399d7f6..26a2b3405fa 100644
--- a/code/game/objects/weapons.dm
+++ b/code/game/objects/weapons.dm
@@ -141,6 +141,10 @@
 			if(affecting.take_damage(1, 0))
 				H.UpdateDamageIcon()
 			H.updatehealth()
+	else if(ismouse(target))
+		var/mob/living/simple_animal/mouse/M = target
+		src.visible_message("\red <b>SPLAT!</b>")
+		M.splat()
 	playsound(target.loc, 'snap.ogg', 50, 1)
 	icon_state = "mousetrap"
 	armed = 0
@@ -197,9 +201,7 @@
 						continue
 					O.show_message("\red <B>[H] accidentally steps on the mousetrap.</B>", 1)
 		if(ismouse(AM))
-			var/mob/living/simple_animal/mouse/M = AM
-			src.visible_message("\red <b>SPLAT!</b>")
-			M.splat()
+			triggered(AM)
 	..()
 
 /obj/item/weapon/mousetrap/hitby(A as mob|obj)
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index d9a620d526e..a4046430aa2 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -194,7 +194,7 @@
 				usr << "\blue The egg refuses to take on this color!"
 				return
 
-			usr << "\blue You color \the [C] [clr]"
+			usr << "\blue You color \the [src] [clr]"
 			icon_state = "egg-[clr]"
 			color = clr
 		else
diff --git a/code/modules/mob/living/simple_animal/cat.dm b/code/modules/mob/living/simple_animal/cat.dm
index 317f733b3a2..ccb4459f4d9 100644
--- a/code/modules/mob/living/simple_animal/cat.dm
+++ b/code/modules/mob/living/simple_animal/cat.dm
@@ -35,7 +35,7 @@
 			for(var/mob/living/simple_animal/mouse/M in view(1,src))
 				if(!M.stat)
 					M.splat()
-					emote("\the [src] SPLATS \the [M]")
+					emote("SPLATS \the [M]")
 					movement_target = null
 					stop_automated_movement = 0
 					break