Squashed commit of the following:

commit ac8cd01c17d2331c93d27b2f144f93c7295deb28
Merge: bd27a8a fa84ee1
Author: Cheridan <d_h2005@yahoo.com>
Date:   Thu Sep 5 15:46:11 2013 -0700

    Merge pull request #1284 from caelaislinn/terbs_weekly_fun

    Terbs weekly fun #3 detective can reskin his gun

commit fa84ee1a0e2a0c22d98e445f9f9440c390894451
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Mon Sep 2 12:43:37 2013 +1000

    detective can reskin his gun

    Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

commit bd27a8a02397f9f2064a20cb00e8ed1c0656a8f7
Merge: a830ba2 899a537
Author: MrPerson <spamtaffic@gmail.com>
Date:   Wed Sep 4 12:54:40 2013 -0700

    Merge pull request #1292 from Cheridan/master

    Removes an unused var from every obj

commit a830ba2740b9da449fd311e5c3ab8a7cb8d4d752
Merge: a05ffb5 eaf201b
Author: Cheridan <d_h2005@yahoo.com>
Date:   Wed Sep 4 10:01:31 2013 -0700

    Merge pull request #1282 from MrPerson/grammer

    Grammar fixes

commit a05ffb5208a30e8d5be1dddefef8215822ed0494
Merge: 723959f 5558866
Author: Cheridan <d_h2005@yahoo.com>
Date:   Wed Sep 4 09:30:17 2013 -0700

    Merge pull request #1272 from fleure/brigdoor

    Fixed brig doors counting down when timer is stopped

commit 723959fa652b1f51d9f11094cf52aa231b459d1d
Merge: 2ea02f2 ef664e5
Author: Cheridan <d_h2005@yahoo.com>
Date:   Wed Sep 4 09:12:35 2013 -0700

    Merge pull request #1294 from AnturK/mechfix

    Mech recharge fix

commit 2ea02f2c123a1a00face28c3f47e7f51a1c95c19
Merge: f6206dc 6a65cb0
Author: Ricotez <rafageddon@hotmail.com>
Date:   Wed Sep 4 02:20:37 2013 -0700

    Merge pull request #1293 from Erthilo/master

    Fixes Gravitational Catapult not being able to be removed from mechs.

commit f6206dc6ace4483a51ad9e76434c486ceb69b810
Merge: 465cfe7 90bab87
Author: Cael Aislinn <cael_aislinn@yahoo.com.au>
Date:   Wed Sep 4 02:12:10 2013 -0700

    Merge pull request #1187 from Tenebrosity/gunshot

    Replaces the default gunshot sound effect with four higher quality ones

commit 55588662e0e72159fc0123eb82e66dba193955ab
Author: fleure <fleure@hushmail.com>
Date:   Wed Sep 4 00:23:09 2013 +0100

    Implemented suggested code layout changes

commit ef664e5aaba6dab0f0d27d824065046b03b4bb02
Author: AnturK <why@so.serious>
Date:   Tue Sep 3 20:08:02 2013 +0200

    Mech recharge fix

commit 6a65cb0f37d9c1d0846ec80fbfeb45db7f99dff2
Author: Erthilo <erthilo@gmail.com>
Date:   Tue Sep 3 17:31:09 2013 +0100

    Fixes Gravitational Catapult not being able to be removed from mechs.

commit 899a53787a556fd95e2a5b249cebac2d28b8799f
Author: Cheridan <d_h2005@yahoo.com>
Date:   Tue Sep 3 09:38:30 2013 -0500

    Removes an unused var defined for every obj.

commit 3fd508c29df9d321786818f1d6ff7515cf2bf5ba
Author: fleure <fleure@hushmail.com>
Date:   Mon Sep 2 23:23:35 2013 +0100

    Reverted brig doors fix if layout, and removed redundant src ref

commit d0b0c4d0cdf36fd3cafd49b7f62c66956bed0d5d
Merge: 5ce73a0 465cfe7
Author: Cheridan <d_h2005@yahoo.com>
Date:   Mon Sep 2 17:20:19 2013 -0500

    Merge branch 'master' of https://github.com/tgstation/-tg-station

commit 465cfe76f3391620730a1f8c9ecc60b2bf6761f7
Merge: 2780149 aee35c6
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Mon Sep 2 14:09:16 2013 -0700

    Merge pull request #1230 from VistaPOWA/critter_crates

    Adds critter crates

commit aee35c6c087efce9708fe1c4439dad6816d37738
Author: VistaPOWA <hegyi.mokka@gmail.com>
Date:   Mon Sep 2 13:20:02 2013 +0200

    Removed unneeded 'this's

commit 761731c27a98b8560d7162bb3227dd09618cd5bd
Merge: 6e83288 2780149
Author: VistaPOWA <hegyi.mokka@gmail.com>
Date:   Mon Sep 2 13:18:15 2013 +0200

    Merge git://github.com/tgstation/-tg-station into critter_crates

    Conflicts:
    	icons/obj/storage.dmi

commit 27801493535daa2ca04281debd0652cdc85cc8b1
Merge: 8ba4851 cedfa64
Author: MrPerson <spamtaffic@gmail.com>
Date:   Mon Sep 2 04:00:22 2013 -0700

    Merge pull request #1279 from Neerti/9-1-2013-adding_replica_spesshelmet_arcade

    Replaces arcade replica suit prize with a box containing a replica suit & helmet

commit a0c3702ed24592b8a4136d1ef4bb82ae0d6dbb84
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Mon Sep 2 12:43:27 2013 +1000

    changelog update

    Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

commit 8ba48516f250b10e13a98acd7a140016c8aaa055
Merge: c4a7ce2 c00c820
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Sun Sep 1 19:35:49 2013 -0700

    Merge pull request #1258 from RobRichards1997/29/08/2013-TwoHanded-Weapon-Buffs

    Buffs Two handed weapons

commit c00c820610f732aa2b6222a44bec61130de50749
Author: Robson Richards <toiletbrush95@gmail.com>
Date:   Mon Sep 2 03:18:05 2013 +0100

    Changes fireaxe to deal 24 damage instead of 25

commit c76f490200c8a39908b4919ce6188e893d7767fe
Merge: 5b62a22 c4a7ce2
Author: Robson Richards <toiletbrush95@gmail.com>
Date:   Mon Sep 2 03:16:40 2013 +0100

    Merge branch 'master' of https://github.com/tgstation/-tg-station into 29/08/2013-TwoHanded-Weapon-Buffs

commit c4a7ce24dfc01e8c70f1f9ba2296afb3d2e1f710
Merge: 9f1803a 3b3da59
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Sun Sep 1 17:57:58 2013 -0700

    Merge pull request #1271 from CreationPro/31-08-2013-medal_boxes

    Fixed medal boxes being invisible by re-adding them into storage.dmi .

commit 9f1803aae467ec884e67d6021fda265c186abb3a
Merge: 9c630fb 35f5fbf
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Sun Sep 1 17:55:49 2013 -0700

    Merge pull request #1270 from caelaislinn/terbs_weekly_fun

    Terbs weekly fun #2: Laser pointers

commit 9c630fbebae07c8a7ef30f9c62ba46ef68937972
Merge: c96b51b 9afd659
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Sun Sep 1 17:54:29 2013 -0700

    Merge pull request #1274 from Sabbat/Beepsky-Rever

    Revert bots arresting unknowns.

commit c96b51bf993814cd89c69fa472fd344d4e3fc80b
Merge: d1b0f85 7096688
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Sun Sep 1 17:52:50 2013 -0700

    Merge pull request #1263 from Cheridan/Offhands

    Offhand IsShield

commit d1b0f850d807a88dd9ae60f3cf15098852f8dd29
Merge: 2ea8dfc 75d2d35
Author: Ricotez <rafageddon@hotmail.com>
Date:   Sun Sep 1 16:02:39 2013 -0700

    Merge pull request #1273 from JJRcop/rework-merge-overlook

    Correcting emote overlooks due to merge from master

commit 2ea8dfc379e64f9345328e4b70b221ddbab84268
Merge: 8eefce0 b4a4aea
Author: Ricotez <rafageddon@hotmail.com>
Date:   Sun Sep 1 15:42:10 2013 -0700

    Merge pull request #1275 from Intigracy/adminchangingstuff

    Fixed an error with my last admin change

commit eaf201bd1c31b9e2b3b18ce503235833a8125b4f
Author: MrPerson <spamtaffic@gmail.com>
Date:   Sun Sep 1 01:40:50 2013 -0700

    Grammer fixes

    You put the the pen into the box ( Fixes #671 )
    Capitalization errors on spiders and cocoons. ( Fixes #679 )

commit cedfa6415ec0559e7039325782134cb72f859505
Author: Neerti <neerti01@gmail.com>
Date:   Sun Sep 1 03:56:36 2013 -0400

    Fixed a typo in the box's description, thanks Kaze.

commit d104cd1c3e253bdf19eb789b9279e704083ec09b
Author: Neerti <neerti01@gmail.com>
Date:   Sun Sep 1 01:01:53 2013 -0400

    Made it so instead of getting the suit or a helmet, you will receive both inside a box that looks very similar to the one you get for ordering a real suit from an uplink.

commit f3cf8e741ad55b10233d7dd818234850b074e6d2
Author: Neerti <neerti01@gmail.com>
Date:   Sun Sep 1 00:20:29 2013 -0400

    Adds the replica syndicate space helmet to the list of prizes able to be obtained from the arcade machine.

commit 35f5fbf17e130726f459e9c5e8f918a6bb74a7bf
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun Sep 1 13:37:57 2013 +1000

    adds laser pointer, makes RD + lawyer + librarian spawn with one, makes laser pointer a steal objective

    Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

commit 286ff345880a961b0e391a08fdf16dec4713dbff
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sun Sep 1 13:37:07 2013 +1000

    moved human helpers out of human.dm to new file human_helpers.dm, added two new mon helpers to check for mutations and mutantraces

    Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

commit b4a4aeaa39ee7be2ddb9edfb805b4dd04b8f8af4
Author: Intigracy <sivartholmberg@gmail.com>
Date:   Sat Aug 31 13:39:47 2013 -0700

    I accidentally broke who for people without +ADMIN who were admins.

    Fixed it so it works correctly now, also added comments.

commit 9afd659b0717acd394b3687c8aac88dfe502a973
Author: Sabbat <YoukaiMori@gmail.com>
Date:   Sat Aug 31 13:23:39 2013 -0700

    Update secbot.dm

commit 1c445d3a025a347f2a4204721b34e54dd63a1b41
Author: Sabbat <YoukaiMori@gmail.com>
Date:   Sat Aug 31 13:23:24 2013 -0700

    Update ed209bot.dm

commit d24b5b66b97e8ef4bb06681c619f6d37ea690ec6
Author: Sabbat <YoukaiMori@gmail.com>
Date:   Sat Aug 31 12:12:38 2013 -0700

    Beepsky and security bots no longer arrest unknown/no id/etc by default.

commit 7d7441746b985485c4707e06d0cb4fafb276f3cd
Author: Sabbat <YoukaiMori@gmail.com>
Date:   Sat Aug 31 12:12:10 2013 -0700

    ED209 no longer arrests unknown/no record/etc by default.

commit 75d2d35982901ad363d0c5983281d11c82d69412
Author: JJRcop <jjrcop@hidden.address>
Date:   Sat Aug 31 14:10:33 2013 -0400

    Correcting overlooks due to merge from master

    When I merged master into pull 1245 to resolve conflicts, I didn't notice that
    the merge did some unintended things, like duplicating conditionals.

    These have been corrected, and I also made more things call ..(act) so that
    there is less duplicate code in different emote procs.

commit 5ce73a02df55ba55ee4b26bd6a66aabac7934516
Merge: 7096688 e153a42
Author: Cheridan <d_h2005@yahoo.com>
Date:   Sat Aug 31 10:27:53 2013 -0500

    Merge branch 'master' of https://github.com/tgstation/-tg-station

commit 3b3da59b8ac3bf1d8bfe8681172b7146b1312798
Author: CreationPro <lukashno1@mail.ru>
Date:   Sat Aug 31 17:09:40 2013 +0300

    Fixed medal boxes being invisible by re-adding them into storage.dmi .

commit 4c1bedab22ae71a3cc6164d776267b7a07a42f14
Author: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date:   Sat Aug 31 15:16:54 2013 +1000

    changelog update

    Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

commit 0900c61d322ee70c8ee1140609f80096fcf2a154
Author: Fleure <fleure@hushmail.com>
Date:   Sat Aug 31 01:30:05 2013 +0100

    Fixed brig doors counting down when timer is stopped

commit 6e83288a7837e42d35e451064ce20dde31acff37
Author: VistaPOWA <hegyi.mokka@gmail.com>
Date:   Fri Aug 30 19:59:23 2013 +0200

    Bunch of fixes

    Cleans up the resist code for lockers
    Adds both locked and broken vars to closets
    Fixes secure lockers opening when welded, but not locked

commit 5b62a22f0fd003612a077003183532b262d3fb76
Author: Robson Richards <toiletbrush95@gmail.com>
Date:   Fri Aug 30 03:55:17 2013 +0100

    Tweaks Damage Values

commit 70966883b94f1ac1e7c582cafd7188ba8e706730
Author: Cheridan <d_h2005@yahoo.com>
Date:   Thu Aug 29 21:21:10 2013 -0500

    Twohanded weapon's offhand item will count as a shield if the weapon itself is a shield.

commit 086187ac3c498826eedaf46665dc5e124a7f6ca7
Author: Robson Richards <toiletbrush95@gmail.com>
Date:   Thu Aug 29 21:58:56 2013 +0100

    Increases the damage of Two handed weapons
    to give them more of an advantage over One handed ones, Suggestion and Exact damage values originally from http://www.ss13.eu/phpbb/viewtopic.php?f=10&t=1303

    Balance issues and Damage value Discussion can happen here: http://www.ss13.eu/phpbb/viewtopic.php?f=12&t=1440

commit 44af51778550986c9bbd98535e94def0da5e7850
Author: VistaPOWA <hegyi.mokka@gmail.com>
Date:   Thu Aug 29 22:51:49 2013 +0200

    Pugs uncommented in supplypacks

commit 7393c4217d8fc97d6106759ddc81410c55a0b058
Author: VistaPOWA <hegyi.mokka@gmail.com>
Date:   Tue Aug 27 22:25:42 2013 +0200

    Adds critter crates

    Fixed several conflicts present in last pull request, should be fine
    now.

    All animals ordered through cargo will arrive in critter crates. These
    crates are designed for the safe transport of animals. Critter crates
    can only be unlocked from the outside and automatically lock when
    closed. You can resist your way out of the crates. Critter crates are
    counted as normal crates when sent back to CentComm.

    Adds cat crate (cost: 40 points).

    Corgi crate now has a 50-50% chance of either containing a male or
    female corgi.
    Moves critter crate sprites from storage.dmi to closet.dmi.

    Removes redundant large animal crates.

commit 90bab87456047eec6904580ecea1ada95266fa3a
Author: Tenebrosity <scottysybilla@gmail.com>
Date:   Tue Aug 20 02:25:20 2013 +1200

    Reverts the laser sound effect to the earsore we've all grown used to

commit fa496b3ec06c1d1519ba3c8b85303cd09f216377
Author: Tenebrosity <scottysybilla@gmail.com>
Date:   Mon Aug 19 15:18:07 2013 +1200

    Adds a new sound effect for silenced weapons.

commit 9109ef620c4d0b59c5e63adf43b7861f83f5841a
Author: Tenebrosity <scottysybilla@gmail.com>
Date:   Mon Aug 19 13:41:25 2013 +1200

    Replaces the default gunshot sound effect with four higher quality ones. Replaces the laser sound effect with an arguably better one.
Merge branch 'master' of https://github.com/Ergovisavi/-tg-station