Merge branch 'dev' into gaydev

Conflicts:
	code/game/machinery/Sleeper.dm
	code/modules/events/event_dynamic.dm
	icons/mob/human_face.dmi