Squashed commit of the following:

commit 6e5616f6ceafb8a8a436a962d4805d257264d49c
Merge: bb2e150 900f5c7
Author: Sieve <sieve32@gmail.com>
Date:   Tue May 27 09:28:38 2014 -0500

    Merge branch 'working' of https://github.com/Sieve/-tg-station into working

    Conflicts:
    	code/game/machinery/buttons/button.dm
    	code/game/machinery/machinery.dm
    	code/game/mecha/mech_fabricator.dm

commit bb2e1507798d06d2d633e9ec5c079c56ca3da89c
Author: Sieve <sieve32@gmail.com>
Date:   Mon May 26 11:02:42 2014 -0500

    Cleaned up and improved commit
    Made the pre_process() more efficient
    Removed the erroneous process() left in
    Included the .dme
    Fixed the maps (hopefully)

commit e8bf110db0723557d8119a6c27d0107c9967fcfc
Author: Sieve <sieve32@gmail.com>
Date:   Mon May 26 09:47:25 2014 -0500

    Revert "Added the other part of the mechfabs using a console list versus 'in world'"

    This reverts commit cef15fb3e8fc8acd22a7c2a21bc51e6f3bf718d3.

commit f0f22a69b0278f1282894da6a0d6d6e8ff753f48
Author: Sieve <sieve32@gmail.com>
Date:   Mon May 26 01:35:17 2014 -0500

    Forgive me for what I've done
    Added onto the MC with a pre_process() that works similar to initialize() but will execute on objects made at runtime
    Used pre_process() for general button setup
    Fixed R&D consoles not properly syncing at round-start using the pre_process() as well

commit 70efa260f0b10b9f79d388745e90e8f612347688
Author: Sieve <sieve32@gmail.com>
Date:   Fri May 23 19:56:37 2014 -0500

    /button/ implementation
    Moves the "id" var up to /obj/machinery

    Conflicts:
    	code/game/machinery/doors/windowdoor.dm
    	code/game/mecha/mech_fabricator.dm

commit 7167682198936d9bc6cc221644f7d79f300e245f
Author: Sieve <sieve32@gmail.com>
Date:   Sun May 25 19:04:37 2014 -0500

    Replaced map buttons with new ones

commit 7731f0753398427a4d21a63791e167e30bdcd7c2
Author: Sieve <sieve32@gmail.com>
Date:   Fri May 23 19:56:37 2014 -0500

    /button/ implementation
    Moves the "id" var up to /obj/machinery

commit a6a424babaac744950e9dae74e04bfb160d0de6a
Author: Sieve <sieve32@gmail.com>
Date:   Fri May 23 08:10:54 2014 -0500

    Hopefully re-added the auto sync button, still need to test later

commit 1d219ce42ef0b434dfbbb58fba136750899453d4
Author: Sieve <sieve32@gmail.com>
Date:   Thu May 22 19:32:09 2014 -0500

    Added the other part of the mechfabs using a console list versus 'in world'

commit ee8dcb43742039a1705084d689d013f39072e2c9
Author: Sieve <sieve32@gmail.com>
Date:   Thu May 22 19:21:21 2014 -0500

    R&D efficiency improvements
    Implemented md5 hashes to check for changes in data instead of comparing every single damn entry
    Removed the vast majority of redundant griefProtection() calls
    Improved griefProtection() in general
    Re-implemented mechfab auto-sync, just needs a button
    Probably some other stuff I forgot

commit 900f5c73ab8f40b820f1444d644a5d654c987ba5
Author: Sieve <sieve32@gmail.com>
Date:   Tue May 27 08:21:28 2014 -0500

    Maybe works this time?

    Squashed commit of the following:

    commit 5bd07ffcc1753b07f8abd8f5277ef39e059e4167
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 14:40:54 2014 -0500

        wqefgdhj

    commit 5ca81b1a82907beee725a158ed8ef267b4e8982d
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 11:02:42 2014 -0500

        Cleaned up and improved commit
        Made the pre_process() more efficient
        Removed the erroneous process() left in
        Included the .dme
        Fixed the maps (hopefully)

    commit b931935bc187622367c14e3e0b6279e80744b531
    Merge: f4f0344 2578e34
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 09:53:00 2014 -0500

        Merge branch 'working' of https://github.com/Sieve/-tg-station into working
        This reverts commit 55fab31e4e516ff03aa84119051f63d19ac85f71.

        Conflicts:
        	code/game/mecha/mech_fabricator.dm

    commit f4f0344addd64c22ccdcf673b99d315fa64402c2
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 09:47:25 2014 -0500

        Revert "Added the other part of the mechfabs using a console list versus 'in world'"

        This reverts commit cef15fb3e8fc8acd22a7c2a21bc51e6f3bf718d3.

    commit c54d5c3abda2b0217db24daa122e9d51c9a46ca5
    Merge: d3e0b01 e052c1a
    Author: Sieve <sieve32@gmail.com>
    Date:   Thu May 22 19:21:21 2014 -0500

        Merge branch 'working' of https://github.com/Sieve/-tg-station into working

        Conflicts:
        	_maps/map_files/tgstation.2.1.3.dmm
        	code/game/machinery/buttons/button.dm
        	code/game/machinery/buttons/door_control.dm
        	code/game/machinery/doors/airlock.dm
        	code/game/machinery/doors/door.dm
        	code/game/machinery/doors/poddoor.dm
        	code/game/machinery/doors/windowdoor.dm
        	code/game/machinery/igniter.dm
        	code/game/machinery/machinery.dm
        	code/game/machinery/mass_driver.dm
        	code/game/mecha/mech_fabricator.dm
        	code/game/objects/structures/morgue.dm

    commit 2578e34d498110fd3473156d8c253fb9a174ecb7
    Merge: d3e0b01 e052c1a
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 01:40:37 2014 -0500

        Merge branch 'working' of https://github.com/Sieve/-tg-station into working

        Conflicts:
        	_maps/map_files/tgstation.2.1.3.dmm
        	code/game/machinery/buttons/button.dm
        	code/game/machinery/buttons/door_control.dm
        	code/game/machinery/doors/airlock.dm
        	code/game/machinery/doors/door.dm
        	code/game/machinery/doors/poddoor.dm
        	code/game/machinery/doors/windowdoor.dm
        	code/game/machinery/igniter.dm
        	code/game/machinery/machinery.dm
        	code/game/machinery/mass_driver.dm
        	code/game/mecha/mech_fabricator.dm
        	code/game/objects/structures/morgue.dm

    commit d3e0b015699d98a62364d5f99eef1ab84d6f21fd
    Author: Sieve <sieve32@gmail.com>
    Date:   Mon May 26 01:35:17 2014 -0500

        Forgive me for what I've done
        Added onto the MC with a pre_process() that works similar to initialize() but will execute on objects made at runtime
        Used pre_process() for general button setup
        Fixed R&D consoles not properly syncing at round-start using the pre_process() as well

    commit 58ff5c57681960a2ff089ca255970ed82b701f4e
    Author: Sieve <sieve32@gmail.com>
    Date:   Sun May 25 19:04:37 2014 -0500

        Replaced map buttons with new ones

    commit 996dccaf3ec7f978eb75a196f32e5875abf01c8a
    Author: Sieve <sieve32@gmail.com>
    Date:   Fri May 23 19:56:37 2014 -0500

        /button/ implementation
        Moves the "id" var up to /obj/machinery

        Conflicts:
        	code/game/machinery/doors/windowdoor.dm
        	code/game/mecha/mech_fabricator.dm

    commit e052c1a8182beedc995456c2fd457c5a9793a093
    Author: Sieve <sieve32@gmail.com>
    Date:   Sun May 25 19:04:37 2014 -0500

        Replaced map buttons with new ones

    commit 5ac072b5c1dd56a2f5722aa01aade5677755229d
    Merge: 6c537b4 26813fc
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sun May 25 19:18:59 2014 +0200

        Merge pull request #3672 from Ikarrus/casecooldown

        Added attack cooldowns to some objects

    commit 26813fc6ac2e23287cfd3ac9432d8b28becd6ba9
    Author: Ikarrus <ericgfwong@hotmail.com>
    Date:   Sun May 25 11:15:41 2014 -0600

        What is this it shouldn't be here.

        It's gone now

    commit 769a220740ed4c3537b3efc5c07bc2ce1702bee8
    Author: Ikarrus <ericgfwong@hotmail.com>
    Date:   Sun May 25 11:10:52 2014 -0600

        I honestly don't remember making these changes before

    commit 82b861702f2158fb636d3076539b8dfc4a2fe37a
    Merge: 20aec66 6c537b4
    Author: ikarrus <ericgfwong@hotmail.com>
    Date:   Sun May 25 10:59:08 2014 -0600

        Resolved Conflicts:
        	code/modules/mob/living/simple_animal/constructs.dm

    commit 6c537b45c16b0fbe486a7b21be56e2e971a2ac7b
    Merge: 6e64f87 a5a91ea
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sun May 25 14:19:22 2014 +0200

        Merge pull request #3791 from phil235/WindowSndFix

        Fix for window unwrenching noise

    commit 6e64f8776b80104b3f5e614245cf13710084d65a
    Merge: 42c8d06 823a991
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 20:09:55 2014 +0200

        Merge pull request #3641 from phil235/WindoorFIx

        Windoor fix

    commit 42c8d061cec3419bae27bd55c98546f8b09436d2
    Merge: 21fdd8d ac30ec1
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:53:58 2014 +0200

        Merge pull request #3763 from phil235/MicrowvFix

        Microwave fix

    commit 21fdd8d7e473a498329a9c685349c2da2f1279f1
    Merge: 97a2560 c7fc7f4
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:51:46 2014 +0200

        Merge pull request #3723 from Ikarrus/monkeyimplants

        Monkeys can be loyalty implanted

    commit 97a25607ca6f5671938128ca2b5fea1ba5c09ecc
    Merge: 5b97955 38ab0be
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:50:46 2014 +0200

        Merge pull request #3748 from Cheridan/wizardDidIt

        Bugfixes

    commit 5b97955d9069f3d87005114be47da8f8bc8c3e28
    Merge: 1baeb25 d1aade9
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:49:05 2014 +0200

        Merge pull request #3719 from Perakp/astar

        Fixes stinging from range pathfinding

    commit 1baeb25578e16f292c89a4215a79e67d024a82e3
    Merge: 5e3c17b ce5b4cb
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:34:15 2014 +0200

        Merge pull request #3758 from Cheridan/vitallyimportant

        Carpet Works

    commit a5a91eaffc1c4789142971b71bc38c853c1a81ca
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Sat May 24 19:34:06 2014 +0200

        Fixes unwrenching noise

    commit 5e3c17b4f69a6f93b4d1feb65ffb150360d1078d
    Merge: 53bc047 7af6ba0
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 19:27:17 2014 +0200

        Merge pull request #3785 from MrStonedOne/keeperofsecrets

        [MINOR] Fixes possibilities: Nothing when an admin forces secret.

    commit 823a991d2f5e7b3f8b73cf509e71d7210d90e5c6
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Sat May 24 19:08:49 2014 +0200

        simple animals, aliens and slimes can attack windoors

    commit 53bc047ae91d3777e1a1fc0a8375d403bdc0f997
    Merge: ab5a3a3 a4c09dc
    Author: Miauw62 <gilles.coremans@gmail.com>
    Date:   Sat May 24 17:27:47 2014 +0200

        Merge pull request #3787 from Giacom/issue_3784

        Reverted the sound file to an uncorrupt version. Fixes #3784

    commit c5e9c36f628d95ee1ddc2df8b373435e5200e8c4
    Author: Sieve <sieve32@gmail.com>
    Date:   Fri May 23 19:56:37 2014 -0500

        /button/ implementation
        Moves the "id" var up to /obj/machinery

    commit 34c4ff33f2ce375f701cf0f072251a944b2b610b
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Fri May 23 20:06:37 2014 +0200

        fix crowbar, fireaxe and armblade attack. adds spans. more use of take_damage

    commit 6f3b06f61475dc970470af9bd9ddc2d493bbeac3
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Fri May 23 19:09:06 2014 +0200

        moving armblade stuff to windowdoor.dm

    commit 7af6ba0caf9c9afa85f0ef3e1d020a2ad1a962ff
    Author: MrStonedOne <kyleshome@gmail.com>
    Date:   Fri May 23 07:52:52 2014 -0700

        Fixes possibilities: Nothing when an admin forces secret.

    commit 674d47b5fce9a59b9448209fa13ceb9d60405b1a
    Merge: 223ab29 d9b248e
    Author: MrStonedOne <kyleshome@gmail.com>
    Date:   Fri May 23 07:47:55 2014 -0700

        Merge pull request #9 from MrStonedOne/letmeshowyoumysecrets

        Re work of game selection logic to be less shit

    commit 55fab31e4e516ff03aa84119051f63d19ac85f71
    Author: Sieve <sieve32@gmail.com>
    Date:   Fri May 23 08:10:54 2014 -0500

        Hopefully re-added the auto sync button, still need to test later

    commit cef15fb3e8fc8acd22a7c2a21bc51e6f3bf718d3
    Author: Sieve <sieve32@gmail.com>
    Date:   Thu May 22 19:32:09 2014 -0500

        Added the other part of the mechfabs using a console list versus 'in world'

    commit 92ef4754d30f2f029fb1631f7eefb613147d3127
    Author: Sieve <sieve32@gmail.com>
    Date:   Thu May 22 19:21:21 2014 -0500

        R&D efficiency improvements
        Implemented md5 hashes to check for changes in data instead of comparing every single damn entry
        Removed the vast majority of redundant griefProtection() calls
        Improved griefProtection() in general
        Re-implemented mechfab auto-sync, just needs a button
        Probably some other stuff I forgot

    commit fd953a6a9d4f3ca5ca8fed6f3fb6cdcf43c946ac
    Merge: 24e1e89 201d608
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Thu May 22 18:57:47 2014 +0200

        Merge pull request #5 from tgstation/master

        repo update

    commit ce5b4cb26a2c1a8349ffd6426a096b843e4c67f2
    Author: Cheridan <d_h2005@yahoo.com>
    Date:   Mon May 19 19:17:59 2014 -0500

        Laying carpet down now works.

    commit 38ab0be4ad3211d0b00810c1e48c611a1c1f4df6
    Author: Cheridan <d_h2005@yahoo.com>
    Date:   Mon May 19 15:06:54 2014 -0500

        Spells are now anchored.

        Space Carp and Bears now take damage from high temperatures.

    commit ac30ec10de9abc3f6b8e5542d7f8c25a5749b116
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Sat May 17 17:28:30 2014 +0200

        Microwave fix

    commit c7fc7f48118e8650e4db9cc45fac6328f02e1fa4
    Author: ikarrus <ericgfwong@hotmail.com>
    Date:   Fri May 16 22:17:06 2014 -0600

        Monkeys can be loyalty implanted

        Monkeys can still be revs, so they should be able to be loyalty implanted. This would also fall in line with the other implants, which have no race restriction.

        Fixes #637

    commit d1aade90f017c712adb553819aa3a2d020b40f43
    Author: Perakp <perhal90@hotmail.com>
    Date:   Fri May 16 23:46:52 2014 +0300

        - Fixes Astar being stupid with maxnodes
        - Diagonal movement now costs whatever sqrt(2) rounds to.
        - Fixes #3665

    commit 20aec66a263fee5665bc5a2ef68476c7425cc050
    Author: Ikarrus <ericgfwong@hotmail.com>
    Date:   Sat May 10 20:17:10 2014 -0600

        Extra period

    commit 995338c21da7d41df677e843e5d975b891ee2bbb
    Author: ikarrus <ericgfwong@hotmail.com>
    Date:   Sat May 10 18:16:35 2014 -0600

        -Added attack cooldown for space vines and simple animals
        -Reduced some duplicate code in constructs.dm

    commit 1a8e87a279bd08af7006ca26ed34d0359dc7c445
    Author: ikarrus <ericgfwong@hotmail.com>
    Date:   Sat May 10 13:21:51 2014 -0600

        -Added cooldowns to turrets. AIs rejoice!

    commit 61b156a07fb432b0bd7266e131773fd36431a044
    Author: ikarrus <ericgfwong@hotmail.com>
    Date:   Sat May 10 12:10:41 2014 -0600

        Added attack cooldowns to a few objects

        Includes:
        -Fire axe cabinets
        -Captain's display case
        -RD's lab cage

    commit 23d88fd3e9cf6719b96d8cb54f5afd465e433d6e
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Wed May 7 20:22:34 2014 +0200

        changeling armblade can force open unpowered windoors.

    commit fc5418d0754bac004e4c11e37c86c8d324d30c6f
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Wed May 7 19:49:04 2014 +0200

        Fixing checks when forcing windoor.

    commit 258f2825e87c370585101af5d6a623915a1682ce
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Tue May 6 18:24:49 2014 +0200

        windoor->window

    commit fb1b4b2a549fcad950bc1ef3317addf6942651ef
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 21:25:04 2014 +0200

        and again

    commit cf5ac3a127d61a616f76a66297609da27cd59cde
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 21:06:41 2014 +0200

        indentation again..

    commit a6adc2aac3f7588568ffe7419e22a7b082a7261b
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 21:00:50 2014 +0200

        Emag can't open unpowered windoor

    commit 08d5724c751d8b90a3b1d0c939ce196bf66fe46d
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 20:52:04 2014 +0200

        fix indentation

    commit ee627d9d19702e0ac2659a1d4a66e69d5e0f91bb
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 20:31:52 2014 +0200

        mecha & bot w/o access trigger deny animation when bumping.

        * mecha & bot w/o access trigger the deny animation when bumping the windoor
        * secure windoors close faster when bumped open by mecha/bot.

    commit 3e16b7e68700bf8f49a13f3f4b127d98e939b078
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 03:15:21 2014 +0200

        unpowered windoor can be forced with crowbar, emag, eblade

        unpowered windoor can be forced open and closed with crowbar and open with emag, eblade

    commit ea312482203d857bc40e720280d2db896770b7a7
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Mon May 5 00:36:06 2014 +0200

        windoor drops more stuff on destruction

        drops 2 glass shards, 2 rods, 2 cable pieces.

    commit bffd90bb0b34ca45b37f0abd0f21d06bd0e5bfac
    Author: phil235 <antoine_hernandez62@hotmail.fr>
    Date:   Sun May 4 22:55:14 2014 +0200

        unusable w/o power and fingerprint when bumped open.

        Leave fingerprints when mob opens via bump.
        Unusable when unpowered

commit 67482d6e871fbd571f317354935e19faa1e8486f
Merge: 69899a8 6749f21
Author: Alex <giacomand@gmail.com>
Date:   Tue May 27 10:04:25 2014 +0100

    Merge pull request #3794 from Menshin/power_distribution_tweaks

    Power distribution tweaking

commit 69899a829422f0f1b7c2a4f51621a6c84e3d26da
Merge: 5ac072b 2e656dd
Author: Alex <giacomand@gmail.com>
Date:   Tue May 27 10:02:55 2014 +0100

    Merge pull request #3797 from optimumtact/patch-2

    remove terrible joke - hitler pull 2014

commit 2e656dd21a38c8ddd2ce644067c30db7c9cff65c
Author: Francis Devine <francis@catalyst.net.nz>
Date:   Mon May 26 11:33:24 2014 +1200

    remove terrible joke

    Remove terrible joke

commit 5ac072b5c1dd56a2f5722aa01aade5677755229d
Merge: 6c537b4 26813fc
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sun May 25 19:18:59 2014 +0200

    Merge pull request #3672 from Ikarrus/casecooldown

    Added attack cooldowns to some objects

commit 26813fc6ac2e23287cfd3ac9432d8b28becd6ba9
Author: Ikarrus <ericgfwong@hotmail.com>
Date:   Sun May 25 11:15:41 2014 -0600

    What is this it shouldn't be here.

    It's gone now

commit 769a220740ed4c3537b3efc5c07bc2ce1702bee8
Author: Ikarrus <ericgfwong@hotmail.com>
Date:   Sun May 25 11:10:52 2014 -0600

    I honestly don't remember making these changes before

commit 82b861702f2158fb636d3076539b8dfc4a2fe37a
Merge: 20aec66 6c537b4
Author: ikarrus <ericgfwong@hotmail.com>
Date:   Sun May 25 10:59:08 2014 -0600

    Resolved Conflicts:
    	code/modules/mob/living/simple_animal/constructs.dm

commit 6c537b45c16b0fbe486a7b21be56e2e971a2ac7b
Merge: 6e64f87 a5a91ea
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sun May 25 14:19:22 2014 +0200

    Merge pull request #3791 from phil235/WindowSndFix

    Fix for window unwrenching noise

commit 6749f210423ca35f6b18991729ac20017f431e94
Author: Menshin <overmenshin@yahoo.co.uk>
Date:   Sun May 25 00:54:41 2014 +0200

    Tweaked the power distribution handling :
    * the power is correctly handled each tick instead of 1 tick on 2, because of bad reinitalization,
    * apcs now draw power as others machines and fixed the amount of power send to them

    Partially fixes #3761.

commit 6e64f8776b80104b3f5e614245cf13710084d65a
Merge: 42c8d06 823a991
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 20:09:55 2014 +0200

    Merge pull request #3641 from phil235/WindoorFIx

    Windoor fix

commit 42c8d061cec3419bae27bd55c98546f8b09436d2
Merge: 21fdd8d ac30ec1
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:53:58 2014 +0200

    Merge pull request #3763 from phil235/MicrowvFix

    Microwave fix

commit 21fdd8d7e473a498329a9c685349c2da2f1279f1
Merge: 97a2560 c7fc7f4
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:51:46 2014 +0200

    Merge pull request #3723 from Ikarrus/monkeyimplants

    Monkeys can be loyalty implanted

commit 97a25607ca6f5671938128ca2b5fea1ba5c09ecc
Merge: 5b97955 38ab0be
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:50:46 2014 +0200

    Merge pull request #3748 from Cheridan/wizardDidIt

    Bugfixes

commit 5b97955d9069f3d87005114be47da8f8bc8c3e28
Merge: 1baeb25 d1aade9
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:49:05 2014 +0200

    Merge pull request #3719 from Perakp/astar

    Fixes stinging from range pathfinding

commit 1baeb25578e16f292c89a4215a79e67d024a82e3
Merge: 5e3c17b ce5b4cb
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:34:15 2014 +0200

    Merge pull request #3758 from Cheridan/vitallyimportant

    Carpet Works

commit a5a91eaffc1c4789142971b71bc38c853c1a81ca
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sat May 24 19:34:06 2014 +0200

    Fixes unwrenching noise

commit 5e3c17b4f69a6f93b4d1feb65ffb150360d1078d
Merge: 53bc047 7af6ba0
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 19:27:17 2014 +0200

    Merge pull request #3785 from MrStonedOne/keeperofsecrets

    [MINOR] Fixes possibilities: Nothing when an admin forces secret.

commit 823a991d2f5e7b3f8b73cf509e71d7210d90e5c6
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sat May 24 19:08:49 2014 +0200

    simple animals, aliens and slimes can attack windoors

commit 53bc047ae91d3777e1a1fc0a8375d403bdc0f997
Merge: ab5a3a3 a4c09dc
Author: Miauw62 <gilles.coremans@gmail.com>
Date:   Sat May 24 17:27:47 2014 +0200

    Merge pull request #3787 from Giacom/issue_3784

    Reverted the sound file to an uncorrupt version. Fixes #3784

commit 34c4ff33f2ce375f701cf0f072251a944b2b610b
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Fri May 23 20:06:37 2014 +0200

    fix crowbar, fireaxe and armblade attack. adds spans. more use of take_damage

commit 6f3b06f61475dc970470af9bd9ddc2d493bbeac3
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Fri May 23 19:09:06 2014 +0200

    moving armblade stuff to windowdoor.dm

commit 7af6ba0caf9c9afa85f0ef3e1d020a2ad1a962ff
Author: MrStonedOne <kyleshome@gmail.com>
Date:   Fri May 23 07:52:52 2014 -0700

    Fixes possibilities: Nothing when an admin forces secret.

commit 674d47b5fce9a59b9448209fa13ceb9d60405b1a
Merge: 223ab29 d9b248e
Author: MrStonedOne <kyleshome@gmail.com>
Date:   Fri May 23 07:47:55 2014 -0700

    Merge pull request #9 from MrStonedOne/letmeshowyoumysecrets

    Re work of game selection logic to be less shit

commit fd953a6a9d4f3ca5ca8fed6f3fb6cdcf43c946ac
Merge: 24e1e89 201d608
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Thu May 22 18:57:47 2014 +0200

    Merge pull request #5 from tgstation/master

    repo update

commit ce5b4cb26a2c1a8349ffd6426a096b843e4c67f2
Author: Cheridan <d_h2005@yahoo.com>
Date:   Mon May 19 19:17:59 2014 -0500

    Laying carpet down now works.

commit 38ab0be4ad3211d0b00810c1e48c611a1c1f4df6
Author: Cheridan <d_h2005@yahoo.com>
Date:   Mon May 19 15:06:54 2014 -0500

    Spells are now anchored.

    Space Carp and Bears now take damage from high temperatures.

commit ac30ec10de9abc3f6b8e5542d7f8c25a5749b116
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sat May 17 17:28:30 2014 +0200

    Microwave fix

commit c7fc7f48118e8650e4db9cc45fac6328f02e1fa4
Author: ikarrus <ericgfwong@hotmail.com>
Date:   Fri May 16 22:17:06 2014 -0600

    Monkeys can be loyalty implanted

    Monkeys can still be revs, so they should be able to be loyalty implanted. This would also fall in line with the other implants, which have no race restriction.

    Fixes #637

commit d1aade90f017c712adb553819aa3a2d020b40f43
Author: Perakp <perhal90@hotmail.com>
Date:   Fri May 16 23:46:52 2014 +0300

    - Fixes Astar being stupid with maxnodes
    - Diagonal movement now costs whatever sqrt(2) rounds to.
    - Fixes #3665

commit 20aec66a263fee5665bc5a2ef68476c7425cc050
Author: Ikarrus <ericgfwong@hotmail.com>
Date:   Sat May 10 20:17:10 2014 -0600

    Extra period

commit 995338c21da7d41df677e843e5d975b891ee2bbb
Author: ikarrus <ericgfwong@hotmail.com>
Date:   Sat May 10 18:16:35 2014 -0600

    -Added attack cooldown for space vines and simple animals
    -Reduced some duplicate code in constructs.dm

commit 1a8e87a279bd08af7006ca26ed34d0359dc7c445
Author: ikarrus <ericgfwong@hotmail.com>
Date:   Sat May 10 13:21:51 2014 -0600

    -Added cooldowns to turrets. AIs rejoice!

commit 61b156a07fb432b0bd7266e131773fd36431a044
Author: ikarrus <ericgfwong@hotmail.com>
Date:   Sat May 10 12:10:41 2014 -0600

    Added attack cooldowns to a few objects

    Includes:
    -Fire axe cabinets
    -Captain's display case
    -RD's lab cage

commit 23d88fd3e9cf6719b96d8cb54f5afd465e433d6e
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Wed May 7 20:22:34 2014 +0200

    changeling armblade can force open unpowered windoors.

commit fc5418d0754bac004e4c11e37c86c8d324d30c6f
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Wed May 7 19:49:04 2014 +0200

    Fixing checks when forcing windoor.

commit 258f2825e87c370585101af5d6a623915a1682ce
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Tue May 6 18:24:49 2014 +0200

    windoor->window

commit fb1b4b2a549fcad950bc1ef3317addf6942651ef
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 21:25:04 2014 +0200

    and again

commit cf5ac3a127d61a616f76a66297609da27cd59cde
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 21:06:41 2014 +0200

    indentation again..

commit a6adc2aac3f7588568ffe7419e22a7b082a7261b
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 21:00:50 2014 +0200

    Emag can't open unpowered windoor

commit 08d5724c751d8b90a3b1d0c939ce196bf66fe46d
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 20:52:04 2014 +0200

    fix indentation

commit ee627d9d19702e0ac2659a1d4a66e69d5e0f91bb
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 20:31:52 2014 +0200

    mecha & bot w/o access trigger deny animation when bumping.

    * mecha & bot w/o access trigger the deny animation when bumping the windoor
    * secure windoors close faster when bumped open by mecha/bot.

commit 3e16b7e68700bf8f49a13f3f4b127d98e939b078
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 03:15:21 2014 +0200

    unpowered windoor can be forced with crowbar, emag, eblade

    unpowered windoor can be forced open and closed with crowbar and open with emag, eblade

commit ea312482203d857bc40e720280d2db896770b7a7
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon May 5 00:36:06 2014 +0200

    windoor drops more stuff on destruction

    drops 2 glass shards, 2 rods, 2 cable pieces.

commit bffd90bb0b34ca45b37f0abd0f21d06bd0e5bfac
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sun May 4 22:55:14 2014 +0200

    unusable w/o power and fingerprint when bumped open.

    Leave fingerprints when mob opens via bump.
    Unusable when unpowered