next set of spans (#16434)

* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly

code/modules/economy/ATM.dm

@@ -85,7 +85,7 @@ log transactions
 	if(istype(I, /obj/item/card))
 		if(emagged > 0)
 			//prevent inserting id into an emagged ATM
-			to_chat(user, span_red("[icon2html(src, user.client)] CARD READER ERROR. This system has been compromised!"))
+			to_chat(user, span_boldwarning("[icon2html(src, user.client)] CARD READER ERROR. This system has been compromised!"))
 			return
 		else if(istype(I,/obj/item/card/emag))
 			I.resolve_attackby(src, user)
@@ -190,7 +190,7 @@ log transactions
 				release_held_id(usr)
 			else
 				if(emagged > 0)
-					to_chat(usr, span_red("[icon2html(src, usr.client)] The ATM card reader rejected your ID because this machine has been sabotaged!"))
+					to_chat(usr, span_boldwarning("[icon2html(src, usr.client)] The ATM card reader rejected your ID because this machine has been sabotaged!"))
 				else
 					var/obj/item/I = usr.get_active_hand()
 					if(istype(I, /obj/item/card/id))
@@ -211,12 +211,12 @@ log transactions
 
 			var/obj/item/paper/R = new(loc)
 			R.name = "Account balance: [authenticated_account.owner_name]"
-			R.info = "<b>NT Automated Teller Account Statement</b><br><br>"
-			R.info += "<i>Account holder:</i> [authenticated_account.owner_name]<br>"
-			R.info += "<i>Account number:</i> [authenticated_account.account_number]<br>"
-			R.info += "<i>Balance:</i> $[authenticated_account.money]<br>"
-			R.info += "<i>Date and time:</i> [stationtime2text()], [current_date_string]<br><br>"
-			R.info += "<i>Service terminal ID:</i> [machine_id]<br>"
+			R.info = span_bold("NT Automated Teller Account Statement") + "<br><br>"
+			R.info += span_italics("Account holder:") + " [authenticated_account.owner_name]<br>"
+			R.info += span_italics("Account number:") + " [authenticated_account.account_number]<br>"
+			R.info += span_italics("Balance:") + " $[authenticated_account.money]<br>"
+			R.info += span_italics("Date and time:") + " [stationtime2text()], [current_date_string]<br><br>"
+			R.info += span_italics("Service terminal ID:") + " [machine_id]<br>"
 
 			//stamp the paper
 			var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -225,7 +225,7 @@ log transactions
 				R.stamped = new
 			R.stamped += /obj/item/stamp
 			R.add_overlay(stampoverlay)
-			R.stamps += "<HR><i>This paper has been stamped by the Automatic Teller Machine.</i>"
+			R.stamps += "<HR>" + span_italics("This paper has been stamped by the Automatic Teller Machine.")
 
 			if(prob(50))
 				playsound(src, 'sound/items/polaroid1.ogg', 50, 1)
@@ -240,19 +240,19 @@ log transactions
 
 			var/obj/item/paper/R = new(loc)
 			R.name = "Transaction logs: [authenticated_account.owner_name]"
-			R.info = "<b>Transaction logs</b><br>"
-			R.info += "<i>Account holder:</i> [authenticated_account.owner_name]<br>"
-			R.info += "<i>Account number:</i> [authenticated_account.account_number]<br>"
-			R.info += "<i>Date and time:</i> [stationtime2text()], [current_date_string]<br><br>"
-			R.info += "<i>Service terminal ID:</i> [machine_id]<br>"
+			R.info = span_bold("Transaction logs") + "<br>"
+			R.info += span_italics("Account holder:") + " [authenticated_account.owner_name]<br>"
+			R.info += span_italics("Account number:") + " [authenticated_account.account_number]<br>"
+			R.info += span_italics("Date and time:") + " [stationtime2text()], [current_date_string]<br><br>"
+			R.info += span_italics("Service terminal ID:") + " [machine_id]<br>"
 			R.info += "<table border=1 style='width:100%'>"
 			R.info += "<tr>"
-			R.info += "<td><b>Date</b></td>"
-			R.info += "<td><b>Time</b></td>"
-			R.info += "<td><b>Target</b></td>"
-			R.info += "<td><b>Purpose</b></td>"
-			R.info += "<td><b>Value</b></td>"
-			R.info += "<td><b>Source terminal ID</b></td>"
+			R.info += "<td>" + span_bold("Date") + "</td>"
+			R.info += "<td>" + span_bold("Time") + "</td>"
+			R.info += "<td>" + span_bold("Target") + "</td>"
+			R.info += "<td>" + span_bold("Purpose") + "</td>"
+			R.info += "<td>" + span_bold("Value") + "</td>"
+			R.info += "<td>" + span_bold("Source terminal ID") + "</td>"
 			R.info += "</tr>"
 			for(var/datum/transaction/T in authenticated_account.transaction_log)
 				R.info += "<tr>"
@@ -272,7 +272,7 @@ log transactions
 				R.stamped = new
 			R.stamped += /obj/item/stamp
 			R.add_overlay(stampoverlay)
-			R.stamps += "<HR><i>This paper has been stamped by the Automatic Teller Machine.</i>"
+			R.stamps += "<HR>" + span_italics("This paper has been stamped by the Automatic Teller Machine.")
 
 			if(prob(50))
 				playsound(src, 'sound/items/polaroid1.ogg', 50, 1)
@@ -317,11 +317,11 @@ log transactions
 							T.time = stationtime2text()
 							failed_account.transaction_log.Add(T)
 					else
-						to_chat(usr, span_red("[icon2html(src, usr.client)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."))
+						to_chat(usr, span_warning("[icon2html(src, usr.client)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."))
 						previous_account_number = tried_account_num
 						playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
 				else
-					to_chat(usr, span_red("[icon2html(src, usr.client)] incorrect pin/account combination entered."))
+					to_chat(usr, span_warning("[icon2html(src, usr.client)] incorrect pin/account combination entered."))
 					number_incorrect_tries = 0
 			else
 				playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
@@ -337,7 +337,7 @@ log transactions
 				T.time = stationtime2text()
 				authenticated_account.transaction_log.Add(T)
 
-				to_chat(usr, span_blue("[icon2html(src, usr.client)] Access granted. Welcome user '[authenticated_account.owner_name].'"))
+				to_chat(usr, span_notice("[icon2html(src, usr.client)] Access granted. Welcome user '[authenticated_account.owner_name].'"))
 
 			previous_account_number = tried_account_num
 			. = TRUE
@@ -353,7 +353,7 @@ log transactions
 				var/target_account_number = text2num(params["target_acc_number"])
 				var/transfer_purpose = params["purpose"]
 				if(charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount))
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='info'>Funds transfer successful.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_info("Funds transfer successful."))
 					authenticated_account.money -= transfer_amount
 
 					//create an entry in the account transaction log
@@ -366,10 +366,10 @@ log transactions
 					T.amount = "([transfer_amount])"
 					authenticated_account.transaction_log.Add(T)
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Funds transfer failed.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Funds transfer failed."))
 
 			else
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>You don't have enough funds to do that!</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("You don't have enough funds to do that!"))
 			. = TRUE
 
 		if("e_withdrawal")
@@ -401,7 +401,7 @@ log transactions
 				T.time = stationtime2text()
 				authenticated_account.transaction_log.Add(T)
 			else
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>You don't have enough funds to do that!</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("You don't have enough funds to do that!"))
 			. = TRUE
 
 		if("withdrawal")
@@ -432,7 +432,7 @@ log transactions
 				T.time = stationtime2text()
 				authenticated_account.transaction_log.Add(T)
 			else
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>You don't have enough funds to do that!</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("You don't have enough funds to do that!"))
 			. = TRUE
 
 	if(.)

code/modules/economy/Accounts.dm

@@ -54,7 +54,7 @@
 		var/obj/item/paper/R = new /obj/item/paper(P)
 		P.wrapped = R
 		R.name = "Account information: [M.owner_name]"
-		R.info = "<b>Account details (confidential)</b><br><hr><br>"
+		R.info = span_bold("Account details (confidential)") + "<br><hr><br>"
 		R.info += "<i>Account holder:</i> [M.owner_name]<br>"
 		R.info += "<i>Account number:</i> [M.account_number]<br>"
 		R.info += "<i>Account pin:</i> [M.remote_access_pin]<br>"

code/modules/economy/EFTPOS.dm

@@ -28,10 +28,10 @@
 	var/obj/item/paper/R = new(src.loc)
 	R.name = "Steps to success: Correct EFTPOS Usage"
 	//Temptative new manual:
-	R.info += "<b>First EFTPOS setup:</b><br>"
+	R.info += span_bold("First EFTPOS setup:") + "<br>"
 	R.info += "1. Memorise your EFTPOS command code (provided with all EFTPOS devices).<br>"
 	R.info += "2. Connect the EFTPOS to the account in which you want to receive the funds.<br><br>"
-	R.info += "<b>When starting a new transaction:</b><br>"
+	R.info += span_bold("When starting a new transaction:") + "<br>"
 	R.info += "1. Enter the amount of money you want to charge and a purpose message for the new transaction.<br>"
 	R.info += "2. Lock the new transaction. If you want to modify or cancel the transaction, you simply have to reset your EFTPOS device.<br>"
 	R.info += "3. Give the EFTPOS device to your customer, he/she must finish the transaction by swiping their ID card or a charge card with enough funds.<br>"
@@ -56,9 +56,9 @@
 /obj/item/eftpos/proc/print_reference()
 	var/obj/item/paper/R = new(src.loc)
 	R.name = "Reference: [eftpos_name]"
-	R.info = "<b>[eftpos_name] reference</b><br><br>"
+	R.info = span_bold("[eftpos_name] reference") + "<br><br>"
 	R.info += "Access code: [access_code]<br><br>"
-	R.info += "<b>Do not lose or misplace this code.</b><br>"
+	R.info += span_bold("Do not lose or misplace this code.") + "<br>"
 
 	//stamp the paper
 	var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -75,7 +75,7 @@
 
 /obj/item/eftpos/attack_self(mob/user as mob)
 	if(get_dist(src,user) <= 1)
-		var/dat = "<b>[eftpos_name]</b><br>"
+		var/dat = span_bold("[eftpos_name]") + "<br>"
 		dat += "<i>This terminal is</i> [machine_id]. <i>Report this code when contacting IT Support</i><br>"
 		if(transaction_locked)
 			dat += "<a href='?src=\ref[src];choice=toggle_lock'>Back[transaction_paid ? "" : " (authentication required)"]</a><br><br>"
@@ -109,7 +109,7 @@
 		if(linked_account)
 			scan_card(I, O)
 		else
-			to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Unable to connect to linked account.</span>")
+			to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Unable to connect to linked account."))
 	else if (istype(O, /obj/item/spacecash/ewallet))
 		var/obj/item/spacecash/ewallet/E = O
 		if (linked_account)
@@ -134,11 +134,11 @@
 						T.time = stationtime2text()
 						linked_account.transaction_log.Add(T)
 					else
-						to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>\The [O] doesn't have that much money!</span>")
+						to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("\The [O] doesn't have that much money!"))
 			else
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Connected account has been suspended.</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Connected account has been suspended."))
 		else
-			to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>EFTPOS is not connected to an account.</span>")
+			to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("EFTPOS is not connected to an account."))
 
 	else
 		..()
@@ -156,14 +156,14 @@
 						tgui_alert_async(usr, "That is not a valid code!")
 					print_reference()
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Incorrect code entered.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Incorrect code entered."))
 			if("change_id")
 				var/attempt_code = text2num(input(usr, "Re-enter the current EFTPOS access code", "Confirm EFTPOS code"))
 				if(attempt_code == access_code)
 					eftpos_name = sanitize(input(usr, "Enter a new terminal ID for this device", "Enter new EFTPOS ID"), MAX_NAME_LEN) + " EFTPOS scanner"
 					print_reference()
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Incorrect code entered.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Incorrect code entered."))
 			if("link_account")
 				var/attempt_account_num = tgui_input_number(usr, "Enter account number to pay EFTPOS charges into", "New account number")
 				var/attempt_pin = tgui_input_number(usr, "Enter pin code", "Account pin")
@@ -171,9 +171,9 @@
 				if(linked_account)
 					if(linked_account.suspended)
 						linked_account = null
-						to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Account has been suspended.</span>")
+						to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Account has been suspended."))
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Account not found.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Account not found."))
 			if("trans_purpose")
 				var/choice = sanitize(input(usr, "Enter reason for EFTPOS transaction", "Transaction purpose"))
 				if(choice) transaction_purpose = choice
@@ -196,14 +196,14 @@
 				else if(linked_account)
 					transaction_locked = 1
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>No account connected to send transactions to.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("No account connected to send transactions to."))
 			if("scan_card")
 				if(linked_account)
 					var/obj/item/I = usr.get_active_hand()
 					if (istype(I, /obj/item/card))
 						scan_card(I)
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Unable to link accounts.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Unable to link accounts."))
 			if("reset")
 				//reset the access code - requires HoP/captain access
 				var/obj/item/I = usr.get_active_hand()
@@ -211,10 +211,10 @@
 					var/obj/item/card/id/C = I
 					if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access))
 						access_code = 0
-						to_chat(usr, "[icon2html(src, usr.client)]<span class='info'>Access code reset to 0.</span>")
+						to_chat(usr, "[icon2html(src, usr.client)]" + span_info("Access code reset to 0."))
 				else if (istype(I, /obj/item/card/emag))
 					access_code = 0
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='info'>Access code reset to 0.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_info("Access code reset to 0."))
 
 	src.attack_self(usr)
 
@@ -267,19 +267,19 @@
 								T.time = stationtime2text()
 								linked_account.transaction_log.Add(T)
 							else
-								to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>You don't have that much money!</span>")
+								to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("You don't have that much money!"))
 						else
-							to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Your account has been suspended.</span>")
+							to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Your account has been suspended."))
 					else
-						to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
+						to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Unable to access account. Check security settings and try again."))
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Connected account has been suspended.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Connected account has been suspended."))
 			else
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>EFTPOS is not connected to an account.</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("EFTPOS is not connected to an account."))
 	else if (istype(I, /obj/item/card/emag))
 		if(transaction_locked)
 			if(transaction_paid)
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='info'>You stealthily swipe \the [I] through \the [src].</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_info("You stealthily swipe \the [I] through \the [src]."))
 				transaction_locked = 0
 				transaction_paid = 0
 			else

code/modules/economy/cash_register.dm

@@ -67,8 +67,8 @@
 	var/dat = "<h2>Cash Register<hr></h2>"
 	if (locked)
 		dat += "<a href='?src=\ref[src];choice=toggle_lock'>Unlock</a><br>"
-		dat += "Linked account: <b>[linked_account ? linked_account.owner_name : "None"]</b><br>"
-		dat += "<b>[cash_locked? "Unlock" : "Lock"] Cash Box</b> | "
+		dat += "Linked account: " + span_bold("[linked_account ? linked_account.owner_name : "None"]") + "<br>"
+		dat += span_bold("[cash_locked? "Unlock" : "Lock"] Cash Box") + " | "
 	else
 		dat += "<a href='?src=\ref[src];choice=toggle_lock'>Lock</a><br>"
 		dat += "Linked account: <a href='?src=\ref[src];choice=link_account'>[linked_account ? linked_account.owner_name : "None"]</a><br>"
@@ -103,7 +103,7 @@
 				if(allowed(usr))
 					locked = !locked
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Insufficient access.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Insufficient access."))
 			if("toggle_cash_lock")
 				cash_locked = !cash_locked
 			if("link_account")
@@ -113,9 +113,9 @@
 				if(linked_account)
 					if(linked_account.suspended)
 						linked_account = null
-						src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Account has been suspended.</span>")
+						src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Account has been suspended."))
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Account not found.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Account not found."))
 			if("custom_order")
 				var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose"))
 				if (!t_purpose || !Adjacent(usr)) return
@@ -163,7 +163,7 @@
 					price_list.Cut()
 			if("reset_log")
 				transaction_logs.Cut()
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='notice'>Transaction log reset.</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_notice("Transaction log reset."))
 	updateDialog()
 
 
@@ -208,7 +208,7 @@
 		return 1
 	else
 		confirm_item = I
-		src.visible_message("[icon2html(src,viewers(src))]<b>Total price:</b> [transaction_amount] Thaler\s. Swipe again to confirm.")
+		src.visible_message(span_infoplain("[icon2html(src,viewers(src))]" + span_bold("Total price:") + " [transaction_amount] Thaler\s. Swipe again to confirm."))
 		playsound(src, 'sound/machines/twobeep.ogg', 25)
 		return 0
 
@@ -219,14 +219,14 @@
 
 	if (cash_open)
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
-		to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>The cash box is open.</span>")
+		to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("The cash box is open."))
 		return
 
 	if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(I))
 		return
 
 	if (!linked_account)
-		usr.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to connect to linked account.</span>")
+		usr.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to connect to linked account."))
 		return
 
 	// Access account for transaction
@@ -239,13 +239,13 @@
 		D = attempt_account_access(I.associated_account_number, attempt_pin, 2)
 
 		if(!D)
-			src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
+			src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to access account. Check security settings and try again."))
 		else
 			if(D.suspended)
-				src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Your account has been suspended.</span>")
+				src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Your account has been suspended."))
 			else
 				if(transaction_amount > D.money)
-					src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Not enough funds.</span>")
+					src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Not enough funds."))
 				else
 					// Transfer the money
 					D.money -= transaction_amount
@@ -284,7 +284,7 @@
 
 	if (cash_open)
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
-		to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>The cash box is open.</span>")
+		to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("The cash box is open."))
 		return
 
 	if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(E))
@@ -293,7 +293,7 @@
 	// Access account for transaction
 	if(check_account())
 		if(transaction_amount > E.worth)
-			src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Not enough funds.</span>")
+			src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Not enough funds."))
 		else
 			// Transfer the money
 			E.worth -= transaction_amount
@@ -322,14 +322,14 @@
 
 	if (cash_open)
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
-		to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>The cash box is open.</span>")
+		to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("The cash box is open."))
 		return
 
 	if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(SC))
 		return
 
 	if(transaction_amount > SC.worth)
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Not enough money.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Not enough money."))
 	else
 		// Insert cash into magical slot
 		SC.worth -= transaction_amount
@@ -351,17 +351,17 @@
 /obj/machinery/cash_register/proc/scan_item_price(obj/O)
 	if(!istype(O))	return
 	if(item_list.len > 10)
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Only up to ten different items allowed per purchase."))
 		return
 	if (cash_open)
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
-		to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>The cash box is open.</span>")
+		to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("The cash box is open."))
 		return
 
 	// First check if item has a valid price
 	var/price = O.get_item_cost()
 	if(isnull(price))
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to find item in database.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to find item in database."))
 		return
 	// Call out item cost
 	src.visible_message("[icon2html(src,viewers(src))]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
@@ -399,7 +399,7 @@
 		item_name = item_list[i]
 		dat += "<tr><td class=\"tx-name-r\">[item_list[item_name] ? "<a href='?src=\ref[src];choice=subtract;item=\ref[item_name]'>-</a> <a href='?src=\ref[src];choice=set_amount;item=\ref[item_name]'>Set</a> <a href='?src=\ref[src];choice=add;item=\ref[item_name]'>+</a> [item_list[item_name]] x " : ""][item_name] <a href='?src=\ref[src];choice=clear;item=\ref[item_name]'>Remove</a></td><td class=\"tx-data-r\" width=50>[price_list[item_name] * item_list[item_name]] &thorn</td></tr>"
 	dat += "</table><table width=300>"
-	dat += "<tr><td class=\"tx-name-r\"><a href='?src=\ref[src];choice=clear'>Clear Entry</a></td><td class=\"tx-name-r\" style='text-align: right'><b>Total Amount: [transaction_amount] &thorn</b></td></tr>"
+	dat += "<tr><td class=\"tx-name-r\"><a href='?src=\ref[src];choice=clear'>Clear Entry</a></td><td class=\"tx-name-r\" style='text-align: right'>" + span_bold("Total Amount: [transaction_amount] &thorn") + "</td></tr>"
 	dat += "</table></html>"
 	return dat
 
@@ -424,7 +424,7 @@
 	for(var/i=1, i<=item_list.len, i++)
 		item_name = item_list[i]
 		dat += "<tr><td class=\"tx-name\">[item_list[item_name] ? "[item_list[item_name]] x " : ""][item_name]</td><td class=\"tx-data\" width=50>[price_list[item_name] * item_list[item_name]] &thorn</td></tr>"
-	dat += "<tr></tr><tr><td colspan=\"2\" class=\"tx-name\" style='text-align: right'><b>Total Amount: [transaction_amount] &thorn</b></td></tr>"
+	dat += "<tr></tr><tr><td colspan=\"2\" class=\"tx-name\" style='text-align: right'>" + span_bold("Total Amount: [transaction_amount] &thorn") + "</td></tr>"
 	dat += "</table></html>"
 
 	transaction_logs += dat
@@ -432,11 +432,11 @@
 
 /obj/machinery/cash_register/proc/check_account()
 	if (!linked_account)
-		usr.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to connect to linked account.</span>")
+		usr.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to connect to linked account."))
 		return 0
 
 	if(linked_account.suspended)
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Connected account has been suspended.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Connected account has been suspended."))
 		return 0
 	return 1
 
@@ -444,7 +444,7 @@
 /obj/machinery/cash_register/proc/transaction_complete()
 	/// Visible confirmation
 	playsound(src, 'sound/machines/chime.ogg', 25)
-	src.visible_message("[icon2html(src,viewers(src))]<span class='notice'>Transaction complete.</span>")
+	src.visible_message("[icon2html(src,viewers(src))]" + span_notice("Transaction complete."))
 	flick("register_approve", src)
 	reset_memory()
 	updateDialog()

code/modules/economy/money_bag.dm

@@ -30,7 +30,7 @@
 		if (istype(C,/obj/item/coin/uranium))
 			amt_uranium++;
 
-	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
+	var/dat = span_bold("The contents of the moneybag reveal...") + "<br>"
 	if (amt_gold)
 		dat += text("Gold coins: [amt_gold] <A href='?src=\ref[src];remove=gold'>Remove one</A><br>")
 	if (amt_silver)

code/modules/economy/retail_scanner.dm

@@ -99,7 +99,7 @@
 				if(allowed(usr))
 					locked = !locked
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Insufficient access.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Insufficient access."))
 			if("link_account")
 				var/attempt_account_num = tgui_input_number(usr, "Enter account number", "New account number")
 				var/attempt_pin = tgui_input_number(usr, "Enter PIN", "Account PIN")
@@ -107,9 +107,9 @@
 				if(linked_account)
 					if(linked_account.suspended)
 						linked_account = null
-						src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Account has been suspended.</span>")
+						src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Account has been suspended."))
 				else
-					to_chat(usr, "[icon2html(src, usr.client)]<span class='warning'>Account not found.</span>")
+					to_chat(usr, "[icon2html(src, usr.client)]" + span_warning("Account not found."))
 			if("custom_order")
 				var/t_purpose = sanitize(tgui_input_text(usr, "Enter purpose", "New purpose"))
 				if (!t_purpose || !Adjacent(usr)) return
@@ -157,7 +157,7 @@
 					price_list.Cut()
 			if("reset_log")
 				transaction_logs.Cut()
-				to_chat(usr, "[icon2html(src, usr.client)]<span class='notice'>Transaction log reset.</span>")
+				to_chat(usr, "[icon2html(src, usr.client)]" + span_notice("Transaction log reset."))
 	updateDialog()
 
 
@@ -203,7 +203,7 @@
 		return
 
 	if (!linked_account)
-		usr.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to connect to linked account.</span>")
+		usr.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to connect to linked account."))
 		return
 
 	// Access account for transaction
@@ -216,13 +216,13 @@
 		D = attempt_account_access(I.associated_account_number, attempt_pin, 2)
 
 		if(!D)
-			src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to access account. Check security settings and try again.</span>")
+			src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to access account. Check security settings and try again."))
 		else
 			if(D.suspended)
-				src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Your account has been suspended.</span>")
+				src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Your account has been suspended."))
 			else
 				if(transaction_amount > D.money)
-					src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Not enough funds.</span>")
+					src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Not enough funds."))
 				else
 					// Transfer the money
 					D.money -= transaction_amount
@@ -265,7 +265,7 @@
 	// Access account for transaction
 	if(check_account())
 		if(transaction_amount > E.worth)
-			src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Not enough funds.</span>")
+			src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Not enough funds."))
 		else
 			// Transfer the money
 			E.worth -= transaction_amount
@@ -291,13 +291,13 @@
 /obj/item/retail_scanner/proc/scan_item_price(var/obj/O)
 	if(!istype(O))	return
 	if(item_list.len > 10)
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Only up to ten different items allowed per purchase.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Only up to ten different items allowed per purchase."))
 		return
 
 	// First check if item has a valid price
 	var/price = O.get_item_cost()
 	if(isnull(price))
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to find item in database.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to find item in database."))
 		return
 	// Call out item cost
 	src.visible_message("[icon2html(src,viewers(src))]\A [O]: [price ? "[price] Thaler\s" : "free of charge"].")
@@ -368,11 +368,11 @@
 
 /obj/item/retail_scanner/proc/check_account()
 	if (!linked_account)
-		usr.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Unable to connect to linked account.</span>")
+		usr.visible_message("[icon2html(src,viewers(src))]" + span_warning("Unable to connect to linked account."))
 		return 0
 
 	if(linked_account.suspended)
-		src.visible_message("[icon2html(src,viewers(src))]<span class='warning'>Connected account has been suspended.</span>")
+		src.visible_message("[icon2html(src,viewers(src))]" + span_warning("Connected account has been suspended."))
 		return 0
 	return 1
 
@@ -380,7 +380,7 @@
 /obj/item/retail_scanner/proc/transaction_complete()
 	/// Visible confirmation
 	playsound(src, 'sound/machines/chime.ogg', 25)
-	src.visible_message("[icon2html(src,viewers(src))]<span class='notice'>Transaction complete.</span>")
+	src.visible_message("[icon2html(src,viewers(src))]" + span_notice("Transaction complete."))
 	flick("retail_approve", src)
 	reset_memory()
 	updateDialog()

code/modules/economy/vending.dm

@@ -270,7 +270,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 
 		// This is not a status display message, since it's something the character
 		// themselves is meant to see BEFORE putting the money in
-		to_chat(usr, "[icon2html(cashmoney, user.client)] <span class='warning'>That is not enough money.</span>")
+		to_chat(usr, "[icon2html(cashmoney, user.client)] " + span_warning("That is not enough money."))
 		return 0
 
 	if(istype(cashmoney, /obj/item/spacecash))
@@ -628,7 +628,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 	if(prob(1))
 		sleep(3)
 		if(R.get_product(get_turf(src)))
-			visible_message("<b>\The [src]</b> clunks as it vends an additional item.")
+			visible_message(span_infoplain(span_bold("\The [src]") + " clunks as it vends an additional item."))
 	playsound(src, "sound/[vending_sound]", 100, 1, 1)
 
 	GLOB.items_sold_shift_roundstat++
@@ -754,7 +754,7 @@ GLOBAL_LIST_EMPTY(vending_products)
 		return
 
 	for(var/mob/O in hearers(src, null))
-		O.show_message(span_npc_say("<span class='name'>\The [src]</span> beeps, \"[message]\""),2)
+		O.show_message(span_npc_say(span_name("\The [src]") + " beeps, \"[message]\""),2)
 	return
 
 /obj/machinery/vending/power_change()