From be79fd01c5899fbd978cbda589b0864a9d3940d2 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant2@gmail.com>
Date: Wed, 17 Aug 2016 13:53:36 -0700
Subject: [PATCH] Line note fixes (forgot the tesla in the mecha code hue)

---
 .../game/mecha/equipment/tools/other_tools.dm |  9 --------
 code/game/mecha/mecha.dm                      | 23 +++++--------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index e57ee9ba8a2..af3e5c46bf4 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -348,17 +348,11 @@
 	var/fuel_per_cycle_active = 100
 	var/power_per_cycle = 30
 
-/obj/item/mecha_parts/mecha_equipment/generator/New()
-	..()
-	generator_init()
 
 /obj/item/mecha_parts/mecha_equipment/generator/Destroy()
 	processing_objects.Remove(src)
 	return ..()
 
-/obj/item/mecha_parts/mecha_equipment/generator/proc/generator_init()
-	fuel_amount = 0
-
 /obj/item/mecha_parts/mecha_equipment/generator/detach()
 	processing_objects.Remove(src)
 	..()
@@ -482,9 +476,6 @@
 	power_per_cycle = 50
 	var/rad_per_cycle = 0.3
 
-/obj/item/mecha_parts/mecha_equipment/generator/nuclear/generator_init()
-	fuel_amount = 0
-
 /obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
 	return
 
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 69189e51456..576df927ca6 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1320,34 +1320,23 @@
 	return (get_charge()>=amount)
 
 /obj/mecha/proc/get_charge()
-	return call((proc_res["dyngetcharge"]||src), "dyngetcharge")()
-
-/obj/mecha/proc/dyngetcharge()//returns null if no powercell, else returns cell.charge
-	if(!cell) return
-	diag_hud_set_mechcell()
-	return max(0, cell.charge)
+	for(var/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/R in equipment)
+		var/relay_charge = R.get_charge()
+		if(relay_charge)
+			return relay_charge
+	if(cell)
+		return max(0, cell.charge)
 
 /obj/mecha/proc/use_power(amount)
-	return call((proc_res["dynusepower"]||src), "dynusepower")(amount)
-
-/obj/mecha/proc/dynusepower(amount)
 	if(get_charge())
 		cell.use(amount)
 		return 1
-	//Diagnostic HUD updates
-	diag_hud_set_mechhealth()
-	diag_hud_set_mechcell()
-	diag_hud_set_mechstat()
 	return 0
 
 /obj/mecha/proc/give_power(amount)
 	if(!isnull(get_charge()))
 		cell.give(amount)
 		return 1
-	//Diagnostic HUD updates
-	diag_hud_set_mechhealth()
-	diag_hud_set_mechcell()
-	diag_hud_set_mechstat()
 	return 0
 
 /obj/mecha/proc/reset_icon()