- 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/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

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