diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index d2b682c28..b672fdc3a 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -303,7 +303,8 @@ if(user.nextsoundemote >= world.time) return user.nextsoundemote = world.time + 7 - playsound(user, 'modular_citadel/sound/voice/meow1.ogg', 50, 1, -1) + var/path = pick(list('modular_citadel/sound/voice/merowr.ogg', 'modular_citadel/sound/voice/meow1.ogg', 'modular_citadel/sound/voice/meow2.ogg', 'modular_citadel/sound/voice/meow3.ogg', 'modular_citadel/sound/voice/meow4.ogg')) + playsound(user, path, 50, 1, -1) /datum/emote/living/purr key = "purr" @@ -321,15 +322,15 @@ user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/purr.ogg', 50, 1, -1) -/datum/emote/living/chime - key = "chime" +/datum/emote/living/xpchime + key = "xpchime" key_third_person = "emits a soft chime." message = "emits a soft chime." emote_type = EMOTE_AUDIBLE muzzle_ignore = FALSE restraint_check = FALSE -/datum/emote/living/chime/run_emote(mob/living/user, params) +/datum/emote/living/xpchime/run_emote(mob/living/user, params) if(!(. = ..())) return if(user.nextsoundemote >= world.time) @@ -417,22 +418,6 @@ user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/synth_yes.ogg', 50, 1, -1) -/datum/emote/living/marmeow - key = "marmeow" - key_third_person = "meows." - message = "meows." - emote_type = EMOTE_AUDIBLE - muzzle_ignore = FALSE - restraint_check = FALSE - -/datum/emote/living/marmeow/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/marmeow.ogg', 50, 1, -1) - /datum/emote/living/merowr key = "merowr" key_third_person = "merowrs!" @@ -449,22 +434,6 @@ user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/merowr.ogg', 50, 1, -1) -/datum/emote/living/baranyuu - key = "baranyuu" - key_third_person = "meows..?" - message = "meows..?" - emote_type = EMOTE_AUDIBLE - muzzle_ignore = FALSE - restraint_check = FALSE - -/datum/emote/living/baranyuu/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/baranyuu.ogg', 50, 1, -1) - /datum/emote/living/mothchitter key = "mchitter" key_third_person = "chitters!" @@ -480,3 +449,19 @@ return user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/mothchitter.ogg', 50, 1, -1) + +/datum/emote/living/sping + key = "sping" + key_third_person = "pings!" + message = "pings!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/sping/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/ping.ogg', 50, 1, -1) diff --git a/modular_citadel/sound/voice/marmeow.ogg b/modular_citadel/sound/voice/marmeow.ogg index 24e2d0d36..4c226da82 100644 Binary files a/modular_citadel/sound/voice/marmeow.ogg and b/modular_citadel/sound/voice/marmeow.ogg differ diff --git a/modular_citadel/sound/voice/meow2.ogg b/modular_citadel/sound/voice/meow2.ogg new file mode 100644 index 000000000..345597de5 Binary files /dev/null and b/modular_citadel/sound/voice/meow2.ogg differ diff --git a/modular_citadel/sound/voice/meow3.ogg b/modular_citadel/sound/voice/meow3.ogg new file mode 100644 index 000000000..3ec938d16 Binary files /dev/null and b/modular_citadel/sound/voice/meow3.ogg differ diff --git a/modular_citadel/sound/voice/meow4.ogg b/modular_citadel/sound/voice/meow4.ogg new file mode 100644 index 000000000..3e0390e5c Binary files /dev/null and b/modular_citadel/sound/voice/meow4.ogg differ diff --git a/modular_citadel/sound/voice/ping.ogg b/modular_citadel/sound/voice/ping.ogg new file mode 100644 index 000000000..3f8a27cfc Binary files /dev/null and b/modular_citadel/sound/voice/ping.ogg differ