Merge pull request #4122 from MisterLayne/emotes4dayz

More emotes!
This commit is contained in:
Anewbe
2017-10-22 14:52:07 -05:00
committed by GitHub
4 changed files with 16 additions and 0 deletions

View File

@@ -174,9 +174,11 @@
if ("clap")
if (!src.restrained())
message = "claps."
playsound(src.loc, 'sound/misc/clapping.ogg')
m_type = 2
if(miming)
m_type = 1
if ("flap")
if (!src.restrained())
message = "flaps [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] wings."
@@ -700,6 +702,20 @@
vomit()
return
if("whistle" || "whistles")
if(!muzzled)
message = "whistles a tune."
playsound(loc, 'sound/misc/longwhistle.ogg') //praying this doesn't get abused
else
message = "makes a light spitting noise, a poor attempt at a whistle."
if("qwhistle")
if(!muzzled)
message = "whistles quietly."
playsound(loc, 'sound/misc/shortwhistle.ogg')
else
message = "makes a light spitting noise, a poor attempt at a whistle."
if ("help")
src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \
frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, \

BIN
sound/misc/clapping.ogg Normal file

Binary file not shown.

BIN
sound/misc/longwhistle.ogg Normal file

Binary file not shown.

BIN
sound/misc/shortwhistle.ogg Normal file

Binary file not shown.