Revert "12/21 modernizations from TG live"

code/modules/mob/living/emote.dm

@@ -5,7 +5,7 @@
 
 
 /mob/living/emote(act, m_type=1, message = null)
-	if(stat == DEAD && (act != "deathgasp") || (status_flags & FAKEDEATH))
+	if(stat)
 		return
 
 	var/param = null
@@ -19,7 +19,7 @@
 	switch(act)//Hello, how would you like to order? Alphabetically!
 		if ("aflap")
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps [p_their()] wings ANGRILY!"
+				message = "<B>[src]</B> flaps its wings ANGRILY!"
 				m_type = 2
 
 		if ("blush","blushes")
@@ -51,7 +51,7 @@
 			m_type = 2
 
 		if ("cross","crosses")
-			message = "<B>[src]</B> crosses [p_their()] arms."
+			message = "<B>[src]</B> crosses their arms."
 			m_type = 2
 
 		if ("chuckle","chuckles")
@@ -73,7 +73,7 @@
 				m_type = 1
 
 		if ("deathgasp","deathgasps")
-			message = "<B>[src]</B> seizes up and falls limp, [p_their()] eyes dead and lifeless..."
+			message = "<B>[src]</B> seizes up and falls limp, its eyes dead and lifeless..."
 			m_type = 1
 
 		if ("drool","drools")
@@ -89,7 +89,7 @@
 
 		if ("flap","flaps")
 			if (!src.restrained())
-				message = "<B>[src]</B> flaps [p_their()] wings."
+				message = "<B>[src]</B> flaps its wings."
 				m_type = 2
 
 		if ("flip","flips")
@@ -212,7 +212,7 @@
 		if ("pout","pouts")
 			message = "<B>[src]</B> pouts."
 			m_type = 2
-
+		
 		if ("scream","screams")
 			message = "<B>[src]</B> screams!"
 			m_type = 2
@@ -222,7 +222,7 @@
 			m_type = 1
 
 		if ("shake","shakes")
-			message = "<B>[src]</B> shakes [p_their()] head."
+			message = "<B>[src]</B> shakes its head."
 			m_type = 1
 
 		if ("sigh","sighs")
@@ -268,7 +268,7 @@
 				message = "<B>[src]</B> stares."
 
 		if ("stretch","stretches")
-			message = "<B>[src]</B> stretches [p_their()] arms."
+			message = "<B>[src]</B> stretches their arms."
 			m_type = 2
 
 		if ("sulk","sulks")
@@ -276,12 +276,20 @@
 			m_type = 1
 
 		if ("surrender","surrenders")
-			message = "<B>[src]</B> puts [p_their()] hands on [p_their()] head and falls to the ground, [p_they()] surrender[p_s()]!"
+			message = "<B>[src]</B> puts their hands on their head and falls to the ground, they surrender!"
 			if(sleeping)
 				return //Can't surrender while asleep.
 			Weaken(20) //So you can't resist.
 			m_type = 1
 
+		if ("faint","faints")
+			message = "<B>[src]</B> faints."
+			if(sleeping)
+				return //Can't faint while asleep
+			SetSleeping(10) //Short-short nap
+			m_type = 1
+
+
 		if ("sway","sways")
 			message = "<B>[src]</B> sways around dizzily."
 			m_type = 1
@@ -331,7 +339,7 @@
  // Maybe some people are okay with that.
 
 		for(var/mob/M in dead_mob_list)
-			if(!M.client || isnewplayer(M))
+			if(!M.client || istype(M, /mob/new_player))
 				continue //skip monkeys, leavers and new players
 			var/T = get_turf(src)
 			if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T,null)))