diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index b28983d642..aa218c8193 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -348,22 +348,22 @@
//rand doesn't seem to work with n^-e
//message_admins("randomizing reaction")
OptimalTempMin += rand(-100, 100)
- OptimalTempMax += (OptimalTempMin+rand(0, 200))
- ExplodeTemp += (OptimalTempMaxx+rand(0, 200))
- OptimalpHMin += rand(1, 10)
- OptimalpHMax += (OptimalpHMin + rand(0, 5))
+ OptimalTempMax = (OptimalTempMin+rand(0, 200))
+ ExplodeTemp = (OptimalTempMax+rand(0, 200))
+ OptimalpHMin += rand(1, 10
+ OptimalpHMax = (OptimalpHMin + rand(1, 5))
ReactpHLim += rand(-2, 2)
CurveSharpT += (rand(1, 500)/100)
CurveSharppH += (rand(1, 500)/100)
ThermicConstant += rand(-50, 50)
HIonRelease += (rand(-25, 25)/100)
- RateUpLim += (rand(1, 1000)/10)
+ RateUpLim += (rand(1, 1000)/100)
PurityMin += (rand(-1, 1)/10)
var/additions = list("aluminum", "silver", "gold", "plasma", "silicon", "bluespace")
//var/chosenA = pick(additions)
- var/cataly = list ("felinidmutationtoxin", "uranium", "bluespace")
- required_reagents[pick(additions)] = rand(0.1, 1))
- required_catalysts = list("[pick(cataly)]" = rand(0.1, 1))
+ var/cataly = list ("felinidmutationtoxin", "uranium", "bluespace", "milk")
+ required_reagents[pick(additions)] = rand(1, 5)//weird
+ required_catalysts = list("[pick(cataly)]" = 1)
/datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
message_admins("Someone found the hidden reaction. Amazing!! Please tell Fermis!!")
@@ -388,7 +388,7 @@
//origin = H
var/current_species = H.dna.species.type
var/datum/species/mutation = /datum/species/human/felinid
- if((mutation != current_species) && (purity >= 0.8))//ONLY if purity is high, and given the stuff is random. It's basically impossible to get this to 1.
+ if((mutation != current_species) && (purity >= 0.8))//ONLY if purity is high, and given the stuff is random. It's basically impossible to get this to 1. It already requires felind too, so no new functionality there.
H.set_species(mutation)
H.gender = FEMALE
//exception(al) handler, I said cat tail damnit!
@@ -437,4 +437,4 @@
catto.name = "FermiCat"
catto.desc = "A cute Fermichem cat, created by a lot of compicated and confusing chemistry!"
catto.color = "#770000"
- my_atom.reagents.remove_reagent("secretcatchem", 10)
+ my_atom.reagents.remove_any(10)
diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm
index 553b7983f0..fd23e1054e 100644
--- a/modular_citadel/code/modules/arousal/organs/penis.dm
+++ b/modular_citadel/code/modules/arousal/organs/penis.dm
@@ -60,9 +60,9 @@
o.apply_status_effect(/datum/status_effect/chem/PElarger)
if (round(length) > round(prev_size))
- to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "Chase Redtail", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.")
+ to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [uppertext(round(length))] inch penis.")
else if (round(length) < round(prev_size))
- to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "Chase Redtail", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.")
+ to_chat(o, "Your [pick("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger")] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [uppertext(round(length))] inch penis.")
prev_size = length
icon_state = sanitize_text("penis_[shape]_[size]")
girth = (length * girth_ratio)//Is it just me or is this ludicous, why not make it exponentially decay?
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 3300ce19a7..742e446f10 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -109,7 +109,8 @@
addiction_stage2_end = 30
addiction_stage3_end = 41
addiction_stage4_end = 44 //Incase it's too long
- var/turf/open/location_created
+ var/location_created
+ //var/turf/open/location_created
var/turf/open/location_return = null
var/addictCyc1 = 0
var/addictCyc2 = 0
@@ -1553,20 +1554,13 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
color = "#fbc314"
pH = 3
-
+//Consumes self on addition and shifts pH
/datum/reagent/fermi/fermiABuffer/on_new(datapH)
message_admins("Adding acid")
src.data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return
- /*to be fixed later
- pH = data
- if (pH <= 3)
- pH = 3
- else if (pH >= 7)
- pH = 7
- */
- holder.pH = ((holder.pH * holder.total_volume)+(pH * src.volume))/(holder.total_volume + src.volume) //Shouldn't be required
+ holder.pH = ((holder.pH * holder.total_volume)+(pH * (src.volume*3)))/(holder.total_volume + (src.volume*3)) //Shouldn't be required
var/list/seen = viewers(5, get_turf(holder))
for(var/mob/M in seen)
to_chat(M, "The beaker fizzes as the pH changes!")
@@ -1587,14 +1581,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
src.data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return
- /*to be fixed later
- src.pH = data
- if (pH >= 11)
- pH = 11
- else if (pH <= 7)
- pH = 7
- */
- holder.pH = ((holder.pH * holder.total_volume)+(pH * src.volume))/(holder.total_volume + src.volume) //Shouldn't be required Might be..?
+ holder.pH = ((holder.pH * holder.total_volume)+(pH * (src.volume*3)))/(holder.total_volume + (src.volume*3)) //Shouldn't be required Might be..?
var/list/seen = viewers(5, get_turf(holder))
for(var/mob/M in seen)
to_chat(M, "The beaker froths as the pH changes!")
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 496ffe6461..7ed8af67c1 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -92,7 +92,7 @@
FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics
FermiExplode = FALSE //If the chemical explodes in a special way
-
+//I can never get this to work, please pitch in if you can figure it out. Runtime: Cannot modify null.location_created.
/datum/chemical_reaction/fermi/eigenstate/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
var/turf/open/location = get_turf(my_atom)
var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list