From eb0296c9152b85385ffb140d405d3be7657b25eb Mon Sep 17 00:00:00 2001
From: gaxeer <gax1998@gmail.com>
Date: Thu, 11 Jul 2024 11:15:35 +0300
Subject: [PATCH 1/3] remove unnatural genders

---
 code/modules/client/preferences/body_type.dm  |  2 +-
 .../interfaces/PreferencesMenu/MainPage.tsx   | 36 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm
index 6b27e0f0f0da7..6e36ef7b58504 100644
--- a/code/modules/client/preferences/body_type.dm
+++ b/code/modules/client/preferences/body_type.dm
@@ -8,7 +8,7 @@
 	can_randomize = FALSE
 
 /datum/preference/choiced/body_type/init_possible_values()
-	return list(USE_GENDER, MALE, FEMALE)
+	return list(USE_GENDER) // BANDASTATION REMOVE. Was `return list(USE_GENDER, MALE, FEMALE)`
 
 /datum/preference/choiced/body_type/create_default_value()
 	return USE_GENDER
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
index 35ddf9d2a7326..d9db8609a3019 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
@@ -224,25 +224,23 @@ const GenderButton = (props: {
       placement="right-end"
       content={
         <Stack backgroundColor="white" ml={0.5} p={0.3}>
-          {[Gender.Male, Gender.Female, Gender.Other, Gender.Other2].map(
-            (gender) => {
-              return (
-                <Stack.Item key={gender}>
-                  <Button
-                    selected={gender === props.gender}
-                    onClick={() => {
-                      props.handleSetGender(gender);
-                      setGenderMenuOpen(false);
-                    }}
-                    fontSize="22px"
-                    icon={GENDERS[gender].icon}
-                    tooltip={GENDERS[gender].text}
-                    tooltipPosition="top"
-                  />
-                </Stack.Item>
-              );
-            },
-          )}
+          {[Gender.Male, Gender.Female].map((gender) => {
+            return (
+              <Stack.Item key={gender}>
+                <Button
+                  selected={gender === props.gender}
+                  onClick={() => {
+                    props.handleSetGender(gender);
+                    setGenderMenuOpen(false);
+                  }}
+                  fontSize="22px"
+                  icon={GENDERS[gender].icon}
+                  tooltip={GENDERS[gender].text}
+                  tooltipPosition="top"
+                />
+              </Stack.Item>
+            );
+          })}
         </Stack>
       }
     >

From 7a13051de64b029b2a5f91a3d0310dbaff3cfbe6 Mon Sep 17 00:00:00 2001
From: gaxeer <gax1998@gmail.com>
Date: Thu, 11 Jul 2024 12:48:06 +0300
Subject: [PATCH 2/3] refactor multiple gender removal to use module

---
 code/modules/client/preferences/body_type.dm                 | 2 +-
 modular_bandastation/preferences/_preferences.dm             | 4 ++--
 modular_bandastation/preferences/_preferences.dme            | 4 ++--
 .../preferences/code/{ => modules/client}/preferences.dm     | 0
 .../preferences/code/modules/client/preferences/body_type.dm | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename modular_bandastation/preferences/code/{ => modules/client}/preferences.dm (100%)
 create mode 100644 modular_bandastation/preferences/code/modules/client/preferences/body_type.dm

diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm
index 6e36ef7b58504..6b27e0f0f0da7 100644
--- a/code/modules/client/preferences/body_type.dm
+++ b/code/modules/client/preferences/body_type.dm
@@ -8,7 +8,7 @@
 	can_randomize = FALSE
 
 /datum/preference/choiced/body_type/init_possible_values()
-	return list(USE_GENDER) // BANDASTATION REMOVE. Was `return list(USE_GENDER, MALE, FEMALE)`
+	return list(USE_GENDER, MALE, FEMALE)
 
 /datum/preference/choiced/body_type/create_default_value()
 	return USE_GENDER
diff --git a/modular_bandastation/preferences/_preferences.dm b/modular_bandastation/preferences/_preferences.dm
index 458546b873488..a57829eb5f69e 100644
--- a/modular_bandastation/preferences/_preferences.dm
+++ b/modular_bandastation/preferences/_preferences.dm
@@ -1,4 +1,4 @@
 /datum/modpack/preferences
-	name = "Преференс220"
+	name = "Preferences overrides"
 	desc = "Изменяет preferences.dm под нужды проекта."
-	author = "hardexz"
+	author = "hardexz, gaxeer"
diff --git a/modular_bandastation/preferences/_preferences.dme b/modular_bandastation/preferences/_preferences.dme
index b3cb417dda487..209b86f42c498 100644
--- a/modular_bandastation/preferences/_preferences.dme
+++ b/modular_bandastation/preferences/_preferences.dme
@@ -1,4 +1,4 @@
 #include "_preferences.dm"
 
-#include "code\preferences.dm"
-
+#include "code\modules\client\preferences.dm"
+#include "code\modules\client\preferences\body_type.dm"
diff --git a/modular_bandastation/preferences/code/preferences.dm b/modular_bandastation/preferences/code/modules/client/preferences.dm
similarity index 100%
rename from modular_bandastation/preferences/code/preferences.dm
rename to modular_bandastation/preferences/code/modules/client/preferences.dm
diff --git a/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm b/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm
new file mode 100644
index 0000000000000..5803252b70cf3
--- /dev/null
+++ b/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm
@@ -0,0 +1,5 @@
+/datum/preference/choiced/body_type/apply_to_human(mob/living/carbon/human/target, value)
+	target.physique = target.gender
+
+/datum/preference/choiced/body_type/is_accessible(datum/preferences/preferences)
+	return FALSE

From 316c03a3d47e28eae8104d20292afa0de20e8d12 Mon Sep 17 00:00:00 2001
From: gaxeer <gax1998@gmail.com>
Date: Thu, 11 Jul 2024 13:02:40 +0300
Subject: [PATCH 3/3] call parent for linter to chill

---
 .../preferences/code/modules/client/preferences/body_type.dm   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm b/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm
index 5803252b70cf3..e454a6fb14b0f 100644
--- a/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm
+++ b/modular_bandastation/preferences/code/modules/client/preferences/body_type.dm
@@ -2,4 +2,7 @@
 	target.physique = target.gender
 
 /datum/preference/choiced/body_type/is_accessible(datum/preferences/preferences)
+	if (!..(preferences))
+		return FALSE
+
 	return FALSE