From f0be63eaa1f093a1c12fa08cd8401a362fc2123f Mon Sep 17 00:00:00 2001
From: Whitellama <travis.whitellama@yahoo.com>
Date: Tue, 20 Nov 2012 03:09:42 -0800
Subject: [PATCH] Allowed more mobs to emote with me verb

---
 code/modules/mob/emote.dm                     | 2 +-
 code/modules/mob/living/blob/blob.dm          | 1 +
 code/modules/mob/living/carbon/brain/brain.dm | 5 ++++-
 code/modules/mob/living/parasite/meme.dm      | 6 +++---
 code/modules/mob/mob_defines.dm               | 3 ++-
 code/modules/mob/say.dm                       | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 783f3404e85..0a8f7045ce5 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -1,7 +1,7 @@
 // All mobs should have custom emote, really..
 mob/proc/custom_emote(var/m_type=1,var/message = null)
 
-	if(!emote_allowed && usr == src)
+	if(!use_me && usr == src)
 		usr << "You are unable to emote."
 		return
 
diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm
index e49c166f1b2..b8ec9a3b368 100644
--- a/code/modules/mob/living/blob/blob.dm
+++ b/code/modules/mob/living/blob/blob.dm
@@ -8,6 +8,7 @@
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 	var/ghost_name = "Unknown"
 	var/creating_blob = 0
+	use_me = 0 //Blobs can't emote
 
 
 	New()
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 0a917a0158f..8f60796d0d5 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -5,6 +5,7 @@
 	var/timeofhostdeath = 0
 	var/emp_damage = 0//Handles a type of MMI damage
 	var/alert = null
+	use_me = 0 //Can't use the me verb, it's a freaking immobile brain
 
 	New()
 		var/datum/reagents/R = new/datum/reagents(1000)
@@ -48,6 +49,8 @@
 
 
 /mob/living/carbon/brain/update_canmove()
-	if(in_contents_of(/obj/mecha))	canmove = 1
+	if(in_contents_of(/obj/mecha))
+		canmove = 1
+		use_me = 1 //If it can move, let it emote
 	else							canmove = 0
 	return canmove
\ No newline at end of file
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 60a729c6628..880f21bad51 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -259,7 +259,7 @@ mob/living/parasite/meme/verb/Paralyze()
 	set desc     = "Prevents your host from using emote for a while."
 
 	if(!src.host) return
-	if(!host.emote_allowed)
+	if(!host.use_me)
 		usr << "\red Your host already can't use body language.."
 		return
 	if(!use_points(250)) return
@@ -271,11 +271,11 @@ mob/living/parasite/meme/verb/Paralyze()
 		host << "\red Your body feels numb.. You lose your ability to use body language."
 		usr << "\red Your host can't use body language anymore."
 
-		host.emote_allowed = 0
+		host.use_me = 0
 
 		sleep(1200)
 
-		host.emote_allowed = 1
+		host.use_me = 1
 		host << "\red Your body has feeling again.."
 		usr << "\red [host] can use body language again."
 
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index d69fc758db0..946875f5578 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -44,7 +44,7 @@
 	*/
 	var/obj/screen/zone_sel/zone_sel = null
 
-	var/emote_allowed = 1
+	var/use_me = 1 //Allows all mobs to use the me verb by default, will have to manually specify they cannot
 	var/computer_id = null
 	var/lastattacker = null
 	var/lastattacked = null
@@ -234,3 +234,4 @@
 	var/can_stand = 1 //Whether this mob have ability to stand
 
 	var/immune_to_ssd = 0
+
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 401383762b6..0d2f1b63e7e 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -17,7 +17,7 @@
 
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
-	if(ishuman(src) || isrobot(src))
+	if(use_me)
 		usr.emote("me",1,message)
 	else
 		usr.emote(message)