The 515 MegaPR early downport (#7783)

Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
2025-12-10 02:09:41 +00:00 · 2024-02-27 11:17:32 -08:00
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
--- a/code/game/objects/items/devices/ai_detector.dm
+++ b/code/game/objects/items/devices/ai_detector.dm
@@ -94,22 +94,22 @@
 	if(new_state != old_state)
 		switch(new_state)
 			if(PROXIMITY_OFF_CAMERANET)
-				to_chat(carrier, "<span class='notice'>\icon[src][bicon(src)] Now outside of camera network.</span>")
+				to_chat(carrier, "<span class='notice'>[icon2html(src, carrier.client)] Now outside of camera network.</span>")
 				carrier << 'sound/machines/defib_failed.ogg'
 			if(PROXIMITY_NONE)
-				to_chat(carrier, "<span class='notice'>\icon[src][bicon(src)] Now within camera network, AI and cameras unfocused.</span>")
+				to_chat(carrier, "<span class='notice'>[icon2html(src, carrier.client)] Now within camera network, AI and cameras unfocused.</span>")
 				carrier << 'sound/machines/defib_safetyOff.ogg'
 			if(PROXIMITY_NEAR)
-				to_chat(carrier, "<span class='warning'>\icon[src][bicon(src)] Warning: AI focus at nearby location.</span>")
+				to_chat(carrier, "<span class='warning'>[icon2html(src, carrier.client)] Warning: AI focus at nearby location.</span>")
 				carrier << 'sound/machines/defib_SafetyOn.ogg'
 			if(PROXIMITY_ON_SCREEN)
-				to_chat(carrier, "<font size='3'><span class='danger'>\icon[src][bicon(src)] Alert: AI or camera focused at current location!</span></font>")
+				to_chat(carrier, "<font size='3'><span class='danger'>[icon2html(src, carrier.client)] Alert: AI or camera focused at current location!</span></font>")
 				carrier <<'sound/machines/defib_ready.ogg'
 			if(PROXIMITY_TRACKING)
-				to_chat(carrier, "<font size='3'><span class='danger'>\icon[src][bicon(src)] Danger: AI is actively tracking you!</span></font>")
+				to_chat(carrier, "<font size='3'><span class='danger'>[icon2html(src, carrier.client)] Danger: AI is actively tracking you!</span></font>")
 				carrier << 'sound/machines/defib_success.ogg'
 			if(PROXIMITY_TRACKING_FAIL)
-				to_chat(carrier, "<font size='3'><span class='danger'>\icon[src][bicon(src)] Danger: AI is attempting to actively track you, but you are outside of the camera network!</span></font>")
+				to_chat(carrier, "<font size='3'><span class='danger'>[icon2html(src, carrier.client)] Danger: AI is attempting to actively track you, but you are outside of the camera network!</span></font>")
 				carrier <<'sound/machines/defib_ready.ogg'


@@ -118,4 +118,4 @@
 #undef PROXIMITY_NEAR
 #undef PROXIMITY_ON_SCREEN
 #undef PROXIMITY_TRACKING
-#undef PROXIMITY_TRACKING_FAIL
+#undef PROXIMITY_TRACKING_FAIL
--- a/code/game/objects/items/devices/communicator/UI_tgui.dm
+++ b/code/game/objects/items/devices/communicator/UI_tgui.dm
@@ -382,7 +382,7 @@
 				im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text))
 				log_pda("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", usr)
 				var/obj/item/device/communicator/comm = exonet.get_atom_from_address(their_address)
-				to_chat(usr, "<span class='notice'>\icon[src][bicon(src)] Sent message to [istype(comm, /obj/item/device/communicator) ? comm.owner : comm.name], <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)</span>")
+				to_chat(usr, "<span class='notice'>[icon2html(src, usr.client)] Sent message to [istype(comm, /obj/item/device/communicator) ? comm.owner : comm.name], <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)</span>")
 				for(var/mob/M in player_list)
 					if(M.stat == DEAD && M.is_preference_enabled(/datum/client_preference/ghost_ears))
 						if(istype(M, /mob/new_player) || M.forbid_seeing_deadchat)
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -402,7 +402,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	//CHOMPADDITION END
 	for(var/mob/living/voice/voice in contents)
 		voice_mobs.Remove(voice)
-		to_chat(voice, "<span class='danger'>\icon[src][bicon(src)] Connection timed out with remote host.</span>")
+		to_chat(voice, "<span class='danger'>[icon2html(src, voice.client)] Connection timed out with remote host.</span>")
 		qdel(voice)
 	close_connection(reason = "Connection timed out")

--- a/code/game/objects/items/devices/communicator/messaging.dm
+++ b/code/game/objects/items/devices/communicator/messaging.dm
@@ -34,7 +34,7 @@
 			if(src in comm.voice_invites)
 				comm.open_connection(src)
 				return
-			to_chat(src, "<span class='notice'>\icon[origin_atom][bicon(origin_atom)] Receiving communicator request from [origin_atom].  To answer, use the <b>Call Communicator</b> \
+			to_chat(src, "<span class='notice'>[icon2html(origin_atom,src.client)] Receiving communicator request from [origin_atom].  To answer, use the <b>Call Communicator</b> \
 			verb, and select that name to answer the call.</span>")
 			src << 'sound/machines/defib_SafetyOn.ogg'
 			comm.voice_invites |= src
@@ -44,7 +44,7 @@
 			random = random / 10
 			exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms")
 	if(message == "text")
-		to_chat(src, "<span class='notice'>\icon[origin_atom][bicon(origin_atom)] Received text message from [origin_atom]: <b>\"[text]\"</b></span>")
+		to_chat(src, "<span class='notice'>[icon2html(origin_atom,src.client)] Received text message from [origin_atom]: <b>\"[text]\"</b></span>")
 		src << 'sound/machines/defib_safetyOff.ogg'
 		exonet_messages.Add("<b>From [origin_atom]:</b><br>[text]")
 		return
@@ -84,7 +84,7 @@

 		playsound(src, S, 50, 1)
 		for (var/mob/O in hearers(2, loc))
-			O.show_message(text("\icon[src][bicon(src)] *[ttone]*"))
+			O.show_message(text("[icon2html(src,O.client)] *[ttone]*"))

 	alert_called = 1
 	update_icon()
@@ -95,7 +95,7 @@
 		L = loc

 	if(L)
-		to_chat(L, "<span class='notice'>\icon[src][bicon(src)] Message from [who]: <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)</span>")
+		to_chat(L, "<span class='notice'>[icon2html(src,L.client)] Message from [who]: <b>\"[text]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[candidate]'>Reply</a>)</span>")

 // This is the only Topic the communicators really uses
 /obj/item/device/communicator/Topic(href, href_list)
@@ -108,7 +108,7 @@
 				exonet.send_message(comm.exonet.address, "text", message)
 				im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message))
 				log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr)
-				to_chat(usr, "<span class='notice'>\icon[src][bicon(src)] Sent message to [istype(comm, /obj/item/device/communicator) ? comm.owner : comm.name], <b>\"[message]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)</span>")
+				to_chat(usr, "<span class='notice'>[icon2html(src,usr.client)] Sent message to [istype(comm, /obj/item/device/communicator) ? comm.owner : comm.name], <b>\"[message]\"</b> (<a href='?src=\ref[src];action=Reply;target=\ref[exonet.get_atom_from_address(comm.exonet.address)]'>Reply</a>)</span>")

 // Verb: text_communicator()
 // Parameters: None
--- a/code/game/objects/items/devices/communicator/phone.dm
+++ b/code/game/objects/items/devices/communicator/phone.dm
@@ -39,15 +39,15 @@
 	comm.voice_requests.Remove(src)

 	if(user)
-		comm.visible_message("<span class='notice'>\icon[src][bicon(src)] Connecting to [src].</span>")
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Attempting to call [comm].</span>")
+		comm.visible_message("<span class='notice'>[icon2html(src,viewers(src))] Connecting to [src].</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,user.client)] Attempting to call [comm].</span>")
 		sleep(10)
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Dialing internally from [station_name()], [system_name()].</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,user.client)] Dialing internally from [station_name()], [system_name()].</span>")
 		sleep(20) //If they don't have an exonet something is very wrong and we want a runtime.
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Connection re-routed to [comm] at [comm.exonet.address].</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,user.client)] Connection re-routed to [comm] at [comm.exonet.address].</span>")
 		sleep(40)
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Connection to [comm] at [comm.exonet.address] established.</span>")
-		comm.visible_message("<span class='notice'>\icon[src][bicon(src)] Connection to [src] at [exonet.address] established.</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,user.client)] Connection to [comm] at [comm.exonet.address] established.</span>")
+		comm.visible_message("<span class='notice'>[icon2html(src,viewers(src))] Connection to [src] at [exonet.address] established.</span>")
 		sleep(20)

 	src.add_communicating(comm)
@@ -86,28 +86,28 @@

 	//Now for some connection fluff.
 	if(user)
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Connecting to [candidate].</span>")
-	to_chat(new_voice, "<span class='notice'>\icon[src][bicon(src)] Attempting to call [src].</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,user.client)] Connecting to [candidate].</span>")
+	to_chat(new_voice, "<span class='notice'>[icon2html(src,new_voice.client)] Attempting to call [src].</span>")
 	sleep(10)
-	to_chat(new_voice, "<span class='notice'>\icon[src][bicon(src)] Dialing to [station_name()], Kara Subsystem, [system_name()].</span>")
+	to_chat(new_voice, "<span class='notice'>[icon2html(src,new_voice.client)] Dialing to [station_name()], Kara Subsystem, [system_name()].</span>")
 	sleep(20)
-	to_chat(new_voice, "<span class='notice'>\icon[src][bicon(src)] Connecting to [station_name()] telecommunications array.</span>")
+	to_chat(new_voice, "<span class='notice'>[icon2html(src,new_voice.client)] Connecting to [station_name()] telecommunications array.</span>")
 	sleep(40)
-	to_chat(new_voice, "<span class='notice'>\icon[src][bicon(src)] Connection to [station_name()] telecommunications array established.  Redirecting signal to [src].</span>")
+	to_chat(new_voice, "<span class='notice'>[icon2html(src,new_voice.client)] Connection to [station_name()] telecommunications array established.  Redirecting signal to [src].</span>")
 	sleep(20)

 	//We're connected, no need to hide everything.
 	new_voice.client.screen.Remove(blackness)
 	qdel(blackness)

-	to_chat(new_voice, "<span class='notice'>\icon[src][bicon(src)] Connection to [src] established.</span>")
+	to_chat(new_voice, "<span class='notice'>[icon2html(src,new_voice.client)] Connection to [src] established.</span>")
 	to_chat(new_voice, "<b>To talk to the person on the other end of the call, just talk normally.</b>")
 	to_chat(new_voice, "<b>If you want to end the call, use the 'Hang Up' verb.  The other person can also hang up at any time.</b>")
 	to_chat(new_voice, "<b>Remember, your character does not know anything you've learned from observing!</b>")
 	if(new_voice.mind)
 		new_voice.mind.assigned_role = "Disembodied Voice"
 	if(user)
-		to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Your communicator is now connected to [candidate]'s communicator.</span>")
+		to_chat(user, "<span class='notice'>[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.</span>")

 // Proc: close_connection()
 // Parameters: 3 (user - the user who initiated the disconnect, target - the mob or device being disconnected, reason - string shown when disconnected)
@@ -120,8 +120,8 @@
 	for(var/mob/living/voice/voice in voice_mobs) //Handle ghost-callers
 		if(target && voice != target) //If no target is inputted, it deletes all of them.
 			continue
-		to_chat(voice, "<span class='danger'>\icon[src][bicon(src)] [reason].</span>")
-		visible_message("<span class='danger'>\icon[src][bicon(src)] [reason].</span>")
+		to_chat(voice, "<span class='danger'>[icon2html(src,voice.client)] [reason].</span>")
+		visible_message("<span class='danger'>[icon2html(src,viewers(src))] [reason].</span>")
 		voice_mobs.Remove(voice)
 		qdel(voice)
 		update_icon()
@@ -131,8 +131,8 @@
 			continue
 		src.del_communicating(comm)
 		comm.del_communicating(src)
-		comm.visible_message("<span class='danger'>\icon[src][bicon(src)] [reason].</span>")
-		visible_message("<span class='danger'>\icon[src][bicon(src)] [reason].</span>")
+		comm.visible_message("<span class='danger'>[icon2html(src,viewers(src))] [reason].</span>")
+		visible_message("<span class='danger'>[icon2html(src,viewers(src))] [reason].</span>")
 		if(comm.camera && video_source == comm.camera) //We hung up on the person on video
 			end_video()
 		if(camera && comm.video_source == camera) //We hung up on them while they were watching us
@@ -163,7 +163,7 @@
 	if(ringer)
 		playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
 		for (var/mob/O in hearers(2, loc))
-			O.show_message(text("\icon[src][bicon(src)] *beep*"))
+			O.show_message(text("[icon2html(src,O.client)] *beep*"))

 	alert_called = 1
 	update_icon()
@@ -174,7 +174,7 @@
 		L = loc

 	if(L)
-		to_chat(L, "<span class='notice'>\icon[src][bicon(src)] Communications request from [who].</span>")
+		to_chat(L, "<span class='notice'>[icon2html(src,L.client)] Communications request from [who].</span>")

 // Proc: del_request()
 // Parameters: 1 (candidate - the ghost or communicator to be declined)
@@ -197,13 +197,13 @@
 		us = loc

 	if(us)
-		to_chat(us, "<span class='notice'>\icon[src][bicon(src)] Declined request.</span>")
+		to_chat(us, "<span class='notice'>[icon2html(src,us.client)] Declined request.</span>")

 // Proc: see_emote()
 // Parameters: 2 (M - the mob the emote originated from, text - the emote's contents)
 // Description: Relays the emote to all linked communicators.
 /obj/item/device/communicator/see_emote(mob/living/M, text)
-	var/rendered = "\icon[src][bicon(src)] <span class='message'>[text]</span>"
+
 	for(var/obj/item/device/communicator/comm in communicating)
 		var/turf/T = get_turf(comm)
 		if(!T) return
@@ -216,7 +216,7 @@
 			var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
 			mobs_to_relay = in_range["mobs"]
 		//VOREStation Edit End
-
+		var/rendered = "[icon2html(src,mobs_to_relay)] <span class='message'>[text]</span>"
 		for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other.
 			var/dst = get_dist(get_turf(mob),get_turf(comm))
 			if(dst <= video_range)
@@ -250,20 +250,20 @@
 			var/message = combined["formatted"]
 			var/name_used = M.GetVoice()
 			var/rendered = null
-			rendered = "<span class='game say'>\icon[src][bicon(src)] <span class='name'>[name_used]</span> [message]</span>"
+			rendered = "<span class='game say'>[icon2html(src,mobs_to_relay)] <span class='name'>[name_used]</span> [message]</span>"
 			mob.show_message(rendered, 2)

 // Proc: show_message()
 // Parameters: 4 (msg - the message, type - number to determine if message is visible or audible, alt - unknown, alt_type - unknown)
 // Description: Relays the message to all linked communicators.
 /obj/item/device/communicator/show_message(msg, type, alt, alt_type)
-	var/rendered = "\icon[src][bicon(src)] <span class='message'>[msg]</span>"
+
 	for(var/obj/item/device/communicator/comm in communicating)
 		var/turf/T = get_turf(comm)
 		if(!T) return
 		var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0)
 		var/list/mobs_to_relay = in_range["mobs"]
-
+		var/rendered = "[icon2html(src, mobs_to_relay)] <span class='message'>[msg]</span>"
 		for(var/mob/mob in mobs_to_relay)
 			mob.show_message(rendered)
 	..()
@@ -339,28 +339,28 @@
 		return

 	if(!(src in comm.communicating) || !comm.camera) //You called someone with a broken communicator or one that's fake or yourself or something
-		to_chat(user, "<span class='danger'>\icon[src][bicon(src)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.</span>")
+		to_chat(user, "<span class='danger'>[icon2html(src, user.client)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.</span>")
 		return

-	to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Attempting to start video over existing call.</span>")
+	to_chat(user, "<span class='notice'>[icon2html(src, user.client)] Attempting to start video over existing call.</span>")
 	sleep(30)
-	to_chat(user, "<span class='notice'>\icon[src][bicon(src)] Please wait...</span>")
+	to_chat(user, "<span class='notice'>[icon2html(src, user.client)] Please wait...</span>")

 	video_source = comm.camera
-	comm.visible_message("<span class='danger'>\icon[src][bicon(src)] New video connection from [comm].</span>")
+	comm.visible_message("<span class='danger'>[icon2html(src,viewers(src))] New video connection from [comm].</span>")
 	update_active_camera_screen()
-	GLOB.moved_event.register(video_source, src, PROC_REF(update_active_camera_screen))
+	RegisterSignal(video_source, COMSIG_OBSERVER_MOVED, PROC_REF(update_active_camera_screen))
 	update_icon()

 // Proc: end_video()
 // Parameters: reason - the text reason to print for why it ended
 // Description: Ends the video call by clearing video_source
 /obj/item/device/communicator/proc/end_video(var/reason)
-	GLOB.moved_event.unregister(video_source, src, PROC_REF(update_active_camera_screen))
+	UnregisterSignal(video_source, COMSIG_OBSERVER_MOVED)
 	show_static()
 	video_source = null

-	. = "<span class='danger'>\icon[src][bicon(src)] [reason ? reason : "Video session ended"].</span>"
+	. = "<span class='danger'>[bicon(src)] [reason ? reason : "Video session ended"].</span>"

 	visible_message(.)
 	update_icon()
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -65,7 +65,7 @@
 		STOP_PROCESSING(SSobj, src)
 	update_icon()
 	update_sound()
-	to_chat(user, "<span class='notice'>\icon[src][bicon(src)] You switch [scanning ? "on" : "off"] \the [src].</span>")
+	to_chat(user, "<span class='notice'>[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].</span>")

 /obj/item/device/geiger/update_icon()
 	if(!scanning)
@@ -120,7 +120,7 @@
 	scanning = !scanning
 	update_icon()
 	update_sound()
-	to_chat(user, "<span class='notice'>\icon[src] You switch [scanning ? "on" : "off"] \the [src].</span>")
+	to_chat(user, "<span class='notice'>[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].</span>")

 /obj/item/device/geiger/wall/update_icon()
 	if(!scanning)
@@ -165,4 +165,4 @@

 /obj/item/device/geiger/wall/west
 	pixel_x = -28
-	dir = WEST
+	dir = WEST
--- a/code/game/objects/items/devices/geiger_yw.dm
+++ b/code/game/objects/items/devices/geiger_yw.dm
@@ -56,7 +56,7 @@
 	scanning = !scanning
 	update_icon()
 	update_sound()
-	to_chat(user, "<span class='notice'>\icon[src] You switch [scanning ? "on" : "off"] \the [src].</span>")
+	to_chat(user, "<span class='notice'>[icon2html(src,user.client)] You switch [scanning ? "on" : "off"] \the [src].</span>")

 /obj/item/device/geiger/wall/update_icon()
 	if(!scanning)
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -38,15 +38,15 @@ var/list/GPS_list = list()
 /obj/item/device/gps/proc/update_holder()

 	if(holder && loc != holder)
-		GLOB.moved_event.unregister(holder, src)
-		GLOB.dir_set_event.unregister(holder, src)
+		UnregisterSignal(holder, COMSIG_OBSERVER_MOVED)
+		//GLOB.dir_set_event.unregister(holder, src)
 		holder.client?.screen -= compass
 		holder = null

 	if(istype(loc, /mob))
 		holder = loc
-		GLOB.moved_event.register(holder, src, PROC_REF(update_compass))
-		GLOB.dir_set_event.register(holder, src, PROC_REF(update_compass))
+		RegisterSignal(holder, COMSIG_OBSERVER_MOVED, PROC_REF(update_compass), override = TRUE)
+		//GLOB.dir_set_event.register(holder, src, PROC_REF(update_compass))

 	if(holder && tracking)
 		if(!is_in_processing_list)
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -71,12 +71,12 @@
 		to_chat(user, "<span class='warning'>You are already hacking!</span>")
 		return 0
 	if(!is_type_in_list(target, supported_types))
-		to_chat(user, "\icon[src][bicon(src)] <span class='warning'>Unable to hack this target, invalid target type.</span>")
+		to_chat(user, "[icon2html(src, user.client)] <span class='warning'>Unable to hack this target, invalid target type.</span>")
 		return 0

 	var/obj/machinery/door/airlock/D = target
 	if(D.security_level > max_level)
-		to_chat(user, "\icon[src][bicon(src)] <span class='warning'>Target's electronic security is too complex.</span>")
+		to_chat(user, "[icon2html(src, user.client)] <span class='warning'>Target's electronic security is too complex.</span>")
 		return 0

 	var/found = known_targets.Find(D)
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -21,13 +21,15 @@
 	. = ..()
 	var/area/A = get_area(src)
 	if(A)
-		GLOB.apc_event.register(A, src, /atom/proc/update_icon)
+		RegisterSignal(A, COMSIG_OBSERVER_APC, /atom/proc/update_icon)
 	update_icon()

 /obj/item/device/radio/intercom/Destroy()
 	var/area/A = get_area(src)
 	if(A)
-		GLOB.apc_event.unregister(A, src, /atom/proc/update_icon)
+		UnregisterSignal(A, COMSIG_OBSERVER_APC)
+	if(circuit)
+		QDEL_NULL(circuit)
 	return ..()

 /obj/item/device/radio/intercom/custom
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -498,7 +498,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
 				distance = 99
 			else
 				distance = jamming["distance"]
-			to_chat(M, "<span class='danger'>\icon[src][bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.</span>")
+			to_chat(M, "<span class='danger'>[icon2html(src, M.client)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.</span>")
 			return FALSE

 		// First, we want to generate a new radio signal
--- a/code/game/objects/items/devices/text_to_speech.dm
+++ b/code/game/objects/items/devices/text_to_speech.dm
@@ -24,7 +24,7 @@

 	var/message = sanitize(tgui_input_text(user,"Choose a message to relay to those around you."))
 	if(message)
-		audible_message("\icon[src][bicon(src)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech")
+		audible_message("[icon2html(src, user.client)] \The [src.name] states, \"[message]\"", runemessage = "synthesized speech")
 		if(ismob(loc))
 			loc.audible_message("", runemessage = "\[TTS Voice\] [message]")