Fixes do_after(). If the item was deleted, it would check if(null == null) to cancel it
Various mineral/material standardizations, minor mob changes
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
Various mining changes IE: mineral amounts per tile, mining mob stuff, mob anchoring, etc
Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy
Wooden Walls
Adds variables for spray ranges.
Click cooldowns!
Added comments.
Emergency Shuttle Signal Tracing

Intended to cut down on shuttle ping-ponging caused by stealth comms consoles.

-After the second recall, centcom will attempt to trace the origin of emergency shuttle calls and recalls
-The results can be viewed on any authenticated communications console.
-Tracing has a 40% failure chance to further reduce the risk of metagaming the game mode
Hopefully merge conflict fixes
Standardizing circuitboard design names
Make Telecomms equipment garbage collect
Sensible circuit design names

Signed-off-by: Firecage <firecage@hotmail.com>
Added a small alcove in Engineering Maint

As requested by Cheridan
Merge pull request #3375 from Steelpoint/master

[MAP] New Brig Layout/Additions v3
Adds point-blank shooting

Adds point blank shooting, now you can shoot anyone even if they are on
the same tile or one tile from you. On harm intent, you BUTT-STROKE or
PISTOL WHIP (military terms!!) people with the gun, allowing for not
quite harmful floggings.

Makes gun.dm less shit.
mergending
Adds missing newline
Merge pull request #3365 from Firecage/master

Standardised and Sensible circuitboard design names