Merge branch 'dev' of git://github.com/Baystation12/Baystation12 into dev
Gives those asshole greyshirts fukkin' air tanks. The fucks.
Gives IA security headsets as DEMOCRACY'D here: http://baystation12.net/forums/viewtopic.php?f=5&t=8096
Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken.
Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW.
Merge pull request #3509 from meyar/bleeding-edge-freeze

fixes, weapon adjustments.
Merge branch 'master' into dev
Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev
Merge branch 'master' into dev
Praying this works
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
Actually put in the atmos closets

Signed-off-by: Jamini <mobiousjami@gmail.com>
Merge pull request #3510 from Jamini/dev

Engineernig tweaks
Merge resolution in Engineering.dm
Compile fix.
Merge branch 'master' into dev
Remove useless code
Merge pull request #3521 from LethalGhost/patch-4

Remove useless code
Merge branch 'master' into dev
Removes Alien syndrome because it kinda does not make sense.
Merge pull request #3527 from comma/dev

Removes Alien syndrome because it kinda does not make sense.