diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 64cb2b784e..5f2c8a47cc 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -300,7 +300,7 @@ if(owner.client?.prefs.lewdchem) to_chat(owner, "[pick("It feels so good to listen to [master].", "You can't keep your eyes off [master].", "[master]'s voice is making you feel so sleepy.", "You feel so comfortable with [master]", "[master] is so dominant, it feels right to obey them.")].") if (2) //partially enthralled - if (enthrallTally > 250) + if (enthrallTally > 200) phase += 1 mental_capacity -= resistanceTally//leftover resistance per step is taken away from mental_capacity. enthrallTally = 0 diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm index 574ee7794a..b1c4bbffcc 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm @@ -45,6 +45,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING var/playerClone = FALSE var/unitCheck = FALSE metabolization_rate = 0.5 * REAGENTS_METABOLISM + taste_description = "a weird chemical fleshy flavour" //var/datum/status_effect/chem/SDGF/candidates/candies var/list/candies = list() //var/polling = FALSE @@ -58,6 +59,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING 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. //Setup clone 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 c2d4e7fbc8..b2ede684a4 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -223,6 +223,9 @@ N.nanite_volume = -2 ..() +/datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume) + O.emp_act(EMP_HEAVY) + /datum/reagent/fermi/nanite_b_goneTox name = "Naninte bain" id = "nanite_b_goneTox" diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 59037d80c4..6b4df94b88 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -489,7 +489,7 @@ RateUpLim += (rand(1, 1000)/100) PurityMin += (rand(-1, 1)/10) var/additions = list("aluminium", "silver", "gold", "plasma", "silicon", "bluespace", "uranium", "milk") - required_reagents[pick(additions)] = rand(1, 5)//weird + required_reagents[pick(additions)] = rand(0.1, 0.5)//weird /datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom) SSblackbox.record_feedback("tally", "catgirlium")//log