Fixes merge conflicts again.

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

@@ -660,8 +660,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	// auto update every Master Controller tick
 	ui.set_auto_update(auto_update)
 
-//NOTE: graphic resources are loaded on client login
 /obj/item/device/pda/attack_self(mob/user as mob)
+	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/pda)
+	assets.send(user)
 
 	user.set_machine(src)
 
@@ -1151,7 +1152,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if (!beep_silent)
 		playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
 		for (var/mob/O in hearers(2, loc))
-			O.show_message(text("\icon[src] *[message_tone]*"))
+			O.show_message(text("[bicon(src)] *[message_tone]*"))
 	//Search for holder of the PDA.
 	var/mob/living/L = null
 	if(loc && isliving(loc))
@@ -1166,7 +1167,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		SSnanoui.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message
 
 /obj/item/device/pda/proc/new_news(var/message)
-	new_info(news_silent, newstone, news_silent ? "" : "\icon[src] <b>[message]</b>")
+	new_info(news_silent, newstone, news_silent ? "" : "[bicon(src)] <b>[message]</b>")
 
 	if(!news_silent)
 		new_news = 1
@@ -1181,7 +1182,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	new_message(sending_device, sending_device.owner, sending_device.ownjob, message)
 
 /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message, var/reply = 1)
-	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" ([reply ? "<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>" : "Unable to Reply"])"
+	var/reception_message = "[bicon(src)] <b>Message from [sender] ([sender_job]), </b>\"[message]\" ([reply ? "<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>" : "Unable to Reply"])"
 	new_info(message_silent, ttone, reception_message)
 
 	log_pda("(PDA: [sending_unit]) sent \"[message]\" to [name]", usr)
@@ -1193,7 +1194,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	if(ismob(sending_unit.loc) && isAI(loc))
 		track = "(<a href='byond://?src=\ref[loc];track=\ref[sending_unit.loc];trackname=[html_encode(sender)]'>Follow</a>)"
 
-	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=1;skiprefresh=1;target=\ref[sending_unit]'>Reply</a>) [track]"
+	var/reception_message = "[bicon(src)] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=1;skiprefresh=1;target=\ref[sending_unit]'>Reply</a>) [track]"
 	new_info(message_silent, newstone, reception_message)
 
 	log_pda("(PDA: [sending_unit]) sent \"[message]\" to [name]",usr)

code/game/objects/items/devices/PDA/cart.dm

@@ -425,14 +425,14 @@ var/list/civilian_cartridges = list(
 
 	if(mode==47)
 		var/supplyData[0]
-		var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
+		var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
 		if (shuttle)
 			supplyData["shuttle_moving"] = shuttle.has_arrive_time()
 			supplyData["shuttle_eta"] = shuttle.eta_minutes()
 			supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
 		var/supplyOrderCount = 0
 		var/supplyOrderData[0]
-		for(var/S in supply_controller.shoppinglist)
+		for(var/S in SSsupply.shoppinglist)
 			var/datum/supply_order/SO = S
 
 			supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment))
@@ -444,7 +444,7 @@ var/list/civilian_cartridges = list(
 
 		var/requestCount = 0
 		var/requestData[0]
-		for(var/S in supply_controller.order_history)
+		for(var/S in SSsupply.order_history)
 			var/datum/supply_order/SO = S
 			if(SO.status != SUP_ORDER_REQUESTED)
 				continue

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] Now outside of camera network.</span>")
+				to_chat(carrier, "<span class='notice'>[bicon(src)] Now outside of camera network.</span>")
 				carrier << 'sound/machines/defib_failed.ogg'
 			if(PROXIMITY_NONE)
-				to_chat(carrier, "<span class='notice'>\icon[src] Now within camera network, AI and cameras unfocused.</span>")
+				to_chat(carrier, "<span class='notice'>[bicon(src)] 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] Warning: AI focus at nearby location.</span>")
+				to_chat(carrier, "<span class='warning'>[bicon(src)] 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] Alert: AI or camera focused at current location!</span></font>")
+				to_chat(carrier, "<font size='3'><span class='danger'>[bicon(src)] 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] Danger: AI is actively tracking you!</span></font>")
+				to_chat(carrier, "<font size='3'><span class='danger'>[bicon(src)] 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] 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'>[bicon(src)] Danger: AI is attempting to actively track you, but you are outside of the camera network!</span></font>")
 				carrier <<'sound/machines/defib_ready.ogg'
 
 

code/game/objects/items/devices/communicator/cartridge.dm

@@ -140,7 +140,7 @@
 			if(!reason)
 				return
 
-			supply_controller.create_order(S, user, reason)
+			SSsupply.create_order(S, user, reason)
 			internal_data["supply_reqtime"] = (world.time + 5) % 1e5
 
 	if(href_list["order_ref"])
@@ -189,20 +189,20 @@
 					O.approved_at = new_val
 
 		if(href_list["approve"])
-			supply_controller.approve_order(O, user)
+			SSsupply.approve_order(O, user)
 
 		if(href_list["deny"])
-			supply_controller.deny_order(O, user)
+			SSsupply.deny_order(O, user)
 
 		if(href_list["delete"])
-			supply_controller.delete_order(O, user)
+			SSsupply.delete_order(O, user)
 
 	if(href_list["clear_all_requests"])
 		var/mob/user = locate(href_list["user"])
 		if(!istype(user)) // Invalid ref
 			return
 
-		supply_controller.deny_all_pending(user)
+		SSsupply.deny_all_pending(user)
 
 	if(href_list["export_ref"])
 		var/datum/exported_crate/E = locate(href_list["export_ref"])
@@ -258,29 +258,29 @@
 						E.value = num
 
 		else if(href_list["delete"])
-			supply_controller.delete_export(E, user)
+			SSsupply.delete_export(E, user)
 
 		else if(href_list["add_item"])
-			supply_controller.add_export_item(E, user)
+			SSsupply.add_export_item(E, user)
 
-	if(supply_controller && supply_controller.shuttle)
+	if(SSsupply && SSsupply.shuttle)
 		switch(href_list["send_shuttle"])
 			if("send_away")
-				if(supply_controller.shuttle.forbidden_atoms_check())
+				if(SSsupply.shuttle.forbidden_atoms_check())
 					to_chat(usr, "<span class='warning'>For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.</span>")
 				else
-					supply_controller.shuttle.launch(src)
+					SSsupply.shuttle.launch(src)
 					to_chat(usr, "<span class='notice'>Initiating launch sequence.</span>")
 
 			if("send_to_station")
-				supply_controller.shuttle.launch(src)
-				to_chat(usr, "<span class='notice'>The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.</span>")
+				SSsupply.shuttle.launch(src)
+				to_chat(usr, "<span class='notice'>The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.</span>")
 
 			if("cancel_shuttle")
-				supply_controller.shuttle.cancel_launch(src)
+				SSsupply.shuttle.cancel_launch(src)
 
 			if("force_shuttle")
-				supply_controller.shuttle.force_launch(src)
+				SSsupply.shuttle.force_launch(src)
 
 	// Status display
 	switch(href_list["stat_display"])

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

@@ -313,7 +313,7 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 /obj/item/device/communicator/Destroy()
 	for(var/mob/living/voice/voice in contents)
 		voice_mobs.Remove(voice)
-		to_chat(voice, "<span class='danger'>\icon[src] Connection timed out with remote host.</span>")
+		to_chat(voice, "<span class='danger'>[bicon(src)] Connection timed out with remote host.</span>")
 		qdel(voice)
 	close_connection(reason = "Connection timed out")
 

code/game/objects/items/devices/communicator/helper.dm

@@ -394,7 +394,7 @@
 // code\game\machinery\computer\supply.dm, starting at line 55
 /obj/item/weapon/commcard/proc/get_supply_shuttle_status()
 	var/shuttle_status[0]
-	var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
+	var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle
 	if(shuttle)
 		if(shuttle.has_arrive_time())
 			shuttle_status["location"] = "In transit"
@@ -454,7 +454,7 @@
 // code\game\machinery\computer\supply.dm, starting at line 130
 /obj/item/weapon/commcard/proc/get_supply_orders()
 	var/orders[0]
-	for(var/datum/supply_order/S in supply_controller.order_history)
+	for(var/datum/supply_order/S in SSsupply.order_history)
 		orders[++orders.len] = list(
 				"ref" = "\ref[S]",
 				"status" = S.status,
@@ -477,7 +477,7 @@
 // code\game\machinery\computer\supply.dm, starting at line 147
 /obj/item/weapon/commcard/proc/get_supply_receipts()
 	var/receipts[0]
-	for(var/datum/exported_crate/E in supply_controller.exported_crates)
+	for(var/datum/exported_crate/E in SSsupply.exported_crates)
 		receipts[++receipts.len] = list(
 				"ref" = "\ref[E]",
 				"contents" = E.contents,
@@ -495,8 +495,8 @@
 // code\game\machinery\computer\supply.dm, starting at line 147
 /obj/item/weapon/commcard/proc/get_supply_pack_list()
 	var/supply_packs[0]
-	for(var/pack_name in supply_controller.supply_pack)
-		var/datum/supply_pack/P = supply_controller.supply_pack[pack_name]
+	for(var/pack_name in SSsupply.supply_pack)
+		var/datum/supply_pack/P = SSsupply.supply_pack[pack_name]
 		if(P.group == internal_data["supply_category"])
 			var/list/pack = list(
 					"name" = P.name,
@@ -521,7 +521,7 @@
 	return list(
 			"shuttle_auth" = (internal_data["supply_controls"] & SUP_SEND_SHUTTLE),
 			"order_auth" = (internal_data["supply_controls"] & SUP_ACCEPT_ORDERS),
-			"supply_points" = supply_controller.points,
+			"supply_points" = SSsupply.points,
 			"supply_categories" = all_supply_groups
 		)
 

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] Receiving communicator request from [origin_atom].  To answer, use the <b>Call Communicator</b> \
+			to_chat(src, "<span class='notice'>[bicon(origin_atom)] 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] Received text message from [origin_atom]: <b>\"[text]\"</b></span>")
+		to_chat(src, "<span class='notice'>[bicon(origin_atom)] 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
@@ -78,7 +78,7 @@
 	if(ringer)
 		playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
 		for (var/mob/O in hearers(2, loc))
-			O.show_message(text("\icon[src] *beep*"))
+			O.show_message(text("[bicon(src)] *beep*"))
 
 	alert_called = 1
 	update_icon()
@@ -89,7 +89,7 @@
 		L = loc
 
 	if(L)
-		to_chat(L, "<span class='notice'>\icon[src] Message from [who].</span>")
+		to_chat(L, "<span class='notice'>[bicon(src)] Message from [who].</span>")
 
 // Verb: text_communicator()
 // Parameters: None

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] Connecting to [src].</span>")
-		to_chat(user, "<span class='notice'>\icon[src] Attempting to call [comm].</span>")
+		comm.visible_message("<span class='notice'>[bicon(src)] Connecting to [src].</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] Attempting to call [comm].</span>")
 		sleep(10)
-		to_chat(user, "<span class='notice'>\icon[src] Dialing internally from [station_name()], [system_name()].</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] 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] Connection re-routed to [comm] at [comm.exonet.address].</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] Connection re-routed to [comm] at [comm.exonet.address].</span>")
 		sleep(40)
-		to_chat(user, "<span class='notice'>\icon[src] Connection to [comm] at [comm.exonet.address] established.</span>")
-		comm.visible_message("<span class='notice'>\icon[src] Connection to [src] at [exonet.address] established.</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] Connection to [comm] at [comm.exonet.address] established.</span>")
+		comm.visible_message("<span class='notice'>[bicon(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] Connecting to [candidate].</span>")
-	to_chat(new_voice, "<span class='notice'>\icon[src] Attempting to call [src].</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] Connecting to [candidate].</span>")
+	to_chat(new_voice, "<span class='notice'>[bicon(src)] Attempting to call [src].</span>")
 	sleep(10)
-	to_chat(new_voice, "<span class='notice'>\icon[src] Dialing to [station_name()], Kara Subsystem, [system_name()].</span>")
+	to_chat(new_voice, "<span class='notice'>[bicon(src)] Dialing to [station_name()], Kara Subsystem, [system_name()].</span>")
 	sleep(20)
-	to_chat(new_voice, "<span class='notice'>\icon[src] Connecting to [station_name()] telecommunications array.</span>")
+	to_chat(new_voice, "<span class='notice'>[bicon(src)] Connecting to [station_name()] telecommunications array.</span>")
 	sleep(40)
-	to_chat(new_voice, "<span class='notice'>\icon[src] Connection to [station_name()] telecommunications array established.  Redirecting signal to [src].</span>")
+	to_chat(new_voice, "<span class='notice'>[bicon(src)] 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] Connection to [src] established.</span>")
+	to_chat(new_voice, "<span class='notice'>[bicon(src)] 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] Your communicator is now connected to [candidate]'s communicator.</span>")
+		to_chat(user, "<span class='notice'>[bicon(src)] 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] [reason].</span>")
-		visible_message("<span class='danger'>\icon[src] [reason].</span>")
+		to_chat(voice, "<span class='danger'>[bicon(src)] [reason].</span>")
+		visible_message("<span class='danger'>[bicon(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] [reason].</span>")
-		visible_message("<span class='danger'>\icon[src] [reason].</span>")
+		comm.visible_message("<span class='danger'>[bicon(src)] [reason].</span>")
+		visible_message("<span class='danger'>[bicon(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(loc, 'sound/machines/twobeep.ogg', 50, 1)
 		for (var/mob/O in hearers(2, loc))
-			O.show_message(text("\icon[src] *beep*"))
+			O.show_message(text("[bicon(src)] *beep*"))
 
 	alert_called = 1
 	update_icon()
@@ -174,7 +174,7 @@
 		L = loc
 
 	if(L)
-		to_chat(L, "<span class='notice'>\icon[src] Communications request from [who].</span>")
+		to_chat(L, "<span class='notice'>[bicon(src)] 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] Declined request.</span>")
+		to_chat(us, "<span class='notice'>[bicon(src)] 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] <span class='message'>[text]</span>"
+	var/rendered = "[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
@@ -241,16 +241,16 @@
 			var/name_used = M.GetVoice()
 			var/rendered = null
 			if(speaking) //Language being used
-				rendered = "<span class='game say'>\icon[src] <span class='name'>[name_used]</span> [speaking.format_message(text, verb)]</span>"
+				rendered = "<span class='game say'>[bicon(src)] <span class='name'>[name_used]</span> [speaking.format_message(text, verb)]</span>"
 			else
-				rendered = "<span class='game say'>\icon[src] <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></span>"
+				rendered = "<span class='game say'>[bicon(src)] <span class='name'>[name_used]</span> [verb], <span class='message'>\"[text]\"</span></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] <span class='message'>[msg]</span>"
+	var/rendered = "[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
@@ -331,14 +331,14 @@
 		to_chat(user, "<span class='danger'>You cannot see well enough to do that!</span>")
 
 	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]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.</span>")
+		to_chat(user, "<span class='danger'>[bicon(src)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.</span>")
 
-	to_chat(user, "<span class='notice'>\icon[src] Attempting to start video over existing call.</span>")
+	to_chat(user, "<span class='notice'>[bicon(src)] Attempting to start video over existing call.</span>")
 	sleep(30)
-	to_chat(user, "<span class='notice'>\icon[src] Please wait...</span>")
+	to_chat(user, "<span class='notice'>[bicon(src)] Please wait...</span>")
 
 	video_source = comm.camera
-	comm.visible_message("<span class='danger'>\icon[src] New video connection from [comm].</span>")
+	comm.visible_message("<span class='danger'>[bicon(src)] New video connection from [comm].</span>")
 	watch_video(user)
 	update_icon()
 
@@ -377,7 +377,7 @@
 /obj/item/device/communicator/proc/end_video(var/reason)
 	video_source = null
 
-	. = "<span class='danger'>\icon[src] [reason ? reason : "Video session ended"].</span>"
+	. = "<span class='danger'>[bicon(src)] [reason ? reason : "Video session ended"].</span>"
 
 	visible_message(.)
 	update_icon()

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

@@ -62,7 +62,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'>[bicon(src)] You switch [scanning ? "on" : "off"] \the [src].</span>")
 
 /obj/item/device/geiger/update_icon()
 	if(!scanning)

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

@@ -47,7 +47,7 @@
 		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] <span class='warning'>Unable to hack this target!</span>")
+		to_chat(user, "[bicon(src)] <span class='warning'>Unable to hack this target!</span>")
 		return 0
 	var/found = known_targets.Find(target)
 	if(found)

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

@@ -364,7 +364,7 @@ var/global/list/default_medbay_channels = list(
 		var/list/jamming = is_jammed(src)
 		if(jamming)
 			var/distance = jamming["distance"]
-			to_chat(M, "<span class='danger'>\icon[src] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.</span>")
+			to_chat(M, "<span class='danger'>[bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.</span>")
 			return FALSE
 
 		// First, we want to generate a new radio signal

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

@@ -25,4 +25,4 @@
 	var/message = sanitize(input(user,"Choose a message to relay to those around you.") as text|null)
 	if(message)
 		var/obj/item/device/text_to_speech/O = src
-		audible_message("\icon[O] \The [O.name] states, \"[message]\"")
+		audible_message("[bicon(O)] \The [O.name] states, \"[message]\"")

code/game/objects/items/toys.dm

@@ -446,7 +446,7 @@
 
 /obj/item/toy/waterflower/examine(mob/user)
 	if(..(user, 0))
-		to_chat(user, "\icon[src] [src.reagents.total_volume] units of water left!")
+		to_chat(user, "[bicon(src)] [src.reagents.total_volume] units of water left!")
 
 /*
  * Bosun's whistle

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

@@ -41,7 +41,7 @@
 
 /obj/item/weapon/extinguisher/examine(mob/user)
 	if(..(user, 0))
-		to_chat(user, text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume))
+		to_chat(user, "[bicon(src)] [src.name] contains [src.reagents.total_volume] units of water left!")
 
 /obj/item/weapon/extinguisher/attack_self(mob/user as mob)
 	safety = !safety

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -91,8 +91,8 @@
 	return dat
 
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
-	user.visible_message("\The [user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\
-		"You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]")
+	user.visible_message("\The [user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]",\
+		"You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]")
 
 	src.add_fingerprint(user)
 	return
@@ -108,7 +108,7 @@
 	set category = "Object"
 	set src in usr
 
-	to_chat(usr, "\icon[src] [src.name]: The current assignment on the card is [src.assignment].")
+	to_chat(usr, "[bicon(src)] [src.name]: The current assignment on the card is [src.assignment].")
 	to_chat(usr, "The blood type on the card is [blood_type].")
 	to_chat(usr, "The DNA hash on the card is [dna_hash].")
 	to_chat(usr, "The fingerprint hash on the card is [fingerprint_hash].")

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

@@ -50,7 +50,7 @@
 	icon_state = "c-4[size]_1"
 	playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1)
 	for(var/mob/O in hearers(src, null))
-		O.show_message("\icon[src] <span class = 'warning'> The [src.name] beeps! </span>")
+		O.show_message("[bicon(src)] <span class = 'warning'> The [src.name] beeps! </span>")
 	sleep(50)
 	explosion(get_turf(src), devastate, heavy_impact, light_impact, flash_range)
 	for(var/dirn in cardinal)		//This is to guarantee that C4 at least breaks down all immediately adjacent walls and doors.

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

@@ -329,6 +329,9 @@ var/list/global/tank_gauge_cache = list()
 /obj/item/weapon/tank/remove_air(amount)
 	return air_contents.remove(amount)
 
+/obj/item/weapon/tank/proc/remove_air_by_flag(flag, amount)
+	return air_contents.remove_by_flag(flag, amount)
+
 /obj/item/weapon/tank/return_air()
 	return air_contents
 
@@ -465,7 +468,7 @@ var/list/global/tank_gauge_cache = list()
 				return
 			T.assume_air(air_contents)
 			playsound(get_turf(src), 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
-			visible_message("\icon[src] <span class='danger'>\The [src] flies apart!</span>", "<span class='warning'>You hear a bang!</span>")
+			visible_message("[bicon(src)] <span class='danger'>\The [src] flies apart!</span>", "<span class='warning'>You hear a bang!</span>")
 			T.hotspot_expose(air_contents.temperature, 70, 1)
 
 
@@ -510,7 +513,7 @@ var/list/global/tank_gauge_cache = list()
 
 			T.assume_air(leaked_gas)
 			if(!leaking)
-				visible_message("\icon[src] <span class='warning'>\The [src] relief valve flips open with a hiss!</span>", "You hear hissing.")
+				visible_message("[bicon(src)] <span class='warning'>\The [src] relief valve flips open with a hiss!</span>", "You hear hissing.")
 				playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
 				leaking = 1
 				#ifdef FIREDBG

code/game/objects/items/weapons/tools/combitool.dm

@@ -27,7 +27,7 @@
 	if(loc == usr && tools.len)
 		to_chat(usr, "It has the following fittings:")
 		for(var/obj/item/tool in tools)
-			to_chat(usr, "\icon[tool] - [tool.name][tools[current_tool]==tool?" (selected)":""]")
+			to_chat(usr, "[bicon(tool)] - [tool.name][tools[current_tool]==tool?" (selected)":""]")
 
 /obj/item/weapon/combitool/New()
 	..()

code/game/objects/items/weapons/tools/weldingtool.dm

@@ -58,7 +58,7 @@
 /obj/item/weapon/weldingtool/examine(mob/user)
 	if(..(user, 0))
 		if(max_fuel)
-			to_chat(user, text("\icon[] The [] contains []/[] units of fuel!", src, src.name, get_fuel(),src.max_fuel ))
+			to_chat(user, "[bicon(src)] The [src.name] contains [get_fuel()]/[src.max_fuel] units of fuel!")
 
 /obj/item/weapon/weldingtool/attack(atom/A, mob/living/user, def_zone)
 	if(ishuman(A) && user.a_intent == I_HELP)
@@ -560,9 +560,9 @@
 		to_chat(user, desc)
 	else
 		if(power_supply)
-			to_chat(user, "\icon[src] The [src.name] has [get_fuel()] charge left.")
+			to_chat(user, "[bicon(src)] The [src.name] has [get_fuel()] charge left.")
 		else
-			to_chat(user, "\icon[src] The [src.name] has no power cell!")
+			to_chat(user, "[bicon(src)] The [src.name] has no power cell!")
 
 /obj/item/weapon/weldingtool/electric/get_fuel()
 	if(use_external_power)

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

@@ -145,7 +145,7 @@
 
 /obj/item/weapon/weldpack/examine(mob/user)
 	..(user)
-	to_chat(user, "\icon[src] [src.reagents.total_volume] units of fuel left!")
+	to_chat(user, "[bicon(src)] [src.reagents.total_volume] units of fuel left!")
 	return
 
 /obj/item/weapon/weldpack/survival