Merge pull request #15715 from Kashargul/styleSync

fix some more font tags, syncing stylesheets

code/__defines/span_vr.dm

@@ -10,7 +10,7 @@
 
 #define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
 #define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
-#define span_centradio(str) ("<span class='centradio'>" + str + "</span>"
+#define span_centradio(str) ("<span class='centradio'>" + str + "</span>")
 #define span_airadio(str) ("<span class='airadio'>" + str + "</span>")
 #define span_entradio(str) ("<span class='entradio'>" + str + "</span>")
 
@@ -18,7 +18,7 @@
 #define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
 #define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
 #define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
-#define span_supradio(str) ("<span class='supradio'>" + str + "</span>"
+#define span_supradio(str) ("<span class='supradio'>" + str + "</span>")
 #define span_srvradio(str) ("<span class='srvradio'>" + str + "</span>")
 #define span_expradio(str) ("<span class='expradio'>" + str + "</span>")
 
@@ -81,6 +81,7 @@
 #define span_debug_debug(str) ("<span class='debug_debug'>" + str + "</span>")
 #define span_debug_trace(str) ("<span class='debug_trace'>" + str + "</span>")
 
+#define span_white(str) ("<span class='white'>" + str + "</span>")
 #define span_black(str) ("<span class='black'>" + str + "</span>")
 #define span_darkgray(str) ("<span class='darkgray'>" + str + "</span>")
 #define span_gray(str) ("<span class='gray'>" + str + "</span>")
@@ -95,3 +96,5 @@
 #define span_crimson(str) ("<span class='crimson'>" + str + "</span>")
 #define span_maroon(str) ("<span class='maroon'>" + str + "</span>")
 #define span_brown(str) ("<span class='brown'>" + str + "</span>")
+#define span_lightpurple(str) ("<span class='lightpurple'>" + str + "</span>")
+#define span_darkpink(str) ("<span class='lightpurple'>" + str + "</span>")

code/game/gamemodes/technomancer/equipment.dm

@@ -14,9 +14,9 @@
 	name = "Rapid Core"
 	desc = "A core optimized for passive regeneration, however at the cost of capacity.  Has a capacity of 7,000 units of energy, and \
 	recharges at a rate of 70 units.  Complex gravatics and force manipulation allows the wearer to also run slightly faster.<br>\
-	<font color='red'>Capacity: 7k</font><br>\
-	<font color='green'><b>Recharge: 70/s</b></font><br>\
-	<font color='red'>Instability Modifier: 90%</font><br>\
+	" + span_red("Capacity: 7k") + "<br>\
+	" + span_green("<b>Recharge: 70/s</b>") + "<br>\
+	" + span_red("Instability Modifier: 90%") + "<br>\
 	Energy Cost Modifier: 100%<br>\
 	Spell Power: 100%"
 	cost = 100
@@ -27,11 +27,11 @@
 	desc = "This core has very large capacitors, however it also has a subpar fractal reactor.  The user is recommended to \
 	purchase one or more energy-generating Functions as well if using this core.  The intense weight of the core unfortunately can \
 	cause the wear to move slightly slower, and the closeness of the capacitors causes a slight increase in incoming instability.<br>\
-	<font color='green'><b>Capacity: 20k</b></font><br>\
-	<font color='red'>Recharge: 25/s</font><br>\
-	<font color='red'>Instability Modifier: 100%</font><br>\
+	" + span_green("<b>Capacity: 20k</b>") + "<br>\
+	" + span_red("Recharge: 25/s") + "<br>\
+	" + span_red("Instability Modifier: 100%") + "<br>\
 	Energy Cost Modifier: 100%<br>\
-	<font color='green'>Spell Power: 140%</font>"
+	" + span_green("Spell Power: 140%") + ""
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/bulky
 
@@ -40,22 +40,22 @@
 	desc = "This core feeds off unstable energies around the user in addition to a fractal reactor.  This means that it performs \
 	better as the user has more instability, which could prove dangerous to the inexperienced or unprepared.  The rate of recharging \
 	increases as the user accumulates more instability, eventually exceeding even the rapid core in regen speed, at a huge risk.<br>\
-	<font color='green'>Capacity: 13k</font><br>\
-	<font color='green'>Recharge: 35/s to 110/s+</font><br>\
-	<font color='red'><b>Instability Modifier: 130%</b></font><br>\
-	<font color='green'>Energy Cost Modifier: 70%</font><br>\
-	<font color='green'>Spell Power: 110%</font>"
+	" + span_green("Capacity: 13k") + "<br>\
+	" + span_green("Recharge: 35/s to 110/s+") + "<br>\
+	" + span_red("<b>Instability Modifier: 130%</b>") + "<br>\
+	" + span_green("Energy Cost Modifier: 70%") + "<br>\
+	" + span_green("Spell Power: 110%") + ""
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/unstable
 
-/datum/technomancer/equipment/recycling
+/datum/technomancer/equipment/recyclingW
 	name = "Recycling Core"
 	desc = "This core is optimized for energy efficency, being able to sometimes recover energy that would have been lost with other \
 	cores.  Each time energy is spent, there is a 30% chance of recovering half of what was spent.<br>\
-	<font color='green'>Capacity: 12k</font><br>\
-	<font color='red'>Recharge: 40/s</font><br>\
-	<font color='green'>Instability Modifier: 60%</font><br>\
-	<font color='green'>Energy Cost Modifier: 80%</font><br>\
+	" + span_green("Capacity: 12k") + "<br>\
+	" + span_red("Recharge: 40/s") + "<br>\
+	" + span_green("Instability Modifier: 60%") + "<br>\
+	" + span_green("Energy Cost Modifier: 80%") + "<br>\
 	Spell Power: 100%"
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/recycling
@@ -65,11 +65,11 @@
 	desc = "A unique type of core, this one sacrifices other characteristics in order to optimize it for the purposes teleporting \
 	entities from vast distances, and keeping them there.  Wearers of this core can maintain up to 40 summons at once, and the energy \
 	demand for maintaining summons is severely reduced.<br>\
-	<font color='red'>Capacity: 8k</font><br>\
-	<font color='red'>Recharge: 35/s</font><br>\
-	<font color='red'>Instability Modifier: 120%</font><br>\
+	" + span_red("Capacity: 8k") + "<br>\
+	" + span_red("Recharge: 35/s") + "<br>\
+	" + span_red("Instability Modifier: 120%") + "<br>\
 	Energy Cost Modifier: 100%<br>\
-	<font color='green'>Spell Power: 120%</font>"
+	" + span_green("Spell Power: 120%") + ""
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/summoner
 
@@ -77,11 +77,11 @@
 	name = "Safety Core"
 	desc = "This core is designed so that the wearer suffers almost no instability.  It unfortunately comes at a cost of subpar \
 	ratings for everything else.<br>\
-	<font color='red'>Capacity: 7k</font><br>\
-	<font color='red'>Recharge: 30/s</font><br>\
-	<font color='green'><b>Instability Modifier: 30%</b></font><br>\
+	" + span_red("Capacity: 7k") + "<br>\
+	" + span_red("Recharge: 30/s") + "<br>\
+	" + span_green("<b>Instability Modifier: 30%</b>") + "<br>\
 	Energy Cost Modifier: 100%<br>\
-	<font color='red'><b>Spell Power: 70%</b></font>"
+	" + span_red("<b>Spell Power: 70%</b>") + ""
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/safety
 
@@ -90,11 +90,11 @@
 	desc = "A core that was created in order to get the most power out of functions.  It does this by shoving the most power into \
 	those functions, so it is the opposite of energy efficent, however the enhancement of functions is second to none for other \
 	cores.<br>\
-	<font color='red'>Capacity: 15k (effectively 7.5k)</font><br>\
-	<font color='red'>Recharge: 40/s</font><br>\
-	<font color='red'>Instability Modifier: 110%</font><br>\
-	<font color='red'><b>Energy Cost Modifier: 200%</b></font><br>\
-	<font color='green'><b>Spell Power: 175%</b></font>"
+	" + span_red("Capacity: 15k (effectively 7.5k)") + "<br>\
+	" + span_red("Recharge: 40/s") + "<br>\
+	" + span_red("Instability Modifier: 110%") + "<br>\
+	" + span_red("<b>Energy Cost Modifier: 200%</b>") + "<br>\
+	" + span_green("<b>Spell Power: 175%</b>") + ""
 	cost = 100
 	obj_path = /obj/item/weapon/technomancer_core/overcharged
 

code/modules/admin/verbs/modify_robot.dm

@@ -3,7 +3,7 @@
 	set name = "Modify Robot Module"
 	set desc = "Allows to add or remove modules to/from robots."
 	set category = "Admin"
-	if(!check_rights(R_ADMIN, R_FUN, R_VAREDIT))
+	if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT))
 		return
 
 	if(!istype(target) || !target.module)

code/modules/admin/verbs/resize.dm

@@ -2,7 +2,7 @@
     set name = "Resize"
     set desc = "Resizes any living mob without any restrictions on size."
     set category = "Fun"
-    if(!check_rights(R_ADMIN, R_FUN, R_VAREDIT))
+    if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT))
         return
 
     var/size_multiplier = tgui_input_number(usr, "Input size multiplier.", "Resize", 1)

code/modules/mob/hear_say.dm

@@ -218,37 +218,47 @@
 	return "<span class='say_quote'>\[[time2text(world.timeofday, "hh:mm")]\]</span>"
 
 /mob/proc/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
+	var/time = ""
+	if(client.prefs.chat_timestamp)
+		time = say_timestamp()
 	var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
 	if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
-		final_message = "[part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
+		final_message = "[time][part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
 	else
-		final_message = "[part_a][final_message][part_e]"
+		final_message = "[time][part_a][final_message][part_e]"
 	to_chat(src, final_message)
 
 /mob/observer/dead/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
+	var/time = ""
+	if(client.prefs.chat_timestamp)
+		time = say_timestamp()
 	var/final_message = "[part_b][track][part_c][formatted][part_d]"
 	if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
-		final_message = "[part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
+		final_message = "[time][part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
 	else
-		final_message = "[part_a][final_message][part_e]"
+		final_message = "[time][part_a][final_message][part_e]"
 	to_chat(src, final_message)
 
 /mob/living/silicon/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
-	var/time = say_timestamp()
+	var/time = ""
+	if(client.prefs.chat_timestamp)
+		time = say_timestamp()
 	var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
 	if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
-		final_message = "[part_a][time]<font size='3'><b>[final_message]</b></font>[part_e]"
+		final_message = "[time][part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
 	else
-		final_message = "[part_a][time][final_message][part_e]"
+		final_message = "[time][part_a][final_message][part_e]"
 	to_chat(src, final_message)
 
 /mob/living/silicon/ai/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e)
-	var/time = say_timestamp()
+	var/time = ""
+	if(client.prefs.chat_timestamp)
+		time = say_timestamp()
 	var/final_message = "[part_b][track][part_c][formatted][part_d]"
 	if(check_mentioned(formatted) && is_preference_enabled(/datum/client_preference/check_mention))
-		final_message = "[part_a][time]<font size='3'><b>[final_message]</b></font>[part_e]"
+		final_message = "[time][part_a]<font size='3'><b>[final_message]</b></font>[part_e]"
 	else
-		final_message = "[part_a][time][final_message][part_e]"
+		final_message = "[time][part_a][final_message][part_e]"
 	to_chat(src, final_message)
 
 /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/verb_understood = "gestures", var/datum/language/language, var/mob/speaker = null, var/speech_type = 1)

interface/stylesheet.dm

@@ -133,7 +133,8 @@ h1.alert, h2.alert		{color: #000000;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 .say_quote_italics		{font-style: italic; font-family: Georgia, Verdana, sans-serif;}
 .terminus				{font-family: "Times New Roman", Times, serif, sans-serif}
-.spacer					{color: #9c660b;} /* VOREStation Add */
+.psionic                {color: #993399;}
+.spacer					{color: #9c660b;}
 .blob					{color: #ff950d; font-weight: bold; font-style: italic;}
 .teppi					{color: #816540; word-spacing:4pt; font-family: "Segoe Script Bold","Segoe Script",sans-serif,Verdana;}
 .shadekin				{color: #be3cc5; font-size: 150%; font-weight: bold; font-family: "Gabriola", cursive, sans-serif;}
@@ -163,6 +164,9 @@ BIG IMG.icon 			{width: 32px; height: 32px;}
 .maroon					{color: #800000;}
 .crimson				{color: #DC143C;}
 .brown					{color: #8D4925;}
+.lightpurple			{color: #AD5AAD;}
+.darkpink				{color: #E3209B;}
+.white					{color: #FFFFFF;}
 
 .pnarrate				{color: #009AB2;}
 

tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss

@@ -683,6 +683,10 @@ img.icon.bigicon {
   color: #ffffff;
 }
 
+.white {
+  color: #ffffff;
+}
+
 .darkgray {
   color: #808080;
 }
@@ -785,6 +789,14 @@ img.icon.bigicon {
   color: #9956d3;
 }
 
+.lightpurple {
+  color: #ad5aad;
+}
+
+.darkpink {
+  color: #e3209b;
+}
+
 .holoparasite {
   color: #88809c;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-light.scss

@@ -710,6 +710,10 @@ h2.alert {
   color: #000000;
 }
 
+.white {
+  color: #000000;
+}
+
 .darkgray {
   color: #808080;
 }
@@ -812,6 +816,14 @@ h2.alert {
   color: #5e2d79;
 }
 
+.lightpurple {
+  color: #ad5aad;
+}
+
+.darkpink {
+  color: #e3209b;
+}
+
 .holoparasite {
   color: #35333a;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss

@@ -684,6 +684,10 @@ img.icon.bigicon {
   color: #ffffff;
 }
 
+.white {
+  color: #ffffff;
+}
+
 .darkgray {
   color: #808080;
 }
@@ -786,6 +790,14 @@ img.icon.bigicon {
   color: #9956d3;
 }
 
+.lightpurple {
+  color: #ad5aad;
+}
+
+.darkpink {
+  color: #e3209b;
+}
+
 .holoparasite {
   color: #88809c;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss

@@ -711,6 +711,10 @@ h2.alert {
   color: #000000;
 }
 
+.white {
+  color: #000000;
+}
+
 .darkgray {
   color: #808080;
 }
@@ -813,6 +817,14 @@ h2.alert {
   color: #5e2d79;
 }
 
+.lightpurple {
+  color: #ad5aad;
+}
+
+.darkpink {
+  color: #e3209b;
+}
+
 .holoparasite {
   color: #35333a;
 }