last touches

code/modules/client/preferences/clothing.dm

@@ -1,13 +1,13 @@
-/proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color)
+/proc/generate_underwear_icon(datum/sprite_accessory/accessory, icon/base_icon, color, icon_offset = 0) // DOPPLER EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks
 	var/icon/final_icon = new(base_icon)
 
 	if (!isnull(accessory))
-		var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state)
+		var/icon/accessory_icon = icon(accessory.icon, accessory.icon_state) // DOPPLER EDIT CHANGE: ORIGINAL - var/icon/accessory_icon = icon('icons/mob/clothing/underwear.dmi', accessory.icon_state)
 		if (color && !accessory.use_static)
 			accessory_icon.Blend(color, ICON_MULTIPLY)
 		final_icon.Blend(accessory_icon, ICON_OVERLAY)
 
-	final_icon.Crop(10, 1, 22, 13)
+	final_icon.Crop(10, 1+icon_offset, 22, 13+icon_offset)	// DOPPLER EDIT CHANGE : adds icon_offset - Colorable Undershirt/Socks
 	final_icon.Scale(32, 32)
 
 	return final_icon
@@ -165,9 +165,9 @@
 
 	if (value != "Nude")
 		var/datum/sprite_accessory/accessory = SSaccessories.undershirt_list[value]
-		icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY)
+		icon_with_undershirt.Blend(icon(accessory.icon, accessory.icon_state), ICON_OVERLAY) // DOPPLER EDIT CHANGE: ORIGINAL - icon_with_undershirt.Blend(icon('icons/mob/clothing/underwear.dmi', accessory.icon_state), ICON_OVERLAY)
 
-	icon_with_undershirt.Crop(9, 9, 23, 23)
+	icon_with_undershirt.Crop(10, 11, 22, 23) // DOPPLER EDIT CHANGE : ORIGINAL - icon_with_undershirt.Crop(9, 9, 23, 23)
 	icon_with_undershirt.Scale(32, 32)
 	return icon_with_undershirt
 
@@ -198,7 +198,7 @@
 		lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_leg"), ICON_OVERLAY)
 		lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY)
 
-	return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK)
+	return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK, icon_offset = 5) // DOPPLER EDIT CHANGE : ICON_OFFSET // DOPPLER EDIT CHANGE - ORIGINAL: return generate_underwear_icon(SSaccessories.underwear_list[value], lower_half, COLOR_ALMOST_BLACK)
 
 /datum/preference/choiced/underwear/apply_to_human(mob/living/carbon/human/target, value)
 	target.underwear = value

modular_doppler/modular_customization/accessories/code/underwear_accessories/bras.dm

@@ -1,6 +1,6 @@
 //Modular separation of Bras as a separate underwear option that displays below undershirts
 /datum/sprite_accessory/bra
-	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/bra.dmi'
 	use_static = FALSE
 	gender = FEMALE
 

modular_doppler/modular_customization/accessories/code/underwear_accessories/socks.dm

@@ -1,6 +1,6 @@
 /datum/sprite_accessory/socks
 	//All underwear goes in the same file for the sake of digi variants
-	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/socks.dmi'
 	use_static = TRUE
 
 /datum/sprite_accessory/socks/socks_norm

modular_doppler/modular_customization/accessories/code/underwear_accessories/undershirts.dm

@@ -1,6 +1,6 @@
 //Modular Undershirts
 /datum/sprite_accessory/undershirt
-	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi'
+	icon = 'modular_doppler/modular_customization/accessories/icons/underwear/undershirt.dmi'
 	use_static = TRUE
 	///Whether this underwear includes a bottom (For Leotards and the likes)
 	var/hides_groin = FALSE

tgstation.dme

@@ -6762,8 +6762,8 @@
 #include "modular_doppler\modular_customization\preferences\snout.dm"
 #include "modular_doppler\modular_customization\preferences\species_traits.dm"
 #include "modular_doppler\modular_customization\preferences\tail.dm"
-#include "modular_doppler\modular_customization\preferences\underwear_color.dm"
 #include "modular_doppler\modular_customization\preferences\underwear.dm"
+#include "modular_doppler\modular_customization\preferences\underwear_color.dm"
 #include "modular_doppler\modular_customization\preferences\wings.dm"
 #include "modular_doppler\modular_customization\tri_color\antennae.dm"
 #include "modular_doppler\modular_customization\tri_color\body_marking_lizard.dm"