missing ones

This commit is contained in:
Fox-McCloud
2016-05-09 03:10:40 -04:00
parent 83b522e289
commit 67bee9ad5f
3 changed files with 10 additions and 7 deletions

View File

@@ -11,6 +11,7 @@
//Emote Cooldown System (it's so simple!)
// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
var/on_CD = 0
act = lowertext(act)
switch(act)
//Cooldown-inducing emotes
if("scream", "screams")

View File

@@ -250,18 +250,19 @@
return
/mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
if(stat)
if(stat)
return
var/on_CD = 0
act = lowertext(act)
switch(act)
if("chirp")
on_CD = handle_emote_CD()
on_CD = handle_emote_CD()
else
on_CD = 0
on_CD = 0
if(on_CD == 1)
return
return
switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
if("chirp")

View File

@@ -269,8 +269,9 @@
return
/mob/living/simple_animal/emote(var/act, var/m_type=1, var/message = null)
if(stat) return
if(stat)
return
act = lowertext(act)
switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
if("scream")
message = "<B>\The [src]</B> whimpers."