From 2e53798e05683fdea4ef9d3de414ea26bc31939a Mon Sep 17 00:00:00 2001 From: quotefox Date: Wed, 16 Jun 2021 18:16:10 +0100 Subject: [PATCH] *chirp and *caw for avians. emotes. --- code/modules/mob/emote.dm | 1 + hyperstation/code/mobs/emote.dm | 33 ++++++++++++++++++++++++++++++++ sound/voice/caw.ogg | Bin 0 -> 7457 bytes sound/voice/chirp.ogg | Bin 0 -> 4782 bytes tgstation.dme | 1 + 5 files changed, 35 insertions(+) create mode 100644 hyperstation/code/mobs/emote.dm create mode 100644 sound/voice/caw.ogg create mode 100644 sound/voice/chirp.ogg 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 0000000000000000000000000000000000000000..22d20d81206b059192f00908c9a7c557fd1ed77e GIT binary patch literal 7457 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 DbQT2_ literal 0 HcmV?d00001 diff --git a/sound/voice/chirp.ogg b/sound/voice/chirp.ogg new file mode 100644 index 0000000000000000000000000000000000000000..73cb0376d215e52d03c0bac88023c0fb828c74bf GIT binary patch literal 4782 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 N6tU}$QGmM^_z(Q3*Bbx; literal 0 HcmV?d00001 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"