diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index bbb162ad2..db01ef47a 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -160,15 +160,6 @@ emote_type = EMOTE_AUDIBLE stat_allowed = UNCONSCIOUS -/datum/emote/living/gasp/run_emote(mob/user, params) - . = ..() - if(. && ishuman(user)) - var/mob/living/carbon/C = user - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/gasp_female1.ogg', 'hyperstation/sound/voice/emotes/gasp_female2.ogg', 'hyperstation/sound/voice/emotes/gasp_female3.ogg', 'hyperstation/sound/voice/emotes/gasp_female4.ogg', 'hyperstation/sound/voice/emotes/gasp_female5.ogg', 'hyperstation/sound/voice/emotes/gasp_female6.ogg', 'hyperstation/sound/voice/emotes/gasp_female7.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/gasp_male1.ogg', 'hyperstation/sound/voice/emotes/gasp_male2.ogg', 'hyperstation/sound/voice/emotes/gasp_male3.ogg', 'hyperstation/sound/voice/emotes/gasp_male4.ogg', 'hyperstation/sound/voice/emotes/gasp_male5.ogg', 'hyperstation/sound/voice/emotes/gasp_male6.ogg', 'hyperstation/sound/voice/emotes/gasp_male7.ogg'), 50, 1) - /datum/emote/living/giggle key = "giggle" key_third_person = "giggles" @@ -176,17 +167,6 @@ message_mime = "giggles silently!" emote_type = EMOTE_AUDIBLE -/datum/emote/living/giggle/run_emote(mob/user, params) - . = ..() - if(. && ishuman(user)) - var/mob/living/carbon/C = user - if(!C.mind || C.mind.miming) - return - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/female_giggle1.ogg', 'hyperstation/sound/voice/emotes/female_giggle2.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/male_laugh3b.ogg'), 50, 1) - /datum/emote/living/glare key = "glare" key_third_person = "glares" @@ -249,11 +229,6 @@ 'sound/voice/catpeople/nyahehe.ogg'), 50, 1) return - if(ishumanbasic(C)) - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/female_laugh1.ogg', 'hyperstation/sound/voice/emotes/female_laugh2.ogg', 'hyperstation/sound/voice/emotes/female_laugh3.ogg', 'hyperstation/sound/voice/emotes/female_laugh4.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/male_laugh1.ogg', 'hyperstation/sound/voice/emotes/male_laugh1b.ogg', 'hyperstation/sound/voice/emotes/male_laugh2.ogg', 'hyperstation/sound/voice/emotes/male_laugh2b.ogg',/*'hyperstation/sound/voice/emotes/male_laugh3.ogg',*/'hyperstation/sound/voice/emotes/male_laugh3b.ogg', 'hyperstation/sound/voice/emotes/male_laugh4.ogg'), 50, 1) /datum/emote/living/look key = "look" @@ -330,11 +305,6 @@ var/mob/living/carbon/C = user if(!C.mind || C.mind.miming) return - if(ishumanbasic(C)) - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/sigh_female.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/sigh_male.ogg'), 50, 1) /datum/emote/living/sit key = "sit" @@ -364,11 +334,6 @@ var/mob/living/carbon/C = user if(!C.mind || C.mind.miming)//mimes can't sneeze because fuck you that's why return - if(ishumanbasic(C)) - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/sneezef1.ogg', 'hyperstation/sound/voice/emotes/sneezef2.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/sneezem1.ogg', 'hyperstation/sound/voice/emotes/sneezem2.ogg'), 50, 1) /datum/emote/living/smug key = "smug" @@ -462,11 +427,6 @@ var/mob/living/carbon/C = user if(!C.mind || C.mind.miming) return - if(ishumanbasic(C)) - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/whimper_female1.ogg', 'hyperstation/sound/voice/emotes/whimper_female2.ogg', 'hyperstation/sound/voice/emotes/whimper_female3.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/whimper_male1.ogg', 'hyperstation/sound/voice/emotes/whimper_male2.ogg', 'hyperstation/sound/voice/emotes/whimper_male3.ogg'), 50, 1) /datum/emote/living/wsmile key = "wsmile" @@ -485,11 +445,6 @@ var/mob/living/carbon/C = user if(!C.mind || C.mind.miming) return - if(ishumanbasic(C)) - if(user.gender == FEMALE) - playsound(C, pick('hyperstation/sound/voice/emotes/female_yawn1.ogg', 'hyperstation/sound/voice/emotes/female_yawn2.ogg', 'hyperstation/sound/voice/emotes/female_yawn3.ogg'), 50, 1) - else - playsound(C, pick('hyperstation/sound/voice/emotes/male_yawn1.ogg', 'hyperstation/sound/voice/emotes/male_yawn2.ogg'), 50, 1) /datum/emote/living/custom key = "me" diff --git a/hyperstation/sound/voice/emotes/female_giggle1.ogg b/hyperstation/sound/voice/emotes/female_giggle1.ogg deleted file mode 100644 index 87961f5cc..000000000 Binary files a/hyperstation/sound/voice/emotes/female_giggle1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_giggle2.ogg b/hyperstation/sound/voice/emotes/female_giggle2.ogg deleted file mode 100644 index bd1e99de7..000000000 Binary files a/hyperstation/sound/voice/emotes/female_giggle2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_laugh1.ogg b/hyperstation/sound/voice/emotes/female_laugh1.ogg deleted file mode 100644 index b4b464bb6..000000000 Binary files a/hyperstation/sound/voice/emotes/female_laugh1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_laugh2.ogg b/hyperstation/sound/voice/emotes/female_laugh2.ogg deleted file mode 100644 index 3124eaf05..000000000 Binary files a/hyperstation/sound/voice/emotes/female_laugh2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_laugh3.ogg b/hyperstation/sound/voice/emotes/female_laugh3.ogg deleted file mode 100644 index ed80538fa..000000000 Binary files a/hyperstation/sound/voice/emotes/female_laugh3.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_laugh4.ogg b/hyperstation/sound/voice/emotes/female_laugh4.ogg deleted file mode 100644 index 057a842ad..000000000 Binary files a/hyperstation/sound/voice/emotes/female_laugh4.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_yawn1.ogg b/hyperstation/sound/voice/emotes/female_yawn1.ogg deleted file mode 100644 index 548be96b7..000000000 Binary files a/hyperstation/sound/voice/emotes/female_yawn1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_yawn2.ogg b/hyperstation/sound/voice/emotes/female_yawn2.ogg deleted file mode 100644 index 67b150567..000000000 Binary files a/hyperstation/sound/voice/emotes/female_yawn2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/female_yawn3.ogg b/hyperstation/sound/voice/emotes/female_yawn3.ogg deleted file mode 100644 index 12d42db24..000000000 Binary files a/hyperstation/sound/voice/emotes/female_yawn3.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female1.ogg b/hyperstation/sound/voice/emotes/gasp_female1.ogg deleted file mode 100644 index f74882f90..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female2.ogg b/hyperstation/sound/voice/emotes/gasp_female2.ogg deleted file mode 100644 index 8bd7f74cf..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female3.ogg b/hyperstation/sound/voice/emotes/gasp_female3.ogg deleted file mode 100644 index 6e05d1ea7..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female3.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female4.ogg b/hyperstation/sound/voice/emotes/gasp_female4.ogg deleted file mode 100644 index f33b775fd..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female4.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female5.ogg b/hyperstation/sound/voice/emotes/gasp_female5.ogg deleted file mode 100644 index cbeeb63e1..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female5.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female6.ogg b/hyperstation/sound/voice/emotes/gasp_female6.ogg deleted file mode 100644 index 444b6688a..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female6.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_female7.ogg b/hyperstation/sound/voice/emotes/gasp_female7.ogg deleted file mode 100644 index 096354f98..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_female7.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male1.ogg b/hyperstation/sound/voice/emotes/gasp_male1.ogg deleted file mode 100644 index e0ddde118..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male2.ogg b/hyperstation/sound/voice/emotes/gasp_male2.ogg deleted file mode 100644 index 2119daf88..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male3.ogg b/hyperstation/sound/voice/emotes/gasp_male3.ogg deleted file mode 100644 index 6d5cb214f..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male3.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male4.ogg b/hyperstation/sound/voice/emotes/gasp_male4.ogg deleted file mode 100644 index a9173a1a2..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male4.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male5.ogg b/hyperstation/sound/voice/emotes/gasp_male5.ogg deleted file mode 100644 index 8e7ef3734..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male5.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male6.ogg b/hyperstation/sound/voice/emotes/gasp_male6.ogg deleted file mode 100644 index 546ba45bf..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male6.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/gasp_male7.ogg b/hyperstation/sound/voice/emotes/gasp_male7.ogg deleted file mode 100644 index f73854f6c..000000000 Binary files a/hyperstation/sound/voice/emotes/gasp_male7.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/sigh_female.ogg b/hyperstation/sound/voice/emotes/sigh_female.ogg deleted file mode 100644 index d72c206cc..000000000 Binary files a/hyperstation/sound/voice/emotes/sigh_female.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/sigh_male.ogg b/hyperstation/sound/voice/emotes/sigh_male.ogg deleted file mode 100644 index 1590bcdee..000000000 Binary files a/hyperstation/sound/voice/emotes/sigh_male.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_female1.ogg b/hyperstation/sound/voice/emotes/whimper_female1.ogg deleted file mode 100644 index 4c8034d38..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_female1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_female2.ogg b/hyperstation/sound/voice/emotes/whimper_female2.ogg deleted file mode 100644 index 48353c50b..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_female2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_female3.ogg b/hyperstation/sound/voice/emotes/whimper_female3.ogg deleted file mode 100644 index 174a24f46..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_female3.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_male1.ogg b/hyperstation/sound/voice/emotes/whimper_male1.ogg deleted file mode 100644 index 7bd8ecabc..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_male1.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_male2.ogg b/hyperstation/sound/voice/emotes/whimper_male2.ogg deleted file mode 100644 index 44e8fb702..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_male2.ogg and /dev/null differ diff --git a/hyperstation/sound/voice/emotes/whimper_male3.ogg b/hyperstation/sound/voice/emotes/whimper_male3.ogg deleted file mode 100644 index 42492e42e..000000000 Binary files a/hyperstation/sound/voice/emotes/whimper_male3.ogg and /dev/null differ