Merge pull request #9066 from Fox-McCloud/pain-refactor

Pain Refactor and Tweaks

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

@@ -15,6 +15,7 @@
 	parent_organ = "head"
 	slot = "brain"
 	vital = 1
+	hidden_pain = TRUE //the brain has no pain receptors, and brain damage is meant to be a stealthy damage type.
 	var/mmi_icon = 'icons/obj/assemblies.dmi'
 	var/mmi_icon_state = "mmi_full"
 

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

@@ -1203,7 +1203,7 @@
 		return 0
 
 	if(!L.is_bruised())
-		src.custom_pain("You feel a stabbing pain in your chest!", 1)
+		custom_pain("You feel a stabbing pain in your chest!")
 		L.damage = L.min_bruised_damage
 
 //returns 1 if made bloody, returns 0 otherwise

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

@@ -20,7 +20,7 @@
 		//Moving around with fractured ribs won't do you any good
 			if(E.is_broken() && E.internal_organs && E.internal_organs.len && prob(15))
 				var/obj/item/organ/internal/I = pick(E.internal_organs)
-				custom_pain("You feel broken bones moving in your [E.name]!", 1)
+				custom_pain("You feel broken bones moving in your [E.name]!")
 				I.receive_damage(rand(3,5))
 
 	//handle_stance()