diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index db01ef47a..f46ee4f91 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -229,6 +229,10 @@ 'sound/voice/catpeople/nyahehe.ogg'), 50, 1) return + if(isinsect(C)) + playsound(C, pick('sound/voice/mothlaugh.ogg'), + 50, 1) + return /datum/emote/living/look key = "look" diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index c0fc04000..d2b682c28 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -272,13 +272,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/cackle key = "cackle" @@ -296,6 +289,13 @@ playsound(user, 'modular_citadel/sound/voice/cackle_yeen.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(!(. = ..())) @@ -320,3 +320,163 @@ return user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/purr.ogg', 50, 1, -1) + +/datum/emote/living/chime + key = "chime" + 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) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_citadel/sound/voice/chime.ogg', 50, 1, -1) + +/datum/emote/living/chord + key = "chord" + key_third_person = "emits a sharp chord!" + message = "emits a sharp chord!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/chord/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/chord.ogg', 50, 1, -1) + +/datum/emote/living/tada + key = "tada" + key_third_person = "emits a triumphant tone!" + message = "emits a triumphant tone!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/tada/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/tada.ogg', 50, 1, -1) + +/datum/emote/living/error + key = "error" + key_third_person = "emits a error noise." + message = "emits a error noise." + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/error/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/xp_error.ogg', 50, 1, -1) + +/datum/emote/living/synthno + key = "no" + key_third_person = "emits a negative sad boop." + message = "emits a negative sad." + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/synthno/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/synth_no.ogg', 50, 1, -1) + +/datum/emote/living/synthyes + key = "yes" + key_third_person = "emits a positive boop." + message = "emits a positive boop." + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/synthyes/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/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!" + message = "merowrs!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/merowr/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/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!" + message = "chitters!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/mothchitter/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/mothchitter.ogg', 50, 1, -1) diff --git a/modular_citadel/sound/voice/baranyuu.ogg b/modular_citadel/sound/voice/baranyuu.ogg new file mode 100644 index 000000000..7b6691853 Binary files /dev/null and b/modular_citadel/sound/voice/baranyuu.ogg differ diff --git a/modular_citadel/sound/voice/chime.ogg b/modular_citadel/sound/voice/chime.ogg new file mode 100644 index 000000000..df201e867 Binary files /dev/null and b/modular_citadel/sound/voice/chime.ogg differ diff --git a/modular_citadel/sound/voice/chord.ogg b/modular_citadel/sound/voice/chord.ogg new file mode 100644 index 000000000..e2842859f Binary files /dev/null and b/modular_citadel/sound/voice/chord.ogg differ diff --git a/modular_citadel/sound/voice/marmeow.ogg b/modular_citadel/sound/voice/marmeow.ogg new file mode 100644 index 000000000..24e2d0d36 Binary files /dev/null and b/modular_citadel/sound/voice/marmeow.ogg differ diff --git a/modular_citadel/sound/voice/mothchitter.ogg b/modular_citadel/sound/voice/mothchitter.ogg new file mode 100644 index 000000000..842bcf8e5 Binary files /dev/null and b/modular_citadel/sound/voice/mothchitter.ogg differ diff --git a/modular_citadel/sound/voice/synth_no.ogg b/modular_citadel/sound/voice/synth_no.ogg new file mode 100644 index 000000000..f0d2c3bfb Binary files /dev/null and b/modular_citadel/sound/voice/synth_no.ogg differ diff --git a/modular_citadel/sound/voice/synth_yes.ogg b/modular_citadel/sound/voice/synth_yes.ogg new file mode 100644 index 000000000..300cad132 Binary files /dev/null and b/modular_citadel/sound/voice/synth_yes.ogg differ diff --git a/modular_citadel/sound/voice/tada.ogg b/modular_citadel/sound/voice/tada.ogg new file mode 100644 index 000000000..b1a07640a Binary files /dev/null and b/modular_citadel/sound/voice/tada.ogg differ diff --git a/modular_citadel/sound/voice/xp_error.ogg b/modular_citadel/sound/voice/xp_error.ogg new file mode 100644 index 000000000..aeaa888ae Binary files /dev/null and b/modular_citadel/sound/voice/xp_error.ogg differ diff --git a/sound/voice/mothlaugh.ogg b/sound/voice/mothlaugh.ogg new file mode 100644 index 000000000..391d6c5ae Binary files /dev/null and b/sound/voice/mothlaugh.ogg differ