my glands!

code/__DEFINES/preferences.dm

@@ -464,66 +464,63 @@ GLOBAL_LIST_INIT(undie_position_strings, list("Under Clothes", "Over Clothes", "
 	#define PPT_GAME_PREFERENCES_CONTENT                          "PPT_GAME_PREFERENCES_CONTENT"
 #define PPT_KEYBINDINGS                                       "PPT_KEYBINDINGS"
 
-GLOBAL_LIST_INIT(prefs_menu_layout, list(
-	PPT_CHARCTER_PROPERTIES = list(
-		PPT_CHARCTER_PROPERTIES_INFO = list(),
-		PPT_CHARCTER_PROPERTIES_VOICE = list(),
-		PPT_CHARCTER_PROPERTIES_MISC = list(),
-	),
-	PPT_CHARCTER_APPEARANCE = list(
-		PPT_CHARCTER_APPEARANCE_MISC = list(),
-		PPT_CHARCTER_APPEARANCE_HAIR_EYES = list(),
-		PPT_CHARCTER_APPEARANCE_PARTS = list(),
-		PPT_CHARCTER_APPEARANCE_MARKINGS = list(),
-		PPT_CHARCTER_APPEARANCE_UNDERLYING = list(
-			PPT_CHARCTER_APPEARANCE_UNDERLYING_UNDIES,
-			PPT_CHARCTER_APPEARANCE_UNDERLYING_LAYERING,
-			"READ_GENITALS",
-		)
-	),
-	PPT_LOADOUT = list(),
-	PPT_GAME_PREFERENCES = list(
-		PPT_GAME_PREFERENCES_GENERAL = list(),
-		PPT_GAME_PREFERENCES_UI = list(),
-		PPT_GAME_PREFERENCES_CHAT = list(),
-		PPT_GAME_PREFERENCES_RUNECHAT = list(),
-		PPT_GAME_PREFERENCES_GHOST = list(),
-		PPT_GAME_PREFERENCES_AUDIO = list(),
-		PPT_GAME_PREFERENCES_ADMIN = list(),
-		PPT_GAME_PREFERENCES_CONTENT = list(),
-	),
-	PPT_KEYBINDINGS = list(),
-))
 
-GLOBAL_LIST_INIT(prefs_menu_layout_non_admin, list(
-	PPT_CHARCTER_PROPERTIES = list(
-		PPT_CHARCTER_PROPERTIES_INFO = list(),
-		PPT_CHARCTER_PROPERTIES_VOICE = list(),
-		PPT_CHARCTER_PROPERTIES_MISC = list(),
-	),
-	PPT_CHARCTER_APPEARANCE = list(
-		PPT_CHARCTER_APPEARANCE_MISC = list(),
-		PPT_CHARCTER_APPEARANCE_HAIR_EYES = list(),
-		PPT_CHARCTER_APPEARANCE_PARTS = list(),
-		PPT_CHARCTER_APPEARANCE_MARKINGS = list(),
-		PPT_CHARCTER_APPEARANCE_UNDERLYING = list(
-			PPT_CHARCTER_APPEARANCE_UNDERLYING_UNDIES,
-			PPT_CHARCTER_APPEARANCE_UNDERLYING_LAYERING,
-			"READ_GENITALS",
-		)
-	),
-	PPT_LOADOUT = list(),
-	PPT_GAME_PREFERENCES = list(
-		PPT_GAME_PREFERENCES_GENERAL = list(),
-		PPT_GAME_PREFERENCES_UI = list(),
-		PPT_GAME_PREFERENCES_CHAT = list(),
-		PPT_GAME_PREFERENCES_RUNECHAT = list(),
-		// PPT_GAME_PREFERENCES_GHOST = list(),
-		PPT_GAME_PREFERENCES_AUDIO = list(),
-		// PPT_GAME_PREFERENCES_ADMIN = list(),
-		PPT_GAME_PREFERENCES_CONTENT = list(),
-	),
-	PPT_KEYBINDINGS = list(),
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+GLOBAL_LIST_INIT(pref_cat_2_words, list(
+	PPT_CHARCTER_PROPERTIES                      = "Character Properties",
+	PPT_CHARCTER_PROPERTIES_INFO                 = "Info",
+	PPT_CHARCTER_PROPERTIES_VOICE                = "Voice",
+	PPT_CHARCTER_PROPERTIES_MISC                 = "Misc",
+	PPT_CHARCTER_APPEARANCE                      = "Character Appearance",
+	PPT_CHARCTER_APPEARANCE_MISC                 = "General",
+	PPT_CHARCTER_APPEARANCE_HAIR_EYES            = "Hair / Eyes",
+	PPT_CHARCTER_APPEARANCE_PARTS                = "Cool Parts",
+	PPT_CHARCTER_APPEARANCE_MARKINGS             = "Markings",
+	PPT_CHARCTER_APPEARANCE_UNDERLYING           = "Unmentionables",
+	PPT_CHARCTER_APPEARANCE_UNDERLYING_UNDIES    = "Underwear",
+	PPT_CHARCTER_APPEARANCE_UNDERLYING_LAYERING  = "Layering",
+	PPT_LOADOUT                                  = "Loadout",
+	PPT_GAME_PREFERENCES                         = "Game Preferences",
+	PPT_GAME_PREFERENCES_GENERAL                 = "General",
+	PPT_GAME_PREFERENCES_UI                      = "UI",
+	PPT_GAME_PREFERENCES_CHAT                    = "Chat",
+	PPT_GAME_PREFERENCES_RUNECHAT                = "Runechat",
+	PPT_GAME_PREFERENCES_GHOST                   = "GhostADMINONLY",
+	PPT_GAME_PREFERENCES_AUDIO                   = "Audio",
+	PPT_GAME_PREFERENCES_ADMIN                   = "AdminADMINONLY",
+	PPT_GAME_PREFERENCES_CONTENT                 = "Adult Content",
+	PPT_KEYBINDINGS                              = "Keybindings",
 ))
 
 
+
+
+

code/_globalvars/lists/keybindings.dm

@@ -10,6 +10,8 @@
 /// Adds an instanced keybinding to the global tracker
 /proc/add_keybinding(datum/keybinding/instance)
 	GLOB.keybindings_by_name[instance.name] = instance
+	LAZYINITLIST(GLOB.keybindings_by_category[instance.category])
+	GLOB.keybindings_by_category[instance.category][instance.name] = instance
 
 	// Classic
 	if(LAZYLEN(instance.classic_keys))

code/modules/arousal/genital_data.dm

@@ -26,6 +26,7 @@
 	var/size_max
 	var/size_name
 	var/size_units
+	var/one_or_some
 
 /datum/genital_data/New(obj/item/organ/genital/nad)
 	shapelist = nad.GetShapeList()
@@ -45,6 +46,9 @@
 	name = nad.name
 	genital_flags = nad.genital_flags
 	size_units = nad.size_units
+	one_or_some = nad.one_or_some
+	if(!pref_cat_2_words[has_key])
+		pref_cat_2_words[has_key] = "[name]"
 
 /datum/genital_data/proc/SizeString(size)
 	var/out = size_name
@@ -57,6 +61,20 @@
 		out = replacetext(out, "<ES>", "")
 	return out
 
+/datum/genital_data/proc/CanHave()
+	if(!has_key)
+		return FALSE
+	if(!(genital_flags & GENITAL_CAN_HAVE))
+		return FALSE
+	return TRUE
+
+/datum/genital_data/proc/CanLayer()
+	if(!CanHave())
+		return FALSE
+	if(!(genital_flags & GENITAL_INTERNAL))
+		return FALSE
+	return TRUE
+
 
 
 

code/modules/arousal/genitals.dm

@@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(genital_data_system)
 	var/vis_flags_key
 	var/override_key
 	var/size_units = "Vix"
+	var/one_or_some = "one"
 	/// What flag is this associated with?
 	var/hide_flag = HIDE_MISC
 	var/pickable = FALSE // deprecated

code/modules/arousal/organs/breasts.dm

@@ -29,6 +29,7 @@
 	override_key = "breasts_visibility_override"
 	size_units = "Cupsize"
 	pickable = TRUE
+	one_or_some = "some"
 
 GLOBAL_LIST_INIT(breast_values, list(
 	"a" = 1,

code/modules/arousal/organs/testicles.dm

@@ -25,6 +25,7 @@
 	override_key = "balls_visibility_override"
 	size_units = "Decigrundles"
 	pickable = TRUE
+	one_or_some = "some"
 
 /obj/item/organ/genital/testicles/format_for_tgui()
 	var/list/out = list()