Commit

Commit to safe changes before merge. Working on viruses which is confusing at minimum.
Need to check other branches to find out best way for Viro to work.
Fixed LZ's buggeries.

NEXT TIME KILL EVERYTHING.

Merge branch 'master' into local-branch

Conflicts:
	code/WorkInProgress/TaukaUsanake/guitar.dm
	code/modules/mob/living/carbon/slime/cores.dm
	code/modules/mob/living/carbon/slime/subtypes.dm
	terrastation.dme
	terrastation.rsc