From 410c960f798813276bd9f824edbfdbe92322c97b Mon Sep 17 00:00:00 2001
From: Sishen <sishen1542@gmail.com>
Date: Sat, 22 Jun 2019 18:35:04 -0400
Subject: [PATCH 1/3] Update chem_dispenser.dm

---
 .../chemistry/machinery/chem_dispenser.dm     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index d10e57783d..882bee63a5 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -51,13 +51,15 @@
 //these become available once upgraded.
 	var/list/upgrade_reagents = list(
 		"oil",
-		"ammonia"
+		"ammonia",
+		"ash"
 	)
 
 	var/list/upgrade_reagents2 = list(
 		"acetone",
 		"phenol",
-		"diethylamine"
+		"diethylamine",
+		"saltpetre"
 	)
 
 	var/list/upgrade_reagents3 = list(
@@ -267,7 +269,7 @@
 				if(beaker && dispensable_reagents.Find(r_id)) // but since we verify we have the reagent, it'll be fine
 					var/datum/reagents/R = beaker.reagents
 					var/free = R.maximum_volume - R.total_volume
-					var/actual = min(round(chemicals_to_dispense[key], res), (cell.charge * powerefficiency)*10, free)
+					var/actual = min(max(chemicals_to_dispense[key], res), (cell.charge * powerefficiency)*10, free)
 					if(actual)
 						if(!cell.use(actual / powerefficiency))
 							say("Not enough energy to complete operation!")
@@ -478,9 +480,16 @@
 		"tomatojuice",
 		"lemonjuice",
 		"menthol"
-	) //prevents the soda machine from obtaining chemical upgrades. .
-	upgrade_reagents = null
-	upgrade_reagents2 = null
+	)
+	upgrade_reagents = list(
+		"mushroomhallucinogen",
+		"nothing",
+		"cryoxadone"
+	)
+	upgrade_reagents2 = list(
+		"banana",
+		"berryjuice"
+	)
 	upgrade_reagents3 = null
 	emagged_reagents = list(
 		"thirteenloko",
@@ -533,18 +542,19 @@
 		"creme_de_cacao",
 		"triple_sec",
 		"sake"
-	)//prevents the booze machine from obtaining chemical upgrades.
-	upgrade_reagents = null
+	)
+	upgrade_reagents = list(
+		"ethanol",
+		"fernet"
+	)
 	upgrade_reagents2 = null
 	upgrade_reagents3 = null
 	emagged_reagents = list(
-		"ethanol",
 		"iron",
 		"alexander",
 		"clownstears",
 		"minttoxin",
 		"atomicbomb",
-		"fernet",
 		"aphro",
 		"aphro+"
 	)

From 84e60b1cd2ab360355a71fd37aca5c25ad5740f7 Mon Sep 17 00:00:00 2001
From: Sishen <sishen1542@gmail.com>
Date: Fri, 28 Jun 2019 08:32:56 -0400
Subject: [PATCH 2/3] Update chem_dispenser.dm

---
 code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 882bee63a5..abb65c225a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -59,7 +59,6 @@
 		"acetone",
 		"phenol",
 		"diethylamine",
-		"saltpetre"
 	)
 
 	var/list/upgrade_reagents3 = list(

From 92f530eed105d86e8610bc06c737457c0a81a845 Mon Sep 17 00:00:00 2001
From: Sishen <sishen1542@gmail.com>
Date: Fri, 28 Jun 2019 08:34:35 -0400
Subject: [PATCH 3/3] left the , for diethyl when i removed saltpetre whoops

---
 code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index abb65c225a..ea99f6ad59 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -58,7 +58,7 @@
 	var/list/upgrade_reagents2 = list(
 		"acetone",
 		"phenol",
-		"diethylamine",
+		"diethylamine"
 	)
 
 	var/list/upgrade_reagents3 = list(