From f8495ae96ab353e97d9b9592b098da30d2ab9e27 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 28 Apr 2019 01:45:09 +0100 Subject: [PATCH] I don't know how to icons aaaa --- .../code/modules/arousal/organs/breasts.dm | 20 +++++++++++------- .../chemistry/reagents/fermi_reagents.dm | 3 ++- .../icons/obj/genitals/breasts_onmob.dmi | Bin 753 -> 1141 bytes 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 1b0a3679d7..6a27a185ba 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -49,12 +49,12 @@ desc = "You see a pair of breasts." else desc = "You see some breasts, they seem to be quite exotic." - if (size == "huge") + if(isnum(size)) + desc = "You see [pick("some serious honkers", "a real set of badonkers", "some dobonhonkeros", "massive dohoonkabhankoloos", "big old tonhongerekoogers", "giant bonkhonagahoogs", "humongous hungolomghnonoloughongous")]. Their volume is way beyond cupsize now, measuring in about [size]cm in diameter." + else if (!size == "huge") desc += " You estimate that they're [uppertext(size)]-cups." else - desc = "You see [pick("some serious honkers", "a real set of badonkers", "some dobonhonkeros", "massive dohoonkabhankoloos", "big old tonhongerekoogers", "giant bonkhonagahoogs", "humongous hungolomghnonoloughongous")]. Their volume is way beyond cupsize now, measuring in about [size]cm in diameter." - //else - // desc += " You wouldn't measure them in cup sizes." + desc += " They're very small and flatchested, however." if(producing && aroused_state) desc += " They're leaking [fluid_id]." if(owner) @@ -65,20 +65,21 @@ else color = "#[owner.dna.features["breasts_color"]]" -/obj/item/organ/genital/breasts/update_size(mob/living/carbon/M) +//Allows breasts to grow and change size, with sprite changes too. +/obj/item/organ/genital/breasts/update_size(mob/living/carbon/M)//wah switch(round(cached_size)) if(0) size = "flat" - if(!M.has_status_effect(/datum/status_effect/chem/BElarger)) + if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) owner.remove_status_effect(/datum/status_effect/chem/BElarger) if(1 to 8) size = breast_sizes[round(cached_size)] - if(!M.has_status_effect(/datum/status_effect/chem/BElarger)) + if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) owner.remove_status_effect(/datum/status_effect/chem/BElarger) if(9 to 15) size = breast_sizes[round(cached_size)] - if(M.has_status_effect(/datum/status_effect/chem/BElarger)) + if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) owner.apply_status_effect(/datum/status_effect/chem/BElarger) if(16 to INFINITY) size = "huge" @@ -93,3 +94,6 @@ var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") to_chat(M, "You feel your breasts shrinking away from your body as your chest flattens out.") B.Remove(M) + var/S = GLOB.breasts_shapes_list[shape] + var/mutable_appearance/genital_overlay = mutable_appearance(S.icon) + genital_overlay.icon_state = "breasts_[shape]_[size]_0_FRONT" diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index b5a09502c8..02641b6cad 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -466,6 +466,7 @@ nB.cached_size = 0 to_chat(M, "Your chest feels warm, tingling with newfound sensitivity.") M.reagents.remove_reagent(src.id, 5) + B = nB //If they have them, increase size. If size is comically big, limit movement and rip clothes. message_admins("Breast size: [B.size], [B.cached_size], [holder]") B.cached_size = B.cached_size + 0.1 @@ -509,7 +510,7 @@ var/obj/item/organ/genital/womb/nW = new nW.Insert(M) W = nW - P.update_appearance() + P.update() ..() /datum/reagent/fermi/PElarger // Due to popular demand...! diff --git a/modular_citadel/icons/obj/genitals/breasts_onmob.dmi b/modular_citadel/icons/obj/genitals/breasts_onmob.dmi index 2a7342553bedc478e6e7c2c14fe23ee8fe80511a..5be42c8e7eba00fa9b7a8df2e1b4be958ee3f498 100644 GIT binary patch literal 1141 zcmV-*1d98KP)00001bW%=J06^y0W&i*HvU*flbVOxyV{&P5 zbZKvH004NLos&Ng!XOYwXZRGP-A${mE={X4h>3A0P_Bi+KLMg&-&SX1{B3u`yO%dy zDVlC4m1qx=KPaYfyNZoiFDlNS!DT-!t0iZi!szp7N!etY#==H2DJOk5A!?&5y*(Y( zx!}x&nC2^-4bfa^p6jnzjbIkDShl&oSBH6lUdxe=oaUM zMb45koI!;D{}VRZQkWjJCrwbw-S-ut49QDIj;|U}3IG5AK0)VoyHq|f^~2H~C8Hmn z%(cC@NXWsq`MYUirnmMhy082E1>>Lg-g8Qiw#@hR?RY?5xmR7Xz+?1=9Ziq6&CgUX zPNFDUMFX8eKx00000007|I z3-0Z``$U$`_D{{^Mg=Kh7!?Mmsvt)*yd=Jz6Ov$#m**8vc~PzF=q)dNb3H4gYIdfpNd@hm)Jcc;|zx3l_9b>KKz&4^Lk5 z7Uk0$|9sHlf}x>((!x~vY0BNO&I{h6Trd6eLH2@ZpR_RPvf9`MRe3>6*JwT{J}fAu zebTn9^3~?a3*Mnd^Fc3%ojL83qKBo5%DE^1`^+5_*C*BGmtBCpoB#5OCIA2c0002^ zPJu(@`Zz~St)H7cs)%`{LoUOiIz39P;&204kYq!RF za^`MlNBf-UVg7ex4L8}_pS{VNIq@8t6ijOO?w%0000LP)t-s{{a8+ z@bJ;m(f|MdzrVlQ+S;JKoExE!6rUufpB(+)H8Hx&t5@u4l4BQBn|)n zCp4C#WXDY=me$2d^*%C|2KgJC<6wJ5008(9Mo*ui@{+BW>#z19`9)mqmc8ah+_^iq z8%)2))%~j9yeuRu?FRY;BiC;p00000@EM%lyj`W|bKh*HTsP3;b!uL&HcP)L?FM?h z)(ukgGIr(V%*;zr6a7>lothWf%DA!{><@8u_|b1300000Fu3gLGgMx#n)$vo56Qp9 z)z8*=o|u>LINyiLY~b~Lum6rn&C9iu(cElM-0BAq=5?QWk)sr?Z`yv{#?}0x-+Tub z`T>O9sq+8;008j6%O2;Z$vekbx8GCqvT5e~%FMUsdp%yK<~z*yXTjGmRpDpq2c_oa z&Xt#wS}glRbb@i~_Iqkxiet0c4YqN$)eTbf000000Q{wT-VKxI0ssI2004MRzKE+u zdv(3UeDIR5Dzkx)-yg_)>+$}?e24r0BNx9QaPReEd#QN|?q=ug24T8>sWz*bzJSEM z{65qV``T(CU*Z)G!sM>ke3u6hvSW0D;#l^Y??f%y5Kf;500000oL2R`8zw*e1vKvh jytm-szsv&wfK&PdIMr7V0^cM>00000NkvXXu0mjffUj@3