diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 35f7a23568..b526312b1a 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -91,10 +91,6 @@ /obj/item/organ/genital/breasts/update_size()//wah //var/mob/living/carbon/human/o = owner //var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") - if (cached_size == null) - prev_size = size - cached_size = breast_values[size] - return //message_admins("Breast size at start: [size], [cached_size], [owner]") if(!isnum(cached_size)) cached_size = breast_values[cached_size] diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index 823763d898..47fc332d91 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -271,6 +271,13 @@ //fermichem procs /mob/living/carbon/human/proc/Force_update_genitals(mob/living/carbon/human/H) //called in fermiChem + var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") + + if (cached_size == null) //MOVE THIS TO FORCE UPDATE I have to do this because Pooj's latest commit broke everthing. I give up and I hate genitals. + prev_size = size + cached_size = breast_values[size] + if(!isnum(cached_size)) + cached_size = breast_values[cached_size] dna.species.handle_genitals(src) //dna.species.handle_breasts(src) //H.update_body() 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 e1054c1763..249190cfd7 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -1459,7 +1459,9 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y to_chat(C, "The residual voltage from the nanites causes you to seize up!") C.electrocute_act(10, (get_turf(C)), 1, FALSE, FALSE, FALSE, TRUE) if(prob(10)) - empulse((get_turf(C)), 3, 2)//So the nanites randomize + //empulse((get_turf(C)), 3, 2)//So the nanites randomize + var/T = get_turf(C) + T.emp_act(EMP_HEAVY) to_chat(C, "The nanintes short circuit within your system!") ..() @@ -1472,11 +1474,13 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y //Increases shock events. /datum/reagent/fermi/naninte_b_goneTox/on_mob_life(mob/living/carbon/C)//Damages the taker if their purity is low. Extended use of impure chemicals will make the original die. (thus can't be spammed unless you've very good) - if(prob(20)) + if(prob(10)) to_chat(C, "The residual voltage in your system causes you to seize up!") C.electrocute_act(10, (get_turf(C)), 1, FALSE, FALSE, FALSE, TRUE) if(prob(10)) - empulse((get_turf(C)), 2, 1, 1)//So the nanites randomize + //empulse((get_turf(C)), 2, 1, 1)//So the nanites randomize + var/T = get_turf(C) + T.emp_act(EMP_HEAVY) to_chat(C, "You feel your hair stand on end as you glow brightly for a moment!") ..()