diff --git a/GainStation13/code/clothing/clothes.dm b/GainStation13/code/clothing/clothes.dm index 5f11e396..e0dc5f95 100644 --- a/GainStation13/code/clothing/clothes.dm +++ b/GainStation13/code/clothing/clothes.dm @@ -1,41 +1,52 @@ //GS13 business - these clothes don't dynamically adjust to user's weight yet, got to change them manually via alt click -/obj/item/clothing/under/dynamic_jumpsuit +/obj/item/clothing/suit/dynamic_jumpsuit icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi' alternate_worn_icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes.dmi' - name = "dynamic wg jumpsuti" + name = "dynamic wg bra" desc = "click alt to adjust" - icon_state = "default" - item_state = "default" + icon_state = "size_a" + item_state = "size_a" flags_inv = 11 //this is a flag for hiding taur tails strip_delay = 80 always_reskinnable = TRUE //we need this so that the player can always swap between sizes mutantrace_variation = NO_MUTANTRACE_VARIATION //this is important so it works on taur sprites - unique_reskin = list("Default" = "default", "Chubby" = "chubby", "Fatty" = "fatty") + layer = 12 + // body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + unique_reskin = list("Size A" = "size_a", "Size B" = "size_b", "Size C" = "size_c", "Size D" = "size_d", "Size E" = "size_e", "Size F" = "size_f") - -/obj/item/clothing/under/dynamic_jumpsuit/chubby - icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi' - alternate_worn_icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes.dmi' - name = "dynamic wg jumpsuit chubby" +/obj/item/clothing/suit/dynamic_jumpsuit/size_a + name = "dynamic wg bra" desc = "click alt to adjust" - icon_state = "chubby" - item_state = "chubby" - flags_inv = 0 - strip_delay = 80 - always_reskinnable = TRUE - mutantrace_variation = NO_MUTANTRACE_VARIATION - unique_reskin = list("Default" = "default", "Chubby" = "chubby", "Fatty" = "fatty") + icon_state = "size_a" + item_state = "size_a" -/obj/item/clothing/under/dynamic_jumpsuit/fatty - icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi' - alternate_worn_icon = 'GainStation13/icons/mob/uniforms/dynamic_clothes.dmi' - name = "dynamic wg jumpsuit fatty" +/obj/item/clothing/suit/dynamic_jumpsuit/size_b + name = "dynamic wg bra" desc = "click alt to adjust" - icon_state = "fatty" - item_state = "fatty " - flags_inv = 0 - strip_delay = 80 - always_reskinnable = TRUE - mutantrace_variation = NO_MUTANTRACE_VARIATION - unique_reskin = list("Default" = "default", "Chubby" = "chubby", "Fatty" = "fatty") + icon_state = "size_b" + item_state = "size_b" + +/obj/item/clothing/suit/dynamic_jumpsuit/size_c + name = "dynamic wg bra" + desc = "click alt to adjust" + icon_state = "size_c" + item_state = "size_c" + +/obj/item/clothing/suit/dynamic_jumpsuit/size_d + name = "dynamic wg bra" + desc = "click alt to adjust" + icon_state = "size_d" + item_state = "size_d" + +/obj/item/clothing/suit/dynamic_jumpsuit/size_e + name = "dynamic wg bra" + desc = "click alt to adjust" + icon_state = "size_e" + item_state = "size_e" + +/obj/item/clothing/suit/dynamic_jumpsuit/size_f + name = "dynamic wg bra" + desc = "click alt to adjust" + icon_state = "size_f" + item_state = "size_f" diff --git a/GainStation13/icons/mob/uniforms/dynamic_clothes.dmi b/GainStation13/icons/mob/uniforms/dynamic_clothes.dmi index 195839b1..9ef4e7c7 100644 Binary files a/GainStation13/icons/mob/uniforms/dynamic_clothes.dmi and b/GainStation13/icons/mob/uniforms/dynamic_clothes.dmi differ diff --git a/GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi b/GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi index c1d42b0b..f1923a00 100644 Binary files a/GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi and b/GainStation13/icons/mob/uniforms/dynamic_clothes_icons.dmi differ diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index be7a718f..0f163224 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -474,7 +474,7 @@ if(G.slot == "belly") // GS13 genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi' genital_overlay.icon_state = "belly_[size]" - genital_overlay.layer = -UNDER_BACK_LAYER + genital_overlay.layer = -UNDER_BACK_LAYER colourcode = "belly_color" //sizecheck added to prevent rendering blank icons