Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop

src/d_netcmd.c

src/d_netcmd.h

src/dehacked.c

src/dehacked.h

src/doomdef.h

src/p_setup.c

src/p_setup.h

src/r_things.c

src/r_things.h

src/st_stuff.c

src/st_stuff.h

src/w_wad.c

src/w_wad.h