Merge branch 'master' into deferred_loading

2021-02-15 15:30:29 -06:00
parent 6af7621d86 50fccded66
commit e9d0cc2bc2
22 changed files with 357 additions and 115 deletions
--- a/assets/preload/data/characterList.txt
+++ b/assets/preload/data/characterList.txt
@ -13,4 +13,5 @@ gf-christmas
 monster
 bf-pixel
 senpai
+senpai-angry
 spirit
--- a/assets/preload/data/introText.txt
+++ b/assets/preload/data/introText.txt
@ -37,4 +37,4 @@ fashionably late--but here it is
 yooooooooooo--yooooooooo
 pico funny--pico funny
 updates each friday--on time every time
-shoutouts to mason--for da homies
+shoutouts to mason--for da homies