Merge pull request #161 from SkyMarshal/master

Added air pressure define for disposals, minor map edit, removed Deathgasp from emotes.
This commit is contained in:
Albert Iordache
2011-12-28 00:57:37 -08:00
3 changed files with 7622 additions and 7617 deletions
@@ -183,9 +183,10 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
if ("deathgasp")
/* if ("deathgasp")
message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1
m_type = 1 */
//No. --SkyMarshal
if ("giggle")
if (!muzzled)