From bf6c710049eed4adc440ee2b35a3f9fb1df1f939 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Mon, 19 Jun 2023 12:16:08 +0200 Subject: [PATCH] fix merge conflicts --- code/_global_vars/lists/misc.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/_global_vars/lists/misc.dm b/code/_global_vars/lists/misc.dm index 4da4ba5bc4..3447fbaaf1 100644 --- a/code/_global_vars/lists/misc.dm +++ b/code/_global_vars/lists/misc.dm @@ -9,13 +9,9 @@ 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")) +GLOBAL_LIST_INIT(char_directory_erptags, list("Dominant", "Dom-Pref", "Submissive", "Sub-Pref", "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