tgui power monitor; linegraph component

code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm

@@ -6,7 +6,6 @@
 	var/icon_state_open = "cold_off"
 	density = TRUE
 	anchored = TRUE
-	idle_power_usage = 25
 
 	var/on = FALSE
 	var/min_temperature = 0

code/modules/power/apc.dm

@@ -625,7 +625,7 @@
 		"powerCellStatus" = cell ? cell.percent() : null,
 		"chargeMode" = chargemode,
 		"chargingStatus" = charging,
-		"totalLoad" = lastused_equip + lastused_light + lastused_environ,
+		"totalLoad" = lastused_total,
 		"coverLocked" = coverlocked,
 		"siliconUser" = user.has_unlimited_silicon_privilege,
 		"malfStatus" = get_malf_status(user),

code/modules/power/cable.dm

@@ -114,11 +114,6 @@ By design, d1 is the smallest direction and d2 is the highest
 	else
 		icon_state = "[d1]-[d2]"
 
-
-// returns the powernet this cable belongs to
-/obj/structure/cable/proc/get_powernet()			//TODO: remove this as it is obsolete
-	return powernet
-
 //Telekinesis has no effect on a cable
 /obj/structure/cable/attack_tk(mob/user)
 	return

code/modules/power/monitor.dm

@@ -0,0 +1,81 @@
+/obj/machinery/computer/monitor
+	name = "power monitoring console"
+	desc = "It monitors power levels across the station."
+	icon_screen = "power"
+	icon_keyboard = "power_key"
+	use_power = 2
+	idle_power_usage = 20
+	active_power_usage = 100
+	circuit = /obj/item/weapon/circuitboard/powermonitor
+
+	var/obj/structure/cable/attached
+
+	var/list/history = list()
+	var/record_size = 60
+	var/record_interval = 50
+	var/next_record = 0
+
+/obj/machinery/computer/monitor/New()
+	..()
+	search()
+	history["supply"] = list()
+	history["demand"] = list()
+
+/obj/machinery/computer/monitor/process()
+	if(!attached)
+		use_power = 1
+		search()
+	else
+		use_power = 2
+		record()
+
+/obj/machinery/computer/monitor/proc/search()
+	var/turf/T = get_turf(src)
+	attached = locate() in T
+
+/obj/machinery/computer/monitor/proc/record()
+	if(world.time >= next_record)
+		next_record = world.time + record_interval
+
+		var/list/supply = history["supply"]
+		supply += attached.powernet.viewavail
+		if(supply.len > record_size)
+			supply.Cut(1, 2)
+
+		var/list/demand = history["demand"]
+		demand += attached.powernet.viewload
+		if(demand.len > record_size)
+			demand.Cut(1, 2)
+
+/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
+											datum/tgui/master_ui = null, datum/ui_state/state = default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "power_monitor", name, 1200, 1000, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/monitor/get_ui_data()
+	var/list/data = list()
+	data["stored"] = record_size
+	data["interval"] = record_interval / 10
+	data["attached"] = attached ? TRUE : FALSE
+	if(attached)
+		data["supply"] = attached.powernet.viewavail
+		data["demand"] = attached.powernet.viewload
+	data["history"] = history
+
+	data["areas"] = list()
+	for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
+		var/obj/machinery/power/apc/A = term.master
+		if(istype(A))
+			data["areas"] += list(list(
+				"name" = A.area.name,
+				"charge" = A.cell.percent(),
+				"load" = A.lastused_total,
+				"charging" = A.charging,
+				"eqp" = A.equipment,
+				"lgt" = A.lighting,
+				"env" = A.environ
+			))
+
+	return data

code/modules/power/power.dm

@@ -34,7 +34,7 @@
 
 /obj/machinery/power/proc/surplus()
 	if(powernet)
-		return powernet.avail-powernet.load
+		return powernet.avail - powernet.load
 	else
 		return 0
 

code/modules/power/powernet.dm

@@ -3,14 +3,15 @@
 // each contiguous network of cables & nodes
 /////////////////////////////////////
 /datum/powernet
+	var/number					// unique id
 	var/list/cables = list()	// all cables & junctions
 	var/list/nodes = list()		// all connected machines
 
 	var/load = 0				// the current load on the powernet, increased by each machine at processing
 	var/newavail = 0			// what available power was gathered last tick, then becomes...
 	var/avail = 0				//...the current available power in the powernet
+	var/viewavail = 0			// the available power as it appears on the power console (gradually updated)
 	var/viewload = 0			// the load as it appears on the power console (gradually updated)
-	var/number = 0				// Unused //TODEL
 	var/netexcess = 0			// excess power on the powernet (typically avail-load)///////
 
 /datum/powernet/New()
@@ -75,7 +76,6 @@
 //handles the power changes in the powernet
 //called every ticks by the powernet controller
 /datum/powernet/proc/reset()
-
 	//see if there's a surplus of power remaining in the powernet and stores unused power in the SMES
 	netexcess = avail - load
 
@@ -83,11 +83,11 @@
 		for(var/obj/machinery/power/smes/S in nodes)	// find the SMESes in the network
 			S.restore()				// and restore some of the power that was used
 
-	//updates the viewed load (as seen on power computers)
-	viewload = 0.8*viewload + 0.2*load
-	viewload = round(viewload)
+	// update power consoles
+	viewavail = round(0.8 * viewavail + 0.2 * avail)
+	viewload = round(0.8 * viewload + 0.2 * load)
 
-	//reset the powernet
+	// reset the powernet
 	load = 0
 	avail = newavail
 	newavail = 0