Merge branch 'spraycans' into 'master'

src/d_main.c

src/d_netcmd.c

src/deh_lua.c

src/deh_soc.c

src/deh_tables.c

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/g_game.c

src/info.c

src/info.h

src/k_menudraw.c

src/m_cond.c

src/m_cond.h

src/menus/options-data-erase-1.c

src/p_inter.c

src/p_local.h

src/p_mobj.c

src/p_saveg.c

src/p_setup.c