diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm index a9804545d7..8c6d9df54a 100644 --- a/modular_citadel/code/modules/arousal/organs/genitals.dm +++ b/modular_citadel/code/modules/arousal/organs/genitals.dm @@ -296,14 +296,18 @@ //Checks to see if organs are new on the mob, and changes their colours so that they don't get crazy colours. /mob/living/carbon/human/proc/emergent_genital_call() var/organCheck = FALSE + var/breastCheck = FALSE + var/willyCheck = FALSE for(var/obj/item/organ/O in internal_organs) if(istype(O, /obj/item/organ/genital)) organCheck = TRUE if(/obj/item/organ/genital/penis) dna.features["has_cock"] = TRUE + willyCheck = TRUE if(/obj/item/organ/genital/breasts) dna.features["has_breasts"] = TRUE//Goddamnit get in there. - if (organCheck == FALSE) + breastCheck = TRUE + if(organCheck == FALSE) if(ishuman(src) && dna.species.id == "human") dna.features["genitals_use_skintone"] = TRUE dna.species.use_skintones = TRUE @@ -315,6 +319,11 @@ //So people who haven't set stuff up don't get rainbow surprises. dna.features["cock_color"] = "[dna.features["mcolor"]]" dna.features["breasts_color"] = "[dna.features["mcolor"]]" + else //If there's a new organ, make it the same colour. + if(breastCheck == FALSE) + dna.features["breasts_color"] = dna.features["cock_color"] + else if (willyCheck == FALSE) + dna.features["cock_color"] = dna.features["breasts_color"] return /datum/species/proc/handle_genitals(mob/living/carbon/human/H)//more like handle sadness 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 7ab33207e5..7f477d7496 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -546,6 +546,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING H.genital_override = TRUE var/obj/item/organ/genital/breasts/B = H.getorganslot("breasts") if(!B) + H.emergent_genital_call() return if(!B.size == "huge") var/sizeConv = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5) @@ -559,7 +560,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts") if(!B) //If they don't have breasts, give them breasts. var/obj/item/organ/genital/breasts/nB = new - H.emergent_genital_call() nB.Insert(M) if(nB) if(M.dna.species.use_skintones && M.dna.features["genitals_use_skintone"]) @@ -768,6 +768,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason InverseChemVal = 0.25 /datum/reagent/fermi/astral/on_mob_life(mob/living/M) // Gives you the ability to astral project for a moment! + M.alpha = 255 switch(current_cycle) if(0)//Require a minimum origin = M