[MIRROR] Kitchen Sink PR (#10745)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/modules/emotes/definitions/audible.dm

@@ -24,6 +24,23 @@
 	emote_message_3p = "gasps."
 	conscious = FALSE
 
+/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/vol = H.species.gasp_volume
+		var/s = get_species_sound(get_gendered_sound(H))["gasp"]
+		if(!s && !(get_species_sound(H.species.species_sounds) == "None")) // Failsafe, so we always use the default gasp/etc sounds. None will cancel out anyways.
+			if(H.identifying_gender == FEMALE)
+				s = get_species_sound("Human Female")["gasp"]
+			else // Update this if we ever get herm/etc sounds.
+				s = get_species_sound("Human Male")["gasp"]
+		return list(
+				"sound" = s,
+				"vol" = vol,
+				"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
+			)
+
 /decl/emote/audible/scretch
 	key = "scretch"
 	emote_message_3p = "scretches."

code/modules/emotes/definitions/audible_cough.dm

@@ -12,7 +12,6 @@
 	emote_volume_synthetic = 50
 
 	conscious = FALSE
-// CHOMPEdit Start: Standardize Species Sounds
 	// emote_sound_synthetic = list()
 
 /decl/emote/audible/cough/get_emote_sound(var/atom/user)
@@ -36,5 +35,4 @@
 			"vol" = emote_volume,
 			"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
 		)
-// CHOMPEdit End
 	return ..()

code/modules/emotes/definitions/audible_pain.dm

@@ -0,0 +1,44 @@
+/decl/emote/audible/pain
+	key = "pain"
+	emote_message_1p = "You yell in pain!"
+	emote_message_3p = "yells in pain!"
+
+/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		return "You [pick(H.species.pain_verb_1p)] in pain!"
+	else
+		var/mob/living/M = user
+		if(M.pain_emote_1p) // Sanity
+			return "You [pick(M.pain_emote_1p)]!"
+	. = ..()
+
+/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		return "[pick(H.species.pain_verb_3p)] in pain!"
+	else
+		var/mob/living/M = user
+		if(M.pain_emote_3p) // Sanity
+			return "[pick(M.pain_emote_3p)]!"
+	. = ..()
+
+/decl/emote/audible/pain/get_emote_sound(var/atom/user)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/vol = H.species.pain_volume
+		return list(
+				"sound" = get_species_sound(get_gendered_sound(H))["pain"],
+				"vol" = vol,
+				"exr" = 20,
+				"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
+			)
+	else
+		var/mob/living/M = user
+		return list(
+				"sound" = get_species_sound(get_gendered_sound(M))["pain"],
+				"vol" = 50,
+				"exr" = 20,
+				"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
+			)

code/modules/emotes/definitions/audible_scream.dm

@@ -3,6 +3,17 @@
 	emote_message_1p = "You scream!"
 	emote_message_3p = "screams!"
 
+/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/vol = H.species.scream_volume
+		return list(
+				"sound" = get_species_sound(get_gendered_sound(H))["scream"],
+				"vol" = vol,
+				"exr" = 20,
+				"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
+			)
+
 /decl/emote/audible/scream/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user

code/modules/emotes/definitions/audible_scream_vr.dm

@@ -1,18 +1,7 @@
 /decl/emote/audible/scream/get_emote_sound(var/atom/user)
+	..()
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		// CHOMPEdit Start: Commenting out bc _ch calls parent.
-		/*
-		if(H.get_gender() == FEMALE)
-			return list(
-				"sound" = H.species.female_scream_sound,
-				"vol" = emote_volume
-			)
-		else
-			return list(
-				"sound" = H.species.male_scream_sound,
-				"vol" = emote_volume
-		*/
 		var/vol = H.species.scream_volume
 		return list(
 				"sound" = get_species_sound(get_gendered_sound(H))["scream"],
@@ -20,3 +9,8 @@
 				"exr" = 20,
 				"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
 			)
+
+/decl/emote/audible/malehumanscream
+	key = "malehumanscream"
+	emote_message_3p = "screams!"
+	emote_sound = 'sound/voice/malescream_2.ogg'

code/modules/emotes/definitions/audible_sneeze.dm

@@ -10,7 +10,6 @@
 /decl/emote/audible/sneeze/get_emote_sound(var/atom/user)
 	if(ishuman(user) && !check_synthetic(user))
 		var/mob/living/carbon/human/H = user
-		// CHOMPEdit Start: Standardize Species Sounds
 		var/vol = H.species.sneeze_volume
 		var/s = get_species_sound(get_gendered_sound(H))["sneeze"]
 		if(!s && !(get_species_sound(H.species.species_sounds) == "None")) // Failsafe, so we always use the default sneeze/etc sounds. None will cancel out anyways.

code/modules/emotes/definitions/belly_rub.dm

@@ -0,0 +1,27 @@
+/decl/emote/visible/bellyrub
+	key = "bellyrub"
+	check_restraints = TRUE
+	check_range = 1
+	//These aren't actually ever shown BUT can_target requires 1p_target or 3p_target to be set or you can't target people.
+	emote_message_1p = "You rub your belly!"
+	emote_message_1p_target = "You rub TARGET's belly!"
+	emote_message_3p = "rubs their belly!"
+	emote_message_3p_target = "rubs TARGET's belly!"
+
+/decl/emote/visible/bellyrub/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+	if(!target && isliving(user)) //We shouldn't NEED an isliving check here but...Whatever, safety first.
+		var/mob/living/U = user
+		U.vore_bellyrub(U)
+		//We don't need to return a message here. The vore bellyrub does it itself!
+
+	else if(isliving(user) && isliving(target))
+		var/mob/living/U = user
+		var/mob/living/T = target
+		U.vore_bellyrub(T)
+		//We don't need to return a message here. The vore bellyrub does it itself!
+	else
+		to_chat(user, "You can not rub [target]'s belly.")
+	return
+
+/decl/emote/visible/bellyrub/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+	return

code/modules/emotes/definitions/human.dm

@@ -1,5 +1,5 @@
 /decl/emote/human/mob_can_use(var/mob/living/carbon/human/user)
-	return ..() && (istype(user))//VOREStation Edit - What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
+	return ..() && (istype(user))//What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
 
 /decl/emote/human/deathgasp
 	key = "deathgasp"

code/modules/emotes/emote_define.dm

@@ -134,7 +134,7 @@ var/global/list/emotes_by_key
 	if (!use_range)
 		use_range = world.view
 
-	if(ismob(user))
+	if(ismob(user) && (use_3p || use_1p)) //Adds functionality for emotes that don't give use feedback, such as bellyrubs.
 		var/mob/M = user
 		if(message_type == AUDIBLE_MESSAGE)
 			if(isliving(user))