diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 1d7e76f1..09d8ec2e 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -75,3 +75,4 @@ user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/speen.ogg', 50, 1, -1) . = ..() + diff --git a/hyperstation/code/mobs/emote.dm b/hyperstation/code/mobs/emote.dm new file mode 100644 index 00000000..51e0018d --- /dev/null +++ b/hyperstation/code/mobs/emote.dm @@ -0,0 +1,33 @@ +/datum/emote/living/chirp + key = "chirp" + key_third_person = "chirps!" + message = "chirps!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) + +/datum/emote/living/chirp/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'sound/voice/chirp.ogg', 50, 1, -1) + +/datum/emote/living/caw + key = "caw" + key_third_person = "caws!" + message = "caws!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) + +/datum/emote/living/chirp/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'sound/voice/caw.ogg', 50, 1, -1) \ No newline at end of file diff --git a/sound/voice/caw.ogg b/sound/voice/caw.ogg new file mode 100644 index 00000000..22d20d81 Binary files /dev/null and b/sound/voice/caw.ogg differ diff --git a/sound/voice/chirp.ogg b/sound/voice/chirp.ogg new file mode 100644 index 00000000..73cb0376 Binary files /dev/null and b/sound/voice/chirp.ogg differ diff --git a/tgstation.dme b/tgstation.dme index e1440ddd..45042bd7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3064,6 +3064,7 @@ #include "hyperstation\code\hyperbot\hyperbot.dm" #include "hyperstation\code\mobs\carrion.dm" #include "hyperstation\code\mobs\dancer.dm" +#include "hyperstation\code\mobs\emote.dm" #include "hyperstation\code\mobs\hugbot.dm" #include "hyperstation\code\mobs\mimic.dm" #include "hyperstation\code\mobs\werewolf.dm"