From 8ccc4279133e4a64a2fdde8a133d4aaa55f07274 Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Sun, 29 May 2022 04:47:34 +0200 Subject: [PATCH] Makes chem master not use an incorrect constant (#67339) --- .../reagents/chemistry/machinery/chem_master.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index e10fe75cd98..3c7c895c537 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -445,18 +445,17 @@ return FALSE if(action == "analyze") - var/datum/reagent/R = GLOB.name2reagent[params["id"]] - if(R) + var/datum/reagent/analyzed_reagent = GLOB.name2reagent[params["id"]] + if(analyzed_reagent) var/state = "Unknown" - if(initial(R.reagent_state) == 1) + if(initial(analyzed_reagent.reagent_state) == SOLID) state = "Solid" - else if(initial(R.reagent_state) == 2) + else if(initial(analyzed_reagent.reagent_state) == LIQUID) state = "Liquid" - else if(initial(R.reagent_state) == 3) + else if(initial(analyzed_reagent.reagent_state) == GAS) state = "Gas" - var/const/P = 3 //The number of seconds between life ticks - var/T = initial(R.metabolization_rate) * (60 / P) - analyze_vars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "pH" = initial(R.ph)) + var/metabolization_rate = initial(analyzed_reagent.metabolization_rate) * (60 / SSMOBS_DT) + analyze_vars = list("name" = initial(analyzed_reagent.name), "state" = state, "color" = initial(analyzed_reagent.color), "description" = initial(analyzed_reagent.description), "metaRate" = metabolization_rate, "overD" = initial(analyzed_reagent.overdose_threshold), "pH" = initial(analyzed_reagent.ph)) screen = "analyze" return TRUE