Merge pull request #1611 from Yoshax/traits

Adds a set of new traits regarding susceptibility to electric shocks

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

@@ -56,6 +56,18 @@
 	cost = -2
 	var_changes = list("burn_mod" = 1.30)
 
+/datum/trait/conductive
+	name = "Conductive"
+	desc = "Increases your susceptibility to electric shocks by a small amount."
+	cost = -1
+	var_changes = list("siemens_coefficient" = 1.15)
+
+/datum/trait/conductive_plus
+	name = "Conductive (Plus)"
+	desc = "Increases your susceptibility to electric shocks by a moderate amount."
+	cost = -2
+	var_changes = list("siemens_coefficient" = 1.3)
+
 /datum/trait/photosensitive
 	name = "Photosensitive"
 	desc = "Increases stun duration from flashes and other light-based stuns."

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

@@ -32,6 +32,18 @@
 		..(S,H)
 		H.setMaxHealth(S.total_health)
 
+/datum/trait/nonconductive
+	name = "Non-Conductive"
+	desc = "Decreases your susceptibility to electric shocks by a small amount."
+	cost = 1
+	var_changes = list("siemens_coefficient" = 0.85)
+
+/datum/trait/nonconductive_plus
+	name = "Non-Conductive (Plus)"
+	desc = "Decreases your susceptibility to electric shocks by a moderate amount."
+	cost = 2
+	var_changes = list("siemens_coefficient" = 0.7)
+
 /datum/trait/darksight
 	name = "Darksight"
 	desc = "Allows you to see a short distance in the dark."