From d1dbcbe2039e1d4004c916773c1764a83f5d3f3a Mon Sep 17 00:00:00 2001
From: phil235 <marin.phil@gmail.com>
Date: Mon, 27 Oct 2014 16:33:55 +0100
Subject: [PATCH 1/3] Trying to make milk or cream with the biogenerator while
 its container is full no longer uses any points and gives an error message
 instead.

---
 code/modules/hydroponics/biogenerator.dm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 3b76c06082c..45abf174b97 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -127,6 +127,9 @@
 			if("void")
 				dat += "<div class='statusDisplay'>Error: No growns inside.<BR>Please, put growns into reactor.</div>"
 				menustat = "menu"
+			if("beakerfull")
+				dat += "<div class='statusDisplay'>Container full. Unable to create product.</div>"
+				menustat = "menu"
 		if(beaker)
 			dat += "<div class='statusDisplay'>Biomass: [points] units.</div><BR>"
 			dat += "<A href='?src=\ref[src];activate=1'>Activate</A><A href='?src=\ref[src];detach=1'>Detach Container</A>"
@@ -205,9 +208,15 @@
 /obj/machinery/biogenerator/proc/create_product(var/create)
 	switch(create)
 		if("milk")
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+				menustat = "beakerfull"
+				return 0
 			if (check_cost(20/efficiency)) return 0
 			else beaker.reagents.add_reagent("milk",10)
 		if("cream")
+			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+				menustat = "beakerfull"
+				return 0
 			if (check_cost(30/efficiency)) return 0
 			else beaker.reagents.add_reagent("cream",10)
 		if("meat")

From 2bb61534ddb0e761af642d1269e3e4b37c379f82 Mon Sep 17 00:00:00 2001
From: phil235 <marin.phil@gmail.com>
Date: Mon, 27 Oct 2014 17:01:53 +0100
Subject: [PATCH 2/3] Removing an unused var and argument. Container now checks
 if there's enough space to hold all the reagent.

---
 code/modules/hydroponics/biogenerator.dm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 45abf174b97..67b532612bd 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -127,8 +127,8 @@
 			if("void")
 				dat += "<div class='statusDisplay'>Error: No growns inside.<BR>Please, put growns into reactor.</div>"
 				menustat = "menu"
-			if("beakerfull")
-				dat += "<div class='statusDisplay'>Container full. Unable to create product.</div>"
+			if("nobeakerspace")
+				dat += "<div class='statusDisplay'>Not enough space left in container. Unable to create product.</div>"
 				menustat = "menu"
 		if(beaker)
 			dat += "<div class='statusDisplay'>Biomass: [points] units.</div><BR>"
@@ -205,19 +205,20 @@
 		updateUsrDialog()
 		return 0
 
+/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount)
+	if(beaker.reagents.total_volume + reagent_amount >= beaker.reagents.maximum_volume)
+		menustat = "nobeakerspace"
+		return 1
+
 /obj/machinery/biogenerator/proc/create_product(var/create)
 	switch(create)
 		if("milk")
-			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				menustat = "beakerfull"
-				return 0
-			if (check_cost(20/efficiency)) return 0
+			if(check_container_volume(10)) return 0
+			else if (check_cost(20/efficiency)) return 0
 			else beaker.reagents.add_reagent("milk",10)
 		if("cream")
-			if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
-				menustat = "beakerfull"
-				return 0
-			if (check_cost(30/efficiency)) return 0
+			if(check_container_volume(10)) return 0
+			else if (check_cost(30/efficiency)) return 0
 			else beaker.reagents.add_reagent("cream",10)
 		if("meat")
 			if (check_cost(250/efficiency)) return 0
@@ -283,12 +284,11 @@
 	else if(href_list["create"])
 		var/amount = (text2num(href_list["amount"]))
 		var/i = amount
-		var/cost = (text2num(href_list["cost"]))
 		var/C = href_list["create"]
 		if(i <= 0)
 			return
 		while(i >= 1)
-			create_product(C, cost, i)
+			create_product(C)
 			i--
 		updateUsrDialog()
 

From 219ea4f2e20581dd0ac4f981d9ba25126b1ae76d Mon Sep 17 00:00:00 2001
From: phil235 <marin.phil@gmail.com>
Date: Mon, 27 Oct 2014 17:12:17 +0100
Subject: [PATCH 3/3] * Trying to make milk or cream with the biogenerator
 while its container doesn't have enough space no longer uses any points and
 gives an error message instead.

* Remove an unused var and argument.
---
 code/modules/hydroponics/biogenerator.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 67b532612bd..8dbc10d07fb 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -206,7 +206,7 @@
 		return 0
 
 /obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount)
-	if(beaker.reagents.total_volume + reagent_amount >= beaker.reagents.maximum_volume)
+	if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume)
 		menustat = "nobeakerspace"
 		return 1