Merge branch 'working' of https://github.com/Sieve/-tg-station into working

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/buttons/button.dm
	code/game/machinery/buttons/door_control.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/poddoor.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/igniter.dm
	code/game/machinery/machinery.dm
	code/game/machinery/mass_driver.dm
	code/game/mecha/mech_fabricator.dm
	code/game/objects/structures/morgue.dm
Revert "Added the other part of the mechfabs using a console list versus 'in world'"

This reverts commit cef15fb3e8fc8acd22a7c2a21bc51e6f3bf718d3.
Merge branch 'working' of https://github.com/Sieve/-tg-station into working
This reverts commit 55fab31e4e516ff03aa84119051f63d19ac85f71.

Conflicts:
	code/game/mecha/mech_fabricator.dm