Custom_emote now used in place of emote("me")

Also fixes some emotes which didn't actually exist for their respective
characters.
Left untouched: Jungle mobs, whatever those are supposed to be.
This commit is contained in:
Crazylemon64
2015-10-09 13:00:05 -07:00
parent 525953616f
commit 3c72286f2f
30 changed files with 66 additions and 64 deletions
+3 -3
View File
@@ -552,7 +552,7 @@
stage = 3
activate(var/mob/living/carbon/mob,var/multiplier)
if(prob(30))
mob.emote("me",1,"is sweating profusely!")
mob.custom_emote(1,"is sweating profusely!")
if(istype(mob.loc,/turf/simulated))
var/turf/simulated/T = mob.loc
@@ -583,7 +583,7 @@
if(pick(0,1))
mob.say(pick("Uh HUH!", "Thank you, Thank you very much...", "I ain't nothin' but a hound dog!", "Swing low, sweet chariot!"))
else
mob.emote("me",1,pick("curls his lip!", "gyrates his hips!", "thrusts his hips!"))
mob.custom_emote(1,pick("curls his lip!", "gyrates his hips!", "thrusts his hips!"))
if(istype(mob, /mob/living/carbon/human))
var/mob/living/carbon/human/H = mob
if(H.species.name == "Human" && !(H.f_style == "Pompadour"))
@@ -945,7 +945,7 @@ var/list/compatible_mobs = list(/mob/living/carbon/human)
name = "Wheezing"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
mob.emote("me",1,"wheezes.")
mob.custom_emote(1,"wheezes.")
/datum/disease2/effect/optimistic_minor