diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index fc3e5d3b5c..45ae579650 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -7,16 +7,7 @@ message_admins("Someone pressed the superlag button. (Generate Wikichems)") to_chat(usr, "Generating list") - var/prefix = "|Name | Reagent pH | Reagents | Reaction temp | Explosion temp | pH range | Kinetics | Description | OD level | Addiction level | Metabolism rate | Impure chem | InverseChem|\n|---|---|---|---|---|---|---|----------|---|---|---|---|---|\n" - var/medicine = "" - var/toxin = "" - var/consumable = "" - var/plant = "" - var/uranium = "" - var/colours = "" - var/muta = "" - var/fermi = "" - var/remainder = "" + var/prefix = "|Name | Reagents | Reaction vars | Description | Chem properties | Impure chems|\n|---|---|---|---|----------|---|\n" ///datum/reagent/medicine, /datum/reagent/toxin, /datum/reagent/consumable, /datum/reagent/plantnutriment, /datum/reagent/uranium, ///datum/reagent/colorful_reagent, /datum/reagent/mutationtoxin, /datum/reagent/fermi @@ -25,56 +16,83 @@ to_chat(usr, "Attempting reagent scan. Length of list [LAZYLEN(GLOB.chemical_reagents_list)]") var/datum/reagent/R var/tally = 0 - for(var/X in GLOB.chemical_reagents_list) - R = GLOB.chemical_reagents_list[X] - if(istype(R, /datum/reagent/medicine)) - medicine += generate_chemwiki_line(R, X) + var/processCR = TRUE //Process reactions first + for(var/i = 1, i <= 2, i+=1) + var/medicine = "" + var/toxin = "" + var/consumable = "" + var/plant = "" + var/uranium = "" + var/colours = "" + var/muta = "" + var/fermi = "" + var/remainder = "" + for(var/X in GLOB.chemical_reagents_list) + R = GLOB.chemical_reagents_list[X] + if(istype(R, /datum/reagent/medicine)) + medicine += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/toxin)) - toxin += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/toxin)) + toxin += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/consumable)) - consumable += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/consumable)) + consumable += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/plantnutriment)) - plant += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/plantnutriment)) + plant += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/uranium)) - uranium += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/uranium)) + uranium += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/colorful_reagent)) - colours += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/colorful_reagent)) + colours += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/mutationtoxin)) - muta += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/mutationtoxin)) + muta += generate_chemwiki_line(R, X, processCR) - else if(istype(R, /datum/reagent/fermi)) - fermi += generate_chemwiki_line(R, X) + else if(istype(R, /datum/reagent/fermi)) + fermi += generate_chemwiki_line(R, X, processCR) - else - remainder += generate_chemwiki_line(R, X) + else + remainder += generate_chemwiki_line(R, X, processCR) - tally++ - if((tally%50)==0) - to_chat(usr, "[tally] of [LAZYLEN(GLOB.chemical_reagents_list)] done.") + tally++ + if((tally%50)==0) + to_chat(usr, "[tally] of [LAZYLEN(GLOB.chemical_reagents_list)] done.") - to_chat(usr, "finished") - log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n----------------------------------------------------------------------------------\n\n\n# BASIC REAGENTS\n\n[prefix][remainder]\n\n# MEDICINE:\n\n[prefix][medicine]\n\n# TOXIN:\n\n[prefix][toxin]\n\n# CONSUMABLE\n\n[prefix][consumable]\n\n# FERMI\n\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n\n[prefix][fermi]\n\n# PLANTS\n\n[prefix][plant]\n\n# URANIUM\n\n[prefix][uranium]\n\n# COLOURS\n\n[prefix][colours]\n\n# RACE MUTATIONS\n[prefix][muta]\n") + processCR = FALSE + to_chat(usr, "finished chems") + log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n----------------------------------------------------------------------------------\n\n\n# BASIC REAGENTS\n\n[prefix][remainder]\n\n# MEDICINE:\n\n[prefix][medicine]\n\n# TOXIN:\n\n[prefix][toxin]\n\n# CONSUMABLE\n\n[prefix][consumable]\n\n# FERMI\n\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n\n[prefix][fermi]\n\n# PLANTS\n\n[prefix][plant]\n\n# URANIUM\n\n[prefix][uranium]\n\n# COLOURS\n\n[prefix][colours]\n\n# RACE MUTATIONS\n\n[prefix][muta]\n") -/proc/generate_chemwiki_line(datum/reagent/R, X) + prefix = "|Name | Reagents | Reaction vars | Description ||\n|---|---|---|----------|\n" + to_chat(usr, "starting reactions") + for(var/reagent in GLOB.chemical_reactions_list) + for(var/datum/chemical_reaction/CR in GLOB.chemical_reactions_list[reagent]) + generate_chemreactwiki_line(CR) + + to_chat(usr, "finished reactions") + +/proc/generate_chemwiki_line(datum/reagent/R, X, processCR) //name | Reagent pH | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | Addiction level | Metabolism rate | impure chem | inverse chem var/datum/chemical_reaction/CR = get_chemical_reaction(R.id) + if((!CR && processCR) || (CR && !processCR)) // Do reactions first. + return "" + //message_admins("[CR]") - var/outstring = "|[R.name] !\[[R.color]\](https://placehold.it/15/[copytext(R.color, 2, 8)]/000000?text=+)| [R.pH] | " + var/outstring = "|[R.name] !\[[R.color]\](https://placehold.it/15/[copytext(R.color, 2, 8)]/000000?text=+) pH:[R.pH] | " var/datum/reagent/R3 if(CR) outstring += "