shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8054 from deathride58/merp

Browse Source 
Adds merp as an emote
This commit is contained in:
kevinz000
2019-03-01 02:29:42 -08:00
committed by GitHub
parent c9346b4bf1 f6a35c285a
commit bb84b911f5
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/cit_emotes.dm
+19 -4
View File
@@ -205,8 +205,23 @@
mob_type_allowed_typecache = list(/mob/living/carbon)
/datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_citadel/sound/voice/mothsqueak.ogg', 50, 1, -1)
if(ishuman(user))
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_citadel/sound/voice/mothsqueak.ogg', 50, 1, -1)
. = ..()
/datum/emote/living/merp
key = "merp"
key_third_person = "merps"
message = "merps!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/merp/run_emote(mob/living/user, params)
if(ishuman(user))
if(user.nextsoundemote >= world.time)
return
user.nextsoundemote = world.time + 7
playsound(user, 'modular_citadel/sound/voice/merp.ogg', 50, 1, -1)
. = ..()