Merge pull request #1836 from Markolie/power

Power monitor update

code/modules/nano/modules/power_monitor.dm

@@ -25,6 +25,7 @@
 			return
 		data["poweravail"] = powermonitor.powernet.avail
 		data["powerload"] = num2text(powermonitor.powernet.viewload,10)	
+		data["powerdemand"] = powermonitor.powernet.load
 		data["apcs"] = apc_repository.apc_data(powermonitor)
 	
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

code/modules/power/power.dm

@@ -44,6 +44,12 @@
 		return powernet.avail
 	else
 		return 0
+		
+/obj/machinery/power/proc/load()
+	if(powernet)
+		return powernet.load
+	else
+		return 0
 
 /obj/machinery/power/proc/disconnect_terminal() // machines without a terminal will just return, no harm no fowl.
 	return