From 42618dcef1f4524e4bad32377a303edcac97ccbc Mon Sep 17 00:00:00 2001
From: Eearslya <eearslya@gmail.com>
Date: Sat, 6 Aug 2016 21:39:24 -0700
Subject: [PATCH] Resolve polaris merge conflicts

---
 code/game/machinery/autolathe_datums_vr.dm           | 12 ++++--------
 code/modules/client/preference_setup/vore/01_ears.dm |  1 +
 vorestation.dme                                      |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/game/machinery/autolathe_datums_vr.dm b/code/game/machinery/autolathe_datums_vr.dm
index 2f6478c4a5..0a22326d44 100644
--- a/code/game/machinery/autolathe_datums_vr.dm
+++ b/code/game/machinery/autolathe_datums_vr.dm
@@ -1,20 +1,16 @@
-/datum/autolathe/recipe/classic_smg_9mm
+/datum/category_item/autolathe/arms/classic_smg_9mm
 	name = "SMG magazine (9mm)"
 	path = /obj/item/ammo_magazine/mc9mml
-	category = "Arms and Ammunition"
 	hidden = 1
 
-/datum/autolathe/recipe/classic_smg_9mmr
+/datum/category_item/autolathe/arms/classic_smg_9mmr
 	name = "SMG magazine (9mm rubber)"
 	path = /obj/item/ammo_magazine/mc9mml/rubber
-	category = "Arms and Ammunition"
 
-/datum/autolathe/recipe/classic_smg_9mmp
+/datum/category_item/autolathe/arms/classic_smg_9mmp
 	name = "SMG magazine (9mm practice)"
 	path = /obj/item/ammo_magazine/mc9mml/practice
-	category = "Arms and Ammunition"
 
-/datum/autolathe/recipe/classic_smg_9mmf
+/datum/category_item/autolathe/arms/classic_smg_9mmf
 	name = "SMG magazine (9mm flash)"
 	path = /obj/item/ammo_magazine/mc9mml/flash
-	category = "Arms and Ammunition"
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/vore/01_ears.dm b/code/modules/client/preference_setup/vore/01_ears.dm
index 694aacd7a2..780283cf03 100644
--- a/code/modules/client/preference_setup/vore/01_ears.dm
+++ b/code/modules/client/preference_setup/vore/01_ears.dm
@@ -12,6 +12,7 @@
 	var/r_tail = 30		// Tail/Taur color
 	var/g_tail = 30		// Tail/Taur color
 	var/b_tail = 30		// Tail/Taur color
+	var/dress_mob = TRUE
 
 // Definition of the stuff for Ears
 /datum/category_item/player_setup_item/vore/ears
diff --git a/vorestation.dme b/vorestation.dme
index f0001699e5..d38e2b1252 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -524,7 +524,6 @@
 #include "code\game\machinery\alarm.dm"
 #include "code\game\machinery\atmo_control.dm"
 #include "code\game\machinery\autolathe.dm"
-#include "code\game\machinery\autolathe_datums.dm"
 #include "code\game\machinery\autolathe_datums_vr.dm"
 #include "code\game\machinery\Beacon.dm"
 #include "code\game\machinery\biogenerator.dm"