Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink

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

@@ -1,5 +1,6 @@
 /datum/preferences
 	var/list/all_underwear
+	var/list/all_underwear_metadata
 
 /datum/category_item/player_setup_item/general/equipment
 	name = "Clothing"
@@ -7,11 +8,13 @@
 
 /datum/category_item/player_setup_item/general/equipment/load_character(var/savefile/S)
 	S["all_underwear"] >> pref.all_underwear
+	S["all_underwear_metadata"] >> pref.all_underwear_metadata
 	S["backbag"]	>> pref.backbag
 	S["pdachoice"]	>> pref.pdachoice
 
 /datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
 	S["all_underwear"] << pref.all_underwear
+	S["all_underwear_metadata"] << pref.all_underwear_metadata
 	S["backbag"]	<< pref.backbag
 	S["pdachoice"]	<< pref.pdachoice
 
@@ -27,15 +30,21 @@
 					pref.all_underwear[WRC.name] = WRI.name
 					break
 
+	if(!istype(pref.all_underwear_metadata))
+		pref.all_underwear_metadata = list()
+
 	for(var/underwear_category in pref.all_underwear)
 		var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[underwear_category]
 		if(!UWC)
-			pref.all_underwear -= UWC
+			pref.all_underwear -= underwear_category
 		else
 			var/datum/category_item/underwear/UWI = UWC.items_by_name[pref.all_underwear[underwear_category]]
 			if(!UWI)
-				pref.all_underwear -= UWC
+				pref.all_underwear -= underwear_category
 
+	for(var/underwear_metadata in pref.all_underwear_metadata)
+		if(!(underwear_metadata in pref.all_underwear))
+			pref.all_underwear_metadata -= underwear_metadata
 	pref.backbag	= sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
 	pref.pdachoice	= sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice))
 
@@ -44,11 +53,34 @@
 	. += "<b>Equipment:</b><br>"
 	for(var/datum/category_group/underwear/UWC in global_underwear.categories)
 		var/item_name = pref.all_underwear[UWC.name] ? pref.all_underwear[UWC.name] : "None"
-		. += "[UWC.name]: <a href='?src=\ref[src];change_underwear=[UWC.name]'><b>[item_name]</b></a><br>"
+		. += "[UWC.name]: <a href='?src=\ref[src];change_underwear=[UWC.name]'><b>[item_name]</b></a>"
+		var/datum/category_item/underwear/UWI = UWC.items_by_name[item_name]
+		if(UWI)
+			for(var/datum/gear_tweak/gt in UWI.tweaks)
+				. += " <a href='?src=\ref[src];underwear=[UWC.name];tweak=\ref[gt]'>[gt.get_contents(get_metadata(UWC.name, gt))]</a>"
+
+		. += "<br>"
 	. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
 	. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
 
-	return jointext(.)
+	return jointext(.,null)
+
+/datum/category_item/player_setup_item/general/equipment/proc/get_metadata(var/underwear_category, var/datum/gear_tweak/gt)
+	var/metadata = pref.all_underwear_metadata[underwear_category]
+	if(!metadata)
+		metadata = list()
+		pref.all_underwear_metadata[underwear_category] = metadata
+
+	var/tweak_data = metadata["[gt]"]
+	if(!tweak_data)
+		tweak_data = gt.get_default()
+		metadata["[gt]"] = tweak_data
+	return tweak_data
+
+/datum/category_item/player_setup_item/general/equipment/proc/set_metadata(var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
+	var/list/metadata = pref.all_underwear_metadata[underwear_category]
+	metadata["[gt]"] = new_metadata
+
 
 /datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user)
 	if(href_list["change_backpack"])
@@ -72,4 +104,16 @@
 			pref.all_underwear[UWC.name] = selected_underwear.name
 		return TOPIC_REFRESH_UPDATE_PREVIEW
 
+	else if(href_list["underwear"] && href_list["tweak"])
+		var/underwear = href_list["underwear"]
+		if(!(underwear in pref.all_underwear))
+			return TOPIC_NOACTION
+		var/datum/gear_tweak/gt = locate(href_list["tweak"])
+		if(!gt)
+			return TOPIC_NOACTION
+		var/new_metadata = gt.get_metadata(usr, get_metadata(underwear, gt))
+		if(new_metadata)
+			set_metadata(underwear, gt, new_metadata)
+			return TOPIC_REFRESH_UPDATE_PREVIEW
+
 	return ..()

code/modules/client/preference_setup/loadout/gear_tweaks.dm

@@ -17,8 +17,6 @@
 * Color adjustment
 */
 
-var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
-
 /datum/gear_tweak/color
 	var/list/valid_colors
 
@@ -32,10 +30,10 @@ var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
 /datum/gear_tweak/color/get_default()
 	return valid_colors ? valid_colors[1] : COLOR_GRAY
 
-/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference")
 	if(valid_colors)
-		return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
-	return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
+		return input(user, "Choose a color.", title, metadata) as null|anything in valid_colors
+	return input(user, "Choose a color.", title, metadata) as color|null
 
 /datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
 	if(valid_colors && !(metadata in valid_colors))

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -53,10 +53,26 @@
 	display_name = "tie, blue"
 	path = /obj/item/clothing/accessory/blue
 
+/datum/gear/accessory/tie/blue_clip
+	display_name = "tie, blue with clip"
+	path = /obj/item/clothing/accessory/blue_clip
+
 /datum/gear/accessory/tie/red
 	display_name = "tie, red"
 	path = /obj/item/clothing/accessory/red
 
+/datum/gear/accessory/tie/red_long
+	display_name = "tie, red long"
+	path = /obj/item/clothing/accessory/red_long
+
+/datum/gear/accessory/tie/yellow
+	display_name = "tie, yellow"
+	path = /obj/item/clothing/accessory/yellow
+
+/datum/gear/accessory/tie/navy
+	display_name = "tie, navy blue"
+	path = /obj/item/clothing/accessory/navy
+
 /datum/gear/accessory/tie/horrible
 	display_name = "tie, socially disgraceful"
 	path = /obj/item/clothing/accessory/horrible

code/modules/client/preferences.dm

@@ -350,10 +350,17 @@ datum/preferences
 				I.robotize()
 
 	character.all_underwear.Cut()
+	character.all_underwear_metadata.Cut()
+
 	for(var/underwear_category_name in all_underwear)
-		var/underwear_item_name = all_underwear[underwear_category_name]
 		var/datum/category_group/underwear/underwear_category = global_underwear.categories_by_name[underwear_category_name]
-		character.all_underwear[underwear_category_name] = underwear_category.items_by_name[underwear_item_name]
+		if(underwear_category)
+			var/underwear_item_name = all_underwear[underwear_category_name]
+			character.all_underwear[underwear_category_name] = underwear_category.items_by_name[underwear_item_name]
+			if(all_underwear_metadata[underwear_category_name])
+				character.all_underwear_metadata[underwear_category_name] = all_underwear_metadata[underwear_category_name]
+		else
+			all_underwear -= underwear_category_name
 
 	if(backbag > 4 || backbag < 1)
 		backbag = 1 //Same as above
@@ -367,6 +374,7 @@ datum/preferences
 		character.force_update_limbs()
 		character.update_mutations(0)
 		character.update_body(0)
+		character.update_underwear(0)
 		character.update_hair(0)
 		character.update_icons()
 

code/modules/mob/living/carbon/human/human_defines.dm

@@ -36,6 +36,7 @@
 	var/datum/robolimb/synthetic		//If they are a synthetic (aka synthetic torso)
 
 	var/list/all_underwear = list()
+	var/list/all_underwear_metadata = list()
 	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.
 	var/pdachoice = 1	//Which PDA type the player has chosen. Default, Slim, or Old.
 

code/modules/mob/living/carbon/human/update_icons.dm

@@ -109,29 +109,30 @@ Please contact me on #coderbus IRC. ~Carn x
 #define MUTATIONS_LAYER			1
 #define DAMAGE_LAYER			2
 #define SURGERY_LEVEL			3		//bs12 specific.
-#define UNIFORM_LAYER			4
-#define ID_LAYER				5
-#define SHOES_LAYER				6
-#define GLOVES_LAYER			7
-#define BELT_LAYER				8
-#define SUIT_LAYER				9
-#define TAIL_LAYER				10		//bs12 specific. this hack is probably gonna come back to haunt me
-#define GLASSES_LAYER			11
-#define BELT_LAYER_ALT			12
-#define SUIT_STORE_LAYER		13
-#define BACK_LAYER				14
-#define HAIR_LAYER				15		//TODO: make part of head layer?
-#define EARS_LAYER				16
-#define FACEMASK_LAYER			17
-#define HEAD_LAYER				18
-#define COLLAR_LAYER			19
-#define HANDCUFF_LAYER			20
-#define LEGCUFF_LAYER			21
-#define L_HAND_LAYER			22
-#define R_HAND_LAYER			23
-#define FIRE_LAYER				24		//If you're on fire
-#define TARGETED_LAYER			25		//BS12: Layer for the target overlay from weapon targeting system
-#define TOTAL_LAYERS			25
+#define UNDERWEAR_LAYER  		4
+#define UNIFORM_LAYER			5
+#define ID_LAYER				6
+#define SHOES_LAYER				7
+#define GLOVES_LAYER			8
+#define BELT_LAYER				9
+#define SUIT_LAYER				10
+#define TAIL_LAYER				11		//bs12 specific. this hack is probably gonna come back to haunt me
+#define GLASSES_LAYER			12
+#define BELT_LAYER_ALT			13
+#define SUIT_STORE_LAYER		14
+#define BACK_LAYER				15
+#define HAIR_LAYER				16		//TODO: make part of head layer?
+#define EARS_LAYER				17
+#define FACEMASK_LAYER			18
+#define HEAD_LAYER				19
+#define COLLAR_LAYER			20
+#define HANDCUFF_LAYER			21
+#define LEGCUFF_LAYER			22
+#define L_HAND_LAYER			23
+#define R_HAND_LAYER			24
+#define FIRE_LAYER				25		//If you're on fire
+#define TARGETED_LAYER			26		//BS12: Layer for the target overlay from weapon targeting system
+#define TOTAL_LAYERS			26
 //////////////////////////////////
 
 /mob/living/carbon/human
@@ -148,8 +149,12 @@ Please contact me on #coderbus IRC. ~Carn x
 
 	if (icon_update)
 		icon = stand_icon
-		for(var/image/I in overlays_standing)
-			overlays += I
+		for(var/entry in overlays_standing)
+			if(istype(entry, /image))
+				overlays += entry
+			else if(istype(entry, /list))
+				for(var/inner_entry in entry)
+					overlays += inner_entry
 
 	if(lying && !species.prone_icon) //Only rotate them if we're not drawing a specific icon for being prone.
 		var/matrix/M = matrix()
@@ -318,18 +323,24 @@ var/global/list/damage_icon_parts = list()
 	//END CACHED ICON GENERATION.
 	stand_icon.Blend(base_icon,ICON_OVERLAY)
 
-	//Underwear
-	if(species.appearance_flags & HAS_UNDERWEAR)
-		for(var/category in all_underwear)
-			var/datum/category_item/underwear/UW = all_underwear[category]
-			UW.apply_to_icon(stand_icon)
-
 	if(update_icons)
 		update_icons()
 
 	//tail
 	update_tail_showing(0)
 
+//UNDERWEAR OVERLAY
+/mob/living/carbon/human/proc/update_underwear(var/update_icons=1)
+	overlays_standing[UNDERWEAR_LAYER] = null
+
+	if(species.appearance_flags & HAS_UNDERWEAR)
+		overlays_standing[UNDERWEAR_LAYER] = list()
+		for(var/category in all_underwear)
+			var/datum/category_item/underwear/UWI = all_underwear[category]
+			overlays_standing[UNDERWEAR_LAYER] += UWI.generate_image(all_underwear_metadata[category])
+
+	if(update_icons)   update_icons()
+
 //HAIR OVERLAY
 /mob/living/carbon/human/proc/update_hair(var/update_icons=1)
 	//Reset our hair
@@ -429,6 +440,7 @@ var/global/list/damage_icon_parts = list()
 
 	update_mutations(0)
 	update_body(0)
+	update_underwear(0)
 	update_hair(0)
 	update_inv_w_uniform(0)
 	update_inv_wear_id(0)

code/modules/organs/subtypes/machine.dm

@@ -25,6 +25,7 @@
 	organ_tag = "brain"
 	parent_organ = BP_HEAD
 	vital = 1
+	var/brain_type = /obj/item/device/mmi
 	var/obj/item/device/mmi/stored_mmi
 
 /obj/item/organ/internal/mmi_holder/Destroy()
@@ -35,8 +36,10 @@
 
 /obj/item/organ/internal/mmi_holder/New(var/mob/living/carbon/human/new_owner, var/internal)
 	..(new_owner, internal)
-	if(!stored_mmi)
-		stored_mmi = new(src)
+	var/mob/living/carbon/human/dummy/mannequin/M = new_owner
+	if(istype(M))
+		return
+	stored_mmi = new brain_type(src)
 	sleep(-1)
 	update_from_mmi()
 
@@ -80,10 +83,8 @@
 
 /obj/item/organ/internal/mmi_holder/posibrain
 	name = "positronic brain interface"
-
-/obj/item/organ/internal/mmi_holder/posibrain/New()
-	stored_mmi = new /obj/item/device/mmi/digital/posibrain(src)
-	..()
+	brain_type = /obj/item/device/mmi/digital/posibrain
+	
 
 /obj/item/organ/internal/mmi_holder/posibrain/update_from_mmi()
 	..()