Merge pull request #16013 from SandPoot/change-preferences

Preferences menu layout change

code/__DEFINES/DNA.dm

@@ -200,3 +200,8 @@
 #define G_FEMALE 2
 #define G_PLURAL 3
 #define G_NEUTER 4
+
+#define PREVIEW_PREF_JOB "Job"
+#define PREVIEW_PREF_LOADOUT "Loadout"
+#define PREVIEW_PREF_NAKED "Naked"
+#define PREVIEW_PREF_NAKED_AROUSED "Naked - Aroused"

code/__DEFINES/loadout.dm

@@ -88,12 +88,21 @@
 
 //the names of the customization tabs
 #define SETTINGS_TAB			0
-#define GAME_PREFERENCES_TAB	1
-#define APPEARANCE_TAB			2
-#define SPEECH_TAB				3
-#define LOADOUT_TAB				4
-#define CONTENT_PREFERENCES_TAB	5
-#define KEYBINDINGS_TAB			6
+#define PREFERENCES_TAB			1
+#define KEYBINDINGS_TAB			2
+
+//subtabs for the character settings tab
+#define GENERAL_CHAR_TAB		0
+#define BACKGROUND_CHAR_TAB		1
+#define APPEARANCE_CHAR_TAB		2
+#define MARKINGS_CHAR_TAB		3
+#define SPEECH_CHAR_TAB			4
+#define LOADOUT_CHAR_TAB		5
+
+//subtabs for preferences tab
+#define GAME_PREFS_TAB			0
+#define OOC_PREFS_TAB			1
+#define CONTENT_PREFS_TAB		2
 
 //quirks
 #define QUIRK_POSITIVE	"Positive"

code/_globalvars/lists/loadout_categories.dm

@@ -1,10 +1,10 @@
 GLOBAL_LIST_INIT(loadout_categories, list(
-	LOADOUT_CATEGORY_ACCESSORY = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_TOYS),
 	LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES),
 	LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_UNIFORM = list(LOADOUT_SUBCATEGORY_UNIFORM_GENERAL, LOADOUT_SUBCATEGORY_UNIFORM_JOBS, LOADOUT_SUBCATEGORY_UNIFORM_SUITS, LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS, LOADOUT_SUBCATEGORY_UNIFORM_DRESSES, LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS, LOADOUT_SUBCATEGORY_UNIFORM_PANTS, LOADOUT_SUBCATEGORY_UNIFORM_SHORTS),
+	LOADOUT_CATEGORY_ACCESSORY = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_SUIT = list(LOADOUT_SUBCATEGORY_SUIT_GENERAL, LOADOUT_SUBCATEGORY_SUIT_COATS, LOADOUT_SUBCATEGORY_SUIT_JACKETS, LOADOUT_SUBCATEGORY_SUIT_JOBS),
 	LOADOUT_CATEGORY_HEAD = list(LOADOUT_SUBCATEGORY_HEAD_GENERAL, LOADOUT_SUBCATEGORY_HEAD_JOBS),
 	LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,

code/_onclick/hud/new_player.dm

@@ -280,7 +280,7 @@
 	if(!.)
 		return
 
-	hud.mymob.client.prefs.current_tab = GAME_PREFERENCES_TAB
+	hud.mymob.client.prefs.current_tab = PREFERENCES_TAB
 	hud.mymob.client.prefs.ShowChoices(hud.mymob)
 
 /atom/movable/screen/lobby/button/bottom/changelog_button

code/modules/arousal/genitals.dm

@@ -41,7 +41,8 @@
 		return FALSE
 	if(!((HAS_TRAIT(owner,TRAIT_PERMABONER) && !new_state) || HAS_TRAIT(owner,TRAIT_NEVERBONER) && new_state))
 		aroused_state = new_state
-	owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE)
+	if(cause)
+		owner.log_message("[src]'s arousal was [new_state ? "enabled" : "disabled"] due to [cause]", LOG_EMOTE)
 	return aroused_state
 
 /obj/item/organ/genital/proc/update()

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -30,7 +30,6 @@
 	age = rand(AGE_MIN,AGE_MAX)
 
 /datum/preferences/proc/update_preview_icon(current_tab)
-	var/equip_job = (current_tab != APPEARANCE_TAB)
 	// Determine what job is marked as 'High' priority, and dress them up as such.
 	var/datum/job/previewJob = get_highest_job()
 
@@ -49,14 +48,25 @@
 	mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
 	copy_to(mannequin, initial_spawn = TRUE)
 
-	if(current_tab == LOADOUT_TAB)
-		//give it its loadout if not on the appearance tab
-		SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
-		SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
-	else
-		if(previewJob && equip_job)
-			mannequin.job = previewJob.title
-			previewJob.equip(mannequin, TRUE, preference_source = parent)
+	switch(preview_pref)
+		if(PREVIEW_PREF_JOB)
+			if(previewJob)
+				mannequin.job = previewJob.title
+				previewJob.equip(mannequin, TRUE, preference_source = parent)
+		if(PREVIEW_PREF_LOADOUT)
+			SSjob.equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
+			SSjob.post_equip_loadout(parent.mob, mannequin, bypass_prereqs = TRUE, can_drop = FALSE)
+		if(PREVIEW_PREF_NAKED)
+			mannequin.hidden_underwear = TRUE
+			mannequin.hidden_undershirt = TRUE
+			mannequin.hidden_socks = TRUE
+		if(PREVIEW_PREF_NAKED_AROUSED)
+			mannequin.hidden_underwear = TRUE
+			mannequin.hidden_undershirt = TRUE
+			mannequin.hidden_socks = TRUE
+			for(var/obj/item/organ/genital/genital in mannequin.internal_organs)
+				if(genital.genital_flags & GENITAL_CAN_AROUSE)
+					genital.set_aroused_state(TRUE, null)
 
 	mannequin.regenerate_icons()