why beaker

This commit is contained in:
nightred
2020-09-25 21:16:32 -05:00
parent 3a70303036
commit 074e745727
@@ -1,5 +1,5 @@
/obj/machinery/chem_master
name = "ChemMaster 3000"
name = "ChemMaster 3001"
desc = "Used to separate chemicals and distribute them in a variety of forms."
density = TRUE
layer = BELOW_OBJ_LAYER
@@ -210,8 +210,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"]
@@ -220,7 +218,10 @@
amount = text2num(input(
"Enter the amount you want to transfer:",
name, ""))
if (amount == null || amount <= 0)
if (to_container == "beaker" && !mode)
reagents.remove_reagent(reagent, amount)
return TRUE
if (!beaker || amount == null || amount <= 0)
return FALSE
if (to_container == "buffer")
beaker.reagents.trans_id_to(src, reagent, amount)
@@ -228,9 +229,6 @@
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")