From ad0f34cdf8d3d2d075e34835692a1ac15222b70b Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Wed, 9 Oct 2019 06:04:06 +0100
Subject: [PATCH] Tweaks wiki a lil
---
code/modules/reagents/chem_wiki_render.dm | 8 +++-----
code/modules/reagents/chemistry/holder.dm | 4 ++--
.../modules/reagents/chemistry/reagents/fermi_reagents.dm | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index bcc3b63893..19de39893b 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -296,6 +296,8 @@
//Temp, Explosions and pH
if(CR)
outstring += "
[(CR.FermiChem?"- Min react temp: [CR.OptimalTempMin]K
":"[(CR.required_temp?"- Min react temp: [CR.required_temp]K
":"")]")] [(CR.FermiChem?"- Explosion_temp: [CR.ExplodeTemp]K
":"")] [(CR.FermiChem?"- pH range: [max((CR.OptimalpHMin - CR.ReactpHLim), 0)] to [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]
":"")] "
+ if(CR.FermiChem)
+ outstring += "[(CR.PurityMin?"- Min explosive purity: [CR.PurityMin]
":"")] [(CR.FermiExplode?"- Special explosion: Yes
":"")]"
else
outstring += ""
@@ -336,7 +338,7 @@
if(R.inverse_chem && R.impure_chem != "fermiTox")
R3 = GLOB.chemical_reagents_list[R.inverse_chem]
- outstring += "- Inverse chem:[R3.name]
"
+ outstring += "- Inverse chem:[R3.name]
[(R3.inverse_chem_val?"- Inverse purity: [R3.inverse_chem_val]
":"")] "
@@ -347,10 +349,6 @@
outstring += "- Required container: [I.name]
"*/
outstring += "- Required container: [CR.required_container]
"
- if(CR.FermiChem)
- outstring += "- Minimum purity: [CR.PurityMin]
[(CR.FermiExplode?"- Special explosion: Yes
":"")]"
-
-
outstring += "
|\n"
return outstring
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 9d8819c7e5..1abe104142 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -553,8 +553,8 @@
fermiEnd()
return
- for(var/datum/reagent/P in C.required_catalysts)
- if(!has_reagent(P.id))
+ for(var/P in C.required_catalysts)
+ if(!has_reagent(P))
fermiEnd()
return
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 b9a79fe228..4acfda0573 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -168,7 +168,7 @@
//Writen by Trilby!! Embellsished a little by me.
/datum/reagent/fermi/nanite_b_gone
- name = "Naninte bane"
+ name = "Nanite bane"
id = "nanite_b_gone"
description = "A stablised EMP that is highly volatile, shocking small nano machines that will kill them off at a rapid rate in a patient's system."
color = "#708f8f"