Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Conflicts:
	code/game/machinery/Sleeper.dm
	code/modules/events/event_dynamic.dm
	icons/mob/human_face.dmi
RESOLVED.
Merge branch 'dev' of https://github.com/Nanai/Baystation12 into dev

Conflicts:
	code/modules/events/event_dynamic.dm