From 8e52273e20d171f82b9a27838056608780e650a9 Mon Sep 17 00:00:00 2001
From: Hubblenaut <aschnelle@web.de>
Date: Wed, 4 May 2016 16:35:12 +0200
Subject: [PATCH] RCON Interface Update (#1545)

* SMES interface charging fix

* Updates RCON console to use kW units
---
 code/modules/nano/modules/rcon.dm | 10 +++++-----
 code/modules/power/smes.dm        |  2 +-
 nano/templates/rcon.tmpl          |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/modules/nano/modules/rcon.dm b/code/modules/nano/modules/rcon.dm
index 8950f1228e..85387d5a04 100644
--- a/code/modules/nano/modules/rcon.dm
+++ b/code/modules/nano/modules/rcon.dm
@@ -17,10 +17,10 @@
 		smeslist.Add(list(list(
 		"charge" = round(SMES.Percentage()),
 		"input_set" = SMES.input_attempt,
-		"input_val" = round(SMES.input_level),
+		"input_val" = round(SMES.input_level/1000, 0.1),
 		"output_set" = SMES.output_attempt,
-		"output_val" = round(SMES.output_level),
-		"output_load" = round(SMES.output_used),
+		"output_val" = round(SMES.output_level/1000, 0.1),
+		"output_load" = round(SMES.output_used/1000, 0.1),
 		"RCON_tag" = SMES.RCon_tag
 		)))
 
@@ -63,12 +63,12 @@
 	if(href_list["smes_in_set"])
 		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_in_set"])
 		if(SMES)
-			var/inputset = input(usr, "Enter new input level (0-[SMES.input_level_max])", "SMES Input Power Control") as num
+			var/inputset = (input(usr, "Enter new input level (0-[SMES.input_level_max/1000] kW)", "SMES Input Power Control", SMES.input_level/1000) as num) * 1000
 			SMES.set_input(inputset)
 	if(href_list["smes_out_set"])
 		var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(href_list["smes_out_set"])
 		if(SMES)
-			var/outputset = input(usr, "Enter new output level (0-[SMES.output_level_max])", "SMES Input Power Control") as num
+			var/outputset = (input(usr, "Enter new output level (0-[SMES.output_level_max/1000] kW)", "SMES Input Power Control", SMES.output_level/1000) as num) * 1000
 			SMES.set_output(outputset)
 
 	if(href_list["toggle_breaker"])
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 444682b4bf..9fc0f74290 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -303,7 +303,7 @@
 	data["storedCapacity"] = round(100.0*charge/capacity, 0.1)
 	data["storedCapacityAbs"] = round(charge/(1000*60), 0.1)
 	data["storedCapacityMax"] = round(capacity/(1000*60))
-	data["charging"] = round(inputting/1000, 0.1)
+	data["charging"] = inputting
 	data["chargeMode"] = input_attempt
 	data["chargeLevel"] = round(input_level/1000, 0.1)
 	data["chargeMax"] = round(input_level_max/1000)
diff --git a/nano/templates/rcon.tmpl b/nano/templates/rcon.tmpl
index c4337a0731..e16062aec4 100644
--- a/nano/templates/rcon.tmpl
+++ b/nano/templates/rcon.tmpl
@@ -27,12 +27,12 @@
 						</div>
 					{{if !data.hide_smes_details}}
 						<tr><td>
-						Input: {{:value.input_val}}W - {{:value.input_set ? "AUTO" : "OFF"}}
+						Input: {{:value.input_val}} kW - {{:value.input_set ? "AUTO" : "OFF"}}
 						<td>
 						{{:helper.link('', 'power', { 'smes_in_toggle' : value.RCON_tag})}}
 						{{:helper.link('', 'pencil', { 'smes_in_set' : value.RCON_tag})}}
 						<tr><td>
-						Output: {{:value.output_val}}W - {{:value.output_set ? "ONLINE" : "OFFLINE"}}
+						Output: {{:value.output_val}} kW - {{:value.output_set ? "ONLINE" : "OFFLINE"}}
 						<td>
 						{{:helper.link('', 'power', { 'smes_out_toggle' : value.RCON_tag})}}
 						{{:helper.link('', 'pencil', { 'smes_out_set' : value.RCON_tag})}}
@@ -40,7 +40,7 @@
 						<tr><td>
 						Output Load: 
 						<td>
-						{{:value.output_load}}W
+						{{:value.output_load}} kW
 					{{/if}}
 				</table>
 			</div>