.
Merge branch 'goose' of https://github.com/Gooseheaded/July-Project into goose

Conflicts:
	source/GUI/_Testing.dm
Working on CharacterCreation!