diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 8f5dca7508d..af72a5b2e04 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -200,6 +200,7 @@ message_param = "blows a kiss to %t." emote_type = EMOTE_AUDIBLE +/* SKYRAT EDIT REMOVAL - EMOTES - MOVED TO EMOTES.DM MODULAR /datum/emote/living/laugh key = "laugh" key_third_person = "laughs" @@ -215,6 +216,7 @@ return !C.silent /datum/emote/living/laugh/get_sound(mob/living/user) + . = ..() if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna.species.id == "human" && (!H.mind || !H.mind.miming)) @@ -222,6 +224,7 @@ return 'sound/voice/human/womanlaugh.ogg' else return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg') +*/ //SKYRAT EDIT END /datum/emote/living/look key = "look" diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index f8de5bc41c8..c9f4f0667db 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -64,8 +64,14 @@ if(user.nextsoundemote >= world.time) return user.nextsoundemote = world.time + 7 - if (isvox(user)) - playsound(user, 'modular_skyrat/modules/emotes/sound/emotes/voxcough.ogg', 50, 1, -1) + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/male_cough_1.ogg','modular_skyrat/modules/emotes/sound/emotes/male/male_cough_2.ogg','modular_skyrat/modules/emotes/sound/emotes/male/male_cough_3.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/female_cough_1.ogg','modular_skyrat/modules/emotes/sound/emotes/female/female_cough_2.ogg','modular_skyrat/modules/emotes/sound/emotes/female/female_cough_3.ogg') + if(isvox(user)) + sound = 'modular_skyrat/modules/emotes/sound/emotes/voxcough.ogg' + playsound(user, sound, 50, 1, -1) /datum/emote/living/sneeze/run_emote(mob/living/user, params) if(!(. = ..())) @@ -73,8 +79,14 @@ if(user.nextsoundemote >= world.time) return user.nextsoundemote = world.time + 7 - if (isvox(user)) - playsound(user, 'modular_skyrat/modules/emotes/sound/emotes/voxsneeze.ogg', 50, 1, -1) + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/male_sneeze.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/female_sneeze.ogg') + if(isvox(user)) + sound = 'modular_skyrat/modules/emotes/sound/emotes/voxsneeze.ogg' + playsound(user, sound, 50, 1, -1) /datum/emote/living/peep key = "peep" @@ -331,3 +343,137 @@ user.nextsoundemote = world.time + 7 var/sound = 'modular_skyrat/modules/emotes/sound/emotes/hiss.ogg' playsound(user, sound, 50, 1, -1) + +/datum/emote/living/chitter + key = "chitter" + key_third_person = "chitters" + message = "chitters!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + hands_use_check = FALSE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) + +/datum/emote/living/chitter/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg' + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/sigh/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/male_sigh.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/female_sigh.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/sniff/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/male_sniff.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/female_sniff.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/gasp/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/gasp_m1.ogg','modular_skyrat/modules/emotes/sound/emotes/male/gasp_m2.ogg','modular_skyrat/modules/emotes/sound/emotes/male/gasp_m3.ogg','modular_skyrat/modules/emotes/sound/emotes/male/gasp_m4.ogg','modular_skyrat/modules/emotes/sound/emotes/male/gasp_m5.ogg','modular_skyrat/modules/emotes/sound/emotes/male/gasp_m6.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/gasp_f1.ogg','modular_skyrat/modules/emotes/sound/emotes/female/gasp_f2.ogg','modular_skyrat/modules/emotes/sound/emotes/female/gasp_f3.ogg','modular_skyrat/modules/emotes/sound/emotes/female/gasp_f4.ogg','modular_skyrat/modules/emotes/sound/emotes/female/gasp_f5.ogg','modular_skyrat/modules/emotes/sound/emotes/female/gasp_f6.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/snore/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/snore.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/burp/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/male/burp_m.ogg') + if(iscarbon(user)) + var/mob/living/carbon/C = user + if(C.gender == FEMALE) + sound = pick('modular_skyrat/modules/emotes/sound/emotes/female/burp_f.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/clap + key = "clap" + key_third_person = "claps" + message = "claps." + emote_type = EMOTE_AUDIBLE + vary = TRUE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) + +/datum/emote/living/clap/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/clap1.ogg','modular_skyrat/modules/emotes/sound/emotes/clap2.ogg','modular_skyrat/modules/emotes/sound/emotes/clap3.ogg','modular_skyrat/modules/emotes/sound/emotes/clap4.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/clap1 + key = "clap1" + key_third_person = "claps once" + message = "claps once." + emote_type = EMOTE_AUDIBLE + vary = TRUE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon) + +/datum/emote/living/clap1/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/sound = pick('modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg', 'modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg') + playsound(user, sound, 50, 1, -1) + +/datum/emote/living/laugh + key = "laugh" + key_third_person = "laughs" + message = "laughs." + message_mime = "laughs silently!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) + +/datum/emote/living/laugh/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + var/mob/living/carbon/H = user + var/sound = pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg') + if(H.dna.species.id == "moth") + sound = 'modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg' + playsound(user, sound, 50, 1, -1) diff --git a/modular_skyrat/modules/emotes/sound/claponce1.ogg b/modular_skyrat/modules/emotes/sound/claponce1.ogg new file mode 100644 index 00000000000..1e12d0daa3b Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/claponce1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/claponce2.ogg b/modular_skyrat/modules/emotes/sound/claponce2.ogg new file mode 100644 index 00000000000..10dfdba121b Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/claponce2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/clap1.ogg b/modular_skyrat/modules/emotes/sound/emotes/clap1.ogg new file mode 100644 index 00000000000..a9a6cc71f83 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/clap1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/clap2.ogg b/modular_skyrat/modules/emotes/sound/emotes/clap2.ogg new file mode 100644 index 00000000000..72e26d4a241 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/clap2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/clap3.ogg b/modular_skyrat/modules/emotes/sound/emotes/clap3.ogg new file mode 100644 index 00000000000..7a72ab9bf3c Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/clap3.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/clap4.ogg b/modular_skyrat/modules/emotes/sound/emotes/clap4.ogg new file mode 100644 index 00000000000..cdc533ca771 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/clap4.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg b/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg new file mode 100644 index 00000000000..1e12d0daa3b Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg b/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg new file mode 100644 index 00000000000..10dfdba121b Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/burp_f.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/burp_f.ogg new file mode 100644 index 00000000000..53e4ae4fd4f Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/burp_f.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_1.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_1.ogg new file mode 100644 index 00000000000..1888efa17d3 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_2.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_2.ogg new file mode 100644 index 00000000000..cb2b32437d0 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_3.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_3.ogg new file mode 100644 index 00000000000..f04e2800af2 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_cough_3.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg new file mode 100644 index 00000000000..73945321891 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg new file mode 100644 index 00000000000..953450e66a4 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_sigh.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_sigh.ogg new file mode 100644 index 00000000000..0512e961ab3 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_sigh.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_sneeze.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_sneeze.ogg new file mode 100644 index 00000000000..4324415599a Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_sneeze.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/female_sniff.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/female_sniff.ogg new file mode 100644 index 00000000000..6f4ce34b0b8 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/female_sniff.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f1.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f1.ogg new file mode 100644 index 00000000000..5161bb36409 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f2.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f2.ogg new file mode 100644 index 00000000000..d9fc6919074 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f3.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f3.ogg new file mode 100644 index 00000000000..5b39f41333c Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f3.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f4.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f4.ogg new file mode 100644 index 00000000000..9256f2250a2 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f4.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f5.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f5.ogg new file mode 100644 index 00000000000..f75916ab529 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f5.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f6.ogg b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f6.ogg new file mode 100644 index 00000000000..9d31687aa99 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/female/gasp_f6.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/burp_m.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/burp_m.ogg new file mode 100644 index 00000000000..130d3740d7a Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/burp_m.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m1.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m1.ogg new file mode 100644 index 00000000000..5ce88dde766 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m2.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m2.ogg new file mode 100644 index 00000000000..095b92af9fd Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m3.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m3.ogg new file mode 100644 index 00000000000..df311e2698e Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m3.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m4.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m4.ogg new file mode 100644 index 00000000000..5614ae1b573 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m4.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m5.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m5.ogg new file mode 100644 index 00000000000..3d29b276d22 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m5.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m6.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m6.ogg new file mode 100644 index 00000000000..6cbc4001bfd Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/gasp_m6.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_1.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_1.ogg new file mode 100644 index 00000000000..8db082a8fbd Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_2.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_2.ogg new file mode 100644 index 00000000000..b8d1dedc9c1 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_2.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_3.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_3.ogg new file mode 100644 index 00000000000..9b90c460a72 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_cough_3.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_sigh.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_sigh.ogg new file mode 100644 index 00000000000..c267e9d814f Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_sigh.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_sneeze.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_sneeze.ogg new file mode 100644 index 00000000000..08486bbba93 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_sneeze.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/male/male_sniff.ogg b/modular_skyrat/modules/emotes/sound/emotes/male/male_sniff.ogg new file mode 100644 index 00000000000..d4b9ddf6ced Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/male/male_sniff.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg b/modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg new file mode 100644 index 00000000000..842bcf8e533 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg b/modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg new file mode 100644 index 00000000000..391d6c5aefe Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg b/modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg new file mode 100644 index 00000000000..c5ac979aed1 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/scream_moth.ogg b/modular_skyrat/modules/emotes/sound/emotes/scream_moth.ogg new file mode 100644 index 00000000000..c94644fc17b Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/scream_moth.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/snore.ogg b/modular_skyrat/modules/emotes/sound/emotes/snore.ogg new file mode 100644 index 00000000000..a908d3ba360 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/snore.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/yawn_m1.ogg b/modular_skyrat/modules/emotes/sound/emotes/yawn_m1.ogg new file mode 100644 index 00000000000..2029b41a2be Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/yawn_m1.ogg differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/yawn_m2.ogg b/modular_skyrat/modules/emotes/sound/emotes/yawn_m2.ogg new file mode 100644 index 00000000000..c19d4d9e176 Binary files /dev/null and b/modular_skyrat/modules/emotes/sound/emotes/yawn_m2.ogg differ