Merge pull request #13588 from Delams-The-SM/extra_emotes
Adding hiss, purr and meow emotes
This commit is contained in:
@@ -132,6 +132,54 @@
|
||||
user.nextsoundemote = world.time + 7
|
||||
playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1)
|
||||
|
||||
/datum/emote/living/hiss
|
||||
key = "hiss"
|
||||
key_third_person = "hisses"
|
||||
message = "hisses!"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
muzzle_ignore = FALSE
|
||||
restraint_check = FALSE
|
||||
|
||||
/datum/emote/living/hiss/run_emote(mob/living/user, params)
|
||||
if(!(. = ..()))
|
||||
return
|
||||
if(user.nextsoundemote >= world.time)
|
||||
return
|
||||
user.nextsoundemote = world.time + 7
|
||||
playsound(user, 'modular_citadel/sound/voice/hiss.ogg', 50, 1, -1)
|
||||
|
||||
/datum/emote/living/meow
|
||||
key = "meow"
|
||||
key_third_person = "mrowls"
|
||||
message = "mrowls!"
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
muzzle_ignore = FALSE
|
||||
restraint_check = FALSE
|
||||
|
||||
/datum/emote/living/meow/run_emote(mob/living/user, params)
|
||||
if(!(. = ..()))
|
||||
return
|
||||
if(user.nextsoundemote >= world.time)
|
||||
return
|
||||
user.nextsoundemote = world.time + 7
|
||||
playsound(user, 'modular_citadel/sound/voice/meow1.ogg', 50, 1, -1)
|
||||
|
||||
/datum/emote/living/purr
|
||||
key = "purr"
|
||||
key_third_person = "purrs softly"
|
||||
message = "purrs softly."
|
||||
emote_type = EMOTE_AUDIBLE
|
||||
muzzle_ignore = FALSE
|
||||
restraint_check = FALSE
|
||||
|
||||
/datum/emote/living/purr/run_emote(mob/living/user, params)
|
||||
if(!(. = ..()))
|
||||
return
|
||||
if(user.nextsoundemote >= world.time)
|
||||
return
|
||||
user.nextsoundemote = world.time + 7
|
||||
playsound(user, 'modular_citadel/sound/voice/purr.ogg', 50, 1, -1)
|
||||
|
||||
/datum/emote/living/nya
|
||||
key = "nya"
|
||||
key_third_person = "lets out a nya"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user