diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index 6583d9bc9b893..ac950179caf51 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/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 diff --git a/modular_doppler/modular_customization/accessories/code/underwear_accessories/bras.dm b/modular_doppler/modular_customization/accessories/code/underwear_accessories/bras.dm index d8032de1a4898..1ce6b658b784a 100644 --- a/modular_doppler/modular_customization/accessories/code/underwear_accessories/bras.dm +++ b/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 diff --git a/modular_doppler/modular_customization/accessories/code/underwear_accessories/socks.dm b/modular_doppler/modular_customization/accessories/code/underwear_accessories/socks.dm index 4b78d1a6aaef3..94a33bfbbc099 100644 --- a/modular_doppler/modular_customization/accessories/code/underwear_accessories/socks.dm +++ b/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 diff --git a/modular_doppler/modular_customization/accessories/code/underwear_accessories/undershirts.dm b/modular_doppler/modular_customization/accessories/code/underwear_accessories/undershirts.dm index e92756e5038d2..dc4e5376eef87 100644 --- a/modular_doppler/modular_customization/accessories/code/underwear_accessories/undershirts.dm +++ b/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 diff --git a/modular_doppler/modular_customization/accessories/icons/underwear/bra.dmi b/modular_doppler/modular_customization/accessories/icons/underwear/bra.dmi new file mode 100644 index 0000000000000..1048a0a231b0b Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/underwear/bra.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/underwear/socks.dmi b/modular_doppler/modular_customization/accessories/icons/underwear/socks.dmi new file mode 100644 index 0000000000000..6785177ee3095 Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/underwear/socks.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/underwear/undershirt.dmi b/modular_doppler/modular_customization/accessories/icons/underwear/undershirt.dmi new file mode 100644 index 0000000000000..9964bb3a28471 Binary files /dev/null and b/modular_doppler/modular_customization/accessories/icons/underwear/undershirt.dmi differ diff --git a/modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi b/modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi index de3f59856e698..719481e2da4ff 100644 Binary files a/modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi and b/modular_doppler/modular_customization/accessories/icons/underwear/underwear.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 17328a3bfba25..577de4befde27 100644 --- a/tgstation.dme +++ b/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"