Merge branch 'Duns_Efficiency' of https://github.com/Duny-/vgstation13 into Duny--Duns_Efficiency

Conflicts:
	code/game/machinery/vending.dm
	icons/turf/areas.dmi