diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 49b267144..6ed540b2c 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -625,4 +625,65 @@ if(ishumanbasic(C)) playsound(C, pick('hyperstation/sound/voice/emotes/tesh_sneeze1.ogg', 'hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg'), 50, 1) if(is_species(user, /datum/species/avian))//This is required(related to subtypes), otherwise it doesn't play the noises. Sometimes. Always sometimes. Just how it be. - playsound(C, pick('hyperstation/sound/voice/emotes/tesh_sneeze1.ogg', 'hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg'), 50, 1) \ No newline at end of file + playsound(C, pick('hyperstation/sound/voice/emotes/tesh_sneeze1.ogg', 'hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg'), 50, 1) + +/datum/emote/living/racc + key = "racc_chitter" + key_third_person = "chitters" + message = "chitters." + emote_type = EMOTE_AUDIBLE + +/datum/emote/living/racc/can_run_emote(mob/living/user, status_check = TRUE) + . = ..() + if(. && iscarbon(user)) + var/mob/living/carbon/C = user + return !C.silent + +/datum/emote/living/racc/run_emote(mob/user, params) + . = ..() + if(. && iscarbon(user)) + var/mob/living/carbon/C = user + if(!C.mind || C.mind.miming) + return + if(ishumanbasic(C)) + playsound(C, pick('hyperstation/sound/voice/emotes/racc_chitter_1.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_2.ogg',\ + 'hyperstation/sound/voice/emotes/racc_chitter_3.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_4.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_5.ogg',\ + 'hyperstation/sound/voice/emotes/racc_chitter_6.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_7.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_8.ogg'), 50, 1) + if(is_species(user, /datum/species/mammal)) + playsound(C, pick('hyperstation/sound/voice/emotes/racc_chitter_1.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_2.ogg',\ + 'hyperstation/sound/voice/emotes/racc_chitter_3.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_4.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_5.ogg',\ + 'hyperstation/sound/voice/emotes/racc_chitter_6.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_7.ogg', 'hyperstation/sound/voice/emotes/racc_chitter_8.ogg'), 50, 1) + +/datum/emote/living/bat + key = "bat_chitter" + key_third_person = "chitters" + message = "chitters." + emote_type = EMOTE_AUDIBLE + +/datum/emote/living/bat/can_run_emote(mob/living/user, status_check = TRUE) + . = ..() + if(. && iscarbon(user)) + var/mob/living/carbon/C = user + return !C.silent + +/datum/emote/living/bat/run_emote(mob/user, params) + . = ..() + if(. && iscarbon(user)) + var/mob/living/carbon/C = user + if(!C.mind || C.mind.miming) + return + if(ishumanbasic(C)) + playsound(C, pick('hyperstation/sound/voice/emotes/bat_c1.ogg', 'hyperstation/sound/voice/emotes/bat_c2.ogg', 'hyperstation/sound/voice/emotes/bat_c3.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c4.ogg', 'hyperstation/sound/voice/emotes/bat_c5.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c6.ogg', 'hyperstation/sound/voice/emotes/bat_c7.ogg', 'hyperstation/sound/voice/emotes/bat_c8.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c9.ogg'), 50, 1) + if(is_species(user, /datum/species/mammal)) + playsound(C, pick('hyperstation/sound/voice/emotes/bat_c1.ogg', 'hyperstation/sound/voice/emotes/bat_c2.ogg', 'hyperstation/sound/voice/emotes/bat_c3.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c4.ogg', 'hyperstation/sound/voice/emotes/bat_c5.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c6.ogg', 'hyperstation/sound/voice/emotes/bat_c7.ogg', 'hyperstation/sound/voice/emotes/bat_c8.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c9.ogg'), 50, 1) + if(is_species(user, /datum/species/avian))//this and mammal should be considered the same AAAAAAAAAAAA + playsound(C, pick('hyperstation/sound/voice/emotes/bat_c1.ogg', 'hyperstation/sound/voice/emotes/bat_c2.ogg', 'hyperstation/sound/voice/emotes/bat_c3.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c4.ogg', 'hyperstation/sound/voice/emotes/bat_c5.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c6.ogg', 'hyperstation/sound/voice/emotes/bat_c7.ogg', 'hyperstation/sound/voice/emotes/bat_c8.ogg',\ + 'hyperstation/sound/voice/emotes/bat_c9.ogg'), 50, 1) \ No newline at end of file diff --git a/hyperstation/sound/voice/emotes/bat_c1.ogg b/hyperstation/sound/voice/emotes/bat_c1.ogg new file mode 100644 index 000000000..c11beedc1 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c1.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c2.ogg b/hyperstation/sound/voice/emotes/bat_c2.ogg new file mode 100644 index 000000000..45e13541c Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c2.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c3.ogg b/hyperstation/sound/voice/emotes/bat_c3.ogg new file mode 100644 index 000000000..1e34c2cf9 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c3.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c4.ogg b/hyperstation/sound/voice/emotes/bat_c4.ogg new file mode 100644 index 000000000..94f43daf6 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c4.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c5.ogg b/hyperstation/sound/voice/emotes/bat_c5.ogg new file mode 100644 index 000000000..17207ccb8 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c5.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c6.ogg b/hyperstation/sound/voice/emotes/bat_c6.ogg new file mode 100644 index 000000000..ebb740078 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c6.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c7.ogg b/hyperstation/sound/voice/emotes/bat_c7.ogg new file mode 100644 index 000000000..de58d94f1 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c7.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c8.ogg b/hyperstation/sound/voice/emotes/bat_c8.ogg new file mode 100644 index 000000000..3952d5407 Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c8.ogg differ diff --git a/hyperstation/sound/voice/emotes/bat_c9.ogg b/hyperstation/sound/voice/emotes/bat_c9.ogg new file mode 100644 index 000000000..702eac32c Binary files /dev/null and b/hyperstation/sound/voice/emotes/bat_c9.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_1.ogg b/hyperstation/sound/voice/emotes/racc_chitter_1.ogg new file mode 100644 index 000000000..35a90dff6 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_1.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_2.ogg b/hyperstation/sound/voice/emotes/racc_chitter_2.ogg new file mode 100644 index 000000000..060c442f0 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_2.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_3.ogg b/hyperstation/sound/voice/emotes/racc_chitter_3.ogg new file mode 100644 index 000000000..ad750c8a6 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_3.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_4.ogg b/hyperstation/sound/voice/emotes/racc_chitter_4.ogg new file mode 100644 index 000000000..538e765e5 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_4.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_5.ogg b/hyperstation/sound/voice/emotes/racc_chitter_5.ogg new file mode 100644 index 000000000..478edce39 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_5.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_6.ogg b/hyperstation/sound/voice/emotes/racc_chitter_6.ogg new file mode 100644 index 000000000..871a47c4c Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_6.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_7.ogg b/hyperstation/sound/voice/emotes/racc_chitter_7.ogg new file mode 100644 index 000000000..0f10084b1 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_7.ogg differ diff --git a/hyperstation/sound/voice/emotes/racc_chitter_8.ogg b/hyperstation/sound/voice/emotes/racc_chitter_8.ogg new file mode 100644 index 000000000..2e141dd37 Binary files /dev/null and b/hyperstation/sound/voice/emotes/racc_chitter_8.ogg differ