cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10291 from PsiOmegaDelta/150725-ChemicalSanity

Browse Source 
Fixes #10285.
This commit is contained in:
GinjaNinja32
2015-07-26 05:22:16 +01:00
parent cc75e8d220 3c1a3f6951
commit c5a6edbb5d
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+3 -11
View File
@@ -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