cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] ChemMaster does not need beaker to destroy chems (#1079)

Browse Source 
* Merge pull request #53983 from nightred/chemmaster

ChemMaster does not need beaker to destroy chems

* ChemMaster does not need beaker to destroy chems

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-30 17:54:41 +02:00
committed by GitHub
co-authored by ShizCalev
parent 3acfae9157
commit 3a51665bf1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_master.dm
+5 -5
View File
@@ -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")