Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update

code/modules/client/client procs.dm

@@ -144,7 +144,7 @@
 //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.
 /client/AllowUpload(filename, filelength)
 	if(filelength > UPLOAD_LIMIT)
-		to_chat(src, "<font color='red'>Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.</font>")
+		to_chat(src, span_red("Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB."))
 		return 0
 /*	//Don't need this at the moment. But it's here if it's needed later.
 	//Helps prevent multiple files being uploaded at once. Or right after eachother.
@@ -174,7 +174,7 @@
 
 	//Only show this if they are put into a new_player mob. Otherwise, "what title screen?"
 	if(isnewplayer(src.mob))
-		to_chat(src, "<font color='red'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</font>")
+		to_chat(src, span_red("If the title screen is black, resources are still downloading. Please be patient until the title screen appears."))
 
 	GLOB.clients += src
 	GLOB.directory[ckey] = src

code/modules/client/preference_setup/global/setting_datums.dm

@@ -330,6 +330,12 @@ var/list/_client_preferences_by_type
 	enabled_description = "On"
 	disabled_description = "Off"
 
+/datum/client_preference/vore_health_bars
+	description = "Vore Health Bars"
+	key = "VORE_HEALTH_BARS"
+	enabled_description = "Enabled"
+	disabled_description = "Disabled"
+
 /datum/client_preference/runechat_mob
 	description = "Runechat (Mobs)"
 	key = "RUNECHAT_MOB"

code/modules/client/preferences_toggle_procs.dm

@@ -489,6 +489,19 @@
 
 	feedback_add_details("admin_verb","TSubtleSounds")
 
+/client/verb/toggle_vore_health_bars()
+	set name = "Toggle Vore Health Bars"
+	set category = "Preferences"
+	set desc = "Toggle the display of vore related health bars"
+
+	var/pref_path = /datum/client_preference/vore_health_bars
+	toggle_preference(pref_path)
+	SScharacter_setup.queue_preferences_save(prefs)
+
+	to_chat(src, "Vore related health bars - [(is_preference_enabled(/datum/client_preference/vore_health_bars)) ? "Enabled" : "Disabled"]")
+
+	feedback_add_details("admin_verb","TVoreHealthBars")
+
 // Not attached to a pref datum because those are strict binary toggles
 /client/verb/toggle_examine_mode()
 	set name = "Toggle Examine Mode"

code/modules/client/verbs/who.dm

@@ -16,29 +16,29 @@
 		entry += " - Playing as [C.mob.real_name]"
 		switch(C.mob.stat)
 			if(UNCONSCIOUS)
-				entry += " - <font color='darkgray'><b>Unconscious</b></font>"
+				entry += " - [span_darkgray("<b>Unconscious</b>")]"
 			if(DEAD)
 				if(isobserver(C.mob))
 					var/mob/observer/dead/O = C.mob
 					if(O.started_as_observer)
-						entry += " - <font color='gray'>Observing</font>"
+						entry += " - [span_gray("Observing")]"
 					else
-						entry += " - <font color='black'><b>DEAD</b></font>"
+						entry += " - [span_black("<b>DEAD</b>")]"
 				else
-					entry += " - <font color='black'><b>DEAD</b></font>"
+					entry += " - [span_black("<b>DEAD</b>")]"
 
 		if(C.player_age != initial(C.player_age) && isnum(C.player_age)) // database is on
 			var/age = C.player_age
 			switch(age)
 				if(0 to 1)
-					age = "<font color='#ff0000'><b>[age] days old</b></font>"
+					age = span_red("<b>[age] days old</b>")
 				if(1 to 10)
-					age = "<font color='#ff8c00'><b>[age] days old</b></font>"
+					age = span_orange("<b>[age] days old</b>")
 				else
 					entry += " - [age] days old"
 
 		if(is_special_character(C.mob))
-			entry += " - <b><font color='red'>Antagonist</font></b>"
+			entry += " - [span_red("<b>Antagonist</b>")]"
 
 		if(C.is_afk())
 			var/seconds = C.last_activity_seconds()