Death

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()

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")