From 66ae9f4aac719fd1a9c0d3d575793a0bd594e110 Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Wed, 14 Jan 2015 20:45:20 +1300
Subject: [PATCH 1/3] SMES UI fix

- Changed SMES NanoUI Online/Offline switch to reflect the current state
it is set to
- UI now also displays it's output status:
- Outputting = SMES is switched online and outputting normally
- Not Outputting = SMES is switched to offline
- Stored energy too low = SMES is set to online but can't output because
it doesn't have enough charge
---
 code/modules/power/smes.dm | 9 ++++++++-
 nano/templates/smes.tmpl   | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 11bcef5881..ec5225b54b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -301,6 +301,13 @@
 	data["outputMax"] = output_level_max
 	data["outputLoad"] = round(output_used)
 
+	if(outputting)
+		data["outputting"] = 2			// smes is outputting
+	else if(!outputting && output_attempt && charge < output_level)
+		data["outputting"] = 1			// smes is online but not outputting because it's charge level is too low
+	else
+		data["outputting"] = 0			// smes is not outputting
+
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
@@ -326,7 +333,7 @@
 		update_icon()
 
 	else if( href_list["online"] )
-		outputting(!outputting)
+		outputting(!output_attempt)
 		update_icon()
 	else if( href_list["input"] )
 		switch( href_list["input"] )
diff --git a/nano/templates/smes.tmpl b/nano/templates/smes.tmpl
index 8b72cefedd..799ac3911d 100644
--- a/nano/templates/smes.tmpl
+++ b/nano/templates/smes.tmpl
@@ -50,6 +50,14 @@
 	</div>
 	<div class="itemContent">
 		{{:helper.link('Online', 'power', {'online' : 1}, data.outputOnline ? 'selected' : null)}}{{:helper.link('Offline', 'close', {'online' : 1}, data.outputOnline ? null : 'selected')}}
+		&nbsp;
+		{{if data.outputting == 2}}
+			[<span class='good'>Outputting</span>]
+		{{else data.outputting == 1}}
+			[<span class='average'>Stored energy too low</span>]
+		{{else}}
+			[<span class='bad'>Not Outputting</span>]
+		{{/if}}
 	</div>
 </div>
 

From f479ba9212b1460480e85bcd3fe3bb087a5f2f14 Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Wed, 14 Jan 2015 22:03:29 +1300
Subject: [PATCH 2/3] SMES UI tweak

Switching this to mirror output switching as in the last commit
---
 code/modules/power/smes.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index ec5225b54b..546b9ef465 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -329,7 +329,7 @@
 		return 1
 
 	if( href_list["cmode"] )
-		inputting(!inputting)
+		inputting(!input_attempt)
 		update_icon()
 
 	else if( href_list["online"] )

From f711e3b24c52617dd9ed0713084d28e6cd7e2de0 Mon Sep 17 00:00:00 2001
From: Loganbacca <wookieemanlogan@hotmail.com>
Date: Thu, 15 Jan 2015 15:35:45 +1300
Subject: [PATCH 3/3] Removed unnecessary check

---
 code/modules/power/smes.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 546b9ef465..18aa6b4885 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -303,7 +303,7 @@
 
 	if(outputting)
 		data["outputting"] = 2			// smes is outputting
-	else if(!outputting && output_attempt && charge < output_level)
+	else if(!outputting && output_attempt)
 		data["outputting"] = 1			// smes is online but not outputting because it's charge level is too low
 	else
 		data["outputting"] = 0			// smes is not outputting