Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms

Conflicts:
	code/__HELPERS/lists.dm

code/modules/power/cable.dm

@@ -560,14 +560,14 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
 		if(!istype(usr.loc,/turf)) return
 		if(src.amount <= 14)
-			usr << "\red You need at least 15 lengths to make restraints!"
+			usr << "<span class='warning'>You need at least 15 lengths to make restraints!</span>"
 			return
 		var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
-		B.icon_state = "cuff_[color]"
-		usr << "\blue You wind some cable together to make some restraints."
+		B.color = color
+		usr << "<span class='notice'>You wind some cable together to make some restraints.</span>"
 		src.use(15)
 	else
-		usr << "\blue You cannot do that."
+		usr << "<span class='warning'>You cannot do that.</span>"
 	..()
 
 // Items usable on a cable coil :

code/modules/power/solar.dm

@@ -303,11 +303,13 @@
 	..()
 	if(!powernet) 
 		return
+	connect_to_network()
+	set_panels(cdir)
 	if(autostart)
 		src.search_for_connected()
 		if(connected_tracker && track == 2)
 			connected_tracker.set_angle(sun.angle)
-	set_panels(cdir)
+		set_panels(cdir)
 
 /obj/machinery/power/solar_control/Destroy()
 	for(var/obj/machinery/power/solar/M in connected_panels)