Merge remote-tracking branch 'bs12/bleeding-edge-freeze'

Conflicts:
	code/modules/admin/verbs/adminpm.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_box.dm
Merge branch 'master' of https://github.com/tehdrama/NanotrasenStation