Updates a buncha stuff.

2019-09-20 21:11:20 +01:00
parent 9cca272986
commit d12fd72ebf
8 changed files with 41 additions and 27 deletions
@@ -404,6 +404,21 @@ SLIME SCANNER
 					msg += "<span class='danger'>[R.name]</span>\n"
 			else
 				msg += "<span class='notice'>Subject is not addicted to any reagents.</span>\n"
+
+			if(M.reagents.has_reagent("fermiTox"))
+				var/datum/reagent/fermiTox = M.reagents.has_reagent("fermiTox")
+				switch(fermiTox.volume)
+					if(5 to 10)
+						msg += "<span class='notice'>Subject contains a low amount of toxic isomers.</span>\n"
+					if(10 to 25)
+						msg += "<span class='danger'>Subject contains toxic isomers.</span>\n"
+					if(25 to 50)
+						msg += "<span class='danger'>Subject contains a substantial amount of toxic isomers.</span>\n"
+					if(50 to 95)
+						msg += "<span class='danger'>Subject contains a high amount of toxic isomers.</span>\n"
+					if(95 to INFINITY)
+						msg += "<span class='danger'>Subject contains a extremely dangerous amount of toxic isomers.</span>\n"
+
 			msg += "*---------*</span>"
 			to_chat(user, msg)

@@ -90,13 +90,12 @@
 	var/mob/living/carbon/M = L
 	if(!M)
 		return
-	if(chemical_flags & REAGENT_DONOTSPLIT)
-		return
-
 	if(cached_purity == 1)
 		cached_purity = purity
-	else if(cached_purity < 0)
+	else if(purity < 0)
 		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
+	if(chemical_flags & REAGENT_DONOTSPLIT)
+		return

 	if ((inverse_chem_val > purity) && (inverse_chem))//Turns all of a added reagent into the inverse chem
 		M.reagents.remove_reagent(id, amount, FALSE)
@@ -143,14 +142,12 @@
 		return
 	if(!iscarbon(M))
 		return
+	cached_purity = purity //purity SHOULD be precalculated from the add_reagent, update cache.
+	if (purity < 0)
+		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
 	if(chemical_flags & REAGENT_DONOTSPLIT)
 		return

-	if(cached_purity == 1)
-		cached_purity = purity
-	else if (purity < 0)
-		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
-
 	if ((inverse_chem_val > purity) && (inverse_chem)) //INVERT
 		M.reagents.remove_reagent(id, amount, FALSE)
 		M.reagents.add_reagent(inverse_chem, amount, FALSE, other_purity = 1-cached_purity)
@@ -7,16 +7,17 @@


 /datum/reagent/impure/fermiTox
-	name = "FermiTox"
+	name = "Chemical Isomers"
 	id = "fermiTox"
-	description = "You should be really careful with this...! Also, how did you get this? You shouldn't have this!"
+	description = "Toxic chemical isomers made from impure reactions. At low volumes will cause light toxin damage, but as the volume increases, it deals larger amounts, damages the liver, then eventually the heart."
 	data = "merge"
 	color = "FFFFFF"
 	can_synth = FALSE
+    var/potency = 1 //potency multiplies the volume when added.


 //I'm concerned this is too weak, but I also don't want deathmixes.
-//TODO: liver damage.
+//TODO: liver damage, 100+ heart
 /datum/reagent/impure/fermiTox/on_mob_life(mob/living/carbon/C, method)
 	if(C.dna && istype(C.dna.species, /datum/species/jelly))
 		C.adjustToxLoss(-2)
@@ -150,7 +150,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 /datum/reagent/fermi/enthrall/test
 	name = "MKUltraTest"
 	id = "enthrallTest"
-	description = "A forbidden deep red mixture that overwhelms a foreign body with waves of joy, intoxicating them into servitude. When taken by the creator, it will enhance the draw of their voice to those affected by it."
+	description = "A forbidden deep red mixture that makes you like Fermis a little too much. Unobtainable and due to be removed from the wiki."
 	data = list("creatorID" = "honkatonkbramblesnatch", "creatorGender" = "Mistress", "creatorName" = "Fermis Yakumo")
 	creatorID  = "honkatonkbramblesnatch"//ckey
 	creatorGender = "Mistress"
@@ -300,7 +300,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 /datum/reagent/fermi/enthrallExplo//Created in a gas cloud when it explodes
 	name = "Gaseous MKUltra"
 	id = "enthrallExplo"
-	description = "A forbidden deep red mixture that overwhelms a foreign body with waves of desire, inducing a chemial love for another. Also, how the HECC did you get this?"
+	description = "A forbidden deep red gas that overwhelms a foreign body, causing the person they next lay their eyes on to become more interesting. Studies have shown that people are 66% more likely to make friends with this in the air. Produced when MKUltra explodes."
 	color = "#2C051A" // rgb: , 0, 255
 	metabolization_rate = 0.1
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses."
@@ -280,8 +280,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING

 //Unobtainable, used in clone spawn.
 /datum/reagent/fermi/SDGFheal
-	name = "synthetic-derived growth factor"
+	name = "synthetic-derived healing factor"
 	id = "SDGFheal"
+	description = "Leftover SDGF is transferred into the resulting clone, which quickly heals up the stresses from suddenly splitting. Restores blood, nutrition, and repaires brain and clone damage quickly. Only obtainable from using excess SDGF, and only enters the cloned body."
 	metabolization_rate = 1
 	can_synth = FALSE

@@ -295,9 +296,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING

 //Unobtainable, used if SDGF is impure but not too impure
 /datum/reagent/impure/SDGFtox
-	name = "synthetic-derived growth factor"
+	name = "Synthetic-derived apoptosis factor"
 	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.
+	description = "Impure synthetic-derived growth factor causes certain cells to undergo cell death, causing clone damage, and damaging blood cells."//i.e. tell me please, figure it's a good way to get pinged for bugfixes.
 	metabolization_rate = 1
 	can_synth = FALSE
 	chemical_flags = REAGENT_INVISIBLE
@@ -309,9 +310,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING

 //Fail state of SDGF
 /datum/reagent/impure/SDZF
-	name = "synthetic-derived growth factor"
+	name = "synthetic-derived zombie factor"
 	id = "SDZF"
-	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. This message should never appear, how did you manage to get a hold of this?"
+	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. Emulates normal synthetic-derived growth factor, but produces a hostile zombie at the end of it."
 	color = "#a502e0" // rgb: 96, 0, 255
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	var/startHunger
@@ -140,7 +140,7 @@
 /datum/reagent/fermi/BEsmaller
 	name = "Modesty milk"
 	id = "BEsmaller"
-	description = "A volatile collodial mixture derived from milk that encourages mammary reduction via a potent estrogen mix."
+	description = "A volatile collodial mixture derived from milk that encourages mammary reduction via a potent estrogen mix. Produced by reacting impure Succubus milk."
 	color = "#E60584" // rgb: 96, 0, 255
 	taste_description = "a milky ice cream like flavour."
 	metabolization_rate = 0.25
@@ -311,7 +311,7 @@
 /datum/reagent/fermi/PEsmaller // Due to cozmo's request...!
 	name = "Chastity draft"
 	id = "PEsmaller"
-	description = "A volatile collodial mixture derived from various masculine solutions that encourages a smaller 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."
+	description = "A volatile collodial mixture derived from various masculine solutions that encourages a smaller gentleman's package via a potent testosterone mix. Produced by reacting impure Incubus draft."
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
 	metabolization_rate = 0.5
@@ -198,7 +198,7 @@
 		//empulse((get_turf(C)), 3, 2)//So the nanites randomize
 		var/atom/T = C
 		T.emp_act(EMP_HEAVY)
-		to_chat(C, "<span class='warning'>The nanites short circuit within your system!</b></span>")
+		to_chat(C, "<span class='warning'>You feel a strange tingling sensation come from your core.</b></span>")
 	if(isnull(N))
 		return ..()
 	N.nanite_volume = -2
@@ -208,10 +208,10 @@
 	O.emp_act(EMP_HEAVY)

 /datum/reagent/fermi/nanite_b_goneTox
-	name = "Naninte bain"
+	name = "Electromagnetic crystals"
 	id = "nanite_b_goneTox"
-	description = "Poorly made, and shocks you!"
-	metabolization_rate = 1
+	description = "Causes items upon the patient to sometimes short out, as well as causing a shock in the patient, if the residual charge between the crystals builds up to sufficient quantities"
+	metabolization_rate = 0.5
 	chemical_flags = REAGENT_INVISIBLE

 //Increases shock events.
@@ -74,9 +74,9 @@
 	..()

 /datum/reagent/impure/yamerol_tox
-	name = "Yamerol"
+	name = "Yamer oh no"
 	id = "yamerol_tox"
-	description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
+	description = "A dangerous, cloying toxin that stucks to a patient’s respiratory system, damaging their tongue, lungs and causing suffocation."
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
 	pH = 8.6