Fixes pain and announcement font size. (#22681)

title, h2 and manual font size brokey

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>

code/__DEFINES/span.dm

@@ -34,7 +34,7 @@
 #define SPAN_YELLOW(str) "<span style='color:[COLOR_YELLOW]'>[str]</span>"
 #define SPAN_GREEN(str) "<span style='color:[COLOR_GREEN]'>[str]</span>"
 
-#define SPAN_SIZE(size, text) ("<span style=\"font-size: [size]\">" + text + "</span>")
+#define SPAN_SIZE(size, text) ("<font size='[size]'>" + text + "</font>")
 
 #define SPAN_HIGHDANGER(str) (FONT_LARGE(SPAN_DANGER(str)))
 
@@ -52,11 +52,11 @@
 #####################
 */
 
-#define FONT_SIZE_SMALL "10px"
-#define FONT_SIZE_NORMAL "13px"
-#define FONT_SIZE_LARGE "16px"
-#define FONT_SIZE_HUGE "18px"
-#define FONT_SIZE_GIANT "24px"
+#define FONT_SIZE_SMALL "2"
+#define FONT_SIZE_NORMAL "3"
+#define FONT_SIZE_LARGE "4"
+#define FONT_SIZE_HUGE "5"
+#define FONT_SIZE_GIANT "6"
 
 #define FONT_SMALL(str) SPAN_SIZE(FONT_SIZE_SMALL, str)
 #define FONT_NORMAL(str) SPAN_SIZE(FONT_SIZE_NORMAL, str)

code/controllers/subsystems/event.dm

@@ -110,7 +110,7 @@ SUBSYSTEM_DEF(events)
 	if(!report_at_round_end)
 		return
 
-	to_world("<br><br><br><font size=3><b>Random Events This Round:</b></font>")
+	to_world("<br><br><br><font size=4><b>Random Events This Round:</b></font>")
 	for(var/datum/event/E in active_events|finished_events)
 		var/datum/event_meta/EM = E.event_meta
 		if(EM.name == "Nothing")

code/defines/procs/announce.dm

@@ -62,25 +62,28 @@
 	Log(message, message_title)
 
 /datum/announcement/proc/FormMessage(var/message, var/message_title)
-	. = "<h2 class='alert'>[message_title]</h2>"
+	. = FONT_HUGE(SPAN_BOLD("[message_title]"))
 	. += "<br><span class='alert'>[message]</span>"
 	if (announcer)
 		. += "<br><span class='alert'> -[html_encode(announcer)]</span>"
+	. = EXAMINE_BLOCK_GREY(.)
 
 /datum/announcement/minor/FormMessage(var/message, var/message_title)
 	. = "<b>[message]</b>"
 
 /datum/announcement/priority/command/FormMessage(var/message, var/message_title)
-	. = "<h2 class='alert'>[SSatlas.current_map.boss_name] Update</h2>"
+	. = FONT_HUGE(SPAN_BOLD("[SSatlas.current_map.boss_name] Update<br>"))
 	if (message_title)
-		. += "<h3 class='alert'>[message_title]</h3>"
+		. += FONT_LARGE(SPAN_RED(SPAN_BOLD("[message_title]")))
 
 	. += "<br><span class='alert'>[message]</span><br>"
 	. += "<br>"
+	. = EXAMINE_BLOCK_BLUE(.)
 
 /datum/announcement/priority/security/FormMessage(var/message, var/message_title)
-	. = "<font size=4 color='red'>[message_title]</font>"
+	. = FONT_HUGE(SPAN_RED(SPAN_BOLD("[message_title]")))
 	. += "<br><span class='warning'>[message]</span>"
+	. = EXAMINE_BLOCK_RED(.)
 
 /datum/announcement/proc/NewsCast(message as text, message_title as text)
 	if(!newscast)

code/game/antagonist/antagonist_add.dm

@@ -45,7 +45,7 @@
 	// Handle only adding a mind and not bothering with gear etc.
 	if(nonstandard_role_type)
 		faction_members |= player
-		to_chat(player.current, SPAN_DANGER("<font size=3>You are \a [nonstandard_role_type]!</font>"))
+		to_chat(player.current, SPAN_DANGER("<font size=5>You are \a [nonstandard_role_type]!</font>"))
 		player.special_role = nonstandard_role_type
 		if(nonstandard_role_msg)
 			to_chat(player.current, SPAN_NOTICE("[nonstandard_role_msg]"))

code/game/antagonist/antagonist_create.dm

@@ -113,7 +113,7 @@
 /datum/antagonist/proc/greet(var/datum/mind/player)
 
 	// Basic intro text.
-	to_chat(player.current, SPAN_DANGER("<font size=3>You are a [role_text]!</font>"))
+	to_chat(player.current, SPAN_DANGER("<font size=5>You are a [role_text]!</font>"))
 	if(leader_welcome_text && player == leader)
 		to_chat(player.current, SPAN_NOTICE("[leader_welcome_text]"))
 	else

code/game/gamemodes/events/holidays/holidays.dm

@@ -187,7 +187,7 @@ var/global/Holiday = null
 /proc/Holiday_Game_Start()
 	if(Holiday)
 		to_world(SPAN_NOTICE("and..."))
-		to_world("<h4>Happy [Holiday] Everybody!</h4>")
+		to_world(FONT_LARGE("Happy [Holiday] Everybody!"))
 		switch(Holiday)			//special holidays
 			if("Easter")
 				Easter_Game_Start()

code/game/objects/items/devices/megaphone.dm

@@ -47,12 +47,12 @@
 				return
 		if(emagged)
 			if(insults)
-				user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>", "<B>[user]</B> speaks into \the [src].", 14)
+				user.audible_message("<B>[user]</B> broadcasts, <FONT size=5>\"[pick(insultmsg)]\"</FONT>", "<B>[user]</B> speaks into \the [src].", 14)
 				insults--
 			else
 				to_chat(user, SPAN_WARNING("*BZZZZzzzzzt*"))
 		else
-			user.audible_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>", "<B>[user]</B> speaks into \the [src].", 14)
+			user.audible_message("<B>[user]</B> broadcasts, <FONT size=5>\"[message]\"</FONT>", "<B>[user]</B> speaks into \the [src].", 14)
 		if(activation_sound)
 			playsound(loc, activation_sound, 100, 0, 1)
 		for (var/mob/living/carbon/human/C in range(user, 2) - user)

code/game/objects/items/eightball.dm

@@ -87,7 +87,7 @@
 /obj/item/eightball/haunted/start_shaking(mob/user)
 	for(var/mob/abstract/ghost/observer/O in GLOB.player_list)
 		if(O.client)
-			to_chat(O, "[ghost_follow_link(user, O)] <span class='deadsay'><font size=3><b>\The [user] is shaking \the [src], hoping to get an answer to \"[question]\".<a href='byond://?src=[REF(src)];candidate=[REF(O)]'>(Answer)</a></b></font></span>")
+			to_chat(O, "[ghost_follow_link(user, O)] <span class='deadsay'><font size=4><b>\The [user] is shaking \the [src], hoping to get an answer to \"[question]\".<a href='byond://?src=[REF(src)];candidate=[REF(O)]'>(Answer)</a></b></font></span>")
 
 /obj/item/eightball/haunted/Topic(href, href_list)
 	if(href_list["candidate"])

code/game/objects/items/weapons/material/knives.dm

@@ -58,7 +58,7 @@
 		var/obj/S = thing
 		usr.visible_message(SPAN_NOTICE("[usr] starts carefully digging out something in [H == usr ? "themselves" : H]..."))
 		O.take_damage(8, 0, DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, src)
-		H.custom_pain(SPAN_DANGER("<font size=3>It burns!</font>"), 50)
+		H.custom_pain(SPAN_DANGER("<font size=4>It burns!</font>"), 50)
 		if(do_mob(usr, H, 100))
 			H.remove_implant(S, FALSE)
 			log_and_message_admins("has extracted [S] out of [key_name(H)]")

code/game/objects/structures/machinery/computer/arcade_orion.dm

@@ -462,7 +462,7 @@
 			else
 				src.visible_message("Something slams into the floor around \the [src] - luckily, it didn't get through!", "You hear something crack.")
 		if(ORION_TRAIL_GAMEOVER)
-			to_chat(usr, SPAN_DANGER("<font size=3>You're never going to make it to Orion...</font>"))
+			to_chat(usr, SPAN_DANGER("<font size=4>You're never going to make it to Orion...</font>"))
 			var/mob/living/M = usr
 			M.visible_message("\The [M] starts rapidly deteriorating.")
 			show_browser(M, null, "window=arcade")

code/modules/admin/admin.dm

@@ -706,7 +706,7 @@ var/global/enabled_spooking = 0
 		if(!check_rights(R_ADMIN, 0))
 			message = sanitize(message, 500, extra = 0)
 		message = replacetext(message, "\n", "<br>") // required since we're putting it in a <p> tag
-		to_world("<span class=notice><b>[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
+		to_world(EXAMINE_BLOCK_BLUE("<span class=notice><b>[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>"))
 		log_admin("Announce: [key_name(usr)] : [message]")
 	feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -1088,7 +1088,7 @@ var/global/enabled_spooking = 0
 		alert("Not before roundstart!", "Alert")
 		return
 
-	var/out = "<font size=3><b>Current mode: [SSticker.mode.name] (<a href='byond://?src=[REF(SSticker.mode)];debug_antag=self'>[SSticker.mode.config_tag]</a>)</b></font><br/>"
+	var/out = "<font size=5><b>Current mode: [SSticker.mode.name] (<a href='byond://?src=[REF(SSticker.mode)];debug_antag=self'>[SSticker.mode.config_tag]</a>)</b></font><br/>"
 	out += "<hr>"
 
 	if(SSticker.mode.ert_disabled)

code/modules/admin/admin_verbs.dm

@@ -1132,7 +1132,7 @@ GLOBAL_LIST_INIT(admin_verbs_storyteller, list(
 	set name = "Man Up"
 	set desc = "Tells mob to man up and deal with it."
 
-	to_chat(T, SPAN_NOTICE("<b><font size=3>Man up and deal with it.</font></b>"))
+	to_chat(T, SPAN_NOTICE("<b><font size=6>Man up and deal with it.</font></b>"))
 	to_chat(T, SPAN_NOTICE("Move on."))
 
 	log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")

code/modules/ghostroles/spawner/human/responseteams/response_team.dm

@@ -21,5 +21,5 @@
 
 /datum/ghostspawner/human/ert/post_spawn(mob/user)
 	if(name)
-		to_chat(user, SPAN_DANGER("<font size=3>You are [max_count > 1 ? "a" : "the"] [name]!</font>"))
+		to_chat(user, SPAN_DANGER("<font size=5>You are [max_count > 1 ? "a" : "the"] [name]!</font>"))
 	return ..()

code/modules/mob/living/carbon/human/human.dm

@@ -370,7 +370,7 @@
 		suit = w_uniform
 
 	user.set_machine(src)
-	var/dat = "<B><HR><FONT size=3>[name]</FONT></B><BR><HR>"
+	var/dat = "<B><HR><FONT size=5>[name]</FONT></B><BR><HR>"
 
 	if(internals)
 		dat += "<B>Internals: [internal ? "On" : "Off"]</B><BR>"

code/modules/mob/living/carbon/human/species/species.dm

@@ -202,12 +202,12 @@
 
 	// External Organ Pain Damage
 	var/organ_low_pain_message = "<b>Your %PARTNAME% hurts.</b>"
-	var/organ_med_pain_message = "<b><font size=3>Your %PARTNAME% hurts badly!</font></b>"
-	var/organ_high_pain_message = "<b><font size=3>Your %PARTNAME% is screaming out in pain!</font></b>"
+	var/organ_med_pain_message = "<b><font size=4>Your %PARTNAME% hurts badly!</font></b>"
+	var/organ_high_pain_message = "<b><font size=5>Your %PARTNAME% is screaming out in pain!</font></b>"
 
 	var/organ_low_burn_message = SPAN_DANGER("Your %PARTNAME% burns.")
-	var/organ_med_burn_message = SPAN_DANGER("<font size=3>Your %PARTNAME% burns horribly!</font>")
-	var/organ_high_burn_message = SPAN_DANGER("<font size=4>Your %PARTNAME% feels like it's on fire!</font>")
+	var/organ_med_burn_message = SPAN_DANGER("<font size=4>Your %PARTNAME% burns horribly!</font>")
+	var/organ_high_burn_message = SPAN_DANGER("<font size=5>Your %PARTNAME% feels like it's on fire!</font>")
 
 	var/list/stutter_verbs = list("stammers", "stutters")
 

code/modules/mob/living/carbon/human/species/station/diona/diona.dm

@@ -57,12 +57,12 @@ They are very slow, reasonably strong, and quite durable. They also require ligh
 	Dionae survive primarily on off of the electromagnetic spectrum and biological matter."
 
 	organ_low_pain_message = "<b>The nymph making up our %PARTNAME% feels injured.</b>"
-	organ_med_pain_message = "<b><font size=3>The nymph making up our %PARTNAME% can barely manage the pain!</font></b>"
-	organ_high_pain_message = "<b><font size=3>The nymph making up our %PARTNAME% screams out in pain!</font></b>"
+	organ_med_pain_message = "<b><font size=4>The nymph making up our %PARTNAME% can barely manage the pain!</font></b>"
+	organ_high_pain_message = "<b><font size=5>The nymph making up our %PARTNAME% screams out in pain!</font></b>"
 
 	organ_low_burn_message = "<b>The nymph making up our %PARTNAME% notes a burning injury.</b>"
-	organ_med_burn_message = SPAN_DANGER("<font size=3>The nymph making up our %PARTNAME% burns terribly!</font>")
-	organ_high_burn_message = SPAN_DANGER("<font size=3>The nymph making up our %PARTNAME% screams in agony at the burning!</font>")
+	organ_med_burn_message = SPAN_DANGER("<font size=4>The nymph making up our %PARTNAME% burns terribly!</font>")
+	organ_high_burn_message = SPAN_DANGER("<font size=5>The nymph making up our %PARTNAME% screams in agony at the burning!</font>")
 
 	halloss_message = "creaks and crumbles to the floor."
 	halloss_message_self = "We can't take this much pain..."

code/modules/mob/living/silicon/pai/pai.dm

@@ -202,7 +202,7 @@
 /mob/living/silicon/pai/LateLogin()
 	if(!greeted)
 		// Basic intro text.
-		to_chat(src, SPAN_DANGER("<font size=3>You are a Personal AI!</font>"))
+		to_chat(src, SPAN_DANGER("<font size=5>You are a Personal AI!</font>"))
 		to_chat(src, SPAN_NOTICE("You are a small artificial intelligence contained inside a portable tablet, and you are bound to a master. Your primary directive is to serve them and follow their instructions, follow this prime directive above all others. Check your Software interface to spend ram on programs that can help, and unfold your chassis to take a holographic form and move around the world."))
 		playsound(usr, 'sound/effects/pai/pai_login.ogg', 75)
 		greeted = 1

code/modules/mob/living/simple_animal/borer/borer_powers.dm

@@ -429,7 +429,7 @@
 			to_chat(B.host_brain, SPAN_WARNING("You feel a strange sensation as a foreign influence prods your mind."))
 			to_chat(src, SPAN_WARNING("It doesn't seem to be as effective as you hoped."))
 		else
-			to_chat(B.host_brain, SPAN_DANGER("<FONT size=3>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT>"))
+			to_chat(B.host_brain, SPAN_DANGER("<FONT size=6>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT>"))
 
 /mob/living/carbon/proc/spawn_larvae()
 	set category = "Abilities"

code/modules/organs/internal/heart.dm

@@ -291,7 +291,7 @@
 
 		if(world.time >= next_blood_squirt && istype(owner.loc, /turf) && do_spray.len)
 			owner.visible_message(SPAN_DANGER("Blood squirts from \the [owner]'s [pick(do_spray)]!"), \
-								SPAN_DANGER("<font size=3>Blood sprays out of your [pick(do_spray)]!</font>"))
+								SPAN_DANGER("<font size=5>Blood sprays out of your [pick(do_spray)]!</font>"))
 			owner.eye_blurry = 2
 			owner.Stun(1)
 			next_blood_squirt = world.time + time_between_arterial_sprays

code/modules/organs/organ_external.dm

@@ -1126,20 +1126,20 @@ Note that amputating the affected organ does in fact remove the infection from t
 				var/gore_sound = "[(status & ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]"
 				owner.visible_message(
 					SPAN_DANGER("\The [owner]'s [src.name] flies off in an arc!"),\
-					"<span class='moderate'><b><font size=2>Your [src.name] goes flying off!</font></b></span>",\
+					"<span class='moderate'><b><font size=5>Your [src.name] goes flying off!</font></b></span>",\
 					SPAN_DANGER("You hear the terrible sound of [gore_sound]."))
 		if(DROPLIMB_BURN)
 			var/gore = "[(status & ORGAN_ROBOT) ? "": " of burning flesh"]"
 			owner.visible_message(
 				SPAN_DANGER("\The [owner]'s [src.name] flashes away into ashes!"),\
-				"<span class='moderate'><b><font size=2>Your [src.name] flashes away into ashes!</font></b></span>",\
+				"<span class='moderate'><b><font size=5>Your [src.name] flashes away into ashes!</font></b></span>",\
 				SPAN_DANGER("You hear the crackling sound[gore]."))
 		if(DROPLIMB_BLUNT)
 			var/gore = "[(status & ORGAN_ROBOT) ? "": " in a shower of gore"]"
 			var/gore_sound = "[(status & ORGAN_ROBOT) ? "rending sound of tortured metal" : "sickening splatter of gore"]"
 			owner.visible_message(
 				SPAN_DANGER("\The [owner]'s [src.name] explodes[gore]!"),\
-				"<span class='moderate'><b><font size=3>Your [src.name] explodes[gore]!</font></b></span>",\
+				"<span class='moderate'><b><font size=5>Your [src.name] explodes[gore]!</font></b></span>",\
 				SPAN_DANGER("You hear the [gore_sound]."))
 
 	var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
@@ -1296,8 +1296,8 @@ Note that amputating the affected organ does in fact remove the infection from t
 	if(!silent)
 		var/message = pick("broke in half", "shattered")
 		owner.visible_message(\
-			SPAN_WARNING("<font size=2>You hear a loud cracking sound coming from \the [owner]!</font>"),\
-			SPAN_DANGER("<font size=3>Something feels like it [message] in your [name]!</font>"),\
+			SPAN_WARNING("<font size=4>You hear a loud cracking sound coming from \the [owner]!</font>"),\
+			SPAN_DANGER("<font size=5>Something feels like it [message] in your [name]!</font>"),\
 			"You hear a sickening crack!")
 		if(owner.species && owner.can_feel_pain())
 			owner.emote("scream")

code/modules/organs/pain.dm

@@ -26,11 +26,11 @@
 		last_pain_message = message
 		if(power >= 110)
 			flash_strong_pain()
-			to_chat(src, SPAN_DANGER("<font size=3>[message]</font>"))
+			to_chat(src, SPAN_DANGER(FONT_HUGE("[message]")))
 		else if(power >= 70)
-			to_chat(src, SPAN_DANGER("<font size=3>[message]</font>"))
+			to_chat(src, SPAN_DANGER(FONT_LARGE("[message]")))
 		else if(power >= 40)
-			to_chat(src, SPAN_DANGER("<font size=2>[message]</font>"))
+			to_chat(src, SPAN_DANGER(FONT_LARGE("[message]")))
 		else if(power >= 10)
 			to_chat(src, SPAN_DANGER("[message]"))
 		else

code/modules/psionics/complexus/complexus_helpers.dm

@@ -66,7 +66,7 @@
 		return FALSE
 
 	sound_to(owner, sound('sound/effects/psi/power_feedback.ogg'))
-	to_chat(owner, SPAN_DANGER("<font size=3>Wild energistic feedback blasts across your psyche!</font>"))
+	to_chat(owner, SPAN_DANGER("<font size=5>Wild energistic feedback blasts across your psyche!</font>"))
 	stunned(value * 2)
 	set_cooldown(value * 100)
 

html/changelogs/mattatlas-fixsizees.yml

@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixed pain and ingame announcement font sizes."