Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks

.circleci/config.yml

.travis.yml

src/Makefile.cfg

src/android/i_sound.c

src/dehacked.c

src/djgppdos/i_sound.c

src/doomdef.h

src/doomstat.h

src/dummy/i_sound.c

src/f_finale.c

src/g_game.c

src/i_sound.h

src/lua_baselib.c

src/lua_maplib.c

src/p_inter.c

src/p_setup.c

src/p_spec.c

src/p_user.c

src/r_segs.c

src/s_sound.c