From 00c822d64f02cd413ab23b2acc8593a28b045f96 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Mon, 19 Jun 2023 04:48:11 +1000
Subject: [PATCH] Update Pref Options

---
 code/_global_vars/lists/misc.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/_global_vars/lists/misc.dm b/code/_global_vars/lists/misc.dm
index f8666fc68e..4da4ba5bc4 100644
--- a/code/_global_vars/lists/misc.dm
+++ b/code/_global_vars/lists/misc.dm
@@ -9,9 +9,13 @@ GLOBAL_LIST_EMPTY(wire_name_directory)	// This is an associative list
 GLOBAL_LIST_EMPTY(tagger_locations)
 
 GLOBAL_LIST_INIT(char_directory_tags, list("Pred", "Pred-Pref", "Prey", "Prey-Pref", "Switch", "Non-Vore", "Unset"))
+<<<<<<< HEAD
 GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP", "Unset"))
 // CHOMPStation Edit Start: Directory Update
 GLOBAL_LIST_INIT(char_directory_sexualitytags, list("Straight", "Bisexual", "Pansexual", "Gay", "Lesbian", "Asexual", "Demisexual", "Unset"))
 GLOBAL_LIST_INIT(char_directory_gendertags, list("Male", "Female", "Nonbinary", "Trans Man", "Trans Woman", "Other", "Ungendered", "Unset"))
 // CHOMPStation Edit End: Directory Update
+=======
+GLOBAL_LIST_INIT(char_directory_erptags, list("Dominant", "Dom-Pref", "Submissive", "Sub-Pref", "Switch", "No ERP", "Unset"))
+>>>>>>> b83c847995... Merge pull request #15031 from KillianKirilenko/kk-cdir
 GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes