From 439fc01c1506c37286bd4ad033e95aab49c5d7d3 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 9 Jan 2022 20:49:33 -0500
Subject: [PATCH] powder that makes you say yes

---
 .../modules/client/preference_setup/loadout/loadout_suit_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 3c7e1d1f75..3542aadda0 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -108,12 +108,9 @@ Talon winter coat
 /datum/gear/suit/wintercoat/talon
 	display_name = "winter coat, Talon"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
-<<<<<<< HEAD
-=======
 
 
 /datum/gear/suit/armor/combat/crusader_explo
 	display_name = "knight, explo"
 	path = /obj/item/clothing/suit/armor/combat/crusader_explo
 	allowed_roles = list("Explorer","Field Medic","Pathfinder")
->>>>>>> 62a6177d876... Merge pull request #12044 from TheDavestDave/dnd-explo-amour