added even more flashes

3 files changed, 302 insertions, 52 deletions

diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 0ba2a247..0ffc646b 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -567,6 +567,8 @@ Art Tags:
 - Gamzee
 - Green Sun
 - Meteor
+Referenced Tracks:
+- Feel (Old. Ver)
 Commentary: |-
     <i>Luke Benjamins:</i>
     I actually wrote the melody for this track almost five years ago, for a project that never got off the ground. As far as I can remember, I didn't have any particular inspiration when I wrote it, musical or otherwise. It's the catchiest tune I've ever made, yet I couldn't tell you how it came to me exactly. This version is a completely unique take on this melody compared to the original context, giving it a very different Feel. I wasn't able to do any of the audio production for this track, but I did guide RJ as to how I Feel it should be put together. We ended up pushing the deadline too much with this one, and there are still a couple things I wish had been changed, but like with any creative work, you need to draw the line somewhere, lest you polish it endlessly.
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 459dacd9..81f4c51d 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -123,6 +123,13 @@ Duration: '4:20'
 URLs: 
 - https://spellmynamewithabang.tumblr.com/day/2012/05/14
 ---
+Track: Cats
+Artists:
+- Toby Fox
+Duration: '1:36'
+URLs:
+- https://www.youtube.com/watch?v=-S-7Yc0n3uc
+---
 Track: Catscratch
 Artists:
 - Toby Fox
@@ -258,6 +265,22 @@ Duration: '4:20'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/Exploring%20the%20Depths%20of%20Sburb.mp3
 ---
+Track: Feel (Old. Ver)
+Artists: 
+- Luke Benjamins
+Duration: '1:30'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Feel%20%28Old%20Ver.%29.mp3
+Referenced Tracks:
+- Feel
+---
+Track: Feel
+Artists: 
+- Luke Benjamins
+Duration: '1:07'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Feel.mp3
+---
 Track: Five-Four Stress
 Artists:
 - Buzinkai
diff --git a/flashes.yaml b/flashes.yaml
index d2ef2bd5..89513934 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -2599,6 +2599,24 @@ URLs:
 - https://mspfa.com/?s=14113&p=1668
 - https://www.youtube.com/watch?v=sDmM_2_AjQk
 ---
+Flash: 'TAIMVOIP ORIGINAL ANAMATED VIDEO PAGE: “humour”'
+Directory: humour
+Date: March 30, 2020
+Featured Tracks:
+- Yule and New 
+URLs:
+- https://mspfa.com/?s=31376&p=25
+- https://www.youtube.com/watch?v=Xhbkb6dM_kg
+---
+Flash: 'TAIMVOIP ORIGINAL ANAMATED VIDEO PAGE: “lifdoff”'
+Directory: lifdoff
+Date: June 13, 2021
+Featured Tracks:
+- Waiting Room
+URLs:
+- hhttps://mspfa.com/?s=31376&p=133
+- https://www.youtube.com/watch?v=mDri9wioeOM
+---
 Color: '#626262'
 Act: Karkat Goes to a Convention
 Anchor: karkat-goes-to-a-convention
@@ -3444,11 +3462,11 @@ URLs:
 - https://mspfa.com/?s=34761&p=881
 - https://www.youtube.com/watch?v=DrOQQ1ErfqQ
 ---
-Color: '#fafafa'
-Act: Other Fan Adventures
-Anchor: other-fan-adventures
+Act: Nightfall
+Color: '#005682'
+Anchor: nightfall
 ---
-Flash: 'Nightfall: [S] Liz: STRIFE!'
+Flash: '[S] Liz: STRIFE!'
 Directory: liz-strife
 Date: February 26, 2012
 Featured Tracks:
@@ -3456,7 +3474,7 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=x3x7PHg9io0
 ---
-Flash: 'Nightfall: [S] Killer: Approach.'
+Flash: '[S] Killer: Approach.'
 Directory: killer-approach
 Date: June 18, 2012
 Featured Tracks:
@@ -3464,7 +3482,7 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=XUI4Nk_JGRU
 ---
-Flash: 'Nightfall: [S] Sylja: Engage.'
+Flash: '[S] Sylja: Engage.'
 Directory: sylja-engage
 Date: November 21, 2013
 Featured Tracks:
@@ -3472,7 +3490,11 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=cs64HZTw_K0
 ---
-Flash: 'Mr. Tambourine Man: [S] Dave: Strife!'
+Act: Mr. Tambourine Man
+Color: '#0715cd'
+Anchor: mr-tambourine-man
+---
+Flash: '[S] Dave: Strife!'
 Directory: dave-strife-mr-tambourine-man
 Date: April 6, 2018
 Featured Tracks:
@@ -3481,7 +3503,7 @@ Featured Tracks:
 URLs:
 - https://odditycollector.com/mtm/?s=6&p=002970retcon
 ---
-Flash: 'Mr. Tambourine Man: [S] ==>'
+Flash: '[S] ==>'
 Directory: next-mr-tambourine-man
 Date: January 13, 2020
 Featured Tracks:
@@ -3493,7 +3515,7 @@ URLs:
 # psych0ruins is used in a secret triggered by inputting up up down down left right left right b a
 # Freefall and Ascend were also in the easter egg credits (which I checked through hacking), but
 # I suspect that's foreshadowing for future flashes
-Flash: 'Mr. Tambourine Man: [S] ACT 6 INTERMISSION 3'
+Flash: '[S] ACT 6 INTERMISSION 3'
 Directory: act-6-intermission-3-mr-tambourine-man
 Date: June 25, 2020
 Featured Tracks:
@@ -3502,16 +3524,20 @@ Featured Tracks:
 URLs:
 - https://odditycollector.com/mtm/?s=6&p=007163retcon
 ---
-Flash: 'Apocryphal Antithesis: Opening Flash'
-Directory: apocryphal-antithesis-opening-flash
-Date: December 27, 2015
+Act: Hexane Universe
+Color: '#dc0067'
+Anchor: hexane
+---
+Flash: '[S] 0001, 0002, 0003, Amoria: Behold glory of Bloody Hell.'
+Directory: behold-glory-of-bloody-hell
+# Late 2012 is all the credits say (Dungeons of Sunnydale has a missing original upload)
+Date: December 31, 2012
 Featured Tracks:
-- Hymn of the Horrorterrors
+- Warhammer of Zillyhoo
 URLs:
-- https://mspfa.com/?s=12776&p=2
-- https://www.youtube.com/watch?v=NU-sbsNcQkE
+- https://www.youtube.com/watch?v=N8Ro_XV0BH8
 ---
-Flash: 'Hexane: [S] ===>'
+Flash: '[S] ===>'
 Directory: next-hexane
 Date: March 23, 2013
 Featured Tracks:
@@ -3519,7 +3545,7 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=SkqotKfI4tw
 ---
-Flash: 'Hexane: [S] Nina and Lars: Enter.'
+Flash: '[S] Nina and Lars: Enter.'
 Directory: nina-and-lars-enter
 Date: October 29, 2016
 Featured Tracks:
@@ -3527,7 +3553,7 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=Pxbiw4Nu7Is
 ---
-Flash: 'Hexane: [S] Viy: Rise Up.'
+Flash: '[S] Viy: Rise Up.'
 Directory: viy-rise-up
 Date: February 2, 2018
 Featured Tracks:
@@ -3535,14 +3561,162 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=y9lVuJTuOkw
 ---
-Flash: 'Dungeons of Sunnydale: [S] 0001, 0002, 0003, Amoria: Behold glory of Bloody Hell.'
-Directory: behold-glory-of-bloody-hell
-# Late 2012 is all the credits say (Dungeons of Sunnydale has a missing original upload)
-Date: December 31, 2012
+Act: The Crow Strider AU
+Color: '#ff0000'
+Anchor: the-crow-strider-au
+---
+Flash: '[S]Heir of grief: PLAY'
+Directory: heir-of-grief-play
+Date: April 16, 2022
 Featured Tracks:
-- Warhammer of Zillyhoo
+- Pipeorgankind
 URLs:
-- https://www.youtube.com/watch?v=N8Ro_XV0BH8
+- https://www.youtube.com/watch?v=GWAh4_9pBhA
+- https://mspfa.com/?s=44153&p=897
+---
+Flash: '[S] Finish it'
+Directory: finish-it
+Date: July 11, 2022
+Featured Tracks:
+- A War of One Bullet
+- Showtime (End Strife Remix)
+URLs:
+- https://www.youtube.com/watch?v=hlYj887H6pY
+- https://mspfa.com/?s=44153&p=2590
+---
+Flash: Farewell
+Directory: farewell
+Date: December 24, 2022
+Featured Tracks:
+- Merge
+URLs:
+- https://www.youtube.com/watch?v=YYFHzeBEGs0
+- https://mspfa.com/?s=44153&p=4300
+---
+Act: 'Sburb: Refresh'
+Color: '#b57a41'
+Anchor: sburb-refresh
+---
+Flash: '[S] Jeff: STRIFE!'
+Directory: jeff-strife
+Date: June 10, 2018
+Featured Tracks:
+- Stress
+URLs:
+- https://mspfa.com/?s=24551&p=60
+- https://www.youtube.com/watch?v=vGuFKLAtads
+---
+Flash: '[S] Ryan: Glare at the sun and roll the intro screen.'
+Directory: ryan-glare
+Date: June 12, 2018
+Featured Tracks:
+- Windchime Foley
+URLs:
+- https://mspfa.com/?s=24551&p=83
+- https://www.youtube.com/watch?v=epbpOHe6FAc
+---
+Flash: '[S] Ryan and Jeff: Enter.'
+Directory: ryan-and-jeff-enter
+Date: July 20, 2018
+Featured Tracks:
+- Sburban Jungle
+URLs:
+- https://mspfa.com/?s=24551&p=137
+- https://www.youtube.com/watch?v=Rf_BT1WIiww
+---
+Flash: '[S] Jeff: Return.'
+Directory: jeff-return
+Date: August 28, 2018
+Featured Tracks:
+- Crystalanthemums
+URLs:
+- https://mspfa.com/?s=24551&p=276
+- https://www.youtube.com/watch?v=1vDPWvNfSHo
+---
+Flash: '[S] Ashley: Enter.'
+Directory: ashley-enter
+Date: November 14, 2018
+Featured Tracks:
+- Another Jungle
+URLs:
+- https://mspfa.com/?s=24551&p=438
+- https://www.youtube.com/watch?v=5YwOOjU8t3s
+---
+Flash: '[S] Enter.'
+Directory: enter-sburb-refresh
+Date: February 20, 2019
+Featured Tracks:
+- Umbral Ultimatum
+URLs:
+- https://mspfa.com/?s=24551&p=470
+- https://www.youtube.com/watch?v=rjlACBZ_yWg
+---
+Flash: '[S] Jeff: Descend.'
+Directory: jeff-descend
+Date: July 4, 2019
+Featured Tracks:
+- Elevatorstuck
+URLs:
+- https://mspfa.com/?s=24551&p=664
+- https://www.youtube.com/watch?v=xu6LmzMb3s8
+---
+Flash: '[S] Tim: Enter.'
+Directory: tim-enter
+Date: November 29, 2019
+Featured Tracks:
+- Sburban Reversal
+URLs:
+- https://mspfa.com/?s=24551&p=922
+- https://www.youtube.com/watch?v=zWu3rUfKZkQ
+---
+Flash: '[S] April and Tim: Enter.'
+Directory: april-and-tim-enter
+Date: February 20, 2020
+Featured Tracks:
+- Sburban Reversal
+URLs:
+- https://mspfa.com/?s=24551&p=931
+- https://www.youtube.com/watch?v=PWPWMlsTUmI
+---
+Flash: '[S] April: Break.'
+Directory: april-break
+Date: February 20, 2021
+Featured Tracks:
+- Feel (Old. Ver)
+URLs:
+- https://mspfa.com/?s=24551&p=1286
+- https://www.youtube.com/watch?v=ylarDhRwKJU
+---
+Flash: '[S] Gambit: Ascend.'
+Directory: gambit-ascend
+Date: May 10, 2023
+Featured Tracks:
+- Black
+URLs:
+- https://mspfa.com/?s=24551&p=1825
+- https://www.youtube.com/watch?v=218CxSqT82s
+---
+Flash: '[S] Converge.'
+Directory: converge-sburb-refresh
+Date: June 23, 2023
+Featured Tracks:
+- Explore
+URLs:
+- https://mspfa.com/?s=24551&p=1872
+- https://www.youtube.com/watch?v=2E9p-wcaroc
+---
+Act: Other Fan Adventures
+Color: '#fafafa'
+Anchor: other-fan-adventures
+---
+Flash: 'Apocryphal Antithesis: Opening Flash'
+Directory: apocryphal-antithesis-opening-flash
+Date: December 27, 2015
+Featured Tracks:
+- Hymn of the Horrorterrors
+URLs:
+- https://mspfa.com/?s=12776&p=2
+- https://www.youtube.com/watch?v=NU-sbsNcQkE
 ---
 Flash: 'Do fim para o começo: [S]Bruxa: Desperte'
 Directory: bruxa-desperte
@@ -3578,34 +3752,6 @@ URLs:
 - https://www.youtube.com/watch?v=TX7v0I1FI5Q
 - https://mspfa.com/?s=17592&p=164
 ---
-Flash: 'The Crow Strider AU: [S]Heir of grief: PLAY'
-Directory: heir-of-grief-play
-Date: April 16, 2022
-Featured Tracks:
-- Pipeorgankind
-URLs:
-- https://www.youtube.com/watch?v=GWAh4_9pBhA
-- https://mspfa.com/?s=44153&p=897
----
-Flash: 'The Crow Strider AU: [S] Finish it'
-Directory: finish-it
-Date: July 11, 2022
-Featured Tracks:
-- A War of One Bullet
-- Showtime (End Strife Remix)
-URLs:
-- https://www.youtube.com/watch?v=hlYj887H6pY
-- https://mspfa.com/?s=44153&p=2590
----
-Flash: 'The Crow Strider AU: Farewell'
-Directory: farewell
-Date: December 24, 2022
-Featured Tracks:
-- Merge
-URLs:
-- https://www.youtube.com/watch?v=YYFHzeBEGs0
-- https://mspfa.com/?s=44153&p=4300
----
 Flash: 'Honkstuck: [S] Ivan: fly'
 Directory: ivan-fly
 Date: April 14, 2012
@@ -3647,6 +3793,85 @@ Featured Tracks:
 URLs:
 - https://www.youtube.com/watch?v=iTdRrwOn87w
 ---
+Flash: 'NEPETAQUEST 2022: [S] Nepeta: CHAOS DUNK'
+Directory: nepeta-chaos-dunk
+Date: October 5, 2022
+Featured Tracks:
+- Cats
+URLs:
+- https://mspfa.com/?s=48025&p=126
+- https://www.youtube.com/watch?v=WQuaSfDheuc
+---
+Flash: 'Cool and Vast Error: [S] ackjack: kil merrit forr runing yuor cavv exdepition1!!1!!'
+Directory: ackjack-kil-merrit
+Date: December 9, 2019
+Featured Tracks:
+- Starsetter
+URLs:
+- https://mspfa.com/?s=31973&p=135
+- https://www.youtube.com/watch?v=HQCRO8-_e8g
+---
+Flash: 'No More Angst: [S] Roxy: Defend'
+Directory: roxy-defend
+Date: November 17, 2019
+Featured Tracks:
+- Even in Death
+URLs:
+- https://mspfa.com/?s=32314&p=78
+- https://www.youtube.com/watch?v=yjfxo1sOcHM
+---
+Flash: 'Scapecast: [S] Izzy: STRIFE!'
+Directory: izzy-strife
+Date: August 29, 2019
+Featured Tracks:
+- FIDUSPAWN, GO!
+URLs:
+- https://mspfa.com/?s=27141&p=120
+- https://www.youtube.com/watch?v=M3omKYT-q0Q
+---
+Flash: 'Song of Skaia: [S] Rob: Seagaze'
+Directory: rob-seagaze
+Date: October 10, 2018
+Featured Tracks:
+- Lies With The Sea
+URLs:
+- https://mspfa.com/?s=20310&p=136
+- https://www.youtube.com/watch?v=RLBbrrrwsF8
+---
+Flash: 'Song of Skaia: [S] Mike and Rob: Encounter'
+Directory: mike-and-rob-encounter
+Date: December 13, 2019
+Featured Tracks:
+- Carbon Nadsat / Cuestick Genius
+URLs:
+- https://mspfa.com/?s=20310&p=220
+- https://youtu.be/oRrkYLa9KXk
+---
+Flash: 'CON AIR 2: THE EPILOGUE: [S] Ollywood Showdown'
+Directory: ollywood-showdown
+Date: April 7, 2019
+Featured Tracks:
+- Skaianet
+- Break Shot
+- G4M3 OR D13
+- How Do I Live (Bunny Back in the Box Version)
+- Nic Cage Song
+URLs:
+- https://www.youtube.com/watch?v=gV3sis_x25E
+- https://mspfa.com/?s=29894&p=29
+- https://www.neonredfeather.com/hs/con-air-2/29
+- https://skaianet.tumblr.com/post/184018098042/s-ollywood-showdown
+---
+Flash: 'Ligmastuck: [S] John: Descendascend.'
+Directory: john-descendascend
+Date: April 13, 2022
+Featured Tracks:
+- Stormspirit
+- Heir Conditioning
+URLs:
+- https://www.youtube.com/watch?v=IgAWmWER_90
+- https://mspfa.com/?s=42495&p=200
+---
 Color: '#fafafa'
 Act: Fan Animations
 Anchor: fan-animations