cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky

Browse Source 
Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Albert Iordache
2011-12-27 17:08:52 +02:00
parent f8ebfeeeb4 22cf9306e9
commit 9219a22f14
8 changed files with 7824 additions and 7808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+2 -2
View File
@@ -271,12 +271,12 @@
m_type = 2
if ("mumble")
message = "<B>[src]</B> mumbles!"
message = "<B>[src]</B> mumbles."
m_type = 2
if ("grumble")
if (!muzzled)
message = "<B>[src]</B> grumbles!"
message = "<B>[src]</B> grumbles."
m_type = 2
else
message = "<B>[src]</B> makes a noise."