From b1ae9eb41c8ea84f4a1f600744c81ac5c886ed2c Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 30 Nov 2023 15:04:34 +0100 Subject: [PATCH] testing first bras cleaned up the code a bit current problems: - belly organ covers the clothes - the change doesn't happen dynamically, need to put the suit on and off --- GainStation13/code/clothing/clothes.dm | 67 ++++++++++-------- .../icons/mob/uniforms/dynamic_clothes.dmi | Bin 834 -> 451 bytes .../mob/uniforms/dynamic_clothes_icons.dmi | Bin 660 -> 514 bytes .../code/modules/arousal/organs/genitals.dm | 2 +- 4 files changed, 40 insertions(+), 29 deletions(-) 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 195839b152a4da9a3c9be1e8b2f1004efa6d9854..9ef4e7c76b671f3f3a9faa9b523bd274a857ee12 100644 GIT binary patch delta 390 zcmV;10eSwy2EzkKiBL{Q4GJ0x0000DNk~Le0001>0001>0s{a50QRAez5oCK2~bQ_ zMZmzo|1K2eE_GbOXA7^I7f zGp#5wHxVg$hSd4$p1DVpUVlSXH_ySr%;XVw!I?$e?Dk$ kEkU^T$-}fW(u?FF-pR@+XOI1#Pyhe`07*qoM6N<$g6Nj2)&Kwi delta 776 zcmV+j1NZ#H1HuMYiBL{Q4GJ0x0000DNk~Le0001h0001h1Oos705K4J_y7O^7*I@9 zMZmzo1Ox>2v1k7?|1&fH05kvp006+iz&W{DKL7v#0d!JMQvg8b*k%9#0FRMJNPj6M zH7&6;r$mX1GbOXA7^IDhGp#5wHxTf%H9DkA$s$P9a*!+RA!pV2ZLr1OI}-)A$$~ zm|{QL-vBao{n&*DmMuNIEn-ZO-4-!UDe>-*(!P?jz{wUMEW(>Bz*xQ(EW+z@DwI{& zxdMpgYrzLo0I~|n6+kSX>P|kFq5x#-MR+R<oCc0At$l@%ZubPPHt{3x6oL8${_4 zp@Fr>xdMz;;LyP9Fz7=Aufw1%+WvpF%?BIlvE`X+Sd~!8#5_okIp;mfVyJDBPmU;y zAU`_h=TOH)18Ls#@_eJ5mqdka7#JswTbut7PeO7908bN#8z2ytXG;ys_{KQreRBDa zaL)VW@*m+G*QNmEoVKNaGJo}>D*%}|S^?%k()M_Kr%Kkxs}xXHLnFXEuhWT8UX=5n z1mwI{aBI68+~NhsdSpsZWcLzP>EIDZRrsxegZN#Ib) zi!f9&<=eOsP!@q*0mhUK%L0g}3&goYpqx8QX^67)$bn4($ji)8&2yU`s(DsIJ?r#q zhbENo^8x+f{|A>=^BLO>9;1Ev?)dL_(8bt=Z}{>Kwp)7y$CnM-j-YX!?E3-3KQlS7%Tw;0002r`ru6f000J1OjJd{z`*|i|F}(h#sB~S0d!JMQvg8b z*k%9#0DX~GNPnp~vnn+{QHhH)C9|j)C}7CNnO2mTn+jp0DoY|xSu%0TQixNQN}RGZ zT*{OcT>V_YK?4B0zfuw+`rT*%00ALML_t(2k+ssXPQx$|2H@Xy6lI7+**sJz0}tSh zrGh+45lE~Z86!HdFfj5sL1JX!5&9SmsOA5CHbh7rI)8Ag9e-(azMKmj8TV7XPu9Lp zmpQNiYF}^%RBjL=@Tx^Z$Lk2Vg0UykGb;|l608lD`opkDcs5*U?YIw0Hb2h`-as94 zCjJy{1I+Z{eh5S*MAb>Of)b%gh5ur|WsYcYvm002ovPDHLkV1lwGz8(Mo delta 578 zcmV-I0=@l$1e67k7(N680000N8gD%S000pwr;Bmaj;UMZlDK)BPD} zsstPmF9RpSF97H))Gyyv!0MX;74Uq!`5#zYT=Q~Z6;}R=zCS}3Lg%mOIz!v)l8nB$ zBz{zq`46O?2h4vU_5DDYd+Fr!{s_SQ2U@?Uq$dM&&%4%d0A6sX|AB`BzcN0+`#u-p Q761SM07*qoM6N<$f@huZjQ{`u 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