From b537758aefd9f6daf81b1c27682db90aa88e6deb Mon Sep 17 00:00:00 2001
From: VampyrBytes <stuartoatley@rocketmail.com>
Date: Sun, 26 Jun 2016 23:30:59 +0100
Subject: [PATCH] Fixes deathgasp and emote colour (#4790)

---
 code/datums/Emote_system/emote.dm  | 4 ++--
 code/datums/Emote_system/emotes.dm | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm
index 4f130fbf330..0866addff58 100644
--- a/code/datums/Emote_system/emote.dm
+++ b/code/datums/Emote_system/emote.dm
@@ -36,8 +36,8 @@ VampyrBytes
 	var/targetText = "at" // what goes inbetween user and target
 	var/takesNumber	= 0	// 1 if the emote uses a number parameter
 
-	var/emoteSpanClass = "notice"
-	var/userSpanClass = "em"
+	var/emoteSpanClass = "say"
+	var/userSpanClass = "bold"
 	var/baseLevel = 1
 	var/allowParent = 0			// 1 if you want the parent available as well as this one
 
diff --git a/code/datums/Emote_system/emotes.dm b/code/datums/Emote_system/emotes.dm
index fd17fcc3953..35303e84ea6 100644
--- a/code/datums/Emote_system/emotes.dm
+++ b/code/datums/Emote_system/emotes.dm
@@ -344,6 +344,10 @@
 	commands = list("deathgasp", "deathgasps")
 	audible = 1
 
+/datum/emote/deathgasp/prevented(var/mob/user)
+	if(user.stat == DEAD)
+		return "you are already dead!"
+
 /datum/emote/deathgasp/alien
 	text = "lets out a waning guttural screech, green blood bubbling from its maw..."
 	selfText = "let out a waning guttural screech, green blood bubbling from your maw..."