Merge pull request #16903 from KillianKirilenko/kk-jacketbutton

Default Jacket Toggle

code/datums/outfits/outfit.dm

@@ -127,7 +127,8 @@ var/list/outfits_decls_by_type_
 	if(uniform)
 		H.equip_to_slot_or_del(new uniform(H),slot_w_uniform)
 	if(suit)
-		H.equip_to_slot_or_del(new suit(H),slot_wear_suit)
+		if(!(H.client?.prefs?.no_jacket))
+			H.equip_to_slot_or_del(new suit(H),slot_wear_suit)
 	if(back)
 		H.equip_to_slot_or_del(new back(H),slot_back)
 	if(belt)

code/game/jobs/job_controller.dm

@@ -426,7 +426,9 @@ var/global/datum/controller/occupations/job_master
 					//if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
 					//	custom_equip_leftovers += thing
 					//else
-					if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)	//RS ADD
+					if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket)
+						continue
+					if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)
 						continue
 					if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
 						to_chat(H, span_notice("Equipping you with \the [thing]!"))
@@ -453,7 +455,9 @@ var/global/datum/controller/occupations/job_master
 		// If some custom items could not be equipped before, try again now.
 		for(var/thing in custom_equip_leftovers)
 			var/datum/gear/G = gear_datums[thing]
-			if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)	//RS ADD
+			if(G.slot == slot_wear_suit && H.client?.prefs?.no_jacket)
+				continue
+			if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)
 				continue
 			if(G.slot in custom_equip_slots)
 				spawn_in_storage += thing

code/modules/client/preference_setup/general/04_equipment.dm

@@ -17,6 +17,7 @@
 	pref.communicator_visibility	= save_data["communicator_visibility"]
 	pref.ringtone					= save_data["ringtone"]
 	pref.shoe_hater					= save_data["shoe_hater"]
+	pref.no_jacket					= save_data["no_jacket"]
 
 /datum/category_item/player_setup_item/general/equipment/save_character(list/save_data)
 	save_data["all_underwear"]				= pref.all_underwear
@@ -30,6 +31,7 @@
 	save_data["communicator_visibility"]	= pref.communicator_visibility
 	save_data["ringtone"]					= pref.ringtone
 	save_data["shoe_hater"] 				= pref.shoe_hater
+	save_data["no_jacket"]					= pref.no_jacket
 
 var/global/list/valid_ringtones = list(
 		"beep",
@@ -135,7 +137,8 @@ var/global/list/valid_ringtones = list(
 	. += "PDA Type: <a href='byond://?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
 	. += "Communicator Visibility: <a href='byond://?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
 	. += "Ringtone (leave blank for job default): <a href='byond://?src=\ref[src];set_ringtone=1'><b>[pref.ringtone]</b></a><br>"
-	. += "Spawn With Shoes:<a href='byond://?src=\ref[src];toggle_shoes=1'><b>[(pref.shoe_hater) ? "No" : "Yes"]</b></a><br>" //RS Addition
+	. += "Spawn With Shoes:<a href='byond://?src=\ref[src];toggle_shoes=1'><b>[(pref.shoe_hater) ? "No" : "Yes"]</b></a><br>"
+	. += "Spawn With Jacket:<a href='byond://?src=\ref[src];toggle_jacket=1'><b>[(pref.no_jacket) ? "No" : "Yes"]</b></a><br>"
 
 	return jointext(.,null)
 
@@ -210,10 +213,13 @@ var/global/list/valid_ringtones = list(
 		else
 			pref.ringtone = choice
 		return TOPIC_REFRESH
-	else if(href_list["toggle_shoes"])	//RS ADD START
+	else if(href_list["toggle_shoes"])
 		if(CanUseTopic(user))
 			pref.shoe_hater = !pref.shoe_hater
 			return TOPIC_REFRESH
-			//RS ADD END
+	else if(href_list["toggle_jacket"])
+		if(CanUseTopic(user))
+			pref.no_jacket = !pref.no_jacket
+			return TOPIC_REFRESH
 
 	return ..()

code/modules/client/preferences.dm

@@ -26,6 +26,7 @@ var/list/preferences_datums = list()
 	var/backbag = 2						//backpack type
 	var/pdachoice = 1					//PDA type
 	var/shoe_hater = FALSE				//RS ADD - if true, will spawn with no shoes
+	var/no_jacket = FALSE				//if true, will not spawn with outfit's jacket/outer layer
 	var/h_style = "Bald"				//Hair type
 	var/grad_style = "none"				//Gradient style
 	var/f_style = "Shaved"				//Face hair type