From e08c89ce48711114cf75ad53d7cbb5584377c7a7 Mon Sep 17 00:00:00 2001
From: Artur <arturpaavooskari.lang@gmail.com>
Date: Fri, 21 Feb 2020 15:10:39 +0200
Subject: [PATCH] Reverts some

---
 code/modules/power/solar.dm   | 32 +++++++++++++++-----------------
 code/modules/power/tracker.dm | 24 ++----------------------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index e31c0c905b..021b575fef 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -27,15 +27,16 @@
 
 /obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S)
 	. = ..()
-	panel = new()
-#if DM_VERSION >= 513
-	panel.vis_flags = VIS_INHERIT_ID|VIS_INHERIT_ICON|VIS_INHERIT_PLANE
-	vis_contents += panel
-#endif
-	panel.icon = icon
-	panel.icon_state = "solar_panel"
-	panel.layer = FLY_LAYER
-	Make(S)
+	if(!S)
+		assembly = new /obj/item/solar_assembly
+		assembly.glass_type = new /obj/item/stack/sheet/glass(null, 2)
+		assembly.anchored = TRUE
+	else
+		S.moveToNullspace()
+		assembly = S
+	assembly.glass_type.on_solar_construction(src)
+	obj_integrity = max_integrity
+	update_icon()
 	connect_to_network()
 	RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/queue_update_solar_exposure)
 
@@ -78,7 +79,7 @@
 
 /obj/machinery/power/solar/obj_break(damage_flag)
 	if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
-		playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
+		playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE)
 		stat |= BROKEN
 		unset_control()
 		update_icon()
@@ -324,16 +325,13 @@
 					if(!T.control) //i.e unconnected
 						T.set_control(src)
 
-/obj/machinery/power/solar_control/update_icon()
+/obj/machinery/power/solar/update_icon()
+	..()
 	cut_overlays()
-	if(stat & NOPOWER)
-		add_overlay("[icon_keyboard]_off")
-		return
-	add_overlay(icon_keyboard)
 	if(stat & BROKEN)
-		add_overlay("[icon_state]_broken")
+		add_overlay(mutable_appearance(icon, "solar_panel-b", FLY_LAYER))
 	else
-		add_overlay(icon_screen)
+		add_overlay(mutable_appearance(icon, "solar_panel", FLY_LAYER))
 
 /obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 												datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 3ee75ea130..69d2564892 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -18,15 +18,7 @@
 
 /obj/machinery/power/tracker/Initialize(mapload, obj/item/solar_assembly/S)
 	. = ..()
-	if(!S)
-		assembly = new /obj/item/solar_assembly
-		assembly.glass_type = new /obj/item/stack/sheet/glass(null, 2)
-		assembly.tracker = TRUE
-		assembly.anchored = TRUE
-	else
-		S.moveToNullspace()
-		assembly = S
-	update_icon()
+	Make(S)
 	connect_to_network()
 	RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/sun_update)
 
@@ -47,16 +39,6 @@
 		control.connected_tracker = null
 		control = null
 
-//updates the tracker icon and the facing angle for the control computer
-/obj/machinery/power/tracker/proc/set_angle(angle)
-	sun_angle = angle
-
-	//set icon dir to show sun illumination
-	setDir(turn(NORTH, -angle - 22.5)	)// 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST
-
-	if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet
-		control.currentdir = angle
-
 ///Tell the controller to turn the solar panels
 /obj/machinery/power/tracker/proc/sun_update(datum/source, azimuth)
 	setDir(angle2dir(azimuth))
@@ -69,9 +51,7 @@
 		S.glass_type = new /obj/item/stack/sheet/glass(null, 2)
 		S.tracker = TRUE
 		S.anchored = TRUE
-	else
-		S.moveToNullspace()
-	update_icon()
+	S.forceMove(src)
 
 /obj/machinery/power/tracker/crowbar_act(mob/user, obj/item/I)
 	playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)