diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 55e0f6c59..bbb162ad2 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -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)
\ 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/female_cough1.ogg b/hyperstation/sound/voice/emotes/female_cough1.ogg
new file mode 100644
index 000000000..35cea5a5c
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_cough2.ogg b/hyperstation/sound/voice/emotes/female_cough2.ogg
new file mode 100644
index 000000000..1322ed054
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_cough3.ogg b/hyperstation/sound/voice/emotes/female_cough3.ogg
new file mode 100644
index 000000000..97c2d8104
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_cough4.ogg b/hyperstation/sound/voice/emotes/female_cough4.ogg
new file mode 100644
index 000000000..bb0b32888
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_cough5.ogg b/hyperstation/sound/voice/emotes/female_cough5.ogg
new file mode 100644
index 000000000..4f95822a2
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough5.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_cough6.ogg b/hyperstation/sound/voice/emotes/female_cough6.ogg
new file mode 100644
index 000000000..debd775ef
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_cough6.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_giggle1.ogg b/hyperstation/sound/voice/emotes/female_giggle1.ogg
new file mode 100644
index 000000000..87961f5cc
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_giggle1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_giggle2.ogg b/hyperstation/sound/voice/emotes/female_giggle2.ogg
new file mode 100644
index 000000000..bd1e99de7
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_giggle2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh1.ogg b/hyperstation/sound/voice/emotes/female_laugh1.ogg
new file mode 100644
index 000000000..b4b464bb6
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_laugh1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh2.ogg b/hyperstation/sound/voice/emotes/female_laugh2.ogg
new file mode 100644
index 000000000..3124eaf05
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_laugh2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh3.ogg b/hyperstation/sound/voice/emotes/female_laugh3.ogg
new file mode 100644
index 000000000..ed80538fa
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_laugh3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_laugh4.ogg b/hyperstation/sound/voice/emotes/female_laugh4.ogg
new file mode 100644
index 000000000..057a842ad
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_laugh4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_scream1.ogg b/hyperstation/sound/voice/emotes/female_scream1.ogg
new file mode 100644
index 000000000..e2dce0e7a
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_scream1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_scream1b.ogg b/hyperstation/sound/voice/emotes/female_scream1b.ogg
new file mode 100644
index 000000000..19dd74f46
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_scream1b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn1.ogg b/hyperstation/sound/voice/emotes/female_yawn1.ogg
new file mode 100644
index 000000000..548be96b7
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_yawn1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn2.ogg b/hyperstation/sound/voice/emotes/female_yawn2.ogg
new file mode 100644
index 000000000..67b150567
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_yawn2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/female_yawn3.ogg b/hyperstation/sound/voice/emotes/female_yawn3.ogg
new file mode 100644
index 000000000..12d42db24
Binary files /dev/null and b/hyperstation/sound/voice/emotes/female_yawn3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female1.ogg b/hyperstation/sound/voice/emotes/gasp_female1.ogg
new file mode 100644
index 000000000..f74882f90
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female2.ogg b/hyperstation/sound/voice/emotes/gasp_female2.ogg
new file mode 100644
index 000000000..8bd7f74cf
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female3.ogg b/hyperstation/sound/voice/emotes/gasp_female3.ogg
new file mode 100644
index 000000000..6e05d1ea7
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female4.ogg b/hyperstation/sound/voice/emotes/gasp_female4.ogg
new file mode 100644
index 000000000..f33b775fd
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female5.ogg b/hyperstation/sound/voice/emotes/gasp_female5.ogg
new file mode 100644
index 000000000..cbeeb63e1
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female5.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female6.ogg b/hyperstation/sound/voice/emotes/gasp_female6.ogg
new file mode 100644
index 000000000..444b6688a
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female6.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_female7.ogg b/hyperstation/sound/voice/emotes/gasp_female7.ogg
new file mode 100644
index 000000000..096354f98
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_female7.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male1.ogg b/hyperstation/sound/voice/emotes/gasp_male1.ogg
new file mode 100644
index 000000000..e0ddde118
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male2.ogg b/hyperstation/sound/voice/emotes/gasp_male2.ogg
new file mode 100644
index 000000000..2119daf88
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male3.ogg b/hyperstation/sound/voice/emotes/gasp_male3.ogg
new file mode 100644
index 000000000..6d5cb214f
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male4.ogg b/hyperstation/sound/voice/emotes/gasp_male4.ogg
new file mode 100644
index 000000000..a9173a1a2
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male5.ogg b/hyperstation/sound/voice/emotes/gasp_male5.ogg
new file mode 100644
index 000000000..8e7ef3734
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male5.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male6.ogg b/hyperstation/sound/voice/emotes/gasp_male6.ogg
new file mode 100644
index 000000000..546ba45bf
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male6.ogg differ
diff --git a/hyperstation/sound/voice/emotes/gasp_male7.ogg b/hyperstation/sound/voice/emotes/gasp_male7.ogg
new file mode 100644
index 000000000..f73854f6c
Binary files /dev/null and b/hyperstation/sound/voice/emotes/gasp_male7.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_cough1.ogg b/hyperstation/sound/voice/emotes/male_cough1.ogg
new file mode 100644
index 000000000..142d90b21
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_cough1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_cough2.ogg b/hyperstation/sound/voice/emotes/male_cough2.ogg
new file mode 100644
index 000000000..7dde1e86a
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_cough2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_cough3.ogg b/hyperstation/sound/voice/emotes/male_cough3.ogg
new file mode 100644
index 000000000..35cc3e7aa
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_cough3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_cough4.ogg b/hyperstation/sound/voice/emotes/male_cough4.ogg
new file mode 100644
index 000000000..168784482
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_cough4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh1.ogg b/hyperstation/sound/voice/emotes/male_laugh1.ogg
new file mode 100644
index 000000000..b13933cb3
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh1b.ogg b/hyperstation/sound/voice/emotes/male_laugh1b.ogg
new file mode 100644
index 000000000..6b4f906ff
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh1b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh2.ogg b/hyperstation/sound/voice/emotes/male_laugh2.ogg
new file mode 100644
index 000000000..f3ef8495f
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh2b.ogg b/hyperstation/sound/voice/emotes/male_laugh2b.ogg
new file mode 100644
index 000000000..06eb4abdf
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh2b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh3.ogg b/hyperstation/sound/voice/emotes/male_laugh3.ogg
new file mode 100644
index 000000000..e9a248863
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh3b.ogg b/hyperstation/sound/voice/emotes/male_laugh3b.ogg
new file mode 100644
index 000000000..befb76657
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh3b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh4.ogg b/hyperstation/sound/voice/emotes/male_laugh4.ogg
new file mode 100644
index 000000000..4033e04ea
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh4.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh4b.ogg b/hyperstation/sound/voice/emotes/male_laugh4b.ogg
new file mode 100644
index 000000000..dba2e80c2
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_laugh4b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_scream1.ogg b/hyperstation/sound/voice/emotes/male_scream1.ogg
new file mode 100644
index 000000000..33acc5188
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_scream1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_scream2.ogg b/hyperstation/sound/voice/emotes/male_scream2.ogg
new file mode 100644
index 000000000..bb66916ab
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_scream2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_scream3.ogg b/hyperstation/sound/voice/emotes/male_scream3.ogg
new file mode 100644
index 000000000..e58bc8df7
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_scream3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_yawn1.ogg b/hyperstation/sound/voice/emotes/male_yawn1.ogg
new file mode 100644
index 000000000..193f59874
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_yawn1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/male_yawn2.ogg b/hyperstation/sound/voice/emotes/male_yawn2.ogg
new file mode 100644
index 000000000..4064029e1
Binary files /dev/null and b/hyperstation/sound/voice/emotes/male_yawn2.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
diff --git a/hyperstation/sound/voice/emotes/sigh_female.ogg b/hyperstation/sound/voice/emotes/sigh_female.ogg
new file mode 100644
index 000000000..d72c206cc
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sigh_female.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sigh_male.ogg b/hyperstation/sound/voice/emotes/sigh_male.ogg
new file mode 100644
index 000000000..1590bcdee
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sigh_male.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sneezef1.ogg b/hyperstation/sound/voice/emotes/sneezef1.ogg
new file mode 100644
index 000000000..279414795
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sneezef1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sneezef2.ogg b/hyperstation/sound/voice/emotes/sneezef2.ogg
new file mode 100644
index 000000000..91c9d9d15
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sneezef2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sneezem1.ogg b/hyperstation/sound/voice/emotes/sneezem1.ogg
new file mode 100644
index 000000000..b36b86eb4
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sneezem1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sneezem2.ogg b/hyperstation/sound/voice/emotes/sneezem2.ogg
new file mode 100644
index 000000000..d473e4ad1
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sneezem2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/sniff.ogg b/hyperstation/sound/voice/emotes/sniff.ogg
new file mode 100644
index 000000000..4e4edf8b8
Binary files /dev/null and b/hyperstation/sound/voice/emotes/sniff.ogg differ
diff --git a/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg b/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg
new file mode 100644
index 000000000..b344bbcff
Binary files /dev/null and b/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg b/hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg
new file mode 100644
index 000000000..f74286546
Binary files /dev/null and b/hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female1.ogg b/hyperstation/sound/voice/emotes/whimper_female1.ogg
new file mode 100644
index 000000000..4c8034d38
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_female1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female2.ogg b/hyperstation/sound/voice/emotes/whimper_female2.ogg
new file mode 100644
index 000000000..48353c50b
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_female2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_female3.ogg b/hyperstation/sound/voice/emotes/whimper_female3.ogg
new file mode 100644
index 000000000..174a24f46
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_female3.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male1.ogg b/hyperstation/sound/voice/emotes/whimper_male1.ogg
new file mode 100644
index 000000000..7bd8ecabc
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_male1.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male2.ogg b/hyperstation/sound/voice/emotes/whimper_male2.ogg
new file mode 100644
index 000000000..44e8fb702
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_male2.ogg differ
diff --git a/hyperstation/sound/voice/emotes/whimper_male3.ogg b/hyperstation/sound/voice/emotes/whimper_male3.ogg
new file mode 100644
index 000000000..42492e42e
Binary files /dev/null and b/hyperstation/sound/voice/emotes/whimper_male3.ogg differ
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index 4134e35a3..c0fc04000 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -46,9 +46,9 @@
 			sound = 'sound/creatures/gorilla.ogg'
 		if(ishuman(user))
 			user.adjustOxyLoss(5)
-			sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
+			sound = pick('hyperstation/sound/voice/emotes/male_scream1.ogg', 'hyperstation/sound/voice/emotes/male_scream2.ogg', 'hyperstation/sound/voice/emotes/male_scream3.ogg')
 			if(user.gender == FEMALE)
-				sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
+				sound = pick('hyperstation/sound/voice/emotes/female_scream1.ogg', 'hyperstation/sound/voice/emotes/female_scream1b.ogg')
 			if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc) || is_species(user, /datum/species/synthliz))
 				sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
 			if(is_species(user, /datum/species/lizard))
@@ -279,7 +279,7 @@
 	emote_type = EMOTE_AUDIBLE
 	muzzle_ignore = FALSE
 	restraint_check = FALSE
-	
+
 /datum/emote/living/cackle
 	key = "cackle"
 	key_third_person = "cackles"