Speech bubble refactor and Features (#13598)

* Speech Bubble Update and Refactor

* OBJECTION

* magistrate too

* args

* clean up and plug in atom say

* better

code/controllers/subsystem/nano_mob_hunter.dm

@@ -103,12 +103,12 @@ SUBSYSTEM_DEF(mob_hunt)
 		return
 	if(red_terminal && red_terminal.ready && blue_terminal && blue_terminal.ready)
 		battle_turn = pick("Red", "Blue")
-		red_terminal.audible_message("Battle starting!", null, 5)
-		blue_terminal.audible_message("Battle starting!", null, 5)
+		red_terminal.atom_say("Battle starting!")
+		blue_terminal.atom_say("Battle starting!")
 		if(battle_turn == "Red")
-			red_terminal.audible_message("Red Player's Turn!", null, 5)
+			red_terminal.atom_say("Red Player's Turn!")
 		else if(battle_turn == "Blue")
-			blue_terminal.audible_message("Blue Player's Turn!", null, 5)
+			blue_terminal.atom_say("Blue Player's Turn!")
 
 /datum/controller/subsystem/mob_hunt/proc/launch_attack(team, raw_damage, datum/mob_type/attack_type)
 	if(!team || !raw_damage)
@@ -135,11 +135,11 @@ SUBSYSTEM_DEF(mob_hunt)
 	winner_terminal.ready = 0
 	loser_terminal.ready = 0
 	if(surrender)	//surrender doesn't give exp, to avoid people just farming exp without actually doing a battle
-		winner_terminal.audible_message("Your rival surrendered!", null, 2)
+		winner_terminal.atom_say("Your rival surrendered!")
 	else
 		var/progress_message =  winner_terminal.mob_info.gain_exp()
-		winner_terminal.audible_message("[winner_terminal.team] Player wins!", null, 5)
-		winner_terminal.audible_message(progress_message, null, 2)
+		winner_terminal.atom_say("[winner_terminal.team] Player wins!")
+		winner_terminal.atom_say(progress_message)
 
 /datum/controller/subsystem/mob_hunt/proc/end_turn()
 	red_terminal.updateUsrDialog()
@@ -148,7 +148,7 @@ SUBSYSTEM_DEF(mob_hunt)
 		return
 	if(battle_turn == "Red")
 		battle_turn = "Blue"
-		blue_terminal.audible_message("Blue's turn.", null, 5)
+		blue_terminal.atom_say("Blue's turn.")
 	else if(battle_turn == "Blue")
 		battle_turn = "Red"
-		blue_terminal.audible_message("Red's turn.", null, 5)
+		blue_terminal.atom_say("Red's turn.")

code/datums/wires/airlock.dm

@@ -166,9 +166,9 @@
 			//raises them if they are down (only if power's on)
 			if(!A.locked)
 				if(A.lock())
-					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", hearing_distance =  1)
 			else if(A.unlock())
-				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", hearing_distance =  1)
 
 		if(AIRLOCK_WIRE_BACKUP_POWER1)
 			//two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter).

code/game/atoms.dm

@@ -14,6 +14,7 @@
 	var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom.
 	var/simulated = TRUE //filter for actions - used by lighting overlays
 	var/atom_say_verb = "says"
+	var/bubble_icon = "default" ///what icon the mob uses for speechbubbles
 	var/dont_save = FALSE // For atoms that are temporary by necessity - like lighting overlays
 
 	///Chemistry.
@@ -819,7 +820,16 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 /atom/proc/atom_say(message)
 	if(!message)
 		return
-	audible_message("<span class='game say'><span class='name'>[src]</span> [atom_say_verb], \"[message]\"</span>")
+	var/list/speech_bubble_hearers = list()
+	for(var/mob/M in get_mobs_in_view(7, src))
+		M.show_message("<span class='game say'><span class='name'>[src]</span> [atom_say_verb], \"[message]\"</span>", 2, null, 1)
+		if(M.client)
+			speech_bubble_hearers += M.client
+
+	if(length(speech_bubble_hearers))
+		var/image/I = image('icons/mob/talk.dmi', src, "[bubble_icon][say_test(message)]", FLY_LAYER)
+		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+		INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_hearers, 30)
 
 /atom/proc/speech_bubble(bubble_state = "", bubble_loc = src, list/bubble_recipients = list())
 	return

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -8,6 +8,7 @@
 	icon = 'icons/mob/blob.dmi'
 	pass_flags = PASSBLOB
 	faction = list(ROLE_BLOB)
+	bubble_icon = "blob"
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 360

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -61,6 +61,7 @@
 	icon = 'icons/mob/swarmer.dmi'
 	desc = "Robotic constructs of unknown design, swarmers seek only to consume materials and replicate themselves indefinitely."
 	speak_emote = list("tones")
+	bubble_icon = "swarmer"
 	health = 40
 	maxHealth = 40
 	status_flags = CANPUSH

code/game/gamemodes/miniantags/guardian/guardian.dm

@@ -3,6 +3,7 @@
 	real_name = "Guardian Spirit"
 	desc = "A mysterious being that stands by it's charge, ever vigilant."
 	speak_emote = list("intones")
+	bubble_icon = "guardian"
 	response_help  = "passes through"
 	response_disarm = "flails at"
 	response_harm   = "punches"

code/game/gamemodes/shadowling/shadowling.dm

@@ -194,8 +194,8 @@ Made by Xhuis
 		return 1
 	var/mob/living/M = thrall_mind.current
 	if(issilicon(M))
-		M.audible_message("<span class='notice'>[M] lets out a short blip.</span>", \
-							"<span class='userdanger'>You have been turned into a robot! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...</span>")
+		M.audible_message("<span class='notice'>[M] lets out a short blip.</span>")
+		to_chat(M, "<span class='userdanger'>You have been turned into a robot! You are no longer a thrall! Though you try, you cannot remember anything about your servitude...</span>")
 	else
 		M.visible_message("<span class='big'>[M] looks like [M.p_their()] mind is [M.p_their()] own again!</span>", \
 						"<span class='userdanger'>A piercing white light floods your eyes. Your mind is your own again! Though you try, you cannot remember anything about the shadowlings or your time \
@@ -244,8 +244,8 @@ Made by Xhuis
 		ling_mind.RemoveSpell(S)
 	var/mob/living/M = ling_mind.current
 	if(issilicon(M))
-		M.audible_message("<span class='notice'>[M] lets out a short blip.</span>", \
-						  "<span class='userdanger'>You have been turned into a robot! You are no longer a shadowling! Though you try, you cannot remember anything about your time as one...</span>")
+		M.audible_message("<span class='notice'>[M] lets out a short blip.</span>")
+		to_chat(M, "<span class='userdanger'>You have been turned into a robot! You are no longer a shadowling! Though you try, you cannot remember anything about your time as one...</span>")
 	else
 		M.visible_message("<span class='big'>[M] screams and contorts!</span>", \
 						  "<span class='userdanger'>THE LIGHT-- YOUR MIND-- <i>BURNS--</i></span>")

code/game/jobs/job/supervisor.dm

@@ -223,6 +223,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	id = /obj/item/card/id/nanotrasen
 	l_pocket = /obj/item/flash
+	r_pocket = /obj/item/clothing/accessory/lawyers_badge
 	pda = /obj/item/pda/heads/magistrate
 	backpack_contents = list(
 		/obj/item/melee/classic_baton/telescopic = 1
@@ -262,9 +263,12 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/read_only
 	id = /obj/item/card/id/security
 	l_pocket = /obj/item/laser_pointer
-	r_pocket = /obj/item/flash
+	r_pocket = /obj/item/clothing/accessory/lawyers_badge
 	l_hand = /obj/item/storage/briefcase
 	pda = /obj/item/pda/lawyer
+	backpack_contents = list(
+		/obj/item/flash = 1
+	)
 	implants = list(/obj/item/implant/mindshield)
 	satchel = /obj/item/storage/backpack/satchel_sec
 	dufflebag = /obj/item/storage/backpack/duffel/security

code/game/machinery/doppler_array.dm

@@ -89,12 +89,12 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 
 /obj/machinery/doppler_array/proc/print_explosive_logs(mob/user)
 	if(!logged_explosions.len)
-		atom_say("<span class='notice'>No logs currently stored in internal database.</span>")
+		atom_say("No logs currently stored in internal database.")
 		return
 	if(active_timers)
 		to_chat(user, "<span class='notice'>[src] is already printing something, please wait.</span>")
 		return
-	atom_say("<span class='notice'>Printing explosive log. Standby...</span>")
+	atom_say("Printing explosive log. Standby...")
 	addtimer(CALLBACK(src, .proc/print), 50)
 
 /obj/machinery/doppler_array/proc/print()

code/game/machinery/requests_console.dm

@@ -225,7 +225,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
 			message_log += "<B>Message sent to [recipient] at [station_time_timestamp()]</B><BR>[message]"
 			Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]")
 		else
-			audible_message(text("[bicon(src)] *The Requests Console beeps: '<b>NOTICE:</b> No server detected!'"),,4)
+			atom_say("No server detected!")
 
 	//Handle screen switching
 	if(href_list["setScreen"])
@@ -256,7 +256,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
 		else if(world.time < print_cooldown)
 			error_message = "Please allow the printer time to prepare the next shipping label."
 		if(error_message)
-			audible_message(text("[bicon(src)] *The Requests Console beeps: '<b>NOTICE:</b> [error_message]'"),,4)
+			atom_say("[error_message]")
 			return
 		print_label(ship_tag_name, ship_tag_index)
 		shipping_log += "<B>Shipping Label printed for [ship_tag_name]</b><br>[msgVerified]"

code/game/mecha/mecha.dm

@@ -11,6 +11,7 @@
 	force = 5
 	max_integrity = 300 //max_integrity is base health
 	armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
+	bubble_icon = "machine"
 	var/list/facing_modifiers = list(MECHA_FRONT_ARMOUR = 1.5, MECHA_SIDE_ARMOUR = 1, MECHA_BACK_ARMOUR = 0.5)
 	var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
 	var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items)
@@ -1446,8 +1447,10 @@
 	diag_hud_set_mechtracking()
 
 
-/obj/mecha/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
-	flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30)
+/obj/mecha/speech_bubble(bubble_state = "", bubble_loc = src, list/bubble_recipients = list())
+	var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, FLY_LAYER)
+	I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+	INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, bubble_recipients, 30)
 
 /obj/mecha/update_remote_sight(mob/living/user)
 	if(occupant_sight_flags)

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

@@ -241,6 +241,7 @@
 	user.base_icon = disguise
 	user.icon_state = disguise
 	user.cham_proj = src
+	user.bubble_icon = "robot"
 	active = TRUE
 	user.update_icons()
 
@@ -249,6 +250,7 @@
 	S = user
 	user.base_icon = initial(user.base_icon)
 	user.icon_state = initial(user.icon_state)
+	user.bubble_icon = "syndibot"
 	active = FALSE
 	user.update_icons()
 

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

@@ -52,7 +52,7 @@
 	if(disarmed)
 		visible_message("<span class='danger'>[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!")
 		return
-	src.audible_message("[bicon(src)] <b>[src]</b> beeps, \"Enjoy the pizza!\"")
+	atom_say("Enjoy the pizza!")
 	src.visible_message("<span class='userdanger'>\The [src] violently explodes!</span>")
 	explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
 	qdel(src)

code/game/objects/items/toys.dm

@@ -1408,6 +1408,7 @@ obj/item/toy/cards/deck/syndicate/black
 	name = "xenomorph action figure"
 	desc = "MEGA presents the new Xenos Isolated action figure! Comes complete with realistic sounds! Pull back string to use."
 	w_class = WEIGHT_CLASS_SMALL
+	bubble_icon = "alien"
 	var/cooldown = 0
 
 /obj/item/toy/toy_xeno/attack_self(mob/user)
@@ -1416,7 +1417,7 @@ obj/item/toy/cards/deck/syndicate/black
 		user.visible_message("<span class='notice'>[user] pulls back the string on [src].</span>")
 		icon_state = "[initial(icon_state)]_used"
 		sleep(5)
-		audible_message("<span class='danger'>[bicon(src)] Hiss!</span>")
+		atom_say("Hiss!")
 		var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
 		playsound(get_turf(src), pick(possible_sounds), 50, 1)
 		spawn(45)

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

@@ -477,9 +477,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 	return R.cell.charge >= (amount * use_multiplier)
 
 /obj/item/rcd/proc/detonate_pulse()
-	audible_message("<span class='danger'><b>[src] begins to vibrate and \
-		buzz loudly!</b></span>","<span class='danger'><b>[src] begins \
-		vibrating violently!</b></span>")
+	audible_message("<span class='danger'><b>[src] begins to vibrate and buzz loudly!</b></span>", "<span class='danger'><b>[src] begins vibrating violently!</b></span>")
 	// 5 seconds to get rid of it
 	addtimer(CALLBACK(src, .proc/detonate_pulse_explode), 50)
 

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

@@ -115,6 +115,8 @@
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/glasses/sunglasses/big(src)
 	new /obj/item/clothing/glasses/sunglasses/big(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)
 
 //Paramedic
 

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

@@ -466,3 +466,4 @@
 	new /obj/item/gavelhammer(src)
 	new /obj/item/clothing/head/justice_wig(src)
 	new /obj/item/clothing/accessory/medal/legal(src)
+	new /obj/item/clothing/accessory/lawyers_badge(src)

code/modules/arcade/mob_hunt/battle_computer.dm

@@ -80,7 +80,7 @@
 /obj/machinery/computer/mob_battle_terminal/proc/eject_card(override = 0)
 	if(!override)
 		if(ready && SSmob_hunt.battle_turn != team)
-			audible_message("You can't recall on your rival's turn!", null, 2)
+			atom_say("You can't recall on your rival's turn!")
 			return
 	card.mob_data = mob_info
 	mob_info = null
@@ -202,7 +202,7 @@
 			start_battle()
 		else if(option == 2)
 			ready = 0
-			audible_message("[team] Player cancels their battle challenge.", null, 5)
+			atom_say("[team] Player cancels their battle challenge.")
 
 	updateUsrDialog()
 
@@ -246,7 +246,7 @@
 		var/message = "[mob_info.mob_name] attacks!"
 		if(mob_info.nickname)
 			message = "[mob_info.nickname] attacks!"
-		audible_message(message, null, 5)
+		atom_say(message)
 		SSmob_hunt.launch_attack(team, mob_info.get_raw_damage(), mob_info.get_attack_type())
 
 /obj/machinery/computer/mob_battle_terminal/proc/start_battle()
@@ -255,7 +255,7 @@
 	if(!card)	//don't do anything if there isn't a card inserted
 		return
 	ready = 1
-	audible_message("[team] Player is ready for battle! Waiting for rival...", null, 5)
+	atom_say("[team] Player is ready for battle! Waiting for rival...")
 	SSmob_hunt.start_check()
 
 /obj/machinery/computer/mob_battle_terminal/proc/receive_attack(raw_damage, datum/mob_type/attack_type)
@@ -268,7 +268,7 @@
 		SSmob_hunt.end_turn()
 
 /obj/machinery/computer/mob_battle_terminal/proc/surrender()
-	audible_message("[team] Player surrenders the battle!", null, 5)
+	atom_say("[team] Player surrenders the battle!")
 	SSmob_hunt.end_battle(team, 1)
 
 //////////////////////////////

code/modules/arcade/mob_hunt/mob_avatar.dm

@@ -55,7 +55,7 @@
 	var/datum/data/pda/app/mob_hunter_game/client = P.current_app
 	var/total_catch_mod = client.catch_mod + catch_mod		//negative values decrease the chance of the mob running, positive values makes it more likely to flee
 	if(!client.connected)	//must be connected to attempt captures
-		P.audible_message("[bicon(P)] No server connection. Capture aborted.", null, 4)
+		P.atom_say("No server connection. Capture aborted.")
 		return
 
 	if(mob_info.is_trap)		//traps work even if you ran into them before, which is why this is before the clients_encountered check
@@ -79,7 +79,7 @@
 		return
 	else	//deal with the new hunter by either running away or getting caught
 		clients_encountered += client
-		var/message = "[bicon(P)] "
+		var/message = null
 		var/effective_run_chance = mob_info.run_chance + total_catch_mod
 		if((effective_run_chance > 0) && prob(effective_run_chance))
 			message += "Capture failed! [name] escaped [P.owner ? "from [P.owner]" : "from this hunter"]!"
@@ -91,7 +91,7 @@
 			else
 				message += "Capture error! Try again."
 				clients_encountered -= client		//if the capture registration failed somehow, let them have another chance with this mob
-		P.audible_message(message, null, 4)
+		P.atom_say(message)
 
 /obj/effect/nanomob/proc/despawn()
 	if(SSmob_hunt)

code/modules/assembly/health.dm

@@ -55,7 +55,7 @@
 		health_scan = M.health
 		if(health_scan <= alarm_health)
 			pulse()
-			audible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+			audible_message("[bicon(src)] *beep* *beep*")
 			toggle_scan()
 		return
 	return

code/modules/assembly/infrared.dm

@@ -129,7 +129,7 @@
 		return FALSE
 	cooldown = 2
 	pulse(FALSE)
-	audible_message("[bicon(src)] *beep* *beep*", null, 3)
+	audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3)
 	if(first)
 		qdel(first)
 	addtimer(CALLBACK(src, .proc/process_cooldown), 10)

code/modules/clothing/under/accessories/accessory.dm

@@ -318,6 +318,36 @@
 	if(isliving(user))
 		user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.</span>")
 
+//////////////
+//OBJECTION!//
+//////////////
+
+/obj/item/clothing/accessory/lawyers_badge
+	name = "attorney's badge"
+	desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet."
+	icon_state = "lawyerbadge"
+	item_state = "lawyerbadge"
+	item_color = "lawyerbadge"
+	var/cached_bubble_icon = null
+
+/obj/item/clothing/accessory/attack_self(mob/user)
+	if(prob(1))
+		user.say("The testimony contradicts the evidence!")
+	user.visible_message("<span class='notice'>[user] shows [user.p_their()] attorney's badge.</span>", "<span class='notice'>You show your attorney's badge.</span>")
+
+/obj/item/clothing/accessory/lawyers_badge/on_attached(obj/item/clothing/under/S, mob/user)
+	..()
+	if(has_suit && ismob(has_suit.loc))
+		var/mob/M = has_suit.loc
+		cached_bubble_icon = M.bubble_icon
+		M.bubble_icon = "lawyer"
+
+/obj/item/clothing/accessory/lawyers_badge/on_removed(mob/user)
+	if(has_suit && ismob(has_suit.loc))
+		var/mob/M = has_suit.loc
+		M.bubble_icon = cached_bubble_icon
+	..()
+
 ///////////
 //SCARVES//
 ///////////

code/modules/library/computers/checkout.dm

@@ -207,7 +207,7 @@
 		var/obj/item/barcodescanner/scanner = W
 		scanner.computer = src
 		to_chat(user, "[scanner]'s associated machine has been set to [src].")
-		audible_message("[src] lets out a low, short blip.", 2)
+		audible_message("[src] lets out a low, short blip.", hearing_distance = 2)
 		return 1
 	else
 		return ..()
@@ -413,7 +413,7 @@
 			return
 
 		if(bibledelay)
-			audible_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
+			visible_message("<b>[src]</b>'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
 		else
 			bibledelay = 1
 			spawn(60)

code/modules/mob/living/carbon/alien/alien.dm

@@ -2,6 +2,7 @@
 	name = "alien"
 	voice_name = "alien"
 	speak_emote = list("hisses")
+	bubble_icon = "alien"
 	icon = 'icons/mob/alien.dmi'
 	gender = NEUTER
 	dna = null

code/modules/mob/living/carbon/alien/humanoid/empress.dm

@@ -6,6 +6,7 @@
 	icon_state = "alienq_s"
 	status_flags = CANPARALYSE
 	mob_size = MOB_SIZE_LARGE
+	bubble_icon = "alienroyal"
 	large = 1
 	ventcrawler = 0
 

code/modules/mob/living/say.dm

@@ -269,12 +269,12 @@ proc/get_radio_key_from_channel(var/channel)
 		M.hear_say(message_pieces, verb, italics, src, speech_sound, sound_vol, sound_frequency)
 		if(M.client)
 			speech_bubble_recipients.Add(M.client)
-	spawn(0)
+
 	if(loc && !isturf(loc))
 		var/atom/A = loc //Non-turf, let it handle the speech bubble
-			A.speech_bubble("hR[speech_bubble_test]", A, speech_bubble_recipients)
+		A.speech_bubble("[A.bubble_icon][speech_bubble_test]", A, speech_bubble_recipients)
 	else //Turf, leave speech bubbles to the mob
-			speech_bubble("h[speech_bubble_test]", src, speech_bubble_recipients)
+		speech_bubble("[bubble_icon][speech_bubble_test]", src, speech_bubble_recipients)
 
 	for(var/obj/O in listening_obj)
 		spawn(0)
@@ -462,10 +462,7 @@ proc/get_radio_key_from_channel(var/channel)
 			if(M.client)
 				speech_bubble_recipients.Add(M.client)
 
-	spawn(0)
-		var/image/I = image('icons/mob/talk.dmi', src, "h[speech_bubble_test]", MOB_LAYER + 1)
-		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-		flick_overlay(I, speech_bubble_recipients, 30)
+	speech_bubble("[bubble_icon][speech_bubble_test]", src, speech_bubble_recipients)
 
 	if(watching.len)
 		var/rendered = "<span class='game say'><span class='name'>[name]</span> [not_heard].</span>"
@@ -474,7 +471,7 @@ proc/get_radio_key_from_channel(var/channel)
 
 	return 1
 
-/mob/living/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
-	var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, MOB_LAYER + 1)
+/mob/living/speech_bubble(bubble_state = "", bubble_loc = src, list/bubble_recipients = list())
+	var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, FLY_LAYER)
 	I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-	flick_overlay(I, bubble_recipients, 30)
+	INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, bubble_recipients, 30)

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

@@ -6,6 +6,7 @@
 	icon_state = "repairbot"
 	maxHealth = 35
 	health = 35
+	bubble_icon = "machine"
 	universal_speak = 0
 	universal_understand = 1
 	gender = NEUTER

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

@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	icon_state = "robot"
 	maxHealth = 100
 	health = 100
+	bubble_icon = "robot"
 	universal_understand = 1
 	deathgasp_on_death = TRUE
 

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

@@ -5,6 +5,7 @@
 	scrambledcodes = 1
 	pdahide = 1
 	faction = list("syndicate")
+	bubble_icon = "syndibot"
 	designation = "Syndicate Assault"
 	modtype = "Syndicate"
 	req_access = list(ACCESS_SYNDICATE)

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

@@ -2,6 +2,7 @@
 	gender = NEUTER
 	robot_talk_understand = 1
 	voice_name = "synthesized voice"
+	bubble_icon = "machine"
 	has_unlimited_silicon_privilege = 1
 	weather_immunities = list("ash")
 	var/syndicate = 0

code/modules/mob/living/simple_animal/bot/bot.dm

@@ -18,7 +18,7 @@
 
 	speak_emote = list("states")
 	friendly = "boops"
-
+	bubble_icon = "machine"
 	faction = list("neutral", "silicon")
 
 	var/obj/machinery/bot_core/bot_core = null

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -323,13 +323,13 @@
 /mob/living/simple_animal/bot/mulebot/proc/buzz(type)
 	switch(type)
 		if(SIGH)
-			audible_message("[src] makes a sighing buzz.", "<span class='emote'>You hear an electronic buzzing sound.</span>")
+			audible_message("[src] makes a sighing buzz.")
 			playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 		if(ANNOYED)
-			audible_message("[src] makes an annoyed buzzing sound.", "<span class='emote'>You hear an electronic buzzing sound.</span>")
+			audible_message("[src] makes an annoyed buzzing sound.")
 			playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
 		if(DELIGHT)
-			audible_message("[src] makes a delighted ping!", "<span class='emote'>You hear a ping.</span>")
+			audible_message("[src] makes a delighted ping!")
 			playsound(loc, 'sound/machines/ping.ogg', 50, 0)
 
 
@@ -601,7 +601,7 @@
 /mob/living/simple_animal/bot/mulebot/proc/at_target()
 	if(!reached_target)
 		radio_channel = "Supply" //Supply channel
-		audible_message("[src] makes a chiming sound!", "<span class='emote'>You hear a chime.</span>")
+		audible_message("[src] makes a chiming sound!")
 		playsound(loc, 'sound/machines/chime.ogg', 50, 0)
 		reached_target = 1
 

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

@@ -20,6 +20,7 @@
 	melee_damage_upper = 25
 	attacktext = "slashes"
 	speak_emote = list("hisses")
+	bubble_icon = "alien"
 	a_intent = INTENT_HARM
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -127,6 +128,7 @@
 	icon_state = "queen_s"
 	icon_living = "queen_s"
 	icon_dead = "queen_dead"
+	bubble_icon = "alienroyal"
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400

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

@@ -25,6 +25,7 @@
 	gold_core_spawnable = HOSTILE_SPAWN
 	loot = list(/obj/effect/decal/cleanable/blood/gibs/robot)
 	deathmessage = "blows apart!"
+	bubble_icon = "machine"
 	del_on_death = 1
 
 /mob/living/simple_animal/hostile/hivebot/range

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

@@ -363,6 +363,7 @@
 	minbodytemp = 0
 	mob_size = MOB_SIZE_TINY
 	flying = 1
+	bubble_icon = "syndibot"
 	gold_core_spawnable = HOSTILE_SPAWN
 	del_on_death = 1
 	deathmessage = "is smashed into pieces!"

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

@@ -17,6 +17,7 @@
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
 	speak_emote = list("blorbles")
+	bubble_icon = "slime"
 
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 

code/modules/mob/mob.dm

@@ -127,14 +127,12 @@
 // self_message (optional) is what the src mob hears.
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message)
+/mob/audible_message(message, deaf_message, hearing_distance)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
 	var/msg = message
 	for(var/mob/M in get_mobs_in_view(range, src))
-		if(self_message && M == src)
-			msg = self_message
 		M.show_message(msg, 2, deaf_message, 1)
 
 	// based on say code
@@ -156,12 +154,12 @@
 // message is the message output to anyone who can hear.
 // deaf_message (optional) is what deaf people will see.
 // hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance)
+/atom/proc/audible_message(message, deaf_message, hearing_distance)
 	var/range = 7
 	if(hearing_distance)
 		range = hearing_distance
 	for(var/mob/M in get_mobs_in_view(range, src))
-		M.show_message( message, 2, deaf_message, 1)
+		M.show_message(message, 2, deaf_message, 1)
 
 /mob/proc/findname(msg)
 	for(var/mob/M in GLOB.mob_list)

code/modules/mob/say.dm

@@ -114,7 +114,7 @@
 
 	return get_turf(src)
 
-/mob/proc/say_test(var/text)
+/proc/say_test(text)
 	var/ending = copytext(text, length(text))
 	if(ending == "?")
 		return "1"

code/modules/mob/typing_indicator.dm

@@ -5,31 +5,32 @@ mob/var/typing
 mob/var/last_typed
 mob/var/last_typed_time
 
-GLOBAL_DATUM(typing_indicator, /image)
+GLOBAL_LIST_EMPTY(typing_indicator)
 
-/mob/proc/set_typing_indicator(var/state)
+/mob/proc/set_typing_indicator(state)
 
-	if(!GLOB.typing_indicator)
-		GLOB.typing_indicator = image('icons/mob/talk.dmi', null, "typing", MOB_LAYER + 1)
-		GLOB.typing_indicator.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+	if(!GLOB.typing_indicator[bubble_icon])
+		GLOB.typing_indicator[bubble_icon] = image('icons/mob/talk.dmi', null, "[bubble_icon]typing", FLY_LAYER)
+		var/image/I = GLOB.typing_indicator[bubble_icon]
+		I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
 
 	if(ishuman(src))
 		var/mob/living/carbon/human/H = src
 		if((MUTE in H.mutations) || H.silent)
-			overlays -= GLOB.typing_indicator
+			overlays -= GLOB.typing_indicator[bubble_icon]
 			return
 
 	if(client)
 		if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS || is_muzzled())
-			overlays -= GLOB.typing_indicator
+			overlays -= GLOB.typing_indicator[bubble_icon]
 		else
 			if(state)
 				if(!typing)
-					overlays += GLOB.typing_indicator
+					overlays += GLOB.typing_indicator[bubble_icon]
 					typing = 1
 			else
 				if(typing)
-					overlays -= GLOB.typing_indicator
+					overlays -= GLOB.typing_indicator[bubble_icon]
 					typing = 0
 			return state
 

code/modules/paperwork/photocopier.dm

@@ -340,7 +340,7 @@
 		return 0
 	else
 		playsound(loc, 'sound/machines/ping.ogg', 50, 0)
-		atom_say("<span class='danger'>Attention: Posterior Placed on Printing Plaque!</span>")
+		atom_say("Attention: Posterior Placed on Printing Plaque!")
 		return 1
 
 /obj/machinery/photocopier/emag_act(user as mob)

code/modules/paperwork/photography.dm

@@ -562,13 +562,13 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
 			talk_into(M, msg)
 		for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines)
 			if(T.watchers[M] == camera)
-				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> says, '[msg]'", hearing_distance = 2)
+				T.atom_say(msg)
 
 /obj/item/videocam/hear_message(mob/M as mob, msg)
 	if(camera && on)
 		for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines)
 			if(T.watchers[M] == camera)
-				T.audible_message("<span class='game radio'><span class='name'>(Newscaster) [M]</span> [msg]", hearing_distance = 2)
+				T.atom_say(msg)
 
 
 ///hauntings, like hallucinations but more spooky

code/modules/pda/mob_hunt_game_app.dm

@@ -47,7 +47,7 @@
 	SSmob_hunt.connected_clients += src
 	connected = 1
 	if(pda)
-		pda.audible_message("[bicon(pda)] Connection established. Capture all of the mobs, [pda.owner ? pda.owner : "hunter"]!", null, 2)
+		pda.atom_say("Connection established. Capture all of the mobs, [pda.owner ? pda.owner : "hunter"]!")
 	return 1
 
 /datum/data/pda/app/mob_hunter_game/proc/get_player()
@@ -67,7 +67,7 @@
 	connected = 0
 	//show a disconnect message if we were disconnected involuntarily (reason argument provided)
 	if(pda && reason)
-		pda.audible_message("[bicon(pda)] Disconnected from server. Reason: [reason].", null, 2)
+		pda.atom_say("Disconnected from server. Reason: [reason].")
 
 /datum/data/pda/app/mob_hunter_game/program_process()
 	if(!SSmob_hunt || !connected)

code/modules/research/message_server.dm

@@ -103,12 +103,12 @@ GLOBAL_LIST_EMPTY(message_servers)
 				if(2)
 					if(!Console.silent)
 						playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
-						Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5)
+						Console.atom_say("PRIORITY Alert in [sender]")
 					Console.message_log += "<B><FONT color='red'>High Priority message from <A href='?src=[Console.UID()];write=[sender]'>[sender]</A></FONT></B><BR>[authmsg]"
 				else
 					if(!Console.silent)
 						playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
-						Console.audible_message(text("[bicon(Console)] *The Requests Console beeps: 'Message from [sender]'"),,4)
+						Console.atom_say("Message from [sender]")
 					Console.message_log += "<B>Message from <A href='?src=[Console.UID()];write=[sender]'>[sender]</A></B><BR>[authmsg]"
 			Console.set_light(2)