singularity is now OOP
fixes
src
lol forgot to save all
Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity

Conflicts:
	code/modules/mob/living/living.dm
Merge pull request #5392 from hornygranny/OOPgularity

singularity is now OOP