From 197f0b7219e2de25d4a85632fe48d52ac88f3dc9 Mon Sep 17 00:00:00 2001
From: Spacemanspark <heeren_thomas@yahoo.com>
Date: Mon, 28 Sep 2015 16:58:28 -0500
Subject: [PATCH] makes *deathgasp less snowflakey

---
 code/modules/mob/living/carbon/human/emote.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 338727330f5..bfa1f3d248d 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -337,12 +337,8 @@
 					m_type = 2
 
 		if ("deathgasp")
-			if (species.name == "Machine")
-				message = "<B>[src]</B> gives one shrill beep before falling limp, screen quickly flashing blue before shutting off entirely."
-				m_type = 1
-			else
-				message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
-				m_type = 1
+			message = "<B>[src]</B> [species.death_message]"	
+			m_type = 1
 
 		if ("giggle")
 			if(miming)