refactors most spans

code/modules/nifsoft/software/13_soulcatcher.dm

@@ -74,13 +74,13 @@
 
 	to_chat(nif.human,
 			type = MESSAGE_TYPE_NIF,
-			html = "<span class='nif'><b>\[[icon2html(nif.big_icon, nif.human)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
+			html = span_nif("<b>\[[icon2html(nif.big_icon, nif.human)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\""))
 	nif.human << sound
 
 	for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
 		to_chat(CS,
 				type = MESSAGE_TYPE_NIF,
-				html = "<span class='nif'><b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"</span>")
+				html = span_nif("<b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\""))
 		CS << sound
 
 /datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj)
@@ -88,17 +88,17 @@
 
 	//AR Projecting
 	if(eyeobj)
-		sender.eyeobj.visible_message("<span class='game say'><b>[sender_name]</b> says, \"[message]\"</span>")
+		sender.eyeobj.visible_message(span_game(span_say("<b>[sender_name]</b> says, \"[message]\"")))
 
 	//Not AR Projecting
 	else
 		to_chat(nif.human,
 				type = MESSAGE_TYPE_NIF,
-				html = "<span class='nif'><b>\[[icon2html(nif.big_icon, nif.human.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
+				html = span_nif("<b>\[[icon2html(nif.big_icon, nif.human.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\""))
 		for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
 			to_chat(CS,
 					type = MESSAGE_TYPE_NIF,
-					html = "<span class='nif'><b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
+					html = span_nif("<b>\[[icon2html(nif.big_icon, CS.client)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\""))
 
 	log_nsay(message,nif.human.real_name,sender)
 
@@ -107,17 +107,17 @@
 
 	//AR Projecting
 	if(eyeobj)
-		sender.eyeobj.visible_message("<span class='emote'>[sender_name] [message]</span>")
+		sender.eyeobj.visible_message(span_emote("[sender_name] [message]"))
 
 	//Not AR Projecting
 	else
 		to_chat(nif.human,
 				type = MESSAGE_TYPE_NIF,
-				html = "<span class='nif'><b>\[[icon2html(nif.big_icon,nif.human.client)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
+				html = span_nif("<b>\[[icon2html(nif.big_icon,nif.human.client)]NIF\]</b> <b>[sender_name]</b> [message]"))
 		for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
 			to_chat(CS,
 					type = MESSAGE_TYPE_NIF,
-					html = "<span class='nif'><b>\[[icon2html(nif.big_icon,CS.client)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
+					html = span_nif("<b>\[[icon2html(nif.big_icon,CS.client)]NIF\]</b> <b>[sender_name]</b> [message]"))
 
 	log_nme(message,nif.human.real_name,sender)
 
@@ -380,7 +380,7 @@
 			return
 		if (src.client)
 			if (client.prefs.muted & MUTE_IC)
-				to_chat(src, "<span class='warning'>You cannot send IC messages (muted).</span>")
+				to_chat(src, span_warning("You cannot send IC messages (muted)."))
 				return
 		if (stat)
 			return
@@ -398,7 +398,7 @@
 	set name = "Resist"
 	set category = "IC"
 
-	to_chat(src,"<span class='warning'>There's no way out! You're stuck in VR.</span>")
+	to_chat(src,span_warning("There's no way out! You're stuck in VR."))
 
 ///////////////////
 //A projected AR soul thing
@@ -553,11 +553,11 @@
 	set category = "Soulcatcher"
 
 	if(eyeobj)
-		to_chat(src,"<span class='warning'>You're already projecting in AR!</span>")
+		to_chat(src,span_warning("You're already projecting in AR!"))
 		return
 
 	if(!(soulcatcher.setting_flags & NIF_SC_PROJECTING))
-		to_chat(src,"<span class='warning'>Projecting from this NIF has been disabled!</span>")
+		to_chat(src,span_warning("Projecting from this NIF has been disabled!"))
 		return
 
 	if(!client || !client.prefs)
@@ -572,7 +572,7 @@
 	set category = "Soulcatcher"
 
 	if(!eyeobj)
-		to_chat(src,"<span class='warning'>You're not projecting into AR!</span>")
+		to_chat(src,span_warning("You're not projecting into AR!"))
 		return
 
 	eyeobj.forceMove(get_turf(nif))
@@ -583,7 +583,7 @@
 	set category = "Soulcatcher"
 
 	if(!eyeobj)
-		to_chat(src,"<span class='warning'>You're not projecting into AR!</span>")
+		to_chat(src,span_warning("You're not projecting into AR!"))
 		return
 
 	QDEL_NULL(eyeobj)

code/modules/nifsoft/software/14_commlink.dm

@@ -81,7 +81,7 @@
 			var/message = combined["formatted"]
 			var/name_used = M.GetVoice()
 			var/rendered = null
-			rendered = "<span class='game say'>[icon2html(icon_object,mob.client)] <span class='name'>[name_used]</span> [message]</span>"
+			rendered = span_game(span_say("[icon2html(icon_object,mob.client)] [span_name(name_used)] [message]"))
 			mob.show_message(rendered, 2)
 
 //Not supported by the internal one

code/modules/nifsoft/software/15_misc.dm

@@ -21,7 +21,7 @@
 				deactivate()
 			return FALSE
 
-		H.visible_message("<span class='warning'>Thin snakelike tendrils grow from [H] and connect to \the [apc].</span>","<span class='notice'>Thin snakelike tendrils grow from you and connect to \the [apc].</span>")
+		H.visible_message(span_warning("Thin snakelike tendrils grow from [H] and connect to \the [apc]."),span_notice("Thin snakelike tendrils grow from you and connect to \the [apc]."))
 
 /datum/nifsoft/apc_recharge/deactivate(var/force = FALSE)
 	if((. = ..()))
@@ -36,7 +36,7 @@
 			return TRUE
 		else
 			nif.notify("APC charging has ended.")
-			H.visible_message("<span class='warning'>[H]'s snakelike tendrils whip back into their body from \the [apc].</span>","<span class='notice'>The APC connector tendrils return to your body.</span>")
+			H.visible_message(span_warning("[H]'s snakelike tendrils whip back into their body from \the [apc]."),span_notice("The APC connector tendrils return to your body."))
 			deactivate()
 			return FALSE
 
@@ -105,11 +105,11 @@
 
 /datum/nifsoft/compliance/activate()
 	if((. = ..()))
-		to_chat(nif.human,"<span class='danger'>You are compelled to follow these rules: </span>\n<span class='notify'>[laws]</span>")
+		to_chat(nif.human,span_danger("You are compelled to follow these rules: </span>\n<span class='notify'>[laws]"))
 
 /datum/nifsoft/compliance/install()
 	if((. = ..()))
-		to_chat(nif.human,"<span class='danger'>You feel suddenly compelled to follow these rules: </span>\n<span class='notify'>[laws]</span>")
+		to_chat(nif.human,span_danger("You feel suddenly compelled to follow these rules: </span>\n<span class='notify'>[laws]"))
 
 /datum/nifsoft/compliance/uninstall()
 	nif.notify("ERROR! Unable to comply!",TRUE)
@@ -131,12 +131,12 @@
 
 		if (!nif.human.size_range_check(new_size))
 			if(new_size)
-				to_chat(nif.human,"<span class='notice'>The safety features of the NIF Program prevent you from choosing this size.</span>")
+				to_chat(nif.human,span_notice("The safety features of the NIF Program prevent you from choosing this size."))
 			return
 		else
 			if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE))
-				to_chat(nif.human,"<span class='notice'>You set the size to [new_size]%</span>")
-				nif.human.visible_message("<span class='warning'>Swirling grey mist envelops [nif.human] as they change size!</span>","<span class='notice'>Swirling streams of nanites wrap around you as you change size!</span>")
+				to_chat(nif.human,span_notice("You set the size to [new_size]%"))
+				nif.human.visible_message(span_warning("Swirling grey mist envelops [nif.human] as they change size!"),span_notice("Swirling streams of nanites wrap around you as you change size!"))
 		spawn(0)
 			deactivate()
 
@@ -188,7 +188,7 @@
 
 /datum/nifsoft/malware/activate()
 	if((. = ..()))
-		to_chat(nif.human,"<span class='danger'>Runtime error in 15_misc.dm, line 191.</span>")
+		to_chat(nif.human,span_danger("Runtime error in 15_misc.dm, line 191."))
 
 /datum/nifsoft/malware/install()
 	if((. = ..()))
@@ -198,4 +198,4 @@
 	if((. = ..()))
 		if(nif.human.client && world.time - last_ads > rand(10 MINUTES, 15 MINUTES) && prob(1))
 			last_ads = world.time
-			nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5)
+			nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5)