From 117138d2d4f87f54f18b5d98bc827a66aceffc4b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 7 Sep 2022 15:57:25 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../living/carbon/human/species/station/traits_vr/positive.dm | 4 ----
 1 file changed, 4 deletions(-)

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 b3f686f202..983ebd5117 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
@@ -214,9 +214,7 @@
 	var_changes = list("gun_accuracy_mod" = 25)
 	custom_only = FALSE
 	varchange_type = TRAIT_VARCHANGE_MORE_BETTER
-<<<<<<< HEAD
 */
-=======
 
 /datum/trait/negative/pain_tolerance
 	name = "Grit"
@@ -225,5 +223,3 @@
 	var_changes = list("trauma_mod" = 0.85)
 	excludes = list(/datum/trait/negative/neural_hypersensitivity)
 	can_take = ORGANICS
-
->>>>>>> 00381a575f... Merge pull request #13668 from Runa-Dacino/request-pain-tolerance