From 1bd327ce1ed89fc3712b8d046be76bb98b156d17 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Thu, 21 May 2020 15:48:02 -0400
Subject: [PATCH] Merge upstream PR

---
 .../preference_setup/loadout/loadout_head.dm  | 20 ++-----------------
 vorestation.dme                               |  7 +------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index 811b6eaf53..eb107985cf 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -125,21 +125,9 @@
 	display_name = "cap, bill"
 	path = /obj/item/clothing/head/soft/mbill
 
-/*/datum/gear/head/cap/sol
+/datum/gear/head/cap/sol
 	display_name = "cap, sol"
-<<<<<<< HEAD
-	path = /obj/item/clothing/head/soft/sol
-
-/datum/gear/head/cap/expdition
-	display_name = "cap, expedition"
-	path = /obj/item/clothing/head/soft/sol/expedition
-
-/datum/gear/head/cap/fleet
-	display_name = "cap, fleet"
-	path = /obj/item/clothing/head/soft/sol/fleet*/ // Vorestation removal
-=======
 	path = /obj/item/clothing/head/soft/solgov
->>>>>>> 8a2baa1... Updates Solgov/Sifguard uniforms (#7138)
 
 /datum/gear/head/cowboy
 	display_name = "cowboy, rodeo"
@@ -341,11 +329,7 @@
 	display_name = "welding, engie (engineering/robotics)"
 	path = /obj/item/clothing/head/welding/engie
 
-<<<<<<< HEAD
-/*/datum/gear/head/beret/sol
-=======
 /datum/gear/head/beret/solgov
->>>>>>> 8a2baa1... Updates Solgov/Sifguard uniforms (#7138)
 	display_name = "beret sol, selection"
 	path = /obj/item/clothing/head/beret/solgov
 
@@ -355,7 +339,7 @@
 	for(var/sol_style in typesof(/obj/item/clothing/head/beret/solgov))
 		var/obj/item/clothing/head/beret/solgov/sol = sol_style
 		sols[initial(sol.name)] = sol
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal.
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))
 
 /datum/gear/head/surgery
 	display_name = "surgical cap selection"
diff --git a/vorestation.dme b/vorestation.dme
index cd2c37e0cb..b6101c30d9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1641,14 +1641,9 @@
 #include "code\modules\ai\ai_holder_targeting_vr.dm"
 #include "code\modules\ai\interfaces.dm"
 #include "code\modules\ai\say_list.dm"
-<<<<<<< HEAD:vorestation.dme
-#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
-#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
-#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
-=======
 #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
+#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
 #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
->>>>>>> 8a2baa1... Updates Solgov/Sifguard uniforms (#7138):polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"