From 63af8e82c1d7806bec4591798ee4b48877ef4ff2 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 12 Dec 2021 03:54:27 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/client/preference_setup/loadout/loadout_suit.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 29a81c36da..496f8737e7 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -598,13 +598,8 @@
 
 /datum/gear/suit/snowsuit/engineering
 	display_name = "snowsuit, engineering"
-<<<<<<< HEAD
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering
-	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
-=======
-	path = /obj/item/clothing/suit/storage/snowsuit/engineering
 	allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
->>>>>>> 0502970c3f... Merge pull request #11752 from Heroman3003/jobstuff2
 
 /datum/gear/suit/snowsuit/cargo
 	display_name = "snowsuit, supply"