diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index 8cec15cc9..2530d1284 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -1,4 +1,4 @@
-//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
 
 #include "map_files\generic\CentCom.dmm"
 
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index bbb162ad2..55e0f6c59 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -63,15 +63,6 @@
 	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"
@@ -160,15 +151,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 +158,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"
@@ -251,9 +222,9 @@
 			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)
+				playsound(C, 'sound/voice/human/womanlaugh.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)
+				playsound(C, pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg'), 50, 1)
 
 /datum/emote/living/look
 	key = "look"
@@ -324,18 +295,6 @@
 	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"
@@ -352,24 +311,6 @@
 	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"
@@ -381,15 +322,6 @@
 	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"
@@ -456,18 +388,6 @@
 	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"
@@ -479,18 +399,6 @@
 	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"
@@ -602,6 +510,7 @@
 		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
@@ -688,4 +597,6 @@
 			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
+			 'hyperstation/sound/voice/emotes/bat_c9.ogg'), 50, 1)
+=======
+>>>>>>> parent of 10087ded (Merge pull request #1423 from ProbablyCarl/master)
diff --git a/hyperstation/sound/voice/emotes/bat_c1.ogg b/hyperstation/sound/voice/emotes/bat_c1.ogg
deleted file mode 100644
index c11beedc1..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c2.ogg b/hyperstation/sound/voice/emotes/bat_c2.ogg
deleted file mode 100644
index 45e13541c..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c3.ogg b/hyperstation/sound/voice/emotes/bat_c3.ogg
deleted file mode 100644
index 1e34c2cf9..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c4.ogg b/hyperstation/sound/voice/emotes/bat_c4.ogg
deleted file mode 100644
index 94f43daf6..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c5.ogg b/hyperstation/sound/voice/emotes/bat_c5.ogg
deleted file mode 100644
index 17207ccb8..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c5.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c6.ogg b/hyperstation/sound/voice/emotes/bat_c6.ogg
deleted file mode 100644
index ebb740078..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c6.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c7.ogg b/hyperstation/sound/voice/emotes/bat_c7.ogg
deleted file mode 100644
index de58d94f1..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c7.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c8.ogg b/hyperstation/sound/voice/emotes/bat_c8.ogg
deleted file mode 100644
index 3952d5407..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c8.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/bat_c9.ogg b/hyperstation/sound/voice/emotes/bat_c9.ogg
deleted file mode 100644
index 702eac32c..000000000
Binary files a/hyperstation/sound/voice/emotes/bat_c9.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough1.ogg b/hyperstation/sound/voice/emotes/female_cough1.ogg
deleted file mode 100644
index 35cea5a5c..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough2.ogg b/hyperstation/sound/voice/emotes/female_cough2.ogg
deleted file mode 100644
index 1322ed054..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough3.ogg b/hyperstation/sound/voice/emotes/female_cough3.ogg
deleted file mode 100644
index 97c2d8104..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough4.ogg b/hyperstation/sound/voice/emotes/female_cough4.ogg
deleted file mode 100644
index bb0b32888..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough5.ogg b/hyperstation/sound/voice/emotes/female_cough5.ogg
deleted file mode 100644
index 4f95822a2..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough5.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_cough6.ogg b/hyperstation/sound/voice/emotes/female_cough6.ogg
deleted file mode 100644
index debd775ef..000000000
Binary files a/hyperstation/sound/voice/emotes/female_cough6.ogg and /dev/null differ
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_scream1.ogg b/hyperstation/sound/voice/emotes/female_scream1.ogg
deleted file mode 100644
index e2dce0e7a..000000000
Binary files a/hyperstation/sound/voice/emotes/female_scream1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/female_scream1b.ogg b/hyperstation/sound/voice/emotes/female_scream1b.ogg
deleted file mode 100644
index 19dd74f46..000000000
Binary files a/hyperstation/sound/voice/emotes/female_scream1b.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/male_cough1.ogg b/hyperstation/sound/voice/emotes/male_cough1.ogg
deleted file mode 100644
index 142d90b21..000000000
Binary files a/hyperstation/sound/voice/emotes/male_cough1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_cough2.ogg b/hyperstation/sound/voice/emotes/male_cough2.ogg
deleted file mode 100644
index 7dde1e86a..000000000
Binary files a/hyperstation/sound/voice/emotes/male_cough2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_cough3.ogg b/hyperstation/sound/voice/emotes/male_cough3.ogg
deleted file mode 100644
index 35cc3e7aa..000000000
Binary files a/hyperstation/sound/voice/emotes/male_cough3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_cough4.ogg b/hyperstation/sound/voice/emotes/male_cough4.ogg
deleted file mode 100644
index 168784482..000000000
Binary files a/hyperstation/sound/voice/emotes/male_cough4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh1.ogg b/hyperstation/sound/voice/emotes/male_laugh1.ogg
deleted file mode 100644
index b13933cb3..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh1b.ogg b/hyperstation/sound/voice/emotes/male_laugh1b.ogg
deleted file mode 100644
index 6b4f906ff..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh1b.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh2.ogg b/hyperstation/sound/voice/emotes/male_laugh2.ogg
deleted file mode 100644
index f3ef8495f..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh2b.ogg b/hyperstation/sound/voice/emotes/male_laugh2b.ogg
deleted file mode 100644
index 06eb4abdf..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh2b.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh3.ogg b/hyperstation/sound/voice/emotes/male_laugh3.ogg
deleted file mode 100644
index e9a248863..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh3b.ogg b/hyperstation/sound/voice/emotes/male_laugh3b.ogg
deleted file mode 100644
index befb76657..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh3b.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh4.ogg b/hyperstation/sound/voice/emotes/male_laugh4.ogg
deleted file mode 100644
index 4033e04ea..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_laugh4b.ogg b/hyperstation/sound/voice/emotes/male_laugh4b.ogg
deleted file mode 100644
index dba2e80c2..000000000
Binary files a/hyperstation/sound/voice/emotes/male_laugh4b.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_scream1.ogg b/hyperstation/sound/voice/emotes/male_scream1.ogg
deleted file mode 100644
index 33acc5188..000000000
Binary files a/hyperstation/sound/voice/emotes/male_scream1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_scream2.ogg b/hyperstation/sound/voice/emotes/male_scream2.ogg
deleted file mode 100644
index bb66916ab..000000000
Binary files a/hyperstation/sound/voice/emotes/male_scream2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_scream3.ogg b/hyperstation/sound/voice/emotes/male_scream3.ogg
deleted file mode 100644
index e58bc8df7..000000000
Binary files a/hyperstation/sound/voice/emotes/male_scream3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_yawn1.ogg b/hyperstation/sound/voice/emotes/male_yawn1.ogg
deleted file mode 100644
index 193f59874..000000000
Binary files a/hyperstation/sound/voice/emotes/male_yawn1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/male_yawn2.ogg b/hyperstation/sound/voice/emotes/male_yawn2.ogg
deleted file mode 100644
index 4064029e1..000000000
Binary files a/hyperstation/sound/voice/emotes/male_yawn2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_1.ogg b/hyperstation/sound/voice/emotes/racc_chitter_1.ogg
deleted file mode 100644
index 35a90dff6..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_2.ogg b/hyperstation/sound/voice/emotes/racc_chitter_2.ogg
deleted file mode 100644
index 060c442f0..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_3.ogg b/hyperstation/sound/voice/emotes/racc_chitter_3.ogg
deleted file mode 100644
index ad750c8a6..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_3.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_4.ogg b/hyperstation/sound/voice/emotes/racc_chitter_4.ogg
deleted file mode 100644
index 538e765e5..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_4.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_5.ogg b/hyperstation/sound/voice/emotes/racc_chitter_5.ogg
deleted file mode 100644
index 478edce39..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_5.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_6.ogg b/hyperstation/sound/voice/emotes/racc_chitter_6.ogg
deleted file mode 100644
index 871a47c4c..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_6.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_7.ogg b/hyperstation/sound/voice/emotes/racc_chitter_7.ogg
deleted file mode 100644
index 0f10084b1..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_7.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/racc_chitter_8.ogg b/hyperstation/sound/voice/emotes/racc_chitter_8.ogg
deleted file mode 100644
index 2e141dd37..000000000
Binary files a/hyperstation/sound/voice/emotes/racc_chitter_8.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/sneezef1.ogg b/hyperstation/sound/voice/emotes/sneezef1.ogg
deleted file mode 100644
index 279414795..000000000
Binary files a/hyperstation/sound/voice/emotes/sneezef1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sneezef2.ogg b/hyperstation/sound/voice/emotes/sneezef2.ogg
deleted file mode 100644
index 91c9d9d15..000000000
Binary files a/hyperstation/sound/voice/emotes/sneezef2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sneezem1.ogg b/hyperstation/sound/voice/emotes/sneezem1.ogg
deleted file mode 100644
index b36b86eb4..000000000
Binary files a/hyperstation/sound/voice/emotes/sneezem1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sneezem2.ogg b/hyperstation/sound/voice/emotes/sneezem2.ogg
deleted file mode 100644
index d473e4ad1..000000000
Binary files a/hyperstation/sound/voice/emotes/sneezem2.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/sniff.ogg b/hyperstation/sound/voice/emotes/sniff.ogg
deleted file mode 100644
index 4e4edf8b8..000000000
Binary files a/hyperstation/sound/voice/emotes/sniff.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg b/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg
deleted file mode 100644
index b344bbcff..000000000
Binary files a/hyperstation/sound/voice/emotes/tesh_sneeze1.ogg and /dev/null differ
diff --git a/hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg b/hyperstation/sound/voice/emotes/tesh_sneeze1b.ogg
deleted file mode 100644
index f74286546..000000000
Binary files a/hyperstation/sound/voice/emotes/tesh_sneeze1b.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
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index c0fc04000..4134e35a3 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('hyperstation/sound/voice/emotes/male_scream1.ogg', 'hyperstation/sound/voice/emotes/male_scream2.ogg', 'hyperstation/sound/voice/emotes/male_scream3.ogg')
+			sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
 			if(user.gender == FEMALE)
-				sound = pick('hyperstation/sound/voice/emotes/female_scream1.ogg', 'hyperstation/sound/voice/emotes/female_scream1b.ogg')
+				sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.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"