Merge pull request #6859 from VOREStation/pol-baycomps

Port Bay computer icons

code/game/machinery/computer/RCON_Console.dm

@@ -8,7 +8,7 @@
 	name = "\improper RCON console"
 	desc = "Console used to remotely control electrical machinery on the station."
 	icon_keyboard = "power_key"
-	icon_screen = "power:0"
+	icon_screen = "ai-fixer"
 	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rcon_console
 	req_one_access = list(access_engine)
@@ -40,4 +40,6 @@
 /obj/machinery/computer/rcon/update_icon()
 	..()
 	if(!(stat & (NOPOWER|BROKEN)))
-		overlays += image('icons/obj/computer.dmi', "ai-fixer-empty", overlay_layer)
+		add_overlay("ai-fixer-empty")
+	else
+		cut_overlay("ai-fixer-empty")

code/game/machinery/computer/aifixer.dm

@@ -135,8 +135,8 @@
 
 	if(occupant)
 		if(occupant.stat)
-			overlays += image(icon, "ai-fixer-404", overlay_layer)
+			add_overlay("ai-fixer-404")
 		else
-			overlays += image(icon, "ai-fixer-full", overlay_layer)
+			add_overlay("ai-fixer-full")
 	else
-		overlays += image(icon, "ai-fixer-empty", overlay_layer)
+		add_overlay("ai-fixer-empty")

code/game/machinery/computer/computer.dm

@@ -13,12 +13,10 @@
 	var/icon_screen = "generic"
 	var/light_range_on = 2
 	var/light_power_on = 1
-	var/overlay_layer
 
 	clicksound = "keyboard"
 
 /obj/machinery/computer/New()
-	overlay_layer = layer
 	..()
 
 /obj/machinery/computer/Initialize()
@@ -66,31 +64,28 @@
 	ex_act(2)
 
 /obj/machinery/computer/update_icon()
-	overlays.Cut()
+	cut_overlays()
+	// No power
 	if(stat & NOPOWER)
 		set_light(0)
 		if(icon_keyboard)
-			overlays += image(icon,"[icon_keyboard]_off", overlay_layer)
-		return
+			add_overlay("[icon_keyboard]_off")
+	// Yes power
 	else
+		if(icon_keyboard)
+			add_overlay(icon_keyboard)
 		set_light(light_range_on, light_power_on)
 
-	if(stat & BROKEN)
-		overlays += image(icon,"[icon_state]_broken", overlay_layer)
-	else
-		overlays += image(icon,icon_screen, overlay_layer)
-
-	if(icon_keyboard)
-		overlays += image(icon, icon_keyboard, overlay_layer)
+		// Broken
+		if(stat & BROKEN)
+			add_overlay("[icon_state]_broken")
+		// Not broken
+		else
+			add_overlay(icon_screen)	
 
 /obj/machinery/computer/power_change()
 	..()
 	update_icon()
-	if(stat & NOPOWER)
-		set_light(0)
-	else
-		set_light(light_range_on, light_power_on)
-
 
 /obj/machinery/computer/proc/set_broken()
 	stat |= BROKEN

code/game/machinery/computer/shutoff_monitor.dm

@@ -67,4 +67,4 @@
 /obj/machinery/computer/shutoff_monitor/update_icon()
 	..()
 	if(!(stat & (NOPOWER|BROKEN)))
-		overlays += image('icons/obj/computer.dmi', "ai-fixer-empty", overlay_layer)
+		add_overlay("ai-fixer-empty")

code/modules/power/sensors/sensor_monitoring.dm

@@ -7,7 +7,7 @@
 	name = "Power Monitoring Console"
 	desc = "Computer designed to remotely monitor power levels around the station"
 	icon_keyboard = "power_key"
-	icon_screen = "power:0"
+	icon_screen = "power_monitor"
 	light_color = "#ffcc33"
 
 	//computer stuff
@@ -31,9 +31,9 @@
 /obj/machinery/computer/power_monitor/update_icon()
 	if(!(stat & (NOPOWER|BROKEN)))
 		if(alerting)
-			icon_screen = "power:1"
+			icon_screen = "[initial(icon_screen)]"
 		else
-			icon_screen = "power:0"
+			icon_screen = "[initial(icon_screen)]_warn"
 	..()
 
 // On creation automatically connects to active sensors. This is delayed to ensure sensors already exist.