Reverted Bartender Changes
Merge pull request #3355 from Ikarrus/mineralstorage

Mineral Storage Access
Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14

More qdel() changes
Added a small alcove in Engineering Maint

As requested by Cheridan
SecMapChangeV3
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
Generalised PDA naming
Start of large job refactoring
Further work on job refactoring
Job refactoring done
Removed debugging code
Added myself to admins.txt
Generalised ID naming
Merge pull request #3323 from Ikarrus/signalorigin

Emergency Shuttle Signal Tracing
Fixed merge conflict issues
Refactors pAI law code to use the inherited laws datum instead of its own specific variables
Removes annoying double-message box when selecting NEVER FOR THIS ROUND.
Span classes