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.
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"
Strings related to inputting crimes modified

- No matter how much Security may argue, those are crimes, not
disabilities
Multiple fixes to Air Alarms

- Supposed to address #1137
- NanoUI file for Air Alarm fixed to re-include scrub N2 button
- Removed value.state for now since it isn't defined (which explains why
it shows undefined)
- Softened temperature checks
Merge pull request #1246 from dylanstrategie/Air-Alarm-Fix

Multiple fixes to Air Alarms
Merge pull request #1247 from ESwordTheCat/riW3nfAj

Lattice
Merge pull request #20 from d3athrow/Bleeding-Edge

Bleeding edge
Update Chemistry-Reagents.dm
Update Chemistry-Recipes.dm
Lattice