From 9fa147c6ddd0ce9b8353e6c7f1ba130ac8458ef5 Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Tue, 29 May 2012 00:50:14 +0100
Subject: [PATCH] TG: -Minor polishing tweak to borg hypos. The recharge
 time/cost and recharged chemicals cut in half (same net amount over time, but
 it comes more fluidly). Resets the recharge timer upon switching modes so
 your battery charge and chemicals aren't wasted. -Added the (src)s to the
 robot modules that I forgot. It all seems to work fine without them, but just
 for the sake of consistency... Revision: r3669 Author: 	
 d_h2...@yahoo.com

(Also fixes for equip proc due to two ears.)
---
 code/game/algorithm.dm                   | 11 ++++++++---
 code/modules/chemical/Chemistry-Tools.dm | 13 ++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/code/game/algorithm.dm b/code/game/algorithm.dm
index 1a7be31e4ab..4f0822afe20 100644
--- a/code/game/algorithm.dm
+++ b/code/game/algorithm.dm
@@ -146,12 +146,17 @@ proc/countJob(rank)
 			return
 
 	if(W.slot_flags & SLOT_EARS)
-		if(!src.ears)
+		if(!src.l_ear)
 			if( src.get_active_hand() == W )
 				src.u_equip(W)
-			src.ears = W
+			src.l_ear = W
 			update_clothing()
-			return
+		else if(!src.r_ear)
+			if( src.get_active_hand() == W )
+				src.u_equip(W)
+			src.r_ear = W
+			update_clothing()
+		return
 
 	if(W.slot_flags & SLOT_EYES)
 		if(!src.glasses)
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 8275218a5c7..318fbcf71f1 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -1351,9 +1351,9 @@
 	possible_transfer_amounts = null
 	flags = FPRINT
 	var/mode = 1
-	var/charge_cost = 100
+	var/charge_cost = 50
 	var/charge_tick = 0
-	var/recharge_time = 10 //Time it takes for shots to recharge (in seconds)
+	var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
 
 	New()
 		..()
@@ -1374,13 +1374,13 @@
 			if(R && R.cell)
 				if(mode == 1 && reagents.total_volume < 30) 	//Don't recharge reagents and drain power if the storage is full.
 					R.cell.use(charge_cost) 					//Take power from borg...
-					reagents.add_reagent("tricordrazine",10)	//And fill hypo with reagent.
+					reagents.add_reagent("tricordrazine",5)		//And fill hypo with reagent.
 				if(mode == 2 && reagents.total_volume < 30)
 					R.cell.use(charge_cost)
-					reagents.add_reagent("inaprovaline", 10)
+					reagents.add_reagent("inaprovaline", 5)
 				if(mode == 3 && reagents.total_volume < 30)
 					R.cell.use(charge_cost)
-					reagents.add_reagent("spaceacillin", 10)
+					reagents.add_reagent("spaceacillin", 5)
 		//update_icon()
 		return 1
 
@@ -1404,16 +1404,19 @@
 	playsound(src.loc, 'pop.ogg', 50, 0)		//Change the mode
 	if(mode == 1)
 		mode = 2
+		charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes.
 		reagents.clear_reagents() //Flushes whatever was in the storage previously, so you don't get chems all mixed up.
 		user << "\blue Synthesizer is now producing 'Inaprovaline'."
 		return
 	if(mode == 2)
 		mode = 3
+		charge_tick = 0
 		reagents.clear_reagents()
 		user << "\blue Synthesizer is now producing 'Spaceacillin'."
 		return
 	if(mode == 3)
 		mode = 1
+		charge_tick = 0
 		reagents.clear_reagents()
 		user << "\blue Synthesizer is now producing 'Tricordrazine'."
 		return