Merge pull request #13597 from Runa-Dacino/neural-hyperbuff

Significantly buffs the impact of "Neural Hypersensitivty"

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

@@ -20,7 +20,10 @@
 			. += M.slowdown
 
 	var/health_deficiency = (getMaxHealth() - health)
-	if(health_deficiency >= 40) //VOREStation Edit Start
+	if(istype(src, /mob/living/carbon/human)) //VOREStation Edit Start
+		var/mob/living/carbon/human/H = src
+		health_deficiency *= H.species.trauma_mod //Species pain sensitivity does not apply to painkillers, so we apply it before
+	if(health_deficiency >= 40)
 		if(chem_effects[CE_PAINKILLER]) //On painkillers? Reduce pain! On anti-painkillers? Increase pain!
 			health_deficiency = max(0, health_deficiency - src.chem_effects[CE_PAINKILLER])
 		if(health_deficiency >= 40) //Still in enough pain for it to be significant?

code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm

@@ -124,7 +124,7 @@
 
 /datum/trait/negative/neural_hypersensitivity
 	name = "Neural Hypersensitivity"
-	desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock."
+	desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Makes all pain effects twice as strong, and occur at half as much damage."
 	cost = -1
 	var_changes = list("trauma_mod" = 2)
 	can_take = ORGANICS

code/modules/organs/pain.dm

@@ -40,6 +40,9 @@
 		if(dam > maxdam && (maxdam == 0 || prob(70)) )
 			damaged_organ = E
 			maxdam = dam
+			if(istype(src, /mob/living/carbon/human)) //VOREStation Edit Start
+				var/mob/living/carbon/human/H = src
+				maxdam *= H.species.trauma_mod //VOREStation edit end
 	if(damaged_organ && chem_effects[CE_PAINKILLER] < maxdam)
 		if(maxdam > 10 && paralysis)
 			AdjustParalysis(-round(maxdam/10))