Nobody expects the span inquisition: replaces most <span>s with macros (#86798)

## About The Pull Request
123 changed files and multiple crashes after writing broken regex, I
replaced most remains of direct spans with macros. This cleans up the
code and makes it easier to work with in general, see justification for
the original PR. I also fixed a bunch of broken and/or unclosed spans
here too.
I intentionally avoided replacing spans with multiple classes (in most
cases) and spans in the middle of strings as it would impact readability
(in my opinion at least) and could be done later if required.

## Why It's Good For The Game

Cleaner code, actually using our macros, fixes borked HTML in some
places. See original PR.

## Changelog
Nothing player-facing
This commit is contained in:
SmArtKar
2024-09-26 19:36:13 +00:00
committed by GitHub
parent 38c52107cc
commit d4ac95a0e1
123 changed files with 306 additions and 313 deletions
@@ -5,8 +5,8 @@
skill_name = "True Strength"
skill_description = "The knowledge and strength to resolve the most ancient conumdrum; what happens when an unstoppable force meets an immovable object."
skill_icon = "dumbbell"
activate_message = "<span class='notice'>You realise if you apply the correct force, at the correct angle, it is possible to make the immovable permanently movable. And... damn, you look huge.</span>"
deactivate_message = "<span class='notice'>You forget how to permanently anchor a paradoxical object. Also, you should really hit the gym...</span>"
activate_message = span_notice("You realise if you apply the correct force, at the correct angle, it is possible to make the immovable permanently movable. And... damn, you look huge.")
deactivate_message = span_notice("You forget how to permanently anchor a paradoxical object. Also, you should really hit the gym...")
chip_category = SKILLCHIP_CATEGORY_GENERAL
skillchip_flags = NONE
slot_use = 1
@@ -4,8 +4,8 @@
skill_name = "Close Quarters Cooking"
skill_description = "A specialised form of self defence, developed by skilled sous-chef de cuisines. No man fights harder than a chef to defend his kitchen."
skill_icon = "utensils"
activate_message = "<span class='notice'>You can visualize how to defend your kitchen with martial arts.</span>"
deactivate_message = "<span class='notice'>You forget how to control your muscles to execute kicks, slams and restraints while in a kitchen environment.</span>"
activate_message = span_notice("You can visualize how to defend your kitchen with martial arts.")
deactivate_message = span_notice("You forget how to control your muscles to execute kicks, slams and restraints while in a kitchen environment.")
/// The Chef CQC given by the skillchip.
var/datum/martial_art/cqc/under_siege/style
@@ -5,5 +5,5 @@
skill_name = "Supermatter Cognition Theory"
skill_description = "Understand the correct mental patterns to keep in mind around matter in a hyperfractal state, causing immunity to visions and making the matter in question \"calmer\"."
skill_icon = "spa"
activate_message = "<span class='notice'>You start thinking in patterns that will render you immune to visions from, and act as a calming influence for, matter in a hyperfractal state.</span>"
deactivate_message = "<span class='notice'>Your thoughts become more disordered and jumbled. You are no longer immune to the abyss.</span>"
activate_message = span_notice("You start thinking in patterns that will render you immune to visions from, and act as a calming influence for, matter in a hyperfractal state.")
deactivate_message = span_notice("Your thoughts become more disordered and jumbled. You are no longer immune to the abyss.")
@@ -5,5 +5,5 @@
skill_name = "Cyborg Circuitry"
skill_description = "Recognise cyborg wire layouts and understand their functionality at a glance."
skill_icon = "sitemap"
activate_message = "<span class='notice'>You suddenly comprehend the secrets behind cyborg circuitry.</span>"
deactivate_message = "<span class='notice'>Cyborg circuitry stops making sense as images of coloured wires fade from your mind.</span>"
activate_message = span_notice("You suddenly comprehend the secrets behind cyborg circuitry.")
deactivate_message = span_notice("Cyborg circuitry stops making sense as images of coloured wires fade from your mind.")
@@ -5,5 +5,5 @@
skill_name = "Engineering Circuitry"
skill_description = "Recognise airlock and APC wire layouts and understand their functionality at a glance."
skill_icon = "sitemap"
activate_message = "<span class='notice'>You suddenly comprehend the secrets behind airlock and APC circuitry.</span>"
deactivate_message = "<span class='notice'>Airlock and APC circuitry stops making sense as images of coloured wires fade from your mind.</span>"
activate_message = span_notice("You suddenly comprehend the secrets behind airlock and APC circuitry.")
deactivate_message = span_notice("Airlock and APC circuitry stops making sense as images of coloured wires fade from your mind.")
@@ -377,8 +377,8 @@
skill_name = "Underwater Basketweaving"
skill_description = "Master intricate art of using twine to create perfect baskets while submerged."
skill_icon = "shopping-basket"
activate_message = "<span class='notice'>You're one with the twine and the sea.</span>"
deactivate_message = "<span class='notice'>Higher mysteries of underwater basketweaving leave your mind.</span>"
activate_message = span_notice("You're one with the twine and the sea.")
deactivate_message = span_notice("Higher mysteries of underwater basketweaving leave your mind.")
/obj/item/skillchip/wine_taster
name = "WINE skillchip"
@@ -387,8 +387,8 @@
skill_name = "Wine Tasting"
skill_description = "Recognize wine vintage from taste alone. Never again lack an opinion when presented with an unknown drink."
skill_icon = "wine-bottle"
activate_message = "<span class='notice'>You recall wine taste.</span>"
deactivate_message = "<span class='notice'>Your memories of wine evaporate.</span>"
activate_message = span_notice("You recall wine taste.")
deactivate_message = span_notice("Your memories of wine evaporate.")
/obj/item/skillchip/bonsai
name = "Hedge 3 skillchip"
@@ -396,16 +396,16 @@
skill_name = "Hedgetrimming"
skill_description = "Trim hedges and potted plants into marvelous new shapes with any old knife. Not applicable to plastic plants."
skill_icon = "spa"
activate_message = "<span class='notice'>Your mind is filled with plant arrangments.</span>"
deactivate_message = "<span class='notice'>You can't remember what a hedge looks like anymore.</span>"
activate_message = span_notice("Your mind is filled with plant arrangments.")
deactivate_message = span_notice("You can't remember what a hedge looks like anymore.")
/obj/item/skillchip/useless_adapter
name = "Skillchip adapter"
skill_name = "Useless adapter"
skill_description = "Allows you to insert another skillchip into this adapter after it has been inserted into your brain..."
skill_icon = "plug"
activate_message = "<span class='notice'>You can now activate another chip through this adapter, but you're not sure why you did this...</span>"
deactivate_message = "<span class='notice'>You no longer have the useless skillchip adapter.</span>"
activate_message = span_notice("You can now activate another chip through this adapter, but you're not sure why you did this...")
deactivate_message = span_notice("You no longer have the useless skillchip adapter.")
skillchip_flags = SKILLCHIP_ALLOWS_MULTIPLE
// Literally does nothing.
complexity = 0
@@ -417,8 +417,8 @@
skill_name = "Lightbulb Removing"
skill_description = "Stop failing taking out lightbulbs today, no gloves needed!"
skill_icon = "lightbulb"
activate_message = "<span class='notice'>Your feel like your pain receptors are less sensitive to hot objects.</span>"
deactivate_message = "<span class='notice'>You feel like hot objects could stop you again...</span>"
activate_message = span_notice("Your feel like your pain receptors are less sensitive to hot objects.")
deactivate_message = span_notice("You feel like hot objects could stop you again...")
/obj/item/skillchip/disk_verifier
name = "K33P-TH4T-D15K skillchip"
@@ -426,8 +426,8 @@
skill_name = "Nuclear Disk Verification"
skill_description = "Nuclear authentication disks have an extremely long serial number for verification. This skillchip stores that number, which allows the user to automatically spot forgeries."
skill_icon = "save"
activate_message = "<span class='notice'>You feel your mind automatically verifying long serial numbers on disk shaped objects.</span>"
deactivate_message = "<span class='notice'>The innate recognition of absurdly long disk-related serial numbers fades from your mind.</span>"
activate_message = span_notice("You feel your mind automatically verifying long serial numbers on disk shaped objects.")
deactivate_message = span_notice("The innate recognition of absurdly long disk-related serial numbers fades from your mind.")
/obj/item/skillchip/entrails_reader
name = "3NTR41LS skillchip"
@@ -435,8 +435,8 @@
skill_name = "Entrails Reader"
skill_description = "Be able to learn about a person's life, by looking at their internal organs. Not to be confused with looking into the future."
skill_icon = "lungs"
activate_message = "<span class='notice'>You feel that you know a lot about interpreting organs.</span>"
deactivate_message = "<span class='notice'>Knowledge of liver damage, heart strain and lung scars fades from your mind.</span>"
activate_message = span_notice("You feel that you know a lot about interpreting organs.")
deactivate_message = span_notice("Knowledge of liver damage, heart strain and lung scars fades from your mind.")
/obj/item/skillchip/appraiser
name = "GENUINE ID Appraisal Now! skillchip"