[ready]Makes bIcon better

code/datums/callback.dm.rej

@@ -0,0 +1,62 @@
+diff a/code/datums/callback.dm b/code/datums/callback.dm	(rejected hunks)
+@@ -100,60 +100,3 @@
+ 	if (object == GLOBAL_PROC)
+ 		return call(delegate)(arglist(calling_arguments))
+ 	return call(object, delegate)(arglist(calling_arguments))
+-
+-
+-/datum/callback_select
+-	var/list/finished
+-	var/pendingcount
+-	var/total
+-
+-/datum/callback_select/New(count, savereturns)
+-	total = count
+-	if (savereturns)
+-		finished = new(count)
+-
+-
+-/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
+-	set waitfor = FALSE
+-	if (!callback || !istype(callback))
+-		//This check only exists because the alternative is callback_select would block forever if given invalid data
+-		CRASH("invalid callback passed to invoke_callback")
+-	if (!length(callback_args))
+-		callback_args = list()
+-	pendingcount++
+-	debug_usr("calling callback")
+-	var/rtn = callback.Invoke(arglist(callback_args))
+-	debug_usr("callback returned")
+-	pendingcount--
+-	if (savereturn)
+-		finished[index] = rtn
+-
+-
+-
+-
+-//runs a list of callbacks asynchronously, returning once all of them return.
+-//callbacks can be repeated.
+-//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
+-//	the inner lists will be sent to the callbacks when invoked() as additional args.
+-//can optionly save and return a list of return values, in the same order as the original list of callbacks
+-//resolution is the number of byond ticks between checks.
+-/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
+-	if (!callbacks)
+-		return
+-	var/count = length(callbacks)
+-	if (!count)
+-		return
+-	if (!callback_args)
+-		callback_args = list()
+-
+-	callback_args.len = count
+-
+-	var/datum/callback_select/CS = new(count, savereturns)
+-	for (var/i in 1 to count)
+-		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
+-	debug_usr("starting callbacks: [CS.pendingcount]")
+-	while(CS.pendingcount)
+-		debug_usr("callbacks: [CS.pendingcount]")
+-		sleep(resolution*world.tick_lag)
+-	return CS.finished
+-

code/datums/wires/mulebot.dm

@@ -20,12 +20,12 @@
 	var/mob/living/simple_animal/bot/mulebot/M = holder
 	switch(wire)
 		if(WIRE_POWER1, WIRE_POWER2)
-			holder.visible_message("<span class='notice'>[bicon(M)] The charge light flickers.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The charge light flickers.</span>")
 		if(WIRE_AVOIDANCE)
-			holder.visible_message("<span class='notice'>[bicon(M)] The external warning lights flash briefly.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The external warning lights flash briefly.</span>")
 		if(WIRE_LOADCHECK)
-			holder.visible_message("<span class='notice'>[bicon(M)] The load platform clunks.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The load platform clunks.</span>")
 		if(WIRE_MOTOR1, WIRE_MOTOR2)
-			holder.visible_message("<span class='notice'>[bicon(M)] The drive motor whines briefly.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The drive motor whines briefly.</span>")
 		else
-			holder.visible_message("<span class='notice'>[bicon(M)] You hear a radio crackle.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] You hear a radio crackle.</span>")

code/datums/wires/particle_accelerator.dm

@@ -25,7 +25,7 @@
 		if(WIRE_INTERFACE)
 			C.interface_control = !C.interface_control
 		if(WIRE_LIMIT)
-			C.visible_message("[bicon(C)]<b>[C]</b> makes a large whirring noise.")
+			C.visible_message("[icon2html(C, viewers(holder))]<b>[C]</b> makes a large whirring noise.")
 
 /datum/wires/particle_accelerator/control_box/on_cut(wire, mend)
 	var/obj/machinery/particle_accelerator/control_box/C = holder

code/datums/wires/syndicatebomb.dm

@@ -19,21 +19,21 @@
 	switch(wire)
 		if(WIRE_BOOM)
 			if(B.active)
-				holder.visible_message("<span class='danger'>[bicon(B)] An alarm sounds! It's go-</span>")
+				holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] An alarm sounds! It's go-</span>")
 				B.explode_now = TRUE
 				tell_admins(B)
 		if(WIRE_UNBOLT)
-			holder.visible_message("<span class='notice'>[bicon(B)] The bolts spin in place for a moment.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bolts spin in place for a moment.</span>")
 		if(WIRE_DELAY)
 			if(B.delayedbig)
-				holder.visible_message("<span class='notice'>[bicon(B)] The bomb has already been delayed.</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bomb has already been delayed.</span>")
 			else
-				holder.visible_message("<span class='notice'>[bicon(B)] The bomb chirps.</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bomb chirps.</span>")
 				playsound(B, 'sound/machines/chime.ogg', 30, 1)
 				B.detonation_timer += 300
 				B.delayedbig = TRUE
 		if(WIRE_PROCEED)
-			holder.visible_message("<span class='danger'>[bicon(B)] The bomb buzzes ominously!</span>")
+			holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] The bomb buzzes ominously!</span>")
 			playsound(B, 'sound/machines/buzz-sigh.ogg', 30, 1)
 			var/seconds = B.seconds_remaining()
 			if(seconds >= 61) // Long fuse bombs can suddenly become more dangerous if you tinker with them.
@@ -44,13 +44,13 @@
 				B.detonation_timer = world.time + 100
 		if(WIRE_ACTIVATE)
 			if(!B.active && !B.defused)
-				holder.visible_message("<span class='danger'>[bicon(B)] You hear the bomb start ticking!</span>")
+				holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] You hear the bomb start ticking!</span>")
 				B.activate()
 				B.update_icon()
 			else if(B.delayedlittle)
-				holder.visible_message("<span class='notice'>[bicon(B)] Nothing happens.</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] Nothing happens.</span>")
 			else
-				holder.visible_message("<span class='notice'>[bicon(B)] The bomb seems to hesitate for a moment.</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bomb seems to hesitate for a moment.</span>")
 				B.detonation_timer += 100
 				B.delayedlittle = TRUE
 
@@ -62,24 +62,24 @@
 				B.defused = FALSE // Cutting and mending all the wires of an inactive bomb will thus cure any sabotage.
 			else
 				if(B.active)
-					holder.visible_message("<span class='danger'>[bicon(B)] An alarm sounds! It's go-</span>")
+					holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] An alarm sounds! It's go-</span>")
 					B.explode_now = TRUE
 					tell_admins(B)
 				else
 					B.defused = TRUE
 		if(WIRE_UNBOLT)
 			if(!mend && B.anchored)
-				holder.visible_message("<span class='notice'>[bicon(B)] The bolts lift out of the ground!</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The bolts lift out of the ground!</span>")
 				playsound(B, 'sound/effects/stealthoff.ogg', 30, 1)
 				B.anchored = FALSE
 		if(WIRE_PROCEED)
 			if(!mend && B.active)
-				holder.visible_message("<span class='danger'>[bicon(B)] An alarm sounds! It's go-</span>")
+				holder.visible_message("<span class='danger'>[icon2html(B, viewers(holder))] An alarm sounds! It's go-</span>")
 				B.explode_now = TRUE
 				tell_admins(B)
 		if(WIRE_ACTIVATE)
 			if(!mend && B.active)
-				holder.visible_message("<span class='notice'>[bicon(B)] The timer stops! The bomb has been defused!</span>")
+				holder.visible_message("<span class='notice'>[icon2html(B, viewers(holder))] The timer stops! The bomb has been defused!</span>")
 				B.active = FALSE
 				B.defused = TRUE
 				B.update_icon()