From 018c3fc2aa4ebb00ea46360a5db0df7d8fd2d9be Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Wed, 10 Jun 2015 13:21:07 +0930
Subject: [PATCH] Fixes #9517 and #9542

---
 code/modules/mob/freelook/mask/update_triggers.dm      |  2 +-
 code/modules/mob/living/simple_animal/simple_animal.dm | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/freelook/mask/update_triggers.dm b/code/modules/mob/freelook/mask/update_triggers.dm
index a8e68058fde..8100a309a22 100644
--- a/code/modules/mob/freelook/mask/update_triggers.dm
+++ b/code/modules/mob/freelook/mask/update_triggers.dm
@@ -35,7 +35,7 @@
 		cultnet.updateVisibility(src, 0)
 
 /mob/living/death(gibbed, deathmessage="seizes up and falls limp...")
-	if(..())
+	if(..(gibbed, deathmessage))
 		// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
 		cultnet.updateVisibility(src)
 
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e2ec5059a2b..4b33818033b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -295,7 +295,7 @@
 	if(!O.force)
 		visible_message("<span class='notice'>[user] gently taps [src] with \the [O].</span>")
 		return
-	
+
 	if(O.force > resistance)
 		var/damage = O.force
 		if (O.damtype == HALLOSS)
@@ -306,8 +306,8 @@
 		adjustBruteLoss(damage)
 	else
 		usr << "<span class='danger>This weapon is ineffective, it does no damage.</span>"
-	
-	visible_message("<span class='danger>[src] has been attacked with the [O] by [user].</span>")
+
+	visible_message("<span class='danger'>\The [src] has been attacked with the [O] by [user].</span>")
 	user.do_attack_animation(src)
 
 /mob/living/simple_animal/movement_delay()
@@ -327,10 +327,10 @@
 	if(statpanel("Status") && show_stat_health)
 		stat(null, "Health: [round((health / maxHealth) * 100)]%")
 
-/mob/living/simple_animal/death(gibbed, deathmessage="")
+/mob/living/simple_animal/death(gibbed, deathmessage = "dies!")
 	icon_state = icon_dead
 	density = 0
-	return ..()
+	return ..(gibbed,deathmessage)
 
 /mob/living/simple_animal/ex_act(severity)
 	if(!blinded)