cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-18 11:12:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "revert emote sounds"

Browse Source 
This reverts commit 86939b19ec.
This commit is contained in:
quotefox
2022-03-25 10:32:41 +00:00
parent 0dc8a99277
commit 6799e3eda3
82 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/emote.dm
+95 -6
View File
@@ -63,6 +63,15 @@
if(HAS_TRAIT(user, TRAIT_SOOTHED_THROAT))
return FALSE
/datum/emote/living/cough/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/female_cough1.ogg', 'hyperstation/sound/voice/emotes/female_cough2.ogg', 'hyperstation/sound/voice/emotes/female_cough3.ogg', 'hyperstation/sound/voice/emotes/female_cough4.ogg', 'hyperstation/sound/voice/emotes/female_cough5.ogg', 'hyperstation/sound/voice/emotes/female_cough6.ogg'), 50, 1)
else
playsound(C, pick('hyperstation/sound/voice/emotes/male_cough1.ogg', 'hyperstation/sound/voice/emotes/male_cough2.ogg', 'hyperstation/sound/voice/emotes/male_cough3.ogg', 'hyperstation/sound/voice/emotes/male_cough4.ogg'), 50, 1)
/datum/emote/living/dance
key = "dance"
key_third_person = "dances"
@@ -151,6 +160,15 @@
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"
@@ -158,6 +176,17 @@
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"
@@ -222,9 +251,9 @@
return
if(ishumanbasic(C))
if(user.gender == FEMALE)
playsound(C, 'sound/voice/human/womanlaugh.ogg', 50, 1)
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('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg'), 50, 1)
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"
@@ -295,6 +324,18 @@
message = "sighs."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/sigh/run_emote(mob/user, params)
. = ..()
if(. && iscarbon(user))
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"
key_third_person = "sits"
@@ -311,6 +352,24 @@
message = "sneezes."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/sneeze/can_run_emote(mob/living/user, status_check = TRUE)
. = ..()
if(. && iscarbon(user))
var/mob/living/carbon/C = user
return !C.silent
/datum/emote/living/sneeze/run_emote(mob/user, params)
. = ..()
if(. && iscarbon(user))
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"
key_third_person = "smugs"
@@ -322,6 +381,15 @@
message = "sniffs."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/sniff/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/sniff.ogg'), 50, 1)
/datum/emote/living/snore
key = "snore"
key_third_person = "snores"
@@ -388,6 +456,18 @@
message = "whimpers."
message_mime = "appears hurt."
/datum/emote/living/whimper/run_emote(mob/user, params)
. = ..()
if(. && iscarbon(user))
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"
key_third_person = "wsmiles"
@@ -399,6 +479,18 @@
message = "yawns."
emote_type = EMOTE_AUDIBLE
/datum/emote/living/yawn/run_emote(mob/user, params)
. = ..()
if(. && iscarbon(user))
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"
key_third_person = "custom"
@@ -510,7 +602,6 @@
to_chat(user, "<span class='notice'>You ready your slapping hand.</span>")
else
to_chat(user, "<span class='warning'>You're incapable of slapping in your current state.</span>")
<<<<<<< HEAD
//Carl wuz here
/datum/emote/living/tesh_sneeze
@@ -597,6 +688,4 @@
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)
=======
>>>>>>> parent of 10087ded (Merge pull request #1423 from ProbablyCarl/master)
'hyperstation/sound/voice/emotes/bat_c9.ogg'), 50, 1)