From 989ca482826b534c9e7a9647f3c4a83e5fecb87a Mon Sep 17 00:00:00 2001
From: Layne <31356648+MisterLayne@users.noreply.github.com>
Date: Sat, 4 Jul 2020 00:35:30 -0400
Subject: [PATCH 1/2] ice cream

---
 code/modules/client/preference_setup/general/03_body.dm | 6 +++---
 vorestation.dme                                         | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index dfd1f457167..6d4b6ef75e0 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -49,9 +49,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	S["hair_red"]			<< pref.r_hair
 	S["hair_green"]			<< pref.g_hair
 	S["hair_blue"]			<< pref.b_hair
-	S["grad_red"]			>> pref.r_grad
-	S["grad_green"]			>> pref.g_grad
-	S["grad_blue"]			>> pref.b_grad
+	S["grad_red"]			<< pref.r_grad
+	S["grad_green"]			<< pref.g_grad
+	S["grad_blue"]			<< pref.b_grad
 	S["facial_red"]			<< pref.r_facial
 	S["facial_green"]		<< pref.g_facial
 	S["facial_blue"]		<< pref.b_facial
diff --git a/vorestation.dme b/vorestation.dme
index fe1a54bba83..03554023826 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1647,9 +1647,14 @@
 #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\slime_xenobio_ai.dm"
+>>>>>>> 21d0112... ice cream 2: electric boogaloo (#7319):polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"

From dd5ab8ba28349363dd6cb0ca120a0216f58b5ed2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 4 Jul 2020 08:53:47 -0400
Subject: [PATCH 2/2] Update vorestation.dme

---
 vorestation.dme | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 03554023826..fe1a54bba83 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1647,14 +1647,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\slime_xenobio_ai.dm"
->>>>>>> 21d0112... ice cream 2: electric boogaloo (#7319):polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"