diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 1d81eaee9d..60a0165b17 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -37,31 +37,33 @@ /datum/status_effect/chem/BElarger id = "BElarger" //var/list/items = list() - var/mob/living/carbon/human/o = owner - var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") //var/items = o.get_contents() //mob/living/carbon/M = M tried, no dice //owner, tried, no dice /datum/status_effect/chem/BElarger/on_apply(mob/living/carbon/human/H)//Removes clothes, they're too small to contain you. You belong to space now. - message_admins("BElarge started!") + var/mob/living/carbon/human/o = owner if(o.w_uniform) - o.dropItemToGround(H.w_uniform, TRUE) + o.dropItemToGround(H.w_uniform, TRUE) + playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) if(o.wear_suit) - o.dropItemToGround(H.wear_suit, TRUE) - playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) + o.dropItemToGround(H.wear_suit, TRUE) + playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) + message_admins("BElarge started!") o.visible_message("[H]'s chest suddenly bursts forth, ripping their clothes off!'") to_chat(o, "Your clothes give, ripping into peices under the strain of your swelling breasts! Unless you manage to reduce the size of your breasts, there's no way you're going to be able to put anything on over these melons..!") return ..() /datum/status_effect/chem/BElarger/tick(mob/living/carbon/human/H)//If you try to wear clothes, you fail. Slows you down if you're comically huge - message_admins("BElarge tick!") + var/mob/living/carbon/human/o = owner + var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") if(o.w_uniform) - o.dropItemToGround(H.w_uniform, TRUE) + o.dropItemToGround(H.w_uniform, TRUE) to_chat(owner, "Your enormous breasts are way to large to fit anything over!") if(o.wear_suit) - o.dropItemToGround(H.wear_suit, TRUE) + o.dropItemToGround(H.wear_suit, TRUE) to_chat(owner, "Your enormous breasts are way to large to fit anything over!") + message_admins("BElarge tick!") /* var/items = o.get_contents() for(var/obj/item/W in items) @@ -91,41 +93,42 @@ /datum/status_effect/chem/PElarger id = "PElarger" - var/mob/living/carbon/human/o = owner - var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") /datum/status_effect/chem/PElarger/on_apply(mob/living/carbon/human/H)//Removes clothes, they're too small to contain you. You belong to space now. message_admins("PElarge started!") + var/mob/living/carbon/human/o = owner if(o.w_uniform) - o.dropItemToGround(H.w_uniform, TRUE) + o.dropItemToGround(H.w_uniform, TRUE) playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) if(o.wear_suit) - o.dropItemToGround(H.wear_suit, TRUE) + o.dropItemToGround(H.wear_suit, TRUE) playsound(o.loc, 'sound/items/poster_ripped.ogg', 50, 1) - owner.visible_message("[M]'s schlong suddenly bursts forth, ripping their clothes off!'") - to_chat(M, "Your clothes give, ripping into peices under the strain of your swelling pecker! Unless you manage to reduce the size of your emancipated trouser snake, there's no way you're going to be able to put anything on over this girth..!") + owner.visible_message("[o]'s schlong suddenly bursts forth, ripping their clothes off!'") + to_chat(o, "Your clothes give, ripping into peices under the strain of your swelling pecker! Unless you manage to reduce the size of your emancipated trouser snake, there's no way you're going to be able to put anything on over this girth..!") return ..() /datum/status_effect/chem/PElarger/tick(mob/living/carbon/M) + var/mob/living/carbon/human/o = owner + var/obj/item/organ/genital/penis/P = o.getorganslot("penis") message_admins("PElarge tick!") if(o.w_uniform) - o.dropItemToGround(H.w_uniform, TRUE) + o.dropItemToGround(o.w_uniform, TRUE) to_chat(owner, "Your enormous package is way to large to fit anything over!") if(o.wear_suit) - o.dropItemToGround(H.wear_suit, TRUE) + o.dropItemToGround(o.wear_suit, TRUE) to_chat(owner, "Your enormous package is way to large to fit anything over!") - switch(round(P.cached_size)) + switch(round(P.cached_length)) if(11) if (!(P.prev_size == P.size)) - to_chat(H, "Your rascally willy has become a more managable size, liberating your movements.") + to_chat(o, "Your rascally willy has become a more managable size, liberating your movements.") o.remove_movespeed_modifier("hugedick") o.next_move_modifier = 1 if(12 to INFINITY) if (!(P.prev_size == P.size)) - to_chat(H, "Your indulgent johnson is so substantial, it's affecting your movements!") + to_chat(o, "Your indulgent johnson is so substantial, it's affecting your movements!") o.add_movespeed_modifier("hugedick", TRUE, 100, NONE, override = TRUE, multiplicative_slowdown = (P.length - 11.1)) - o.next_move_modifier = (round(B.cached_size) - 8) + o.next_move_modifier = (round(P.length) - 11) ..() diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 2f51cfb26f..9e1dfa2417 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -76,9 +76,9 @@ //Should I turn someone with meter wide... assets into a blob? //this is far too lewd wah /obj/item/organ/genital/breasts/update_size()//wah + var/obj/item/organ/genital/breasts/B = owner.getorganslot("breasts") message_admins("Breast size at start: [size], [cached_size], [owner]") if(cached_size < 0)//I don't actually know what round() does to negative numbers, so to be safe!! - var/obj/item/organ/genital/breasts/B = owner.getorganslot("breasts") to_chat(owner, "You feel your breasts shrinking away from your body as your chest flattens out.") B.Remove(owner) switch(round(cached_size)) @@ -105,10 +105,10 @@ size = cached_size message_admins("Breast size: [size], [cached_size], [owner]") if(round(cached_size) < 16)//Because byond doesn't count from 0, I have to do this. - if (!isnum(prev_size)) - breast_values[prev_size] - if(!isnum(prev_size)//Bloody byond with it's counting from 1 - breast_values[prev_size] + if (isnum(prev_size)) + prev_size = breast_values[prev_size]//make numbers letters + if(isnum(size))//Bloody byond with it's counting from 1 + size = breast_values[size] //make numbers letters message_admins("2. [breast_values[size]] vs [breast_values[prev_size]]") if (breast_values[size] > breast_values[prev_size]) to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a [uppertext(size)]-cup.") @@ -117,7 +117,7 @@ prev_size = size icon_state = sanitize_text("breasts_[shape]_[size]") - else (cached_size == 16.2) - to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom, taking both of your hands to hold!.") + else if (cached_size == 16.2) + to_chat(owner, "Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom, taking both of your hands to hold!.") owner.update_body() B.update_icon() diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index f2219bf597..191951f408 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -18,13 +18,12 @@ var/knot_girth_ratio = KNOT_GIRTH_RATIO_DEF var/list/dickflags = list() var/list/knotted_types = list("knotted", "barbed, knotted") - var/mob/living/carbon/human/o = owner var/statuscheck = FALSE var/prev_size = 6 /obj/item/organ/genital/penis/update_size() - + var/mob/living/carbon/human/o = owner if(cached_length < 0)//I don't actually know what round() does to negative numbers, so to be safe!! var/obj/item/organ/genital/penis/P = o.getorganslot("breasts") to_chat(o, "You feel your tallywacker shrinking away from your body as your groin flattens out!") @@ -60,10 +59,11 @@ prev_size = length icon_state = sanitize_text("penis_[shape]_[size]") o.update_body() - P.update_icon() + //P.update_icon() girth = (length * girth_ratio) /obj/item/organ/genital/penis/update_appearance() + var/mob/living/carbon/human/o = owner var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]" icon_state = sanitize_text(string) var/lowershape = lowertext(shape) @@ -75,7 +75,7 @@ color = "#[skintone2hex(H.skin_tone)]" else color = "#[owner.dna.features["cock_color"]]" - H.update_body() + o.update_body() /obj/item/organ/genital/penis/update_link() if(owner) 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 f533fc517a..ecca3f27a0 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -484,7 +484,7 @@ if(P) P.length = P.length - 0.1 - message_admins("Breast size: [P.size], [P.cached_size], [holder]") + message_admins("Breast size: [P.size], [P.cached_length], [holder]") P.update() if(T) T.Remove(M) @@ -518,30 +518,6 @@ var/mob/living/carbon/human/H /datum/reagent/fermi/PElarger/on_mob_life(mob/living/carbon/M) //Increases penis size - - var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") - if(!B) //If they don't have breasts, give them breasts. - message_admins("No breasts found!") - var/obj/item/organ/genital/breasts/nB = new - nB.Insert(M) - if(nB) - if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"]) - nB.color = skintone2hex(H.skin_tone) - else if(M.dna.features["breasts_color"]) - nB.color = "#[M.dna.features["breasts_color"]]" - else - nB.color = skintone2hex(H.skin_tone) - nB.size = "flat" - - to_chat(M, "Your chest feels warm, tingling with newfound sensitivity.") - - 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 - - B.update() - var/obj/item/organ/genital/penis/P = M.getorganslot("penis") if(!P) message_admins("No penis found!")//They do have a preponderance for escapism, or so I've heard. @@ -556,14 +532,12 @@ P = nP else P.length = P.length + 0.1 - if (P.cached_size >= 10.5 && P.cached_length < 11) //too low? - M.apply_damage(2, BRUTE, target) + if (P.cached_length >= 10.5 && P.cached_length < 11) //too low? var/target = M.get_bodypart(BODY_ZONE_CHEST) to_chat(M, "Your cock begin to strain against your clothes tightly!") M.apply_damage(5, BRUTE, target) P.update_appearance() - message_admins("P size: [P.length]") ..() /datum/reagent/fermi/PElarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.