From 3c1a3f6951fe80e3b0507df7b9cfa8a1534f89c2 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 25 Jul 2015 14:15:55 +0200 Subject: [PATCH] Fixes #10285. Adds Topic() input sanity checking. --- code/modules/reagents/Chemistry-Machinery.dm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 6da1a73332c..5778628dbfd 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -364,7 +364,7 @@ if(href_list["amount"]) var/id = href_list["add"] - var/amount = text2num(href_list["amount"]) + var/amount = isgoodnumber(text2num(href_list["amount"])) R.trans_id_to(src, id, amount) else if (href_list["addcustom"]) @@ -378,7 +378,7 @@ if(href_list["amount"]) var/id = href_list["remove"] - var/amount = text2num(href_list["amount"]) + var/amount = isgoodnumber(text2num(href_list["amount"])) if(mode) reagents.trans_id_to(beaker, id, amount) else @@ -542,18 +542,10 @@ /obj/machinery/chem_master/proc/isgoodnumber(var/num) if(isnum(num)) - if(num > 200) - num = 200 - else if(num < 0) - num = 1 - else - num = round(num) - return num + return Clamp(round(num), 0, 200) else return 0 - - /obj/machinery/chem_master/condimaster name = "CondiMaster 3000" condi = 1