From f0e803f0567ce8e1a11c660f5559d923affac94c Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Tue, 8 Oct 2019 12:38:39 +0100
Subject: [PATCH 1/5] PANIC
---
code/modules/reagents/chem_wiki_render.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index e403e147a6..b3c3a559d7 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -290,12 +290,12 @@
//Description, OD, Addict, Meta
outstring += "[R.description] |
- Metabolism_rate: [R.metabolization_rate/2]u/s
[(R.overdose_threshold?"- Overdose: [R.overdose_threshold]u
":"")] [(R.addiction_threshold?"- Addiction: [R.addiction_threshold]u
":"")] "
- if(R.ImpureChem != "fermiTox" || !R.ImpureChem)
- R3 = GLOB.chemical_reagents_list[R.ImpureChem]
+ if(R.impure_chem != "fermiTox" || !R.impure_chem)
+ R3 = GLOB.chemical_reagents_list[R.impure_chem]
outstring += "- Impure chem:[R3.name]
"
- if(R.InverseChem != "fermiTox" || !R.InverseChem)
- R3 = GLOB.chemical_reagents_list[R.InverseChem]
+ if(R.inverse_chem != "fermiTox" || !R.inverse_chem)
+ R3 = GLOB.chemical_reagents_list[R.inverse_chem]
outstring += "- Inverse chem:[R3.name]
"
From a9ad80691e021f3c5454e09e80f8e8f4056f0809 Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Tue, 8 Oct 2019 12:57:06 +0100
Subject: [PATCH 2/5] Okay this too
---
code/modules/reagents/chem_wiki_render.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index b3c3a559d7..9c99613fcd 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -290,11 +290,11 @@
//Description, OD, Addict, Meta
outstring += "[R.description] | - Metabolism_rate: [R.metabolization_rate/2]u/s
[(R.overdose_threshold?"- Overdose: [R.overdose_threshold]u
":"")] [(R.addiction_threshold?"- Addiction: [R.addiction_threshold]u
":"")] "
- if(R.impure_chem != "fermiTox" || !R.impure_chem)
+ if(R.impure_chem != "fermiTox" && R.impure_chem)
R3 = GLOB.chemical_reagents_list[R.impure_chem]
outstring += "- Impure chem:[R3.name]
"
- if(R.inverse_chem != "fermiTox" || !R.inverse_chem)
+ if(R.inverse_chem != "fermiTox" && R.inverse_chem)
R3 = GLOB.chemical_reagents_list[R.inverse_chem]
outstring += "- Inverse chem:[R3.name]
"
From 9e96f76625bfcac5c750a3f7868c531531721de7 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Tue, 8 Oct 2019 07:00:55 -0500
Subject: [PATCH 3/5] Automatic changelog generation for PR #9443 [ci skip]
---
html/changelogs/AutoChangeLog-pr-9443.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-9443.yml
diff --git a/html/changelogs/AutoChangeLog-pr-9443.yml b/html/changelogs/AutoChangeLog-pr-9443.yml
new file mode 100644
index 0000000000..6bc7507ea9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9443.yml
@@ -0,0 +1,4 @@
+author: "Thalpy"
+delete-after: True
+changes:
+ - bugfix: "fixes broken compiler because a var changed name"
From 10ce91c6861b6b51b80a58507e76fe4ca20d18ff Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Tue, 8 Oct 2019 13:45:16 +0100
Subject: [PATCH 4/5] aaa
---
code/modules/reagents/chem_wiki_render.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index 9c99613fcd..d4a629c508 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -190,10 +190,10 @@
else if(istype(R, /datum/reagent/blob))
blob += generate_chemwiki_line(R, X, processCR)
- /* when merged
+ /*
else if(istype(R, /datum/reagent/impure))
impure += generate_chemwiki_line(R, X, processCR)
- */
+ */
else
remainder += generate_chemwiki_line(R, X, processCR)
From 47c18fd05240fbdf10e702873decde916b5f90b7 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Tue, 8 Oct 2019 07:54:47 -0500
Subject: [PATCH 5/5] Automatic changelog generation for PR #9445 [ci skip]
---
html/changelogs/AutoChangeLog-pr-9445.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-9445.yml
diff --git a/html/changelogs/AutoChangeLog-pr-9445.yml b/html/changelogs/AutoChangeLog-pr-9445.yml
new file mode 100644
index 0000000000..0d479fa63a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9445.yml
@@ -0,0 +1,4 @@
+author: "Thalpy"
+delete-after: True
+changes:
+ - bugfix: "impure travis var anger"