From ad23362781dc6c1fdbfeb8965ec26aa774fb167d Mon Sep 17 00:00:00 2001
From: Tayyyyyyy <Tayyyyyyy@users.noreply.github.com>
Date: Tue, 1 May 2018 18:58:56 -0500
Subject: [PATCH] Death

---
 code/game/verbs/suicide.dm                    | 2 +-
 code/modules/mob/living/carbon/human/emote.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 0f9783d949a..8caaf809c95 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -84,7 +84,7 @@
 				do_suicide(damagetype, held_item)
 				return
 
-		to_chat(viewers(src), "<span class=danger>[src] [pick(species.suicide_messages)] It looks like [src.p_theyre()] trying to commit suicide.</span>")
+		to_chat(viewers(src), "<span class=danger>[src] [replacetext(pick(species.suicide_messages), "their", p_their())] It looks like [src.p_theyre()] trying to commit suicide.</span>")
 		do_suicide(0)
 
 		updatehealth()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index a15a0dbd0bf..a3260ca709e 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -479,7 +479,7 @@
 					m_type = 2
 
 		if("deathgasp", "deathgasps")
-			message = "<B>[src]</B> [species.death_message]"
+			message = "<B>[src]</B> [replacetext(species.death_message, "their", p_their())]"
 			m_type = 1
 
 		if("giggle", "giggles")