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

Merge pull request #11555 from Arkatos1/hissfix

Browse Source 
You can no longer hiss while muzzled
This commit is contained in:
Fox McCloud
2019-05-19 16:45:55 -04:00
committed by GitHub
parent efa8d72941 69cb37bf22
commit 9f9d13dbd0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+7 -3
View File
@@ -206,9 +206,13 @@
if("hiss", "hisses")
var/M = handle_emote_param(param)
message = "<B>[src]</B> hisses[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/unathihiss.ogg', 50, 0) //Credit to Jamius (freesound.org) for the sound.
m_type = 2
if(!muzzled)
message = "<B>[src]</B> hisses[M ? " at [M]" : ""]."
playsound(loc, 'sound/effects/unathihiss.ogg', 50, 0) //Credit to Jamius (freesound.org) for the sound.
m_type = 2
else
message = "<B>[src]</B> makes a weak hissing noise."
m_type = 2
if("quill", "quills")
var/M = handle_emote_param(param)