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 pull request #1240 from ESwordTheCat/riW3nfAj

trivial silicon show_system_integrity() fix
apc stuck in green during powersinks.
Merge pull request #1241 from ESwordTheCat/apc_powersink

apc stuck in green during powersinks.
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.
Merge pull request #19 from d3athrow/Bleeding-Edge

Bleeding edge
Added peptobismol.
Merge pull request #1242 from Heredth/promotionsforeveryone

Anti-Dan
Revert "Anti-Dan"
Merge pull request #1243 from d3athrow/revert-1242-promotionsforeveryone

Revert "Anti-Dan"
Lattice