Hopefully fix solars for realsies

code/modules/power/tracker.dm

@@ -13,12 +13,16 @@
 	directwired = 1
 	use_power = 0
 
-	var/id = 0
 	var/sun_angle = 0		// sun angle as set by sun datum
 
 /obj/machinery/power/tracker/New(var/turf/loc, var/obj/item/solar_assembly/S)
 	..(loc)
-	Make(S)
+	if(!S)
+		S = new /obj/item/solar_assembly(src)
+		S.glass_type = /obj/item/stack/sheet/glass
+		S.tracker = 1
+		S.anchored = 1
+	S.loc = src
 	connect_to_network()
 
 /obj/machinery/power/tracker/disconnect_from_network()
@@ -27,17 +31,7 @@
 
 /obj/machinery/power/tracker/connect_to_network()
 	..()
-	if(powernet)	//if connected and not already in solar_list...
-		solars_list |= src				//... add it
-
-/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S)
-	if(!S)
-		S = new /obj/item/solar_assembly(src)
-		S.glass_type = /obj/item/stack/sheet/glass
-		S.tracker = 1
-		S.anchored = 1
-	S.loc = src
-	update_icon()
+	solars_list.Add(src)
 
 // called by datum/sun/calc_position() as sun's angle changes
 /obj/machinery/power/tracker/proc/set_angle(var/angle)
@@ -46,31 +40,48 @@
 	//set icon dir to show sun illumination
 	dir = turn(NORTH, -angle - 22.5)	// 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST
 
+	// check we can draw power
+	if(stat & NOPOWER)
+		return
+
 	// find all solar controls and update them
 	// currently, just update all controllers in world
 	// ***TODO: better communication system using network
 	if(powernet)
-		for(var/obj/machinery/power/solar_control/C in powernet.nodes)
+		for(var/obj/machinery/power/solar_control/C in get_solars_powernet())
 			if(powernet.nodes[C])
 				if(get_dist(C, src) < SOLAR_MAX_DIST)
 					C.tracker_update(angle)
 
+
 /obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user)
 
-	if(istype(W, /obj/item/weapon/crowbar))
-		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-		user << "<span class='notice'>You begin to take the glass off the solar tracker...</span>"
+	if(iscrowbar(W))
+		playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
 		if(do_after(user, 50))
 			var/obj/item/solar_assembly/S = locate() in src
 			if(S)
 				S.loc = src.loc
 				S.give_glass()
-			playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+			playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
 			user.visible_message("<span class='notice'>[user] takes the glass off the tracker.</span>")
-			qdel(src)
+			del(src)
 		return
 	..()
 
+// timed process
+// make sure we can draw power from the powernet
+/obj/machinery/power/tracker/process()
+
+	var/avail = surplus()
+
+	if(avail > 500)
+		add_load(500)
+		stat &= ~NOPOWER
+	else
+		stat |= NOPOWER
+
+
 // Tracker Electronic
 
 /obj/item/weapon/tracker_electronics