more fixes from #issuefication-zone

13 files changed, 138 insertions, 28 deletions

diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 3ab49eeb..74c4ccb1 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -206,6 +206,10 @@ Art Tags:
 - The Signless
 Referenced Tracks:
 - Crustacean
+Sampled Tracks:
+- Through fire, justice is served!
+Lyrics: |-
+    (THROUGH FIRE, JUSTICE IS SERVED!)
 Commentary: |-
     <i>SerialSymphony:</i>
     Theotokos is about how the Dolorosa saw the Signless growing up, his sermons and execution, and ends with a look forward to his descendant. Making this song was like making a premix brownie cake; I love brownie cakes. But you can't just make a brownie cake, you gotta eat it too.
diff --git a/album/beforus.yaml b/album/beforus.yaml
index f2f10f03..dfe8c2a0 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -175,6 +175,8 @@ Cover Artists:
 Art Tags:
 - Kankri
 - 'cw: body horror (abstract)'
+Lyrics: |-
+    (Now I realize we’ve been at this for some time already, but at the risk of derailing the dialogue you initiated, and may I just say how thrilled I am that you did, Karkat, I would just like to qualify my entire analysis of your “Alternian culture” by saying that in contrast with life on Beforus, while your people may have been engaged in violent, lethal class struggle for millions of sweeps, by no means does that imply that the Beforan way of life was entirely without problematic elements, perhaps even more disturbing and insidious for their lack of acknowledgement and open discussion, particularly as a consequence of what in my view were widely and dismayingly unexamined systemic social injustices resulting from the entrenched power dynamics in play, dynamics strikingly similar to those of your planet’s markedly more... bellicose iteration, which has only served to vindicate my hypothesis that such a hierarchy is really predicated on intrinsic dysfunction, and failure to shift all the usual narratives and undiagnosed problems into an open, judgment-free discourse through which problematic issues are constructively channeled into more intelligently problematized avenues of discussion. Now before I continue—)
 Commentary: |-
     <i>Blackhole:</i>
     Civil Discussi9n was my first purposeful musical contribution to the album! I wanted to produce a track that captured the feeling of Kankri's self-assured snobbery and pseudo-intellectualism as it was presented in his first appearance in Openbound, but from his own perspective. I imagine the feel of the track is rather what Kankri thinks of himself in his crusade for social justice. The structure of the melody was inspired by certain works of baroque classical music, although I can hardly have been said to have stuck to any one particular convention! The track was originally intended to be modified somewhat, but due to technical issues I lost the progress file for it! Hoewver I didn't want to see what I had to waste, and I believe that the track stands up solidly on its own in its current form. I hope you think so too!
diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index 41572e3f..9591797a 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -208,6 +208,7 @@ Cover Art File Extension: png
 Art Tags:
 - Caliborn
 Referenced Tracks:
+- Green Lolly
 - The Undying
 ---
 Track: Constant Confinement
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index a156ee82..3357d30f 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -213,5 +213,7 @@ Track: Battle with a Legendary Fiduspawn
 Duration: '2:52'
 Artists:
 - Rainy
+Referenced Tracks:
+- English
 URLs:
 - https://sahcon.bandcamp.com/track/battle-with-a-legendary-fiduspawn
diff --git a/album/homestuck-for-the-holidays.yaml b/album/homestuck-for-the-holidays.yaml
index 1bb8058d..7ab635e4 100644
--- a/album/homestuck-for-the-holidays.yaml
+++ b/album/homestuck-for-the-holidays.yaml
@@ -235,7 +235,7 @@ URLs:
 - https://homestuckgaiden.bandcamp.com/track/gog-rest-ye-merry-prospitians
 - https://youtu.be/H1s0RX4ikfE
 Referenced Tracks:
-- Santa Claus Is Comin' to Town
+- Here Comes Santa Claus
 - God Rest You Merry, Gentlemen
 - Sburban Jungle
 ---
@@ -349,20 +349,20 @@ Lyrics: |-
     The star is meters off the ground
     How high does it have to be
 
-    Shit, let's be santa
+    Shit, let's be Santa
     I'll be your Mister Claus
     And we'll fade away on Christmas day
     In a jpeg compression loss
 
     Shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
-    Oh shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
+    I'll- Shit, let's be Santa
     I'll be your Mister Claus
     And we'll fade away on Christmas day
     In a jpeg compression loss
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 246601be..d27bc38f 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -1631,13 +1631,25 @@ Commentary: |-
 
     Five it because it's awesome.
 
+    <i>Buoyant:</i> ([Newgrounds comment](https://www.newgrounds.com/audio/listen/229170))
+
+    yes
+
+    The wang-bing is misplaced in relation to the third yogga of the xomp-gong, that must be fixed, other than that it's probably the best song ever made.
+
     <i>SolusLunes:</i> ([Newgrounds comment](https://www.newgrounds.com/audio/listen/229170))
 
-    > Well obviously i fived it!
-    >
-    > That was awesome! It started off nice and ambient. Whatever that piano sounding thing was... it was pretty awesome. I wasnt expecting such a beat, even though the genre is techno. With the ambient feel it had at the beginning, it surprised me a bit. I love 3:27 though, that was really awesome. The main melody went very nicely with the rest of the song. I liked how it wavered (maybe need a different word?) at times.
-    >
-    > So, basically, an awesome song. Everything fit very nicely. 10/10 and 5/5!
+    Well goddamn, I'm pretty sure the third yogga was what you were responsible for.
+
+    <i>nightsurfer:</i> ([Newgrounds comment](https://www.newgrounds.com/audio/listen/229170))
+
+    Well obviously i fived it!
+
+    That was awesome! It started off nice and ambient. Whatever that piano sounding thing was... it was pretty awesome. I wasnt expecting such a beat, even though the genre is techno. With the ambient feel it had at the beginning, it surprised me a bit. I love 3:27 though, that was really awesome. The main melody went very nicely with the rest of the song. I liked how it wavered (maybe need a different word?) at times.
+
+    So, basically, an awesome song. Everything fit very nicely. 10/10 and 5/5!
+
+    <i>SolusLunes:</i> ([Newgrounds comment](https://www.newgrounds.com/audio/listen/229170))
 
     That synth and melody is SBB's awesome brainchild.
 
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index 9c3e8c58..fbeffa88 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -509,6 +509,8 @@ Section: Bonus tracks
 Track: Maplehoof's Adventure
 Artists:
 - Michael Guy Bowman
+Contributors:
+- Tavia Morra (vocals)
 Duration: '3:01'
 URLs:
 - https://homestuck.bandcamp.com/track/maplehoofs-adventure-2
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 7dffa6c3..d7ceaf83 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -1490,6 +1490,7 @@ Referenced Tracks:
 - Skaian Birth
 - Temporal Shenanigans
 - Pendulum
+- track:pendulum-watercolour
 - Skaianet
 - II - Sarabande
 - Underfoot
@@ -1511,6 +1512,10 @@ Referenced Tracks:
 - JUST1C3 R41NS FROM 4BOV3
 - track:daydreamer-lofam4
 - Sburban Metro
+Lyrics: |-
+    (My dear audience, we have a treat for you tonight. One song: every Homestuck album. With the Midnight Crew tonight backed by none other than the beta quartet, I give you: Dance of the Dead.)
+
+    (We’re not quite done yet kiddos. Let’s board the fanmusic train and keep it rollin'!)
 Commentary: |-
     <i>Veritas Unae:</i>
     I'm really sorry I delayed this album. I hope this is worth it.
diff --git a/album/lofam5a2.yaml b/album/lofam5a2.yaml
index b3aa1a03..952b26b5 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -1972,7 +1972,7 @@ Art Tags:
 Referenced Tracks:
 - Iron Knight
 Sampled Tracks:
-- Mischief Makers
+- Through fire, justice is served!
 - 'Tales of Symphonia: Dawn of the New World'
 - Freefall
 Lyrics: |-
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index aa431754..6327c699 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -638,7 +638,10 @@ Lyrics: |-
     I LOVE YOU DOGGY
 ---
 Track: My grand dad is the green sun
+Additional Names:
+- Flare - Homestuck (YouTube upload)
 Artists:
+- SiIvaGunner
 - Marcy Nabors
 Duration: '3:04'
 URLs:
@@ -1752,6 +1755,15 @@ Commentary: |-
     <i>Mathias Ramalho:</i> (Composer)
     Made for a MSPA-styled, DnD Session, named "Colored Castles"
 ---
+Track: Thunderhead
+Directory: thunderhead-loftlocked
+Always Reference By Directory: true
+Artists:
+- Veritas Unae
+Duration: '3:21'
+URLs:
+- https://loftlocked.bandcamp.com/track/thunderhead
+---
 Track: Vacuum Spark
 Artists:
 - Monckat
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 9fe45bd5..a205f0cc 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -297,7 +297,7 @@ Duration: '6:39'
 URLs:
 - https://casualsunday.bandcamp.com/track/infinitys-lament
 Referenced Tracks:
-- Thunderhead
+- track:thunderhead-loftlocked
 - English
 - Black Hole / Green Sun
 - track:glide-lofam4
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 146a760b..4b853c78 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1114,10 +1114,14 @@ URLs:
 - https://hsmusic.wiki/media/misc/archive/Nuclear.mp3
 ---
 Track: Old Skacret
-# Dead URL https://soundcloud.com/jamesroachmusic/old-skacret, no archive
 Artists:
 - James Roach
-Duration: '0:10'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Old%20Skacret.mp3
+# Dead URL https://soundcloud.com/jamesroachmusic/old-skacret, no archive
+Duration: '0:11'
+Referenced Tracks:
+- track:old-secret
 Commentary: |-
     <i>Makin:</i> (wiki editor)
     James Roach took down this track after a year or two and never reuploaded it.
@@ -1304,13 +1308,6 @@ Track: Theme of Dr. Brinner
 Artists:
 - Unknown Artist
 ---
-Track: Thunderhead
-Artists:
-- Veritas Unae
-Duration: '3:21'
-URLs:
-- https://loftlocked.bandcamp.com/track/thunderhead
----
 Track: ⭑✶✦ TILL TOMORROW ✦✶⭑
 Artists:
 - Circlejourney
@@ -11288,6 +11285,55 @@ Duration: '0:43'
 URLs:
 - https://youtu.be/A1wXEEQBHeQ?t=14
 ---
+Track: Here Comes Santa Claus
+Artists:
+- Oakley Haldeman
+- Gene Autry
+Duration: '2:34'
+URLs:
+- https://www.youtube.com/watch?v=U6kRYKvWF1E
+Lyrics: |-
+    Here comes Santa Claus
+    Here comes Santa Claus
+    Right down Santa Claus Lane
+    Vixen and Blitzen and all his reindeers pulling on the reins
+    Bells are ringing, children singing, all is merry and bright
+    So hang your stockings and say your prayers
+    'Cause Santa Claus comes tonight
+
+    Here comes Santa Claus
+    Here comes Santa Claus
+    Right down Santa Claus Lane
+    He's got a bag that's filled with toys for boys and girls again
+    Hear those sleigh bells jingle jangle, oh what a beautiful sight
+    So jump in bed and cover your head
+    'Cause Santa Claus comes tonight
+
+    Here comes Santa Claus
+    Here comes Santa Claus
+    Right down Santa Claus Lane
+    He doesn't care if you're rich or poor
+    He loves you just the same
+    Santa Claus knows we're all God's children, that makes everything right
+    So fill your hearts with Christmas cheer
+    'Cause Santa Claus comes tonight
+
+    Here comes Santa Claus
+    Here comes Santa Claus
+    Right down Santa Claus Lane
+    He'll come around when chimes ring out that it's Christmas morn' again
+    Peace on Earth will come to all if we just follow the light
+    So let's give thanks to the lord above
+    'Cause Santa Claus comes tonight
+
+    Here comes Santa Claus
+    Here comes Santa Claus
+    Right down Santa Claus Lane
+    Vixen and Blitzen and all his reindeers pulling on the rein
+    Bells are ringing, children singing, all is merry and bright
+    Hang your stockings and say your prayers
+    'Cause Santa Claus comes tonight
+---
 Track: I Got Rhythm
 Artists:
 - George Gershwin
@@ -12054,7 +12100,12 @@ Lyrics: |-
     Santa Claus is comin' to town
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
+
     The lyrics may be a little different to what you're used to, but they correspond to the first recording of this carol by Harry Reser.
+
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    [For a very long time,](https://web.archive.org/web/20130111060110/http://xzazupsilon.webs.com/nsnd.html) listed as referenced during the introduction of [[track:gog-rest-ye-merry-prospitians]]; this appears to be [[track:here-comes-santa-claus]] instead.
 ---
 Track: Shchedryk
 Artists:
@@ -29479,6 +29530,15 @@ Lyrics: |-
     Where he at? Where he at? Where he at? Where he at?
     Now there he go, there he go, there he go, there he go
 ---
+Track: Pendulum
+Directory: pendulum-watercolour
+Always Reference By Directory: true
+Artists:
+- Watercolour
+Duration: '5:04'
+URLs:
+- https://www.youtube.com/watch?v=q9I01iNFcL4
+---
 Track: Personal Jesus
 Artists:
 - Depeche Mode
@@ -38703,6 +38763,15 @@ Artists:
 URLs:
 - https://en.wikipedia.org/wiki/The_Pay-Off_(1930_film)
 ---
+Track: Through fire, justice is served!
+Artists:
+- Mischief Makers
+URLs:
+- https://youtu.be/l1sKtz-MnVE?t=66
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+    Spoken by Lunar during the final boss of *Mischief Makers*, which doesn't appear to have voice acting credits available.
+---
 Track: Up-Hill
 Artists:
 - Christina Rossetti
diff --git a/album/tomb-of-the-ancestors.yaml b/album/tomb-of-the-ancestors.yaml
index 1002d4ae..734c52f3 100644
--- a/album/tomb-of-the-ancestors.yaml
+++ b/album/tomb-of-the-ancestors.yaml
@@ -47,8 +47,9 @@ Art Tags:
 - The Signless
 - 'cw: blood'
 Sampled Tracks:
-- Mischief Makers
-Lyrics: (THROUGH FIRE, JUSTICE IS SERVED!)
+- Through fire, justice is served!
+Lyrics: |-
+    (THROUGH FIRE, JUSTICE IS SERVED!)
 ---
 Track: twoward2 the heaven2
 Additional Names: