Merge pull request #53983 from nightred/chemmaster

ChemMaster does not need beaker to destroy chems
This commit is contained in:
ShizCalev
2020-09-30 11:08:44 -04:00
committed by GitHub
@@ -211,8 +211,6 @@
return TRUE
if(action == "transfer")
if(!beaker)
return FALSE
var/reagent = GLOB.name2reagent[params["id"]]
var/amount = text2num(params["amount"])
var/to_container = params["to"]
@@ -223,15 +221,17 @@
name, ""))
if (amount == null || amount <= 0)
return FALSE
if (to_container == "beaker" && !mode)
reagents.remove_reagent(reagent, amount)
return TRUE
if (!beaker)
return FALSE
if (to_container == "buffer")
beaker.reagents.trans_id_to(src, reagent, amount)
return TRUE
if (to_container == "beaker" && mode)
reagents.trans_id_to(beaker, reagent, amount)
return TRUE
if (to_container == "beaker" && !mode)
reagents.remove_reagent(reagent, amount)
return TRUE
return FALSE
if(action == "toggleMode")