diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 27e8094127..74780393b8 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -350,7 +350,7 @@
OptimalTempMin += rand(-100, 100)
OptimalTempMax = (OptimalTempMin+rand(0, 200))
ExplodeTemp = (OptimalTempMax+rand(0, 200))
- OptimalpHMin += rand(1, 10
+ OptimalpHMin += rand(1, 10)
OptimalpHMax = (OptimalpHMin + rand(1, 5))
ReactpHLim += rand(-2, 2)
CurveSharpT += (rand(1, 500)/100)
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index 61bba76cc3..3fce3cacd0 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals.dm
@@ -211,7 +211,8 @@
B.color = "#[dna.features["breasts_color"]]"
B.size = dna.features["breasts_size"]
B.prev_size = B.size
- B.cached_size = B.breast_values[B.size]
+ if (!B.size == "huge")
+ B.cached_size = B.breast_values[B.size]
B.shape = dna.features["breasts_shape"]
B.fluid_id = dna.features["breasts_fluid"]
B.update()
@@ -293,11 +294,10 @@
dna.species.use_skintones = TRUE
return
if(MUTCOLORS)
- if(fixed_mut_color)
- genital_overlay.color = "#[fixed_mut_color]"
- else
- genital_overlay.color = "#[H.dna.features["mcolor"]]"
- return
+ if(src.dna.species.fixed_mut_color)
+ dna.features["cock_color"] = "#[src.dna.species.fixed_mut_color]"
+ dna.features["breasts_color"] = "#[src.dna.species.fixed_mut_color]"
+ return
//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"]]"
@@ -367,6 +367,7 @@
if("vag_color")
genital_overlay.color = "#[H.dna.features["vag_color"]]"
//This was removed for some reason, but it breaks my code, so now it's back!! Tadahhh.
+ /*
if(MUTCOLORS)
if(fixed_mut_color)
genital_overlay.color = "#[fixed_mut_color]"
@@ -382,6 +383,7 @@
genital_overlay.color = "#[fixed_mut_color3]"
else
genital_overlay.color = "#[H.dna.features["mcolor3"]]"
+ */
standing += genital_overlay
if(LAZYLEN(standing))
H.overlays_standing[layer] = standing.Copy()
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 e6da457a1d..9cf2c1fa1b 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -370,7 +370,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
//Really hacky way to deal with this stupid problem I have, and heal the clone. I think around 30u will make a healthy clone.
SM.reagents.add_reagent("SDGFheal", volume)
- M.reagents.remove_reagent(src.id, 999)
+ M.reagents.remove_reagent(src.id, src.vol)
//Give the new clone an idea of their character
//SHOULD print last 5 messages said by the original to the clones chatbox
@@ -552,7 +552,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
S.real_name = "Living teratoma"//horrifying!!
S.rabid = 1//Make them an angery boi
//S.updateappearance(mutcolor_update=1)
- M.reagents.remove_reagent(src.id, 20)
+ M.reagents.remove_reagent(src.id, src.volume)
to_chat(M, "A large glob of the tumour suddenly splits itself from your body. You feel grossed out and slimey...")
if(87 to INFINITY)//purges chemical fast, producing a "slime" for each one. Said slime is weak to fire. TODO: turn tumour slime into real variant.
M.adjustToxLoss(1, 0)
@@ -847,7 +847,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason
//M.alpha = 255//Reset addiction
//antiGenetics = 255// DOesn't work for some reason?
switch(current_cycle)
- if(0)//Require a minimum
+ if(2)//Require a minimum
origin = M
if (G == null)
G = new(get_turf(M.loc))
@@ -869,7 +869,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason
if(prob(50))
to_chat(G, "The high conentration of Astrogen in your blood causes you to lapse your concentration for a moment, bringing your projection back to yourself!")
do_teleport(G, M.loc)
- M.reagents.remove_reagent(src.id, current_cycle-1, FALSE)
+ M.reagents.remove_reagent(src.id, current_cycle/2, FALSE)
..()
/datum/reagent/fermi/astral/on_mob_delete(mob/living/carbon/M)
@@ -885,7 +885,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason
if(M.reagents.has_reagent("astral"))
antiGenetics = 255//Doesn't reset when you take more, which is weird for me, it should.
M.alpha = 255 //Antigenetics is to do with stopping geneticists from turning people invisible to kill them.
- if(prob(60))
+ if(prob(65))
M.alpha--
antiGenetics--
switch(antiGenetics)
@@ -1369,7 +1369,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
var/obj/item/organ/tongue/nT = new /obj/item/organ/tongue/OwO
T.Remove(M)
nT.Insert(M)
- qdel(T)
+ T.forceMove(locate(10,6,1))//To the zelda room.
+ to_chat(M, "Youw tongue feews... weally fwuffy!!")
if(22 to INFINITY)
if(prob(10))
to_chat(M, "You find yourself unable to supress the desire to meow!")
@@ -1387,9 +1388,10 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
..()
/datum/reagent/fermi/furranium/on_mob_delete(mob/living/carbon/M)
- if(purity <= 0.9)//Only permanent if you're a good chemist.
+ if(purity < 0.9)//Only permanent if you're a good chemist.
nT = M.getorganslot(ORGAN_SLOT_TONGUE)
nT.Remove(M)
+ qdel(nT)
T.Insert(M)
to_chat(M, "You feel your tongue.... unfluffify...?")
M.say("Pleh!")
@@ -1533,9 +1535,9 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
holder.clear_reagents()
/datum/reagent/fermi/fermiTox
- name = ""//defined on setup
+ name = "FermiTox"//defined on setup
id = "fermiTox"
- description = "You should be really careful with this...! Also, how did you get this?"
+ description = "You should be really careful with this...! Also, how did you get this? You shouldn't have this!"
data = "merge"
color = "FFFFFF"
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index a37e55d87a..00b26f90a9 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -40,7 +40,7 @@
message_admins("Fermi explosion at [T], with a temperature of [temp], pH of [pH], Impurity tot of [ImpureTot].")
var/datum/reagents/R = new/datum/reagents(3000)//Hey, just in case.
var/datum/effect_system/smoke_spread/chem/s = new()
- Endless loop hell
+ //Endless loop hell?
for (var/datum/reagent/reagent in my_atom.reagents.reagent_list) //make gas for reagents
if (istype(reagent, /datum/reagent/fermi))
R.add_reagent(reagent.id, reagent.volume)
@@ -219,8 +219,8 @@
CurveSharpT = 1
CurveSharppH = 1
ThermicConstant = 25
- HIonRelease = -0.5
- RateUpLim = 20
+ HIonRelease = 1
+ RateUpLim = 15
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.25 // explode purity!
@@ -244,8 +244,8 @@
//CatalystFact = 0
CurveSharpT = 0.5
CurveSharppH = 4
- ThermicConstant = 10
- HIonRelease = -0.1
+ ThermicConstant = 15
+ HIonRelease = 0.1
RateUpLim = 1
FermiChem = TRUE
FermiExplode = TRUE
@@ -301,7 +301,7 @@
CurveSharppH = 0.5
ThermicConstant = -2
HIonRelease = -0.05
- RateUpLim = 5
+ RateUpLim = 2
FermiChem = TRUE
FermiExplode = TRUE
PurityMin = 0.5
@@ -318,7 +318,7 @@
name = "Furranium"
id = "furranium"
results = list("furranium" = 0.5)
- required_reagents = list("aphro" = 1, "moonsugar" = 1, "silver" = 2, "salglu_solution" = 1)
+ required_reagents = list("aphro" = 0.1, "moonsugar" = 0.1, "silver" = 0.2, "salglu_solution" = 0.1)
//mix_message = ""
//FermiChem vars:
OptimalTempMin = 350
@@ -332,7 +332,7 @@
CurveSharppH = 0.5
ThermicConstant = -10
HIonRelease = -0.1
- RateUpLim = 10
+ RateUpLim = 2
FermiChem = TRUE
PurityMin = 0.30
@@ -343,8 +343,8 @@
/datum/chemical_reaction/fermi/naninte_b_gone//done test
name = "Naninte bain"
id = "naninte_b_gone"
- results = list("naninte_b_gone" = 20)
- required_reagents = list("synthflesh" = 5, "uranium" = 5, "iron" = 5, "salglu_solution" = 5)
+ results = list("naninte_b_gone" = 4)
+ required_reagents = list("synthflesh" = 1, "uranium" = 1, "iron" = 1, "salglu_solution" = 1)
mix_message = "the reaction gurgles, encapsulating the reagents in flesh before the emp can be set off."
required_temp = 499//To force fermireactions before EMP.
//FermiChem vars:
@@ -359,7 +359,7 @@
CurveSharppH = 1
ThermicConstant = 5
HIonRelease = 0.01
- RateUpLim = 2
+ RateUpLim = 1
FermiChem = TRUE
PurityMin = 0.15
diff --git a/modular_citadel/code/modules/reagents/objects/fermiclothes.dm b/modular_citadel/code/modules/reagents/objects/fermiclothes.dm
index 2c0df581c4..9e3852eff3 100644
--- a/modular_citadel/code/modules/reagents/objects/fermiclothes.dm
+++ b/modular_citadel/code/modules/reagents/objects/fermiclothes.dm
@@ -7,7 +7,7 @@
icon_state = "cowboy"
desc = "A sythesized hat, you can't seem to take it off. And tips their hat."
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- item_flags = NODROP //Tips their hat!
+ //item_flags = NODROP //Tips their hat!
/*
/obj/item/clothing/head/hattip/equipped(mob/living/carbon/human/user, slot)