From 44cff04515f606c8be47543d030f4414231f2c0e Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 13 Sep 2019 18:03:39 +0100 Subject: [PATCH 01/16] Atom stop crashing pls --- code/modules/reagents/chem_wiki_render.dm | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 code/modules/reagents/chem_wiki_render.dm diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm new file mode 100644 index 0000000000..735d653e00 --- /dev/null +++ b/code/modules/reagents/chem_wiki_render.dm @@ -0,0 +1,46 @@ +//Generates a markdown txt file for use with the wiki + +/client/proc/generate_wikichem_list() + set category = "debug" + set name = "generate_wikichem_list" + set desc = "generate a huge loglist of all the chems. Do not click unless you want lag." + + var/prefix = list("name | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | impure chem \n") + var/medicine = list("") + var/toxin = list("") + var/consumable = list("") + var/plant = list("") + var/uranium = list("") + var/colours = list("") + var/muta = list("") + var/fermi = list("") + var/remainder = list("") + + ///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 + + for(var/datum/reagent/R in GLOB.chemical_reagents_list) + if(istype(R, /datum/reagent/medicine)) + + else if(istype(R, /datum/reagent/toxin)) + + else if(istype(R, /datum/reagent/consumable)) + + else if(istype(R, /datum/reagent/plantnutriment)) + + else if(istype(R, /datum/reagent/uranium)) + + else if(istype(R, /datum/reagent/colorful_reagent)) + + else if(istype(R, /datum/reagent/mutationtoxin)) + + else if(istype(R, /datum/reagent/fermi)) + + else + + + log_game("FERMICHEM: MKULTRA: Status applied on [owner] ckey: [owner.key] with a master of [master] ckey: [enthrallID].") + + //name | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | impure chem + +/proc/generate_line(datum/reagent/R) From eeddcfa2950b35bf4bab6fab8f9e392a1160eb2f Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 13 Sep 2019 19:22:05 +0100 Subject: [PATCH 02/16] I think it works, well, not sure about the CR stuff --- code/modules/reagents/chem_wiki_render.dm | 88 +++++++++++++++++++---- 1 file changed, 75 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index 735d653e00..3269a2fbd6 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -5,42 +5,104 @@ set name = "generate_wikichem_list" set desc = "generate a huge loglist of all the chems. Do not click unless you want lag." - var/prefix = list("name | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | impure chem \n") - var/medicine = list("") - var/toxin = list("") - var/consumable = list("") - var/plant = list("") - var/uranium = list("") - var/colours = list("") - var/muta = list("") - var/fermi = list("") - var/remainder = list("") + var/prefix = list("**Name** | **Reagent pH** | **Reagents** | **Reaction temp** | **Explosion temp** | **pH range** | **Kinetics** | **Description** | **OD level** | **Addiction level** | **Metabolism rate** |**Impure chem** \n---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|") + var/medicine + var/toxin + var/consumable + var/plant + var/uranium + var/colours + var/muta + var/fermi + var/remainder ///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 + //Probably not the most eligant of solutions. for(var/datum/reagent/R in GLOB.chemical_reagents_list) if(istype(R, /datum/reagent/medicine)) + medicine += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/toxin)) + toxin += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/consumable)) + consumable += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/plantnutriment)) + plant += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/uranium)) + uranium += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/colorful_reagent)) + colours += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/mutationtoxin)) + muta += generate_chemwiki_line(R) else if(istype(R, /datum/reagent/fermi)) + fermi += generate_chemwiki_line(R) else + remainer += generate_chemwiki_line(R) - log_game("FERMICHEM: MKULTRA: Status applied on [owner] ckey: [owner.key] with a master of [master] ckey: [enthrallID].") + log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n + ----------------------------------------------------------------------------------\n\n\n + #BASIC REAGENTS\n[prefix][remainder]\n + #MEDICINE:\n[prefix][medicine]\n#TOXIN:\n[prefix][toxin]\n#CONSUMABLE\n[prefix][consumable]\n + #FERMI\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n[prefix][fermi]\n + #PLANTS\n[prefix][plant]\n#URANIUM\n[prefix][uranium]\n#COLOURS\n[prefix][colours]\n + #RACE MUTATIONS\n[prefix][muta]\n") - //name | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | impure chem -/proc/generate_line(datum/reagent/R) + +/proc/generate_chemwiki_line(datum/reagent/R) + //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 = GLOB.chemical_reactions_list[R.id] + if(!CR) + CR = FALSE + var/outstring = "[R.name] | [R.ph] | | [(CR.FermiChem?"[CR.OptimalTempMin]":"[(CR.required_temp?"[CR.required_temp]":"N/A")]")] | [(CR.FermiChem?"[CR.ExplodeTemp]":"N/A")] | [(CR.FermiChem?"[max((CR.OptimalpHMin - CR.ReactpHLim), 0)] - [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]":"N/A")] | " + + //Kinetics + if(CR.FermiChem) + switch(CR.ThermicConstant) + if(-INFINITY to -9.9) + outstring += "Extremely endothermic | " + if(-9.9 to -4.9) + outstring += "Very endothermic | " + if(-4.9 to -0.1) + outstring += "Endothermic | " + if(-0.1 to 0.1) + outstring += "Neutral | " + if(0.1 to 4.9) + outstring += "Exothermic | " + if(4.9 to 9.9) + outstring += "Very exothermic | " + if(9.9 to INFINITY) + outstring += "Extremely exothermic | " + else + outstring += "N/A | " + + //Description, OD, Addict, Meta + outstring += "[R.description] | [(R.overdose_threshold?"[R.overdose_threshold]":"N/A")] | [(R.addiction_threshold?"[R.addiction_threshold]":"N/A")] | [R.metabolization_rate * REAGENTS_METABOLISM] | " + + if(R.ImpureChem != "fermiTox" || !R.ImpureChem) + outstring += "[R.ImpureChem] |" + else + outstring += "N/A |" + + if(R.InverseChem != "fermiTox" || !R.InverseChem) + outstring += "[R.InverseChem] |" + else + outstring += "N/A |" + + return outstring From 87de05622e4ec623494cb45597718659ac36babc Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 13 Sep 2019 19:26:20 +0100 Subject: [PATCH 03/16] Justin case --- code/modules/reagents/chem_wiki_render.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index 3269a2fbd6..fcfccb7ea2 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -70,10 +70,13 @@ outstring += "
  • [R3.name]
    • " //Temp, Explosions and pH - outstring += " | [(CR.FermiChem?"[CR.OptimalTempMin]":"[(CR.required_temp?"[CR.required_temp]":"N/A")]")] | [(CR.FermiChem?"[CR.ExplodeTemp]":"N/A")] | [(CR.FermiChem?"[max((CR.OptimalpHMin - CR.ReactpHLim), 0)] - [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]":"N/A")] | " + if(CR) + outstring += " | [(CR.FermiChem?"[CR.OptimalTempMin]":"[(CR.required_temp?"[CR.required_temp]":"N/A")]")] | [(CR.FermiChem?"[CR.ExplodeTemp]":"N/A")] | [(CR.FermiChem?"[max((CR.OptimalpHMin - CR.ReactpHLim), 0)] - [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]":"N/A")] | " + else + outstring += " | N/A | N/A | N/A | " //Kinetics - if(CR.FermiChem) + if(CR.FermiChem || !CR) switch(CR.ThermicConstant) if(-INFINITY to -9.9) outstring += "Extremely endothermic | " From 04b492924b796b0ce90534371112b71765aa3607 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 13 Sep 2019 20:23:07 +0100 Subject: [PATCH 04/16] Works kinda --- code/modules/admin/admin_verbs.dm | 1 + code/modules/reagents/chem_wiki_render.dm | 90 ++++++++++++----------- tgstation.dme | 1 + 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ac1ae51f69..626fa7f66f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -169,6 +169,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug()) /client/proc/cmd_display_overlay_log, /client/proc/reload_configuration, /datum/admins/proc/create_or_modify_area, + /client/proc/generate_wikichem_list //DO NOT PRESS UNLESS YOU WANT SUPERLAG ) GLOBAL_PROTECT(admin_verbs_possess) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index fcfccb7ea2..9fef2b81e2 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -1,79 +1,84 @@ //Generates a markdown txt file for use with the wiki /client/proc/generate_wikichem_list() - set category = "debug" - set name = "generate_wikichem_list" + set name = "Generate wikichem" + set category = "Debug" set desc = "generate a huge loglist of all the chems. Do not click unless you want lag." - var/prefix = list("**Name** | **Reagent pH** | **Reagents** | **Reaction temp** | **Explosion temp** | **pH range** | **Kinetics** | **Description** | **OD level** | **Addiction level** | **Metabolism rate** |**Impure chem** \n---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|") - var/medicine - var/toxin - var/consumable - var/plant - var/uranium - var/colours - var/muta - var/fermi - var/remainder + var/prefix = "**Name** | **Reagent pH** | **Reagents** | **Reaction temp** | **Explosion temp** | **pH range** | **Kinetics** | **Description** | **OD level** | **Addiction level** | **Metabolism rate** |**Impure chem**|InverseChem \n---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|" + var/medicine = "" + var/toxin = "" + var/consumable = "" + var/plant = "" + var/uranium = "" + var/colours = "" + var/muta = "" + var/fermi = "" + var/remainder = "" ///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 //Probably not the most eligant of solutions. - for(var/datum/reagent/R in GLOB.chemical_reagents_list) - if(istype(R, /datum/reagent/medicine)) + for(var/datum/reagent/R in GLOB.chemical_reagents_list) + if(istype(R, /datum/reagent/medicine)) medicine += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/toxin)) + else if(istype(R, /datum/reagent/toxin)) toxin += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/consumable)) + else if(istype(R, /datum/reagent/consumable)) consumable += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/plantnutriment)) + else if(istype(R, /datum/reagent/plantnutriment)) plant += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/uranium)) + else if(istype(R, /datum/reagent/uranium)) uranium += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/colorful_reagent)) + else if(istype(R, /datum/reagent/colorful_reagent)) colours += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/mutationtoxin)) + else if(istype(R, /datum/reagent/mutationtoxin)) muta += generate_chemwiki_line(R) - else if(istype(R, /datum/reagent/fermi)) + else if(istype(R, /datum/reagent/fermi)) fermi += generate_chemwiki_line(R) - else - remainer += generate_chemwiki_line(R) + else + remainder += generate_chemwiki_line(R) - log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n - ----------------------------------------------------------------------------------\n\n\n - #BASIC REAGENTS\n[prefix][remainder]\n - #MEDICINE:\n[prefix][medicine]\n#TOXIN:\n[prefix][toxin]\n#CONSUMABLE\n[prefix][consumable]\n - #FERMI\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n[prefix][fermi]\n - #PLANTS\n[prefix][plant]\n#URANIUM\n[prefix][uranium]\n#COLOURS\n[prefix][colours]\n - #RACE MUTATIONS\n[prefix][muta]\n") + log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n") + log_sql("----------------------------------------------------------------------------------\n\n\n") + log_sql("#BASIC REAGENTS\n[prefix][remainder]\n") + log_sql("#MEDICINE:\n[prefix][medicine]\n#TOXIN:\n[prefix][toxin]\n#CONSUMABLE\n[prefix][consumable]\n") + log_sql("#FERMI\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n[prefix][fermi]\n") + log_sql("#PLANTS\n[prefix][plant]\n#URANIUM\n[prefix][uranium]\n#COLOURS\n[prefix][colours]\n") + log_sql("#RACE MUTATIONS\n[prefix][muta]\n") /proc/generate_chemwiki_line(datum/reagent/R) //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 = GLOB.chemical_reactions_list[R.id] - if(!CR) - CR = FALSE - var/outstring = "[R.name] | [R.ph] | | [(CR.FermiChem?"[CR.OptimalTempMin]":"[(CR.required_temp?"[CR.required_temp]":"N/A")]")] | [(CR.FermiChem?"[CR.ExplodeTemp]":"N/A")] | [(CR.FermiChem?"[max((CR.OptimalpHMin - CR.ReactpHLim), 0)] - [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]":"N/A")] | " + outstring += "[(CR.FermiChem?"[CR.OptimalTempMin]":"[(CR.required_temp?"[CR.required_temp]":"N/A")]")] | [(CR.FermiChem?"[CR.ExplodeTemp]":"N/A")] | [(CR.FermiChem?"[max((CR.OptimalpHMin - CR.ReactpHLim), 0)] - [min((CR.OptimalpHMax + CR.ReactpHLim), 14)]":"N/A")] | " else - outstring += " | N/A | N/A | N/A | " + outstring += "N/A | N/A | N/A | " //Kinetics if(CR.FermiChem || !CR) @@ -99,13 +104,16 @@ outstring += "[R.description] | [(R.overdose_threshold?"[R.overdose_threshold]":"N/A")] | [(R.addiction_threshold?"[R.addiction_threshold]":"N/A")] | [R.metabolization_rate * REAGENTS_METABOLISM] | " if(R.ImpureChem != "fermiTox" || !R.ImpureChem) - outstring += "[R.ImpureChem] |" + R3 = GLOB.chemical_reagents_list[R.ImpureChem] + outstring += "[R3.name] | " else outstring += "N/A |" if(R.InverseChem != "fermiTox" || !R.InverseChem) - outstring += "[R.InverseChem] |" + R3 = GLOB.chemical_reagents_list[R.InverseChem] + outstring += "[R3.name] | " else - outstring += "N/A |" + outstring += "N/A | " + outstring += "\n" return outstring diff --git a/tgstation.dme b/tgstation.dme index 1173617419..a84daf855d 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2483,6 +2483,7 @@ #include "code\modules\projectiles\projectile\special\temperature.dm" #include "code\modules\projectiles\projectile\special\wormhole.dm" #include "code\modules\reagents\chem_splash.dm" +#include "code\modules\reagents\chem_wiki_render.dm" #include "code\modules\reagents\reagent_containers.dm" #include "code\modules\reagents\reagent_dispenser.dm" #include "code\modules\reagents\chemistry\colors.dm" From 80997e4ef36e71245680ddcd3d426ebf7a2d8ec0 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Fri, 13 Sep 2019 23:06:09 +0100 Subject: [PATCH 05/16] Works. --- code/modules/reagents/chem_wiki_render.dm | 100 ++++++++++++---------- 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index 9fef2b81e2..fc3e5d3b5c 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -1,11 +1,13 @@ //Generates a markdown txt file for use with the wiki /client/proc/generate_wikichem_list() - set name = "Generate wikichem" + set name = "Generate Wikichems" set category = "Debug" - set desc = "generate a huge loglist of all the chems. Do not click unless you want lag." + set desc = "Generate a huge loglist of all the chems. Do not click unless you want lag." - var/prefix = "**Name** | **Reagent pH** | **Reagents** | **Reaction temp** | **Explosion temp** | **pH range** | **Kinetics** | **Description** | **OD level** | **Addiction level** | **Metabolism rate** |**Impure chem**|InverseChem \n---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|" + 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 = "" @@ -20,49 +22,53 @@ ///datum/reagent/colorful_reagent, /datum/reagent/mutationtoxin, /datum/reagent/fermi //Probably not the most eligant of solutions. - for(var/datum/reagent/R in GLOB.chemical_reagents_list) + 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) + medicine += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/toxin)) - toxin += generate_chemwiki_line(R) + toxin += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/consumable)) - consumable += generate_chemwiki_line(R) + consumable += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/plantnutriment)) - plant += generate_chemwiki_line(R) + plant += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/uranium)) - uranium += generate_chemwiki_line(R) + uranium += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/colorful_reagent)) - colours += generate_chemwiki_line(R) + colours += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/mutationtoxin)) - muta += generate_chemwiki_line(R) + muta += generate_chemwiki_line(R, X) else if(istype(R, /datum/reagent/fermi)) - fermi += generate_chemwiki_line(R) + fermi += generate_chemwiki_line(R, X) else - remainder += generate_chemwiki_line(R) + remainder += generate_chemwiki_line(R, X) + + 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") - log_sql("------------BEGINNING OF REAGENTS VAR DUMP:------------------\n") - log_sql("----------------------------------------------------------------------------------\n\n\n") - log_sql("#BASIC REAGENTS\n[prefix][remainder]\n") - log_sql("#MEDICINE:\n[prefix][medicine]\n#TOXIN:\n[prefix][toxin]\n#CONSUMABLE\n[prefix][consumable]\n") - log_sql("#FERMI\nThese chems lie on the cutting edge of chemical technology, and as such are not recommended for beginners!\n[prefix][fermi]\n") - log_sql("#PLANTS\n[prefix][plant]\n#URANIUM\n[prefix][uranium]\n#COLOURS\n[prefix][colours]\n") - log_sql("#RACE MUTATIONS\n[prefix][muta]\n") - - - -/proc/generate_chemwiki_line(datum/reagent/R) +/proc/generate_chemwiki_line(datum/reagent/R, X) //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 = GLOB.chemical_reactions_list[R.id] - var/outstring = "[R.name] | [R.pH] | " + + var/datum/chemical_reaction/CR = get_chemical_reaction(R.id) + + //message_admins("[CR]") + var/outstring = "|[R.name] !\[[R.color]\](https://placehold.it/15/[copytext(R.color, 2, 8)]/000000?text=+)| [R.pH] | " var/datum/reagent/R3 if(CR) outstring += "| fill in manually " + + outstring += "| " @@ -187,6 +187,7 @@ if(CR.is_cold_recipe) outstring += "
  • Cold: Yes
    • " if(CR.required_container) + outstring += "
  • Required container: [CR.required_container]
    • " if(CR.mob_react) outstring += "
  • Can react in mob: Yes
    • " From 6814aae0f8d947fda0b5b3840e4d720e27eb0660 Mon Sep 17 00:00:00 2001 From: Fermi <> Date: Mon, 16 Sep 2019 21:28:23 +0100 Subject: [PATCH 12/16] Tweaks! --- code/modules/reagents/chem_wiki_render.dm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm index 7565f90818..3d35b7e4db 100644 --- a/code/modules/reagents/chem_wiki_render.dm +++ b/code/modules/reagents/chem_wiki_render.dm @@ -92,7 +92,7 @@ return "" - var/outstring = "|

    !\[[R.color]\](https://placehold.it/15/[copytext(R.color, 2, 8)]/000000?text=+)[R.name]

     pH: [R.pH] | " + var/outstring = "|
    !\[[R.color]\](https://placehold.it/15/[copytext(R.color, 2, 8)]/000000?text=+)[R.name]
     pH: [R.pH] | " var/datum/reagent/R3 if(CR) outstring += " |