From ca827480881afae9e780ca2004f524211679abca Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Fri, 17 Jul 2020 14:33:57 +0100
Subject: [PATCH] paintraits

---
 .../human/species/station/traits_vr/negative.dm     | 12 ++++++++++++
 .../human/species/station/traits_vr/positive.dm     | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
index f4bf1e2e4b..4401434f97 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
@@ -108,6 +108,18 @@
 	desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks hit thrice as hard. You may wish to note this down in your medical records, and perhaps your exploitable info as well."
 	cost = -1
 	var_changes = list("alcohol_mod" = 3)
+	
+/datum/trait/pain_intolerance_basic
+	name = "Pain Intolerant"
+	desc = "You are frail and sensitive to pain. You experience 25% more pain from all sources." 
+	cost = -1
+	var_changes = list("pain_mod" = 1.25)
+
+/datum/trait/pain_intolerance_advanced
+	name = "High Pain Intolerance"
+	desc = "You are highly sensitive to all sources of pain, and experience 50% more pain."
+	cost = -2
+	var_changes = list("pain_mod" = 1.5) //this makes you extremely vulnerable to most sources of pain, a stunbaton bop or shotgun beanbag will do around 90 agony, almost enough to drop you in one hit
 //YW ADDITIONS END
 
 /datum/trait/conductive
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index da24754795..2e2396edfe 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -148,6 +148,19 @@
 	desc = "You've drunk so much that most booze doesn't even faze you. It takes something like a Pan-Galactic or a pint of Deathbell for you to even get slightly buzzed. You may wish to note this down in your medical records."
 	cost = 2
 	var_changes = list("alcohol_mod" = 0.25)
+	
+/datum/trait/pain_tolerance_basic
+	name = "Pain Tolerant"
+	desc = "You're a little more resistant to pain than most, and experience 10% less pain from from all sources."
+	cost = 1
+	var_changes = list("pain_mod" = 0.9)
+	
+/datum/trait/pain_tolerance_advanced
+	name = "High Pain Tolerance"
+	desc = "You are noticeably more resistant to pain than most, and experience 20% less pain from all sources."
+	cost = 2
+	var_changes = list("pain_mod" = 0.8)
+
 //YW ADDITIONS END
 
 /datum/trait/photoresistant