The Computer-ening (#13831)

code/modules/power/sensors/sensor_monitoring.dm

@@ -6,10 +6,9 @@
 /obj/machinery/computer/power_monitor
 	name = "Power Monitoring Console"
 	desc = "Computer designed to remotely monitor power levels around the station"
-	icon = 'icons/obj/computer.dmi'
-
-	icon_screen = "engi"
-	light_color = "#ffcc33"
+	icon_screen = "power"
+	icon_keyboard = "yellow_key"
+	light_color = LIGHT_COLOR_YELLOW
 
 	//computer stuff
 	density = 1
@@ -32,10 +31,10 @@
 	if(stat & NOPOWER)
 		icon_screen = null
 	else if(alerting)
-		icon_screen = "engi_alarm_on"
+		icon_screen = "power_alert"
 	else
-		icon_screen = "engi"
-	..()
+		icon_screen = "power"
+	. = ..()
 
 // On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.
 /obj/machinery/computer/power_monitor/Initialize()

code/modules/power/solar.dm

@@ -273,8 +273,8 @@
 /obj/machinery/power/solar_control
 	name = "solar panel control"
 	desc = "A controller for solar panel arrays."
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "computer"
+	icon = 'icons/obj/modular_console.dmi'
+	light_color = LIGHT_COLOR_YELLOW
 	anchored = 1
 	density = 1
 	use_power = POWER_USE_IDLE
@@ -348,21 +348,6 @@
 	if(!connect_to_network()) return
 	set_panels(cdir)
 
-/obj/machinery/power/solar_control/update_icon()
-	icon_state = initial(icon_state)
-	cut_overlays()
-	if(stat & BROKEN)
-		icon_state = "computer-broken"
-		add_overlay("broken")
-		return
-	if(stat & NOPOWER)
-		icon_state = "computer"
-		return
-	add_overlay("solar")
-	if(cdir > -1)
-		add_overlay(image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)))
-	return
-
 /obj/machinery/power/solar_control/attack_hand(mob/user)
 	if(!..())
 		interact(user)
@@ -502,6 +487,10 @@
 /obj/machinery/power/solar_control/power_change()
 	..()
 	update_icon()
+	if(stat & NOPOWER)
+		set_light(0)
+	else
+		set_light(2, 1.3, light_color)
 
 
 /obj/machinery/power/solar_control/proc/broken()
@@ -529,6 +518,8 @@
 
 /obj/machinery/power/solar_control/autostart/Initialize()
 	. = ..()
+	power_change()
+	update_icon()
 	addtimer(CALLBACK(src, .proc/do_solars), 1800)
 
 /obj/machinery/power/solar_control/autostart/proc/do_solars()
@@ -537,6 +528,24 @@
 		connected_tracker.modify_angle(sun.angle)
 	set_panels(cdir)
 
+/obj/machinery/power/solar_control/update_icon()
+	cut_overlays()
+	if(stat & NOPOWER)
+		set_light(0)
+		return
+	else
+		set_light(2, 1.3, light_color)
+
+	icon_state = initial(icon_state)
+
+	if(stat & BROKEN)
+		icon_state = "[initial(icon_state)]-broken"
+		holographic_overlay(src, src.icon, "broken")
+		add_overlay("red_key")
+	else
+		holographic_overlay(src, src.icon, "solar")
+		add_overlay("yellow_key")
+
 //
 // MISC
 //

code/modules/power/turbine.dm

@@ -28,9 +28,10 @@
 /obj/machinery/computer/turbine_computer
 	name = "Gas turbine control computer"
 	desc = "A computer to remotely control a gas turbine"
-	icon = 'icons/obj/computer.dmi'
+	icon_screen = "enginecontrol"
+	icon_keyboard = "cyan_key"
+	light_color = LIGHT_COLOR_CYAN
 
-	icon_screen = "command"
 	circuit = /obj/item/circuitboard/turbine_control
 	anchored = 1
 	density = 1