reverted changes

code/game/sound.dm

@@ -344,11 +344,7 @@
 				S = pick('sound/voice/alien_queen_command.ogg','sound/voice/alien_queen_command2.ogg','sound/voice/alien_queen_command3.ogg')
 			// Human
 			if("male_scream")
-				S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg',5;'sound/voice/human_male_scream_5.ogg',5;'sound/voice/human_jackson_scream.ogg',5;'sound/voice/human_ack_scream.ogg')
-			if("male_panic_scream")
-				S = pick('sound/voice/human_male_panic_scream_1.ogg','sound/voice/human_male_panic_scream_2.ogg')
-			if("female_panic_scream")
-				S = pick('sound/voice/human_female_panic_scream_1.ogg','sound/voice/human_female_panic_scream_2.ogg')
+				S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg',5;'sound/voice/human_male_scream_5.ogg',5;'sound/voice/human_jackson_scream.ogg',5;'sound/voice/human_ack_scream.ogg','sound/voice/human_male_scream_6.ogg')
 			if("male_pain")
 				S = pick('sound/voice/human_male_pain_1.ogg','sound/voice/human_male_pain_2.ogg','sound/voice/human_male_pain_3.ogg',5;'sound/voice/tomscream.ogg',5;'sound/voice/human_bobby_pain.ogg',5;'sound/voice/human_tantrum_scream.ogg', 5;'sound/voice/human_male_pain_rare_1.ogg')
 			if("male_fragout")

code/modules/mob/living/carbon/human/emote.dm

@@ -245,18 +245,6 @@
 	if(isyautja(user))
 		return get_sfx("pred_pain")
 
-/datum/emote/living/carbon/human/scream/panic
-	key = "panic"
-	key_third_person = "panics"
-	message = "panics!"
-
-/datum/emote/living/carbon/human/scream/panic/get_sound(mob/living/user)
-	if(ishuman_strict(user))
-		if(user.gender == MALE)
-			return get_sfx("male_panic_scream")
-		else
-			return get_sfx("female_panic_scream")
-
 /datum/emote/living/carbon/human/scream/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
 	if(!.)

code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm

@@ -38,7 +38,7 @@
 	if (xeno.Adjacent(carbon))
 		xeno.start_pulling(carbon,1)
 		if(ishuman(carbon))
-			INVOKE_ASYNC(carbon, TYPE_PROC_REF(/mob, emote), "panic")
+			INVOKE_ASYNC(carbon, TYPE_PROC_REF(/mob, emote), "scream")
 	else
 		xeno.visible_message(SPAN_XENOWARNING("[xeno]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we lunge but are unable to grab onto our target. Wait a moment to try again."))