Skree2 (#20949)

* Skreeee

Fixed

* Boop

* Oh fucking finally.

Skree is now ready.

* else spacing

code/modules/clothing/shoes/miscellaneous.dm

@@ -175,6 +175,7 @@
 		"Taser" = 'sound/weapons/Taser.ogg',
 		"Male scream" = "malescream",
 		"Female scream" = "femalescream",
+		"Vox shriek" = 'sound/misc/shriek1.ogg',
 		"Male cough" = "malecough",
 		"Female cough" = "femalecough",
 		"Sad trombone" = 'sound/misc/sadtrombone.ogg',

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

@@ -262,7 +262,7 @@
 						visible_message("<span class='danger'>\The [H] can't seem to let go from \the [M]'s shocking handshake!</span>")
 						add_logs(H, M, "stungloved", admin = TRUE)
 
-					playsound(H,(H.gender == MALE) ? pick(male_scream_sound) : pick(female_scream_sound),50,1)
+					H.audible_scream()
 					H.apply_damage(damage = shock_damage, damagetype = BURN, def_zone = (M.zone_sel.selecting == "r_hand") ? "r_hand" : "l_hand" )
 
 					spark(H, 3, FALSE)

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

@@ -231,6 +231,7 @@
 /datum/emote/living/carbon/sound
 	var/list/male_sounds = null
 	var/list/female_sounds = null
+	var/list/birb_sounds = null
 	var/sound_message = null
 
 /datum/emote/living/carbon/sound/scream
@@ -243,6 +244,19 @@
 	male_sounds =  list('sound/misc/malescream1.ogg', 'sound/misc/malescream2.ogg', 'sound/misc/malescream3.ogg', 'sound/misc/malescream4.ogg', 'sound/misc/malescream5.ogg', 'sound/misc/wilhelm.ogg', 'sound/misc/goofy.ogg')
 	female_sounds = list('sound/misc/femalescream1.ogg', 'sound/misc/femalescream2.ogg', 'sound/misc/femalescream3.ogg', 'sound/misc/femalescream4.ogg', 'sound/misc/femalescream5.ogg')
 	sound_message = "screams in agony!"
+	voxemote = FALSE
+
+/datum/emote/living/carbon/sound/shriek
+	key = "shriek"
+	key_third_person = "shrieks"
+	message = "shrieks!"
+	message_mime = "acts out a shriek!"
+	emote_type = EMOTE_AUDIBLE
+	stat_allowed = UNCONSCIOUS
+	birb_sounds = list('sound/misc/shriek1.ogg')
+	sound_message = "shrieks in agony!"
+	voxemote = TRUE
+	voxrestrictedemote = TRUE
 
 /datum/emote/living/carbon/sound/cough
 	key = "cough"
@@ -265,13 +279,18 @@
 				if(sound_message)
 					message = sound_message
 				var/sound
-				switch(H.gender)
-					if (MALE)
-						sound = pick(male_sounds)//AUUUUHHHHHHHHOOOHOOHOOHOOOOIIIIEEEEEE
-					if (FEMALE)
-						sound = pick(female_sounds)
+				if (isvox(H) || isskelevox(H))
+					sound = pick(birb_sounds)
+
+				else
+					switch(H.gender)
+						if (MALE)
+							sound = pick(male_sounds)//AUUUUHHHHHHHHOOOHOOHOOHOOOOIIIIEEEEEE
+						if (FEMALE)
+							sound = pick(female_sounds)
 				playsound(user, sound, 50, 0)
 				H.last_emote_sound = world.time
+
 	else
 		message = "makes a very loud noise."
 

code/modules/mob/living/simple_animal/hostile/human/cult.dm

@@ -69,7 +69,7 @@
 		if(0) //damage
 			var/dmg = rand(10,20)
 			to_chat(L, "<span class='userdanger'>Pain surges through your body and horrible visions flash through your mind!</span>")
-			L.emote("scream")
+			L.audible_scream()
 			L.adjustBruteLoss(dmg)
 		if(1) //deaf
 			var/mob/living/carbon/human/H = L