Fixed another scars issue
Merge branch 'master' into refactor

Conflicts:
	gamemode/client/vgui.lua
FPP dependency shit