Goon-style Ores, committed for N3X15 to look at.
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into butt

Conflicts:
	icons/obj/items.dmi
fixes, DON'T MERGE THIS YET
Fixes, should be ready for merge
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into butt

Conflicts:
	icons/turf/walls.dmi
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into butt

Conflicts:
	icons/obj/items.dmi
Merge pull request #1224 from Iamgoofball/butt

Goon-style Ores, committed for N3X15 to look at.