Allowed more mobs to emote with me verb

This commit is contained in:
Whitellama
2012-11-20 03:09:42 -08:00
parent 5ad12e5c95
commit f0be63eaa1
6 changed files with 12 additions and 7 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -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()
@@ -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
+3 -3
View File
@@ -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."
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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)