Moves string overlays to use images. (#10686)

* Moves string overlays to use images.

* Fixed overlays being missed in replace due to unexpected string characters.

code/ATMOSPHERICS/components/binary_devices/MSGS.dm

@@ -224,19 +224,19 @@
 
 	overlays.Cut()
 	if(node1)
-		overlays += "node-1"
+		overlays += image(icon = icon, icon_state = "node-1")
 
 	if(node2)
-		overlays += "node-2"
+		overlays += image(icon = icon, icon_state = "node-2")
 
 	if(!(stat & (NOPOWER | BROKEN)))
 
-		overlays += "o-[i]"
+		overlays += image(icon = icon, icon_state = "o-[i]")
 
-		overlays += "p"
+		overlays += image(icon = icon, icon_state = "p")
 
 		if(on)
-			overlays += "i"
+			overlays += image(icon = icon, icon_state = "i")
 
 /obj/machinery/atmospherics/binary/msgs/wrenchAnchor(mob/user)
 	..()

code/ATMOSPHERICS/hvac/spaceheater.dm

@@ -69,7 +69,7 @@
 	icon_state = "[base_state][on]"
 	set_light(on ? light_range_on : 0, light_power_on)
 	if(panel_open)
-		overlays  += "[base_state]-open"
+		overlays += image(icon = icon, icon_state = "[base_state]-open")
 	return
 
 /obj/machinery/space_heater/campfire/update_icon()

code/WorkInProgress/autopsy.dm

@@ -158,7 +158,7 @@
 	var/obj/item/weapon/paper/P = new(usr.loc)
 	P.name = "Autopsy Data ([target_name])"
 	P.info = "<tt>[scan_data]</tt>"
-	P.overlays += "paper_words"
+	P.overlays += image(icon = P.icon, icon_state = "paper_words")
 
 	if(istype(usr,/mob/living/carbon))
 		// place the item in the usr's hand if possible

code/_onclick/hud/spell_screen_objects.dm

@@ -205,9 +205,9 @@
 
 	last_charge = spell.charge_counter
 
-	overlays -= "silence"
+	overlays -= image(icon = icon, icon_state = "silence")
 	if(spell.silenced)
-		overlays += "silence"
+		overlays += image(icon = icon, icon_state = "silence")
 
 /obj/screen/spell/Click()
 	if(!usr || !spell)

code/game/area/areas.dm

@@ -675,9 +675,9 @@ var/list/transparent_icons = list("diagonalWall3","swall_f5","swall_f6","swall_f
 							if(istype(T, /turf/space))
 								switch(universe.name)	//for some reason using OnTurfChange doesn't actually do anything in this case.
 									if("Hell Rising")
-										T.overlays += "hell01"
+										T.overlays += image(icon = T.icon, icon_state = "hell01")
 									if("Supermatter Cascade")
-										T.overlays += "end01"
+										T.overlays += image(icon = T.icon, icon_state = "end01")
 
 
 					refined_src -= T

code/game/gamemodes/cult/hell_universe.dm

@@ -34,10 +34,10 @@ In short:
 
 /datum/universal_state/hell/OnTurfChange(var/turf/T)
 	if(T.name == "space")
-		T.overlays += "hell01"
+		T.overlays += image(icon = T.icon, icon_state = "hell01")
 		T.underlays -= "hell01"
 	else
-		T.overlays -= "hell01"
+		T.overlays -= image(icon = T.icon, icon_state = "hell01")
 
 // Apply changes when entering state
 /datum/universal_state/hell/OnEnter()
@@ -109,7 +109,7 @@ In short:
 		count++
 		if(!(count % 50000)) sleep(world.tick_lag)
 		if(istype(T, /turf/space))
-			T.overlays += "hell01"
+			T.overlays += image(icon = T.icon, icon_state = "hell01")
 		else
 			if(!T.holy && prob(1))
 				new /obj/effect/gateway/active/cult(T)

code/game/gamemodes/cult/narsie.dm

@@ -444,7 +444,7 @@ var/global/mr_clean_targets = list(
 	overlays = 0
 
 	if (target && !isturf(target))
-		overlays += "eyes"
+		overlays += image(icon = icon, icon_state = "eyes")
 
 /obj/machinery/singularity/narsie/large/clean/acquire(var/mob/food)
 	..()

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -16,10 +16,10 @@
 
 /datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T)
 	if(T.name == "space")
-		T.overlays += "end01"
+		T.overlays += image(icon = T.icon, icon_state = "end01")
 		T.underlays -= "end01"
 	else
-		T.overlays -= "end01"
+		T.overlays -= image(icon = T.icon, icon_state = "end01")
 
 /datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T)
 	if(istype(T,/turf/simulated/wall))
@@ -152,7 +152,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
 		count++
 		if(!(count % 50000)) sleep(world.tick_lag)
 		if(istype(T, /turf/space))
-			T.overlays += "end01"
+			T.overlays += image(icon = T.icon, icon_state = "end01")
 		else
 			if(T.z != map.zCentcomm)
 				T.underlays += "end01"

code/game/gamemodes/endgame/xmas/snowman.dm

@@ -78,7 +78,7 @@
 		if(user.drop_item(W, src))
 			visible_message("<span class='notice'>[user] puts \a [W] on \the [src]'s nose.</span>")
 			carrot = W
-			overlays += "snowman_carrot"
+			overlays += image(icon = icon, icon_state = "snowman_carrot")
 			speak -= "Would you happen to have a carrot for my nose?"
 			src.say("Ah, most excellent!")
 			if(prob(30))

code/game/machinery/atmoalter/pump.dm

@@ -23,10 +23,10 @@
 		icon_state = "psiphon:0"
 
 	if(holding)
-		overlays += "siphon-open"
+		overlays += image(icon = icon, icon_state = "siphon-open")
 
 	if(connected_port)
-		overlays += "siphon-connector"
+		overlays += image(icon = icon, icon_state = "siphon-connector")
 
 	return
 

code/game/machinery/atmoalter/scrubber.dm

@@ -86,10 +86,10 @@
 		icon_state = "pscrubber:0"
 
 	if(holding)
-		overlays += "scrubber-open"
+		overlays += image(icon = icon, icon_state = "scrubber-open")
 
 	if(connected_port)
-		overlays += "scrubber-connector"
+		overlays += image(icon = icon, icon_state = "scrubber-connector")
 
 	return
 

code/game/machinery/biogenerator.dm

@@ -365,9 +365,9 @@
 		return
 	if(..())
 		if(panel_open)
-			overlays += "biogen-open"
+			overlays += image(icon = icon, icon_state = "biogen-open")
 		else
-			overlays -= "biogen-open"
+			overlays -= image(icon = icon, icon_state = "biogen-open")
 		update_icon()
 		return 1
 	return

code/game/machinery/cell_charger.dm

@@ -53,7 +53,7 @@
 
 		if(chargelevel != newlevel)
 			overlays.len = 0
-			overlays += "ccharger-o[newlevel]"
+			overlays += image(icon = icon, icon_state = "ccharger-o[newlevel]")
 			chargelevel = newlevel
 	else
 		overlays.len = 0

code/game/machinery/computer/message.dm

@@ -503,5 +503,5 @@
 					if(!isnull(server.decryptkey))
 						info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>Please keep this a secret and away from the clown.<br>If necessary, change the password to a more secure one."
 						info_links = info
-						overlays += "paper_words"
+						overlays += image(icon = icon, icon_state = "paper_words")
 						break

code/game/machinery/computer/pda_terminal.dm

@@ -258,6 +258,6 @@
 	..()
 	overlays = 0
 	if(pda_device)
-		overlays += "pdaterm-full"
+		overlays += image(icon = icon, icon_state = "pdaterm-full")
 		if(stat == 0)
-			overlays += "pdaterm-light"
+			overlays += image(icon = icon, icon_state = "pdaterm-light")

code/game/machinery/doors/firedoor.dm

@@ -368,9 +368,9 @@ var/global/list/alert_overlays_global = list()
 	if(density)
 		icon_state = "door_closed"
 		if(blocked)
-			overlays += "welded"
+			overlays += image(icon = icon, icon_state = "welded")
 		if(pdiff_alert)
-			overlays += "palert"
+			overlays += image(icon = icon, icon_state = "palert")
 		if(dir_alerts)
 			for(var/d=1;d<=4;d++)
 				var/cdir = cardinal[d]
@@ -386,7 +386,7 @@ var/global/list/alert_overlays_global = list()
 	else
 		icon_state = "door_open"
 		if(blocked)
-			overlays += "welded_open"
+			overlays += image(icon = icon, icon_state = "welded_open")
 	return
 
 // CHECK PRESSURE

code/game/machinery/flasher.dm

@@ -129,7 +129,7 @@ var/list/obj/machinery/flasher/flashers = list()
 
 		else if (src.anchored)
 			user.show_message(text("<span class='warning'>[src] is now secured.</span>"))
-			src.overlays += "[base_state]-s"
+			src.overlays += image(icon = icon, icon_state = "[base_state]-s")
 
 /obj/machinery/flasher_button/attack_ai(mob/user as mob)
 	src.add_hiddenprint(user)

code/game/machinery/metaldetector.dm

@@ -264,6 +264,6 @@
 	if(..() == 1)
 		overlays.len = 0
 		if(anchored)
-			src.overlays += "[base_state]-s"
+			src.overlays += image(icon = icon, icon_state = "[base_state]-s")
 
 

code/game/machinery/newscaster.dm

@@ -168,7 +168,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 		return
 
 	if(alert) //new message alert overlay
-		src.overlays += "newscaster_alert"
+		src.overlays += image(icon = icon, icon_state = "newscaster_alert")
 
 	if(hitstaken > 0) //Cosmetic damage overlay
 		src.overlays += image(src.icon, "crack[hitstaken]")

code/game/machinery/pdapainter.dm

@@ -48,7 +48,7 @@ Feel free to do whatever with this if you think it lacks.
 		return
 
 	if(storedpda)
-		overlays += "[initial(icon_state)]-closed"
+		overlays += image(icon = icon, icon_state = "[initial(icon_state)]-closed")
 
 	if(powered())
 		icon_state = initial(icon_state)

code/game/machinery/robot_fabricator.dm

@@ -15,7 +15,7 @@
 	if (istype(O, /obj/item/stack/sheet/metal))
 		if (src.metal_amount < 150000.0)
 			var/count = 0
-			src.overlays += "fab-load-metal"
+			src.overlays += image(icon = icon, icon_state = "fab-load-metal")
 			spawn(15)
 				if(O)
 					if(!O:amount)
@@ -30,7 +30,7 @@
 						O = null
 
 					to_chat(user, "You insert [count] metal sheet\s into the fabricator.")
-					src.overlays -= "fab-load-metal"
+					src.overlays -= image(icon = icon, icon_state = "fab-load-metal")
 					updateDialog()
 		else
 			to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.")
@@ -133,7 +133,7 @@ Please wait until completion...</TT><BR>
 
 					src.being_built = new building(src)
 
-					src.overlays += "fab-active"
+					src.overlays += image(icon = icon, icon_state = "fab-active")
 					src.updateUsrDialog()
 
 					spawn (build_time)
@@ -142,7 +142,7 @@ Please wait until completion...</TT><BR>
 							src.being_built = null
 						src.use_power = 1
 						src.operating = 0
-						src.overlays -= "fab-active"
+						src.overlays -= image(icon = icon, icon_state = "fab-active")
 		return
 
 	for (var/mob/M in viewers(1, src))

code/game/objects/items/devices/silicate sprayer.dm

@@ -64,7 +64,7 @@
 	else
 		i = Ceiling(amount / silicate_per_state, 1)
 
-	overlays += "silicate sprayer [i]"
+	overlays += image(icon = icon, icon_state = "silicate sprayer [i]")
 
 /obj/item/device/silicate_sprayer/on_reagent_change()
 	update_icon()
@@ -126,7 +126,7 @@
 /obj/item/device/silicate_sprayer/advanced/update_icon()
 	. = ..()
 	if(mode == MODE_REINFORCE)
-		overlays += "silicate sprayer reinforce"
+		overlays += image(icon = icon, icon_state = "silicate sprayer reinforce")
 
 /obj/item/device/silicate_sprayer/advanced/examine(var/mob/user)
 	. = ..()

code/game/objects/items/devices/transfer_valve.dm

@@ -145,13 +145,13 @@
 	icon_state = "valve"
 
 	if(tank_one)
-		overlays += "[tank_one.icon_state]"
+		overlays += image(icon = icon, icon_state = "[tank_one.icon_state]")
 	if(tank_two)
 		var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
 		J.Shift(WEST, 13)
 		underlays += J
 	if(attached_device)
-		overlays += "device"
+		overlays += image(icon = icon, icon_state = "device")
 
 /obj/item/device/transfer_valve/proc/merge_gases()
 	tank_two.air_contents.volume += tank_one.air_contents.volume

code/game/objects/items/robot/robot_parts.dm

@@ -96,17 +96,17 @@
 /obj/item/robot_parts/robot_suit/proc/updateicon()
 	src.overlays.len = 0
 	if(src.l_arm)
-		src.overlays += "l_arm+o"
+		src.overlays += image(icon = icon, icon_state = "l_arm+o")
 	if(src.r_arm)
-		src.overlays += "r_arm+o"
+		src.overlays += image(icon = icon, icon_state = "r_arm+o")
 	if(src.chest)
-		src.overlays += "chest+o"
+		src.overlays += image(icon = icon, icon_state = "chest+o")
 	if(src.l_leg)
-		src.overlays += "l_leg+o"
+		src.overlays += image(icon = icon, icon_state = "l_leg+o")
 	if(src.r_leg)
-		src.overlays += "r_leg+o"
+		src.overlays += image(icon = icon, icon_state = "r_leg+o")
 	if(src.head)
-		src.overlays += "head+o"
+		src.overlays += image(icon = icon, icon_state = "head+o")
 
 /obj/item/robot_parts/robot_suit/proc/check_completion()
 	if(src.l_arm && src.r_arm)

code/game/objects/items/stacks/packagewrap.dm

@@ -149,7 +149,7 @@
 			sortTag = tag
 			playsound(get_turf(src), 'sound/machines/twobeep.ogg', 100, 1)
 			overlays = 0
-			overlays += "deliverytag"
+			overlays += image(icon = icon, icon_state = "deliverytag")
 			src.desc = "A small wrapped package. It has a label reading [tag]"
 
 	else if(istype(W, /obj/item/weapon/pen))

code/game/objects/items/toys.dm

@@ -380,11 +380,11 @@
 
 /obj/item/toy/bomb/New()
 	..()
-	overlays += "plasma"
+	overlays += image(icon = icon, icon_state = "plasma")
 	var/icon/J = new(icon, icon_state = "oxygen")
 	J.Shift(WEST, 13)
 	underlays += J
-	overlays += "device"
+	overlays += image(icon = icon, icon_state = "device")
 	rendered = getFlatIcon(src)
 
 /obj/item/toy/bomb/examine(mob/user)

code/game/objects/items/weapons/defib.dm

@@ -78,7 +78,7 @@
 		emagged = !src.emagged
 		if(emagged)
 			to_chat(user, "<span class='warning'>You short out [src]'s safety protocols.</span>")
-			overlays += "defib_emag"
+			overlays += image(icon = icon, icon_state = "defib_emag")
 		else
 			to_chat(user, "<span class='notice'>You reset [src]'s safety protocols.</span>")
 			overlays.len = 0

code/game/objects/items/weapons/dice.dm

@@ -90,7 +90,7 @@
 
 /obj/item/weapon/dice/update_icon()
 	overlays.len = 0
-	overlays += "[src.icon_state][src.result]"
+	overlays += image(icon = icon, icon_state = "[src.icon_state][src.result]")
 
 /obj/item/weapon/dice/d20/e20/diceroll(mob/user as mob, thrown)
 	if(!istype(user)) return 0

code/game/objects/structures/crates_lockers/closets.dm

@@ -412,7 +412,7 @@
 	if(!opened)
 		icon_state = icon_closed
 		if(welded)
-			overlays += "welded"
+			overlays += image(icon = icon, icon_state = "welded")
 	else
 		icon_state = icon_opened
 

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -14,7 +14,7 @@
 			else
 				icon_state = icon_closed
 			if(welded)
-				overlays += "welded"
+				overlays += image(icon = icon, icon_state = "welded")
 		else
 			if(exploded)
 				icon_state = icon_exploded

code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm

@@ -66,4 +66,4 @@
 
 	overlays += cabinet_door
 	if(welded)
-		overlays += "welded"
+		overlays += image(icon = icon, icon_state = "welded")

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -169,6 +169,6 @@
 		else
 			icon_state = icon_closed
 		if(welded)
-			overlays += "welded"
+			overlays += image(icon = icon, icon_state = "welded")
 	else
 		icon_state = icon_opened

code/game/objects/structures/tank_dispenser.dm

@@ -30,11 +30,11 @@
 /obj/structure/dispenser/update_icon()
 	overlays.len = 0
 	switch(oxygentanks)
-		if(1 to 3)	overlays += "oxygen-[oxygentanks]"
+		if(1 to 3)	overlays += image(icon = icon, icon_state = "oxygen-[oxygentanks]")
-		if(4 to INFINITY) overlays += "oxygen-4"
+		if(4 to INFINITY) overlays += image(icon = icon, icon_state = "oxygen-4")
 	switch(plasmatanks)
-		if(1 to 4)	overlays += "plasma-[plasmatanks]"
+		if(1 to 4)	overlays += image(icon = icon, icon_state = "plasma-[plasmatanks]")
-		if(5 to INFINITY) overlays += "plasma-5"
+		if(5 to INFINITY) overlays += image(icon = icon, icon_state = "plasma-5")
 
 
 /obj/structure/dispenser/attack_robot(mob/user as mob)

code/libs/Get Flat Icon/demo/demo.dm

@@ -38,7 +38,7 @@ mob
 		overlays += '_flat_demoIcons2.dmi'
 
 		// Testing icon_state overlays (defaults to mob's icon)
-		overlays += "white"
+		overlays += image(icon = icon, icon_state = "white")
 
 		// Testing dynamic icon overlays
 		var/icon/I = icon('_flat_demoIcons.dmi', icon_state="aqua")

code/modules/Economy/POS.dm

@@ -363,9 +363,9 @@ var/const/POS_HEADER = {"<html>
 	overlays = 0
 	if(stat & (NOPOWER|BROKEN)) return
 	if(logged_in)
-		overlays += "pos-working"
+		overlays += image(icon = icon, icon_state = "pos-working")
 	else
-		overlays += "pos-standby"
+		overlays += image(icon = icon, icon_state = "pos-standby")
 
 /obj/machinery/pos/attack_robot(var/mob/user)
 	if(isMoMMI(user))

code/modules/admin/topic.dm

@@ -2783,7 +2783,7 @@
 					if(F.z == 1)
 						F.name = "lava"
 						F.desc = "The floor is LAVA!"
-						F.overlays += "lava"
+						F.overlays += image(icon = F.icon, icon_state = "lava")
 						F.lava = 1
 						lavaturfs += F
 

code/modules/assembly/bomb.dm

@@ -22,7 +22,7 @@
 	if(bombassembly)
 		overlays += bombassembly.icon_state
 		overlays += bombassembly.overlays
-		overlays += "bomb_assembly"
+		overlays += image(icon = icon, icon_state = "bomb_assembly")
 
 /obj/item/device/onetankbomb/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/device/analyzer))

code/modules/assembly/holder.dm

@@ -80,13 +80,13 @@
 /obj/item/device/assembly_holder/update_icon()
 	overlays.len = 0
 	if(a_left)
-		overlays += "[a_left.icon_state]_left"
+		overlays += image(icon = icon, icon_state = "[a_left.icon_state]_left")
 		for(var/O in a_left.attached_overlays)
-			overlays += "[O]_l"
+			overlays += image(icon = icon, icon_state = "[O]_l")
 	if(a_right)
-		src.overlays += "[a_right.icon_state]_right"
+		src.overlays += image(icon = icon, icon_state = "[a_right.icon_state]_right")
 		for(var/O in a_right.attached_overlays)
-			overlays += "[O]_r"
+			overlays += image(icon = icon, icon_state = "[O]_r")
 	if(master)
 		master.update_icon()
 

code/modules/assembly/infrared.dm

@@ -54,8 +54,8 @@
 	overlays.len = 0
 	attached_overlays = list()
 	if(on)
-		overlays += "infrared_on"
 		attached_overlays += "infrared_on"
+		overlays += image(icon = icon, icon_state = "infrared_on")
 
 	if(holder)
 		holder.update_icon()

code/modules/assembly/proximity.dm

@@ -104,11 +104,11 @@
 	overlays.len = 0
 	attached_overlays = list()
 	if(timing)
-		overlays += "prox_timing"
 		attached_overlays += "prox_timing"
+		overlays += image(icon = icon, icon_state = "prox_timing")
 	if(scanning)
-		overlays += "prox_scanning"
 		attached_overlays += "prox_scanning"
+		overlays += image(icon = icon, icon_state = "prox_scanning")
 	if(holder)
 		holder.update_icon()
 	if(holder && istype(holder.loc,/obj/item/weapon/grenade/chem_grenade))

code/modules/assembly/timer.dm

@@ -61,8 +61,8 @@
 	overlays.len = 0
 	attached_overlays = list()
 	if(timing)
-		overlays += "timer_timing"
 		attached_overlays += "timer_timing"
+		overlays += image(icon = icon, icon_state = "timer_timing")
 	if(holder)
 		holder.update_icon()
 	return

code/modules/clothing/gloves/stungloves.dm

@@ -49,9 +49,9 @@
 	..()
 	overlays.len = 0
 	if(wired)
-		overlays += "gloves_wire"
+		overlays += image(icon = icon, icon_state = "gloves_wire")
 	if(cell)
-		overlays += "gloves_cell"
+		overlays += image(icon = icon, icon_state = "gloves_cell")
 	if(wired && cell)
 		item_state = "stungloves"
 	else

code/modules/detectivework/detective_work.dm

@@ -271,7 +271,7 @@ var/const/FINGERPRINT_COMPLETE = 6	//This is the output of the stringpercent(pri
 				var/obj/item/weapon/paper/P = new(loc)
 				var/list/dossier = files[href_list["identifier"]]
 				P.name = "\improper Database File ([dossier[2]])"
-				P.overlays += "paper_words"
+				P.overlays += image(icon = P.icon, icon_state = "paper_words")
 
 				P.info = {"<b>Criminal Evidence Database</b><br><br>
 					Consolidated data points: [dossier[2]]<br>"}
@@ -351,7 +351,7 @@ var/const/FINGERPRINT_COMPLETE = 6	//This is the output of the stringpercent(pri
 				var/obj/item/weapon/paper/P = new(loc)
 				var/list/outputs = misc[href_list["identifier"]]
 				P.name = "\improper Auxiliary Database File ([outputs[3]])"
-				P.overlays += "paper_words"
+				P.overlays += image(icon = P.icon, icon_state = "paper_words")
 
 				P.info = {"<b>Auxiliary Evidence Database</b><br><br>
 					<big><b>Consolidated data points:</b> [outputs[3]]</big><br>"}
@@ -448,7 +448,7 @@ var/const/FINGERPRINT_COMPLETE = 6	//This is the output of the stringpercent(pri
 				var/obj/item/weapon/paper/P = new(loc)
 				P.name = "\improper Scan Data ([scan_name])"
 				P.info = "<tt>[scan_data]</tt>"
-				P.overlays += "paper_words"
+				P.overlays += image(icon = P.icon, icon_state = "paper_words")
 			else
 				temp = "Print Failed: No Data"
 		if("erase")

code/modules/detectivework/evidence.dm

@@ -50,7 +50,7 @@
 	I.pixel_x = xx		//and then return it
 	I.pixel_y = yy
 	overlays += img
-	overlays += "evidence"	//should look nicer for transparent stuff. not really that important, but hey.
+	overlays += image(icon = icon, icon_state = "evidence")	//should look nicer for transparent stuff. not really that important, but hey.
 
 	desc = "An evidence bag containing [I]. [I.desc]"
 	I.loc = src

code/modules/hydroponics/hydro_tray_process.dm

@@ -316,18 +316,18 @@
 
 	//Draw the cover.
 	if(closed_system)
-		overlays += "hydrocover"
+		overlays += image(icon = icon, icon_state = "hydrocover")
 
 	//Updated the various alert icons.
 	if(draw_warnings)
 		if(waterlevel <= 10)
-			overlays += "over_lowwater3"
+			overlays += image(icon = icon, icon_state = "over_lowwater3")
 		if(nutrilevel <= 2)
-			overlays += "over_lownutri3"
+			overlays += image(icon = icon, icon_state = "over_lownutri3")
 		if(weedlevel >= 5 || pestlevel >= 5 || toxins >= 40 || improper_heat || improper_light || improper_kpa || missing_gas)
-			overlays += "over_alert3"
+			overlays += image(icon = icon, icon_state = "over_alert3")
 		if(harvest)
-			overlays += "over_harvest3"
+			overlays += image(icon = icon, icon_state = "over_harvest3")
 
 	// Update bioluminescence and tray light
 	calculate_light()

code/modules/media/broadcast/transmitters/broadcast.dm

@@ -159,14 +159,14 @@
 	if(stat & (NOPOWER|BROKEN) || wires.IsIndexCut(TRANS_POWER))
 		return
 	if(on)
-		overlays+="broadcaster on"
+		overlays += image(icon = icon, icon_state = "broadcaster on")
 		set_light(3) // OH FUUUUCK
 		use_power = 2
 	else
 		set_light(1) // Only the tile we're on.
 		use_power = 1
 	if(sources.len)
-		overlays+="broadcaster linked"
+		overlays += image(icon = icon, icon_state = "broadcaster linked")
 
 /obj/machinery/media/transmitter/broadcast/proc/update_on()
 	if(on)

code/modules/media/jukebox.dm

@@ -240,9 +240,9 @@ var/global/list/loopModeNames=list(
 	icon_state = state_base
 	if(playing)
 		if(emagged)
-			overlays += "[state_base]-emagged"
+			overlays += image(icon = icon, icon_state = "[state_base]-emagged")
 		else
-			overlays += "[state_base]-running"
+			overlays += image(icon = icon, icon_state = "[state_base]-running")
 
 /obj/machinery/media/jukebox/proc/check_reload()
 	return world.time > last_reload + JUKEBOX_RELOAD_COOLDOWN
@@ -767,7 +767,7 @@ var/global/list/loopModeNames=list(
 
 /obj/machinery/media/jukebox/superjuke/adminbus/update_icon()
 	if(playing)
-		overlays += "beats"
+		overlays += image(icon = icon, icon_state = "beats")
 	else
 		overlays = 0
 	return

code/modules/media/tapedeck.dm

@@ -72,9 +72,9 @@
 	icon_state = state_base
 	if(playing)
 		if(emagged)
-			overlays += "[state_base]-emagged"
+			overlays += image(icon = icon, icon_state = "[state_base]-emagged")
 		else
-			overlays += "[state_base]-running"
+			overlays += image(icon = icon, icon_state = "[state_base]-running")
 
 /obj/machinery/media/tapedeck/proc/check_reload()
 	return world.time > last_reload + JUKEBOX_RELOAD_COOLDOWN

code/modules/medical/computer/cloning.dm

@@ -460,6 +460,6 @@
 	overlays = 0
 	if(!(stat & (NOPOWER | BROKEN)))
 		if(scanner && scanner.occupant)
-			overlays += "cloning-scan"
+			overlays += image(icon = icon, icon_state = "cloning-scan")
 		if(pod1 && pod1.occupant)
-			overlays += "cloning-pod"
+			overlays += image(icon = icon, icon_state = "cloning-pod")

code/modules/mob/living/carbon/human/update_icons.dm

@@ -380,8 +380,8 @@ var/global/list/damage_icon_parts = list()
 				add_image = 1
 			*/
 			if(M_LASER)
-				//standing.overlays	+= "lasereyes_s"
+				//standing.overlays += image(icon = standing.icon, icon_state = "lasereyes_s")
-				O.overlays += "lasereyes_s"
+				O.overlays += image(icon = O.icon, icon_state = "lasereyes_s")
 				add_image = 1
 	if((M_RESIST_COLD in mutations) && (M_RESIST_HEAT in mutations))
 		//standing.underlays	-= "cold[fat]_s"

code/modules/mob/living/silicon/mommi/update_icons.dm

@@ -26,11 +26,11 @@
 	// Add a panel image if the MoMMI is open
 	if(opened) // TODO:  Open the front "head" panel
 		if(wiresexposed)
-			overlays += "ov-openpanel +w"
+			overlays += image(icon = icon, icon_state = "ov-openpanel +w")
 		else if(cell)
-			overlays += "ov-openpanel +c"
+			overlays += image(icon = icon, icon_state = "ov-openpanel +c")
 		else
-			overlays += "ov-openpanel -c"
+			overlays += image(icon = icon, icon_state = "ov-openpanel -c")
 
 	// Add the MoMMI eyes
 	// Put our eyes just on top of the lighting, so it looks emissive in maint tunnels.

code/modules/mob/living/silicon/robot/robot.dm

@@ -173,7 +173,7 @@
 		radio.insert_key(new/obj/item/device/encryptionkey/headset_sec(radio))
 		base_icon = icon_state
 		icon_state = "droid-combat"
-		overlays -= "eyes"
+		overlays -= image(icon = icon, icon_state = "eyes")
 		base_icon = icon_state
 		updateicon()
 
@@ -1164,22 +1164,22 @@
 	if(opened)
 		if(custom_sprite)//Custom borgs also have custom panels, heh
 			if(wiresexposed)
-				overlays += "[src.ckey]-openpanel +w"
+				overlays += image(icon = icon, icon_state = "[src.ckey]-openpanel +w")
 			else if(cell)
-				overlays += "[src.ckey]-openpanel +c"
+				overlays += image(icon = icon, icon_state = "[src.ckey]-openpanel +c")
 			else
-				overlays += "[src.ckey]-openpanel -c"
+				overlays += image(icon = icon, icon_state = "[src.ckey]-openpanel -c")
 		else
 			if(wiresexposed)
-				overlays += "ov-openpanel +w"
+				overlays += image(icon = icon, icon_state = "ov-openpanel +w")
 			else if(cell)
-				overlays += "ov-openpanel +c"
+				overlays += image(icon = icon, icon_state = "ov-openpanel +c")
 			else
-				overlays += "ov-openpanel -c"
+				overlays += image(icon = icon, icon_state = "ov-openpanel -c")
 
 	// WHY THE FUCK DOES IT HAVE A SHIELD, ARE YOU STUPID
 	if(module_active && istype(module_active,/obj/item/borg/combat/shield))
-		overlays += "[icon_state]-shield"
+		overlays += image(icon = icon, icon_state = "[icon_state]-shield")
 
 	if(base_icon)
 		// no no no no
@@ -1500,7 +1500,7 @@
 		return
 
 
-	overlays -= "eyes"
+	overlays -= image(icon = icon, icon_state = "eyes")
 	base_icon = icon_state
 	updateicon()
 

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -42,7 +42,7 @@
 
 /mob/living/simple_animal/slime/adult/New()
 	..()
-	overlays += "aslime-:33"
+	overlays += image(icon = icon, icon_state = "aslime-:33")
 
 
 /mob/living/simple_animal/slime/adult/Die()

code/modules/mob/living/simple_animal/hostile/slime.dm

@@ -26,7 +26,7 @@
 /mob/living/simple_animal/hostile/slime/New()
 	..()
 	overlays = 0
-	overlays += "bloodlust"
+	overlays += image(icon = icon, icon_state = "bloodlust")
 
 
 /mob/living/simple_animal/hostile/slime/adult
@@ -39,7 +39,7 @@
 /mob/living/simple_animal/hostile/slime/adult/New()
 	..()
 	overlays = 0
-	overlays += "bloodlust-adult"
+	overlays += image(icon = icon, icon_state = "bloodlust-adult")
 
 
 /mob/living/simple_animal/hostile/slime/adult/Die()

code/modules/optics/photocollector.dm

@@ -67,5 +67,5 @@ var/list/obj/machinery/power/photocollector/photocollector_list = list()
 	if(stat & (NOPOWER|BROKEN))
 		return
 	if(anchored && beams.len>0)
-		overlays += "lasergen-on"
+		overlays += image(icon = icon, icon_state = "lasergen-on")
 

code/modules/paperwork/clipboard.dm

@@ -37,8 +37,8 @@
 		overlays += toppaper.icon_state
 		overlays += toppaper.overlays
 	if(haspen)
-		overlays += "clipboard_pen"
+		overlays += image(icon = icon, icon_state = "clipboard_pen")
-	overlays += "clipboard_over"
+	overlays += image(icon = icon, icon_state = "clipboard_over")
 	return
 
 /obj/item/weapon/clipboard/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/paperwork/folders.dm

@@ -28,7 +28,7 @@
 /obj/item/weapon/folder/update_icon()
 	overlays.len = 0
 	if(contents.len)
-		overlays += "folder_paper"
+		overlays += image(icon = icon, icon_state = "folder_paper")
 	return
 
 /obj/item/weapon/folder/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/modules/power/antimatter/shielding.dm

@@ -147,7 +147,7 @@ proc/cardinalrange(var/center)
 	icon_state = "[prefix]shield_[icondirs]"
 
 	if(core_check())
-		overlays += "core[control_unit && control_unit.active]"
+		overlays += image(icon = icon, icon_state = "core[control_unit && control_unit.active]")
 		if(!processing) setup_core()
 	else if(processing) shutdown_core()
 

code/modules/power/generator.dm

@@ -258,10 +258,10 @@
 	if(!operable())
 		return
 
-	overlays += "teg_mid"
+	overlays += image(icon = icon, icon_state = "teg_mid")
 
 	if(lastgenlev != 0)
-		overlays += "teg-op[lastgenlev]"
+		overlays += image(icon = icon, icon_state = "teg-op[lastgenlev]")
 
 // We actually tick power gen on the pipenet process to make sure we're synced with pipenet updates.
 /obj/machinery/power/generator/proc/pipenet_process(var/list/event_args, var/datum/controller/process/pipenet/owner)

code/modules/power/singularity/field_generator.dm

@@ -39,16 +39,16 @@ var/global/list/obj/machinery/field_generator/field_gen_list = list()
 	overlays.len = 0
 	if(!active)
 		if(warming_up)
-			overlays += "+a[warming_up]"
+			overlays += image(icon = icon, icon_state = "+a[warming_up]")
 	if(fields.len)
-		overlays += "+on"
+		overlays += image(icon = icon, icon_state = "+on")
 	// Power level indicator
 	// Scale % power to % num_power_levels and truncate value
 	var/level = round(num_power_levels * power / field_generator_max_power)
 	// Clamp between 0 and num_power_levels for out of range power values
 	level = Clamp(level, 0, num_power_levels)
 	if(level)
-		overlays += "+p[level]"
+		overlays += image(icon = icon, icon_state = "+p[level]")
 
 	return
 

code/modules/power/singularity/singularity.dm

@@ -148,7 +148,7 @@
 			dissipate_strength = 1
 			overlays = 0
 			if(chained)
-				overlays += "chain_s1"
+				overlays += image(icon = icon, icon_state = "chain_s1")
 			visible_message("<span class='notice'>\The [src] shrinks to a rather pitiful size.</span>")
 		if(STAGE_TWO) //1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them.
 			current_size = 3
@@ -163,7 +163,7 @@
 			dissipate_strength = 5
 			overlays = 0
 			if(chained)
-				overlays += "chain_s3"
+				overlays += image(icon = icon, icon_state = "chain_s3")
 			if(growing)
 				visible_message("<span class='notice'>\The [src] noticeably grows in size.</span>")
 			else
@@ -182,7 +182,7 @@
 				dissipate_strength = 20
 				overlays = 0
 				if(chained)
-					overlays += "chain_s5"
+					overlays += image(icon = icon, icon_state = "chain_s5")
 				if(growing)
 					visible_message("<span class='notice'>\The [src] expands to a reasonable size.</span>")
 				else
@@ -201,7 +201,7 @@
 				dissipate_strength = 10
 				overlays = 0
 				if(chained)
-					overlays += "chain_s7"
+					overlays += image(icon = icon, icon_state = "chain_s7")
 				if(growing)
 					visible_message("<span class='warning'>\The [src] expands to a dangerous size.</span>")
 				else
@@ -217,7 +217,7 @@
 			dissipate = 0 //It cant go smaller due to energy loss.
 			overlays = 0
 			if(chained)
-				overlays += "chain_s9"
+				overlays += image(icon = icon, icon_state = "chain_s9")
 			if(growing)
 				visible_message("<span class='danger'><font size='2'>\The [src] has grown out of control!</font></span>")
 			else
@@ -238,7 +238,7 @@
 			dissipate = 0 //It cant go smaller due to e loss
 			event_chance = 25 //Events will fire off more often.
 			if(chained)
-				overlays += "chain_s9"
+				overlays += image(icon = icon, icon_state = "chain_s9")
 			visible_message("<span class='sinister'><font size='3'>You witness the creation of a destructive force that cannot possibly be stopped by human hands.</font></span>")
 
 	if(current_size == allowed_size)

code/modules/projectiles/guns/energy/nuclear.dm

@@ -89,30 +89,30 @@
 
 		update_charge()
 			if (crit_fail)
-				overlays += "nucgun-whee"
+				overlays += image(icon = icon, icon_state = "nucgun-whee")
 				return
 			var/ratio = power_supply.charge / power_supply.maxcharge
 			ratio = round(ratio, 0.25) * 100
-			overlays += "nucgun-[ratio]"
+			overlays += image(icon = icon, icon_state = "nucgun-[ratio]")
 
 
 		update_reactor()
 			if(crit_fail)
-				overlays += "nucgun-crit"
+				overlays += image(icon = icon, icon_state = "nucgun-crit")
 				return
 			if(lightfail)
-				overlays += "nucgun-medium"
+				overlays += image(icon = icon, icon_state = "nucgun-medium")
 			else if ((power_supply.charge/power_supply.maxcharge) <= 0.5)
-				overlays += "nucgun-light"
+				overlays += image(icon = icon, icon_state = "nucgun-light")
 			else
-				overlays += "nucgun-clean"
+				overlays += image(icon = icon, icon_state = "nucgun-clean")
 
 
 		update_mode()
 			if (mode == 0)
-				overlays += "nucgun-stun"
+				overlays += image(icon = icon, icon_state = "nucgun-stun")
 			else if (mode == 1)
-				overlays += "nucgun-kill"
+				overlays += image(icon = icon, icon_state = "nucgun-kill")
 
 
 	emp_act(severity)

code/modules/projectiles/guns/energy/temperature.dm

@@ -157,16 +157,16 @@
 /obj/item/weapon/gun/energy/temperature/proc/update_charge()
 	var/charge = power_supply.charge
 	switch(charge)
-		if(900 to INFINITY)		overlays += "900"
+		if(900 to INFINITY)		overlays += image(icon = icon, icon_state = "900")
-		if(800 to 900)			overlays += "800"
+		if(800 to 900)			overlays += image(icon = icon, icon_state = "800")
-		if(700 to 800)			overlays += "700"
+		if(700 to 800)			overlays += image(icon = icon, icon_state = "700")
-		if(600 to 700)			overlays += "600"
+		if(600 to 700)			overlays += image(icon = icon, icon_state = "600")
-		if(500 to 600)			overlays += "500"
+		if(500 to 600)			overlays += image(icon = icon, icon_state = "500")
-		if(400 to 500)			overlays += "400"
+		if(400 to 500)			overlays += image(icon = icon, icon_state = "400")
-		if(300 to 400)			overlays += "300"
+		if(300 to 400)			overlays += image(icon = icon, icon_state = "300")
-		if(200 to 300)			overlays += "200"
+		if(200 to 300)			overlays += image(icon = icon, icon_state = "200")
-		if(100 to 200)			overlays += "100"
+		if(100 to 200)			overlays += image(icon = icon, icon_state = "100")
-		if(-INFINITY to 100)	overlays += "0"
+		if(-INFINITY to 100)	overlays += image(icon = icon, icon_state = "0")
 
 /obj/item/weapon/gun/energy/temperature/proc/update_user()
 	if (istype(loc,/mob/living/carbon))

code/modules/projectiles/guns/projectile/constructable/flamethrower.dm

@@ -65,11 +65,11 @@
 /obj/item/weapon/gun/projectile/flamethrower/update_icon()
 	overlays.len = 0
 	if(igniter)
-		overlays += "+igniter[status]"
+		overlays += image(icon = icon, icon_state = "+igniter[status]")
 	if(ptank)
-		overlays += "+ptank"
+		overlays += image(icon = icon, icon_state = "+ptank")
 	if(lit)
-		overlays += "+lit"
+		overlays += image(icon = icon, icon_state = "+lit")
 		item_state = "flamethrower_1"
 	else
 		item_state = "flamethrower_0"

code/modules/reagents/Chemistry-Machinery.dm

@@ -1081,7 +1081,7 @@ USE THIS CHEMISTRY DISPENSER FOR MAPS SO THEY START AT 100 ENERGY
 		else
 			beaker.loc = beaker:holder
 	beaker = null
-	overlays -= "mixer_overlay"
+	overlays -= image(icon = icon, icon_state = "mixer_overlay")
 	src.updateUsrDialog()
 
 /obj/machinery/computer/pandemic/attack_ai(mob/user as mob)
@@ -1205,7 +1205,7 @@ USE THIS CHEMISTRY DISPENSER FOR MAPS SO THEY START AT 100 ENERGY
 		to_chat(user, "You add the beaker to the machine!")
 
 		src.updateUsrDialog()
-		overlays += "mixer_overlay"
+		overlays += image(icon = icon, icon_state = "mixer_overlay")
 
 	else
 		..()

code/modules/research/mechanic/blueprinter.dm

@@ -87,7 +87,7 @@
 		return
 
 	busy = 1
-	overlays += "[base_state]_ani"
+	overlays += image(icon = icon, icon_state = "[base_state]_ani")
 	sleep(30)
 	busy = 0
 	if(use_nano)
@@ -98,5 +98,5 @@
 		paper_loaded -= 1
 	src.visible_message("[bicon(src)]<span class='notice'>\The [src] beeps: 'Successfully printed the [design.name] design'.</span>")
 	spawn(20)
-		overlays -= "[base_state]_ani"
+		overlays -= image(icon = icon, icon_state = "[base_state]_ani")
 	return 1

code/modules/research/mechanic/flatpack.dm

@@ -47,7 +47,7 @@
 					break
 
 /*	if(assembling)
-		overlays += "assembly" */
+		overlays += image(icon = icon, icon_state = "assembly") */
 	else if(stacked.len)
 		for(var/i = 1 to stacked.len)
 			var/image/stack_image = stacked[stacked[i]] //because it's an assoc list
@@ -68,13 +68,13 @@
 		if(do_after(user, src, rand(10,40)))
 			if(machine)
 				to_chat(user, "<span class='notice'>[bicon(src)]You successfully unpack \the [machine]!</span>")
-//				overlays += "assembly"
+//				overlays += image(icon = icon, icon_state = "assembly")
 /*				var/obj/item/weapon/paper/instructions = new (get_turf(src))
 				var/list/inst_list = unpacking.GenerateInstructions()
 				instructions.name = "instructions ([machine.name])"
 				instructions.info = inst_list["instructions"]
 				if(inst_list["misprint"])
-					instructions.overlays += "paper_stamped_denied"
+					instructions.overlays += image(icon = icon, icon_state = "paper_stamped_denied")
 					instructions.name = "misprinted " + instructions.name
 				instructions.update_icon()
 */

code/modules/research/mechanic/flatpacker.dm

@@ -55,13 +55,13 @@
 	src.being_built = new part.build_path(src)
 
 	src.busy = 1
-	src.overlays += "[base_state]_ani"
+	src.overlays += image(icon = icon, icon_state = "[base_state]_ani")
 	src.use_power = 2
 	src.updateUsrDialog()
 	//message_admins("We're going building with [get_construction_time_w_coeff(part)]")
 	sleep(get_construction_time_w_coeff(part))
 	src.use_power = 1
-	src.overlays -= "[base_state]_ani"
+	src.overlays -= image(icon = icon, icon_state = "[base_state]_ani")
 	if(being_built)
 		var/obj/structure/closet/crate/flatpack/FP = new
 		being_built.loc = FP

code/modules/research/mechanic/mechanic_fabs.dm

@@ -99,11 +99,11 @@
 		else if(RB.stored_design)
 			if(src.AddBlueprint(RB, user))
 				if(src.AddMechanicDesign(RB.stored_design, user))
-					overlays += "[base_state]-bp"
+					overlays += image(icon = icon, icon_state = "[base_state]-bp")
 					to_chat(user, "<span class='notice'>You successfully load \the [RB.name] into \the [src].</span>")
 					if(RB.delete_on_use)	qdel(RB) //we delete if the thing is set to delete. Always set to 1 right now
 					spawn(10)
-						overlays -= "[base_state]-bp"
+						overlays -= image(icon = icon, icon_state = "[base_state]-bp")
 		return 1
 
 /obj/machinery/r_n_d/fabricator/mechanic_fab/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)

code/modules/research/mechanic/reverse_engine.dm

@@ -162,11 +162,11 @@
 		return
 	var/researchtime = ( (REV_ENG_RESEARCHBASE * Tech_Difference(design)) / (scan_rating + cap_rating) )
 	busy = 1
-	overlays += "[base_state]_ani"
+	overlays += image(icon = icon, icon_state = "[base_state]_ani")
 	sleep(researchtime) //we use sleep instead of spawn because code like the queue code has to hang on this proc
 	research_queue -= design
 	busy = 0
-	overlays -= "[base_state]_ani"
+	overlays -= image(icon = icon, icon_state = "[base_state]_ani")
 	if(!(design in ready_queue))
 		ready_queue += design
 		src.visible_message("<span class='notice'>[bicon(src)] \The [src] beeps: 'Successfully researched \the [design.name].'</span>")

code/modules/research/rdmachines.dm

@@ -73,7 +73,7 @@ var/global/list/rnd_machines = list()
 /obj/machinery/r_n_d/update_icon()
 	overlays.len = 0
 	if(linked_console)
-		overlays += "[base_state]_link"
+		overlays += image(icon = icon, icon_state = "[base_state]_link")
 
 /obj/machinery/r_n_d/blob_act()
 	if (prob(50))
@@ -115,7 +115,7 @@ var/global/list/rnd_machines = list()
 				if(/obj/machinery/r_n_d/fabricator/circuit_imprinter)
 					linked_console.linked_imprinter = null
 			linked_console = null
-			overlays -= "[base_state]_link"
+			overlays -= image(icon = icon, icon_state = "[base_state]_link")
 		return 1
 
 /obj/machinery/r_n_d/crowbarDestroy(mob/user)
@@ -215,9 +215,9 @@ var/global/list/rnd_machines = list()
 
 		if(research_flags & HASMAT_OVER)
 			update_icon()
-			overlays |= "[base_state]_[stack.name]"
+			overlays |= image(icon = icon, icon_state = "[base_state]_[stack.name]")
 			spawn(10)
-				overlays -= "[base_state]_[stack.name]"
+				overlays -= image(icon = icon, icon_state = "[base_state]_[stack.name]")
 
 		icon_state = "[base_state]"
 		use_power(max(1000, (3750*amount/10)))

code/modules/research/xenoarchaeology/tools/suspension_generator.dm

@@ -46,7 +46,7 @@
 		for(var/obj/item/I in T)
 			if(!suspension_field.contents.len)
 				suspension_field.icon_state = "energynet"
-				suspension_field.overlays += "shield2"
+				suspension_field.overlays += image(icon = suspension_field.icon, icon_state = "shield2")
 			I.loc = suspension_field
 
 		for(var/mob/living/simple_animal/M in T)
@@ -299,7 +299,7 @@
 
 	if(collected)
 		suspension_field.icon_state = "energynet"
-		suspension_field.overlays += "shield2"
+		suspension_field.overlays += image(icon = suspension_field.icon, icon_state = "shield2")
 		src.visible_message("<span class='notice'>[bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].</span>")
 	else
 		if(istype(T,/turf/unsimulated/mineral) || istype(T,/turf/simulated/wall))

code/modules/telesci/gps.dm

@@ -15,7 +15,7 @@ var/list/SPS_list = list()
 
 /obj/item/device/gps/New()
 	..()
-	overlays += "working"
+	overlays += image(icon = icon, icon_state = "working")
 	handle_list()
 
 
@@ -32,12 +32,12 @@ var/list/SPS_list = list()
 
 /obj/item/device/gps/emp_act(severity)
 	emped = 1
-	overlays -= "working"
+	overlays -= image(icon = icon, icon_state = "working")
-	overlays += "emp"
+	overlays += image(icon = icon, icon_state = "emp")
 	spawn(300)
 		emped = 0
-		overlays -= "emp"
+		overlays -= image(icon = icon, icon_state = "emp")
-		overlays += "working"
+		overlays += image(icon = icon, icon_state = "working")
 
 /obj/item/device/gps/attack_self(mob/user as mob)
 	var/obj/item/device/gps/t = ""

code/unused/hivebot/hivebot.dm

@@ -278,9 +278,9 @@
 	src.overlays.len = 0
 
 	if(src.stat == 0)
-		src.overlays += "eyes"
+		src.overlays += image(icon = icon, icon_state = "eyes")
 	else
-		src.overlays -= "eyes"
+		src.overlays -= image(icon = icon, icon_state = "eyes")
 
 
 /mob/living/silicon/hivebot/proc/installed_modules()