From a4c819847946422314a585db38ecb1ec5c5db748 Mon Sep 17 00:00:00 2001
From: Chompstation Bot <chompstation2bot@gmail.com>
Date: Sun, 29 Nov 2020 15:35:52 +0000
Subject: [PATCH 1/2] Horned succubi

---
 .../vore/appearance/sprite_accessories_vr.dm  | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm
index d3d7fe29e1..d2e540b826 100644
--- a/code/modules/vore/appearance/sprite_accessories_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_vr.dm
@@ -591,6 +591,76 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "dragon-horns"
+<<<<<<< HEAD
+||||||| parent of db63b57de1... Merge pull request #9379 from Runa-Dacino/horned-succubi
+
+/datum/sprite_accessory/ears/synthhorns_plain
+	name = "Synth horns, plain"
+	desc = ""
+	icon_state = "synthhorns_plain"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "synthhorns_plain_light"
+
+/datum/sprite_accessory/ears/synthhorns_thick
+	name = "Synth horns, thick"
+	desc = ""
+	icon_state = "synthhorns_thick"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "synthhorns_thick_light"
+
+/datum/sprite_accessory/ears/synthhorns_curly
+	name = "Synth horns, curly"
+	desc = ""
+	icon_state = "synthhorns_curled"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+=======
+
+/datum/sprite_accessory/ears/synthhorns_plain
+	name = "Synth horns, plain"
+	desc = ""
+	icon_state = "synthhorns_plain"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "synthhorns_plain_light"
+
+/datum/sprite_accessory/ears/synthhorns_thick
+	name = "Synth horns, thick"
+	desc = ""
+	icon_state = "synthhorns_thick"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "synthhorns_thick_light"
+
+/datum/sprite_accessory/ears/synthhorns_curly
+	name = "Synth horns, curly"
+	desc = ""
+	icon_state = "synthhorns_curled"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+
+/datum/sprite_accessory/ears/forward_curled_demon_horns_bony
+	name = "Succubus horns, colourable"
+	desc = ""
+	icon_state = "succu-horns_b"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/forward_curled_demon_horns_bony_with_colorable_ears
+	name = "Succubus horns with pointy ears, colourable"
+	desc = ""
+	icon_state = "elfs"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "succu-horns_b"
+
+
+
+>>>>>>> db63b57de1... Merge pull request #9379 from Runa-Dacino/horned-succubi
 /*
 ////////////////////////////
 /  =--------------------=  /

From c0d4e3625d6c851754d1568202b93f9e29139192 Mon Sep 17 00:00:00 2001
From: cadyn <35672377+cadyn@users.noreply.github.com>
Date: Mon, 30 Nov 2020 10:29:59 -0800
Subject: [PATCH 2/2] Resolve conflicts

---
 .../vore/appearance/sprite_accessories_vr.dm  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm
index d2e540b826..b9b556fb68 100644
--- a/code/modules/vore/appearance/sprite_accessories_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_vr.dm
@@ -591,33 +591,6 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "dragon-horns"
-<<<<<<< HEAD
-||||||| parent of db63b57de1... Merge pull request #9379 from Runa-Dacino/horned-succubi
-
-/datum/sprite_accessory/ears/synthhorns_plain
-	name = "Synth horns, plain"
-	desc = ""
-	icon_state = "synthhorns_plain"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-	extra_overlay = "synthhorns_plain_light"
-
-/datum/sprite_accessory/ears/synthhorns_thick
-	name = "Synth horns, thick"
-	desc = ""
-	icon_state = "synthhorns_thick"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-	extra_overlay = "synthhorns_thick_light"
-
-/datum/sprite_accessory/ears/synthhorns_curly
-	name = "Synth horns, curly"
-	desc = ""
-	icon_state = "synthhorns_curled"
-	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
-
-=======
 
 /datum/sprite_accessory/ears/synthhorns_plain
 	name = "Synth horns, plain"
@@ -660,7 +633,6 @@
 
 
 
->>>>>>> db63b57de1... Merge pull request #9379 from Runa-Dacino/horned-succubi
 /*
 ////////////////////////////
 /  =--------------------=  /