From b49c04d1aa2255b9e82c69cebb7e45eba718ed1d Mon Sep 17 00:00:00 2001
From: Anticept <521038+Anticept@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:22:53 +0300
Subject: [PATCH 1/3] [MIRROR] Removes generic_adjective sanity check

---
 code/modules/client/preferences.dm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 51985fa11e82..d7129170e291 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -886,6 +886,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "</td>"
 					mutant_category = 0
 
+<<<<<<< ours
 			if("tajara_chest_markings" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN
@@ -944,13 +945,21 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 
 				dat += "<h3>Character Adjective</h3>"
+=======
+			// begin generic adjective
+			if(!mutant_category)
+				dat += APPEARANCE_CATEGORY_COLUMN
 
-				dat += "<a href='?_src_=prefs;preference=generic_adjective;task=input'>[generic_adjective]</a><BR>"
+			dat += "<h3>Character Adjective</h3>"
+>>>>>>> theirs
 
-				mutant_category++
-				if(mutant_category >= MAX_MUTANT_ROWS)
-					dat += "</td>"
-					mutant_category = 0
+			dat += "<a href='?_src_=prefs;preference=generic_adjective;task=input'>[generic_adjective]</a><BR>"
+
+			mutant_category++
+			if(mutant_category >= MAX_MUTANT_ROWS)
+				dat += "</td>"
+				mutant_category = 0
+			// end generic adjective
 
 			if("wings" in pref_species.default_features && GLOB.r_wings_list.len >1)
 				if(!mutant_category)

From 175934d87712e6a8c5ae1649463bbb0e2ca2357a Mon Sep 17 00:00:00 2001
From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:29:58 +0500
Subject: [PATCH 2/3] Update preferences.dm

Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
---
 code/modules/client/preferences.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d7129170e291..29de02330afb 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -943,15 +943,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				dat += "<a href='?_src_=prefs;preference=body_size;task=input'>[features["body_size"]]</a><BR>"
 
-
-				dat += "<h3>Character Adjective</h3>"
-=======
 			// begin generic adjective
 			if(!mutant_category)
 				dat += APPEARANCE_CATEGORY_COLUMN
 
 			dat += "<h3>Character Adjective</h3>"
->>>>>>> theirs
 
 			dat += "<a href='?_src_=prefs;preference=generic_adjective;task=input'>[generic_adjective]</a><BR>"
 

From 3094fbd36f4b4231b614334dce64d37a353d6419 Mon Sep 17 00:00:00 2001
From: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:30:27 +0500
Subject: [PATCH 3/3] Update preferences.dm

Signed-off-by: MrCat15352 <125268716+MrCat15352@users.noreply.github.com>
---
 code/modules/client/preferences.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 29de02330afb..fb41b702d1fe 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -886,7 +886,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "</td>"
 					mutant_category = 0
 
-<<<<<<< ours
 			if("tajara_chest_markings" in pref_species.default_features)
 				if(!mutant_category)
 					dat += APPEARANCE_CATEGORY_COLUMN