diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 8a6643d23985..88ea10b943a7 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -153,23 +153,6 @@ 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" diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm index 09d5dfe062cd..34e04f4f78a9 100644 --- a/modular_splurt/code/modules/mob/living/emotes.dm +++ b/modular_splurt/code/modules/mob/living/emotes.dm @@ -1437,3 +1437,39 @@ emote_sound = 'modular_splurt/sound/voice/canon_event.ogg' emote_cooldown = 5.0 SECONDS emote_volume = 27 + +/datum/emote/living/audio/meow + key = "meow" + key_third_person = "meows" + message = "meows!" + emote_sound = 'modular_splurt/sound/voice/catpeople/cat_meow1.ogg' + emote_cooldown = 0.8 SECONDS // the longest audio is 1 second but who gives a fuck mrrp mrrp meow + emote_pitch_variance = FALSE // why would you + +/datum/emote/living/audio/meow/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/catpeople/cat_meow1.ogg', 'modular_splurt/sound/voice/catpeople/cat_meow2.ogg', 'modular_splurt/sound/voice/catpeople/cat_meow3.ogg') // Credit to Nyanotrasen (https://github.com/Nyanotrasen/Nyanotrasen) + . = ..() + +/datum/emote/living/audio/meow2 + key = "meow2" + key_third_person = "mews!" + message = "mews!" + emote_sound = 'modular_splurt/sound/voice/catpeople/cat_mew1.ogg' + emote_cooldown = 0.8 SECONDS // mrrp mrrp meow + emote_pitch_variance = FALSE + +/datum/emote/living/audio/meow2/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/catpeople/cat_mew1.ogg', 'modular_splurt/sound/voice/catpeople/cat_mew2.ogg') // Credit to Nyanotrasen (https://github.com/Nyanotrasen/Nyanotrasen) + . = ..() + +/datum/emote/living/audio/mrrp + key = "mrrp" + key_third_person = "mrrps" + message = "trills like a cat!" + emote_sound = 'modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg' + emote_cooldown = 0.8 SECONDS // mrrp mrrp meow + emote_pitch_variance = FALSE + +/datum/emote/living/audio/mrrp/run_emote(mob/user, params) + emote_sound = pick('modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg', 'modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg') + . = ..() diff --git a/modular_splurt/sound/voice/catpeople/cat_meow1.ogg b/modular_splurt/sound/voice/catpeople/cat_meow1.ogg new file mode 100644 index 000000000000..6ed99f0d581e Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_meow1.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_meow2.ogg b/modular_splurt/sound/voice/catpeople/cat_meow2.ogg new file mode 100644 index 000000000000..34bb375fe5db Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_meow2.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_meow3.ogg b/modular_splurt/sound/voice/catpeople/cat_meow3.ogg new file mode 100644 index 000000000000..0af0cb0e07b1 Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_meow3.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_mew1.ogg b/modular_splurt/sound/voice/catpeople/cat_mew1.ogg new file mode 100644 index 000000000000..e41650e0fb16 Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_mew1.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_mew2.ogg b/modular_splurt/sound/voice/catpeople/cat_mew2.ogg new file mode 100644 index 000000000000..d82657b9a47c Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_mew2.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg b/modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg new file mode 100644 index 000000000000..dd37f0a12991 Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg b/modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg new file mode 100644 index 000000000000..1c1fe6951ad5 Binary files /dev/null and b/modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg differ diff --git a/modular_splurt/sound/voice/catpeople/credits.txt b/modular_splurt/sound/voice/catpeople/credits.txt new file mode 100644 index 000000000000..5142f47fbcfd --- /dev/null +++ b/modular_splurt/sound/voice/catpeople/credits.txt @@ -0,0 +1 @@ +Sound Files ported from https://github.com/Nyanotrasen/Nyanotrasen/ created by Elijahrane \ No newline at end of file