General and Diona Pain Tweaks (#9770)

code/modules/organs/internal/_internal.dm

@@ -4,6 +4,7 @@
 /obj/item/organ/internal
 	var/dead_icon // Icon to use when the organ has died.
 	var/damage_reduction = 0.5     //modifier for internal organ injury
+	var/unknown_pain_location = TRUE // if TRUE, pain messages will point to the parent organ, otherwise it will print the organ name
 	var/toxin_type = "undefined"
 	var/relative_size = 25 //Used for size calcs
 	var/on_mob_icon

code/modules/organs/internal/species/diona.dm

@@ -1,3 +1,6 @@
+/obj/item/organ/internal/diona
+	unknown_pain_location = FALSE
+
 /obj/item/organ/internal/diona/process()
 	return
 

code/modules/organs/pain.dm

@@ -49,7 +49,7 @@ mob/var/next_pain_time = 0
 			if(!(use_emote.message_type == AUDIBLE_MESSAGE && silent))
 				emote(force_emote)
 
-	next_pain_time = world.time + (100-power)
+	next_pain_time = world.time + 5 SECONDS
 
 /mob/living/carbon/human/proc/handle_pain()
 	if(!can_feel_pain())
@@ -94,13 +94,13 @@ mob/var/next_pain_time = 0
 		if(prob(1) && !((I.status & ORGAN_DEAD) || BP_IS_ROBOTIC(I)) && I.damage > 5)
 			var/obj/item/organ/external/parent = get_organ(I.parent_organ)
 			var/pain = 10
-			var/message = "You feel a dull pain in your [parent.name]..."
+			var/message = I.unknown_pain_location ? "You feel a dull pain in your [parent.name]..." : "You feel a dull pain radiating from your [I.name]..."
 			if(I.is_bruised())
 				pain = 25
-				message = "You feel a stinging pain in your [parent.name]."
+				message = I.unknown_pain_location ? "You feel a stinging pain in your [parent.name]." : "You feel a stinging pain radiating from your [I.name]."
 			if(I.is_broken())
 				pain = 50
-				message = "You feel a sharp pain in your [parent.name]!"
+				message = I.unknown_pain_location ? "You feel a sharp pain in your [parent.name]!" : "You feel a sharp pain radiating from your [I.name]!"
 			src.custom_pain(message, pain, affecting = parent)
 
 	if(prob(1))