From cd645626c032b016db43aa365aa466b87c37e4b8 Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 3 Jul 2019 02:11:18 +0100 Subject: [PATCH] expasion OD increase, corrected names and inverted listing of fermichems --- .../code/modules/reagents/chemistry/reagents/SDGF.dm | 3 +++ .../modules/reagents/chemistry/reagents/eigentstasium.dm | 1 + .../code/modules/reagents/chemistry/reagents/enlargement.dm | 6 ++++-- .../modules/reagents/chemistry/reagents/fermi_reagents.dm | 5 +++++ .../code/modules/reagents/chemistry/reagents/healing.dm | 1 + .../code/modules/reagents/reagent container/hypovial.dm | 4 ++-- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm index 1f50c2669b..574ee7794a 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm @@ -56,6 +56,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING ImpureChem = "SDGFtox" InverseChemVal = 0.5 InverseChem = "SDZF" + can_synth = TRUE //Main SDGF chemical /datum/reagent/fermi/SDGF/on_mob_life(mob/living/carbon/M) //Clones user, then puts a ghost in them! If that fails, makes a braindead clone. @@ -213,6 +214,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING id = "SDGFtox" description = "A chem that makes a certain chemcat angry at you if you're reading this, how did you get this???"//i.e. tell me please, figure it's a good way to get pinged for bugfixes. metabolization_rate = 1 + can_synth = FALSE /datum/reagent/fermi/SDGFtox/on_mob_life(mob/living/carbon/M)//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) M.blood_volume -= 10 @@ -227,6 +229,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING color = "#a502e0" // rgb: 96, 0, 255 metabolization_rate = 0.5 * REAGENTS_METABOLISM var/startHunger + can_synth = TRUE /datum/reagent/fermi/SDZF/on_mob_life(mob/living/carbon/M) //If you're bad at fermichem, turns your clone into a zombie instead. switch(current_cycle)//Pretends to be normal diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm index e905f7b257..c6bc537ed3 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm @@ -29,6 +29,7 @@ var/mob/living/carbon/fermi_Tclone = null var/teleBool = FALSE pH = 3.7 + can_synth = TRUE /datum/reagent/fermi/eigenstate/on_new(list/data) location_created = data.["location_created"] diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 498bb8cc5f..70283a7edc 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -24,7 +24,7 @@ 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." - overdose_threshold = 12 + overdose_threshold = 17 metabolization_rate = 0.25 ImpureChem = "BEsmaller" //If you make an inpure chem, it stalls growth InverseChemVal = 0.35 @@ -165,6 +165,7 @@ metabolization_rate = 0.25 description = "A medicine used to treat organomegaly in a patient's breasts." var/sizeConv = list("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5) + can_synth = TRUE /datum/reagent/fermi/BEsmaller_hypo/on_mob_add(mob/living/carbon/M) . = ..() @@ -202,7 +203,7 @@ 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" - overdose_threshold = 12 //ODing makes you male and removes female genitals + overdose_threshold = 17 //ODing makes you male and removes female genitals metabolization_rate = 0.5 ImpureChem = "PEsmaller" //If you make an inpure chem, it stalls growth InverseChemVal = 0.35 @@ -329,6 +330,7 @@ taste_description = "chinese dragon powder" description = "A medicine used to treat organomegaly in a patient's penis." metabolization_rate = 0.5 + can_synth = TRUE /datum/reagent/fermi/PEsmaller_hypo/on_mob_add(mob/living/carbon/M) . = ..() 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 a028072dc0..c2d4e7fbc8 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -5,6 +5,7 @@ name = "Fermi" //This should never exist, but it does so that it can exist in the case of errors.. id = "fermi" taste_description = "affection and love!" + can_synth = FALSE //This should process fermichems to find out how pure they are and what effect to do. /datum/reagent/fermi/on_mob_add(mob/living/carbon/M, amount) @@ -77,6 +78,7 @@ overdose_threshold = 25 DoNotSplit = TRUE pH = 4 + can_synth = TRUE /datum/reagent/fermi/hatmium/on_mob_add(mob/living/carbon/human/M) @@ -124,6 +126,7 @@ DoNotSplit = TRUE pH = 5 var/obj/item/organ/tongue/T + can_synth = TRUE /datum/reagent/fermi/furranium/on_mob_life(mob/living/carbon/M) @@ -343,6 +346,7 @@ description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another." color = "#fbc314" pH = 0 + can_synth = TRUE //Consumes self on addition and shifts pH /datum/reagent/fermi/acidic_buffer/on_new(datapH) @@ -363,6 +367,7 @@ description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another." color = "#3853a4" pH = 14 + can_synth = TRUE /datum/reagent/fermi/basic_buffer/on_new(datapH) data = datapH diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index c1e5a1d494..48eae07aa2 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -9,6 +9,7 @@ ImpureChem = "yamerol_tox" InverseChemVal = 0.3 InverseChem = "yamerol_tox" + can_synth = TRUE /datum/reagent/fermi/yamerol/on_mob_life(mob/living/carbon/C) var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE) diff --git a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm index d313e4061a..c1e0d6ff01 100755 --- a/modular_citadel/code/modules/reagents/reagent container/hypovial.dm +++ b/modular_citadel/code/modules/reagents/reagent container/hypovial.dm @@ -138,12 +138,12 @@ comes_with = list("tricordrazine" = 30) /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction - name = "pink hypovial (breast reduction)" + name = "pink hypovial (breast treatment)" icon_state = "hypovial-pink" comes_with = list("BEsmaller_hypo" = 30) /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction - name = "pink hypovial (penis reduction)" + name = "pink hypovial (penis treatment)" icon_state = "hypovial-pink" comes_with = list("PEsmaller_hypo" = 30)