Implements negative trait "Neural hypersensitivity"

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

@@ -105,6 +105,7 @@
 	var/alcohol_mod =		1						// Multiplier to alcohol strength; 0.5 = half, 0 = no effect at all, 2 = double, etc.
 	var/pain_mod =			1						// Multiplier to pain effects; 0.5 = half, 0 = no effect (equal to NO_PAIN, really), 2 = double, etc.
 	var/spice_mod =			1						// Multiplier to spice/capsaicin/frostoil effects; 0.5 = half, 0 = no effect (immunity), 2 = double, etc.
+	var/trauma_mod = 		1						// Affects traumatic shock (how fast pain crit happens). 0 = no effect (immunity to pain crit), 2 = double etc.Overriden by "can_feel_pain" var	
 	// set below is EMP interactivity for nonsynth carbons
 	var/emp_sensitivity =		0			// bitflag. valid flags are: EMP_PAIN, EMP_BLIND, EMP_DEAFEN, EMP_CONFUSE, EMP_STUN, and EMP_(BRUTE/BURN/TOX/OXY)_DMG
 	var/emp_dmg_mod =		1			// Multiplier to all EMP damage sustained by the mob, if it's EMP-sensitive

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

@@ -191,6 +191,7 @@
 /datum/trait/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
 	H.add_modifier(/datum/modifier/trait/colorblind_taj)
+<<<<<<< HEAD
 YW comment finish*/
 
 // YW Addition
@@ -216,3 +217,14 @@ YW comment finish*/
 	..(S,H)
 	H.add_modifier(/datum/modifier/trait/haemophilia)
 // YW Addition End
+||||||| parent of b5b66c1ed1... Merge pull request #9406 from Runa-Dacino/Squashed-hypersensitivity
+	
+=======
+	
+/datum/trait/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."
+	cost = -1
+	var_changes = list("traumatic_mod" = 2)
+	
+>>>>>>> b5b66c1ed1... Merge pull request #9406 from Runa-Dacino/Squashed-hypersensitivity

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

@@ -13,8 +13,7 @@
 	1.2	* src.getShockFireLoss() + 		\
 	1.2	* src.getShockBruteLoss() + 		\
 	1.7	* src.getCloneLoss() + 		\
-	2	* src.halloss + 			\
-	-1	* src.chem_effects[CE_PAINKILLER]
+	2	* src.halloss
 
 	if(src.slurring)
 		src.traumatic_shock -= 20
@@ -27,6 +26,13 @@
 				src.traumatic_shock += 30
 			else if(organ.is_dislocated())
 				src.traumatic_shock += 15
+	
+	// Some individuals/species are more or less supectible to pain. Default trauma_mod = 1. Does not affect painkillers
+	if(istype(src, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = src
+		H.traumatic_shock *= H.species.trauma_mod
+		
+	src.traumatic_shock += -1 *  src.chem_effects[CE_PAINKILLER]
 
 	if(src.traumatic_shock < 0)
 		src.traumatic_shock = 0