diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 211a9f3047..c3c98e0bd7 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -249,8 +249,8 @@ /obj/item/reagent_containers/pill/penis_enlargement name = "penis enlargement pill" - list_reagents = list("PElarger" = 10) + list_reagents = list("penis_enlarger" = 10) /obj/item/reagent_containers/pill/breast_enlargement name = "breast enlargement pill" - list_reagents = list("BElarger" = 10) + list_reagents = list("breast_enlarger" = 10) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 7f5c24b56f..4d1d8f70f0 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -30,13 +30,13 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -/datum/status_effect/chem/BElarger - id = "BElarger" +/datum/status_effect/chem/breast_enlarger + id = "breast_enlarger" alert_type = null var/moveCalc = 1 var/cachedmoveCalc = 1 -/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. +/datum/status_effect/chem/breast_enlarger/on_apply(mob/living/carbon/human/H)//Removes clothes, they're too small to contain you. You belong to space now. investigate_log("[owner]'s breasts has reached comical sizes. ID: [owner.id]") var/mob/living/carbon/human/o = owner var/items = o.get_contents() @@ -50,7 +50,7 @@ to_chat(o, "Your bountiful bosom is so rich with mass, you seriously doubt you'll be able to fit any clothes over it.") 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 +/datum/status_effect/chem/breast_enlarger/tick(mob/living/carbon/human/H)//If you try to wear clothes, you fail. Slows you down if you're comically huge var/mob/living/carbon/human/o = owner var/obj/item/organ/genital/breasts/B = o.getorganslot("breasts") moveCalc = 1+((round(B.cached_size) - 9)/3) //Afffects how fast you move, and how often you can click. @@ -91,12 +91,12 @@ to_chat(owner, "Your back is feeling a little sore.") ..() -/datum/status_effect/chem/BElarger/on_remove(mob/living/carbon/M) +/datum/status_effect/chem/breast_enlarger/on_remove(mob/living/carbon/M) investigate_log("[owner]'s breasts has reduced to an acceptable size. ID: [owner.id]") owner.remove_movespeed_modifier("megamilk") sizeMoveMod(1) -/datum/status_effect/chem/BElarger/proc/sizeMoveMod(var/value) +/datum/status_effect/chem/breast_enlarger/proc/sizeMoveMod(var/value) if(cachedmoveCalc == value) return owner.next_move_modifier /= cachedmoveCalc @@ -106,7 +106,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/status_effect/chem/penis_enlarger - id = "PElarger" + id = "penis_enlarger" alert_type = null var/bloodCalc var/moveCalc diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index ea2fe492f3..5b4b2302c9 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -91,18 +91,18 @@ switch(round(cached_size)) if(0) //If flatchested size = "flat" - if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) - owner.remove_status_effect(/datum/status_effect/chem/BElarger) + if(owner.has_status_effect(/datum/status_effect/chem/breast_enlarger)) + owner.remove_status_effect(/datum/status_effect/chem/breast_enlarger) statuscheck = FALSE if(1 to 8) //If modest size size = GLOB.breasts_size_list[round(cached_size)] - if(owner.has_status_effect(/datum/status_effect/chem/BElarger)) - owner.remove_status_effect(/datum/status_effect/chem/BElarger) + if(owner.has_status_effect(/datum/status_effect/chem/breast_enlarger)) + owner.remove_status_effect(/datum/status_effect/chem/breast_enlarger) statuscheck = FALSE if(9 to 15) //If massive size = GLOB.breasts_size_list[round(cached_size)] - if(!owner.has_status_effect(/datum/status_effect/chem/BElarger)) - owner.apply_status_effect(/datum/status_effect/chem/BElarger) + if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger)) + owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger) statuscheck = TRUE if(16 to INFINITY) //if Rediculous size = cached_size 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 6c08ac1661..2fbbb452de 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -501,9 +501,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING //Overdosing on (what is essentially space estrogen) makes you female, removes balls and shrinks your dick. //OD is low for a reason. I'd like fermichems to have low ODs, and dangerous ODs, and since this is a meme chem that everyone will rush to make, it'll be a lesson learnt early. -/datum/reagent/fermi/BElarger +/datum/reagent/fermi/breast_enlarger name = "Sucubus milk" - id = "BElarger" + id = "breast_enlarger" description = "A volatile collodial mixture derived from milk that encourages mammary production via a potent estrogen mix." color = "#E60584" // rgb: 96, 0, 255 taste_description = "a milky ice cream like flavour." @@ -513,7 +513,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING InverseChemVal = 0.3 InverseChem = "BEsmaller" //At really impure vols, it just becomes 100% inverse -/datum/reagent/fermi/BElarger/on_mob_add(mob/living/carbon/M) +/datum/reagent/fermi/breast_enlarger/on_mob_add(mob/living/carbon/M) . = ..() if(!ishuman(M)) //The monkey clause if(volume >= 15) //To prevent monkey breast farms @@ -541,7 +541,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING B.prev_size = B.size B.cached_size = sizeConv[B.size] -/datum/reagent/fermi/BElarger/on_mob_life(mob/living/carbon/M) //Increases breast size +/datum/reagent/fermi/breast_enlarger/on_mob_life(mob/living/carbon/M) //Increases breast size if(!ishuman(M))//Just in case return..() @@ -582,7 +582,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING B.update() ..() -/datum/reagent/fermi/BElarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders. +/datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders. //Acute hepatic pharmacokinesis. if(M.has_trait(TRAIT_PHARMA)) @@ -644,9 +644,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING //See breast explanation, it's the same but with taliwhackers //instead of slower movement and attacks, it slows you and increases the total blood you need in your system. //Since someone else made this in the time it took me to PR it, I merged them. -/datum/reagent/fermi/PElarger // Due to popular demand...! +/datum/reagent/fermi/penis_enlarger // Due to popular demand...! name = "Incubus draft" - id = "PElarger" + id = "penis_enlarger" description = "A volatile collodial mixture derived from various masculine solutions that encourages a larger gentleman's package via a potent testosterone mix, formula derived from a collaboration from Fermichem and Doctor Ronald Hyatt, who is well known for his phallus palace." //The toxic masculinity thing is a joke because I thought it would be funny to include it in the reagents, but I don't think many would find it funny? dumb color = "#888888" // This is greyish..? taste_description = "chinese dragon powder" @@ -656,7 +656,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING InverseChemVal = 0.3 InverseChem = "PEsmaller" //At really impure vols, it just becomes 100% inverse and shrinks instead. -/datum/reagent/fermi/PElarger/on_mob_add(mob/living/carbon/M) +/datum/reagent/fermi/penis_enlarger/on_mob_add(mob/living/carbon/M) . = ..() if(!ishuman(M)) //Just monkeying around. if(volume >= 15) //to prevent monkey penis farms @@ -681,7 +681,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING P.prev_length = P.length P.cached_length = P.length -/datum/reagent/fermi/PElarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch. +/datum/reagent/fermi/penis_enlarger/on_mob_life(mob/living/carbon/M) //Increases penis size, 5u = +1 inch. if(!ishuman(M)) return var/mob/living/carbon/human/H = M @@ -715,7 +715,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING P.update() ..() -/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. +/datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders. //Acute hepatic pharmacokinesis. if(M.has_trait(TRAIT_PHARMA)) var/obj/item/organ/liver/L = M.getorganslot("liver") diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 74a54bb87f..3950eb2623 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -131,10 +131,10 @@ for(var/mob/M in seen) to_chat(M, "The cells clump up into a horrifying tumour!") -/datum/chemical_reaction/fermi/BElarger +/datum/chemical_reaction/fermi/breast_enlarger name = "Sucubus milk" - id = "BElarger" - results = list("BElarger" = 0.6) + id = "breast_enlarger" + results = list("breast_enlarger" = 0.6) required_reagents = list("salglu_solution" = 0.1, "milk" = 0.5, "synthflesh" = 0.2, "silicon" = 0.2, "aphro" = 0.2) mix_message = "the reaction gives off a mist of milk." //FermiChem vars: @@ -154,19 +154,19 @@ FermiExplode = TRUE PurityMin = 0.1 -/datum/chemical_reaction/fermi/BElarger/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) +/datum/chemical_reaction/fermi/breast_enlarger/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) var/obj/item/organ/genital/breasts/B = new /obj/item/organ/genital/breasts(get_turf(my_atom)) var/list/seen = viewers(8, get_turf(my_atom)) for(var/mob/M in seen) to_chat(M, "The reaction suddenly condenses, creating a pair of breasts!")//OwO - var/datum/reagent/fermi/BElarger/BE = locate(/datum/reagent/fermi/BElarger) in my_atom.reagents.reagent_list + var/datum/reagent/fermi/breast_enlarger/BE = locate(/datum/reagent/fermi/breast_enlarger) in my_atom.reagents.reagent_list B.size = ((BE.volume * BE.purity) / 10) //half as effective. my_atom.reagents.clear_reagents() -/datum/chemical_reaction/fermi/PElarger +/datum/chemical_reaction/fermi/penis_enlarger name = "Incubus draft" - id = "PElarger" - results = list("PElarger" = 0.3) + id = "penis_enlarger" + results = list("penis_enlarger" = 0.3) required_reagents = list("blood" = 0.5, "synthflesh" = 0.2, "carbon" = 0.2, "aphro" = 0.2, "salglu_solution" = 0.1,) mix_message = "the reaction gives off a spicy mist." //FermiChem vars: @@ -186,12 +186,12 @@ FermiExplode = TRUE PurityMin = 0.1 -/datum/chemical_reaction/fermi/PElarger/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) +/datum/chemical_reaction/fermi/penis_enlarger/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH) var/obj/item/organ/genital/penis/P = new /obj/item/organ/genital/penis(get_turf(my_atom)) var/list/seen = viewers(8, get_turf(my_atom)) for(var/mob/M in seen) to_chat(M, "The reaction suddenly condenses, creating a penis!")//OwO - var/datum/reagent/fermi/PElarger/PE = locate(/datum/reagent/fermi/PElarger) in my_atom.reagents.reagent_list + var/datum/reagent/fermi/penis_enlarger/PE = locate(/datum/reagent/fermi/penis_enlarger) in my_atom.reagents.reagent_list P.length = ((PE.volume * PE.purity) / 10)//half as effective. my_atom.reagents.clear_reagents()