From 4cefd9219f3e2d1947b2137702e2b1a5ab5d47cc Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 25 Dec 2017 21:32:05 -0600
Subject: [PATCH] Update say.dm

---
 code/modules/mob/say.dm | 85 -----------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 32710c06f9..f9ee14b638 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -1,87 +1,3 @@
-<<<<<<< HEAD
-//Speech verbs.
-/mob/verb/say_verb(message as text)
-	set name = "Say"
-	set category = "IC"
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-	usr.say(message)
-
-
-/mob/verb/whisper_verb(message as text)
-	set name = "Whisper"
-	set category = "IC"
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-	whisper(message)
-
-/mob/proc/whisper(message, datum/language/language=null)
-	say(message, language) //only living mobs actually whisper, everything else just talks
-
-/mob/verb/me_verb(message as text)
-	set name = "Me"
-	set category = "IC"
-
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-
-	usr.emote("me",1,message)
-
-/mob/proc/say_dead(var/message)
-	var/name = real_name
-	var/alt_name = ""
-
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-
-	if(jobban_isbanned(src, "OOC"))
-		to_chat(src, "<span class='danger'>You have been banned from deadchat.</span>")
-		return
-
-	if (src.client)
-		if(src.client.prefs.muted & MUTE_DEADCHAT)
-			to_chat(src, "<span class='danger'>You cannot talk in deadchat (muted).</span>")
-			return
-
-		if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
-			return
-
-	var/mob/dead/observer/O = src
-	if(isobserver(src) && O.deadchat_name)
-		name = "[O.deadchat_name]"
-	else
-		if(mind && mind.name)
-			name = "[mind.name]"
-		else
-			name = real_name
-		if(name != real_name)
-			alt_name = " (died as [real_name])"
-
-	var/K
-
-	if(key)
-		K = src.key
-
-	message = src.say_quote(message, get_spans())
-	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
-
-	deadchat_broadcast(rendered, follow_target = src, speaker_key = K)
-
-/mob/proc/emote(var/act)
-	return
-
-/mob/proc/hivecheck()
-	return 0
-
-/mob/proc/lingcheck()
-	return LINGHIVE_NONE
-=======
 //Speech verbs.
 /mob/verb/say_verb(message as text)
 	set name = "Say"
@@ -170,4 +86,3 @@
 
 /mob/proc/lingcheck()
 	return LINGHIVE_NONE
->>>>>>> 887cc89... No flipping while unconscious (#33736)