neerdi is a faget
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Squashed commit of the following:

commit 54c30d9aa44ac8a9b2843769c886e9229133216a
Merge: 96ececb ac942d3
Author: sirbayer <sirbayer@gmail.com>
Date:   Sat Nov 2 01:15:24 2013 -0700

    all dat data an' shit

commit 96ececb156995a20a54152ac99ef0c63447c793e
Author: sirbayer <sirbayer@gmail.com>
Date:   Sat Nov 2 01:11:51 2013 -0700

    all dat data an' shit

commit 1b6fda9f2a0e1fb6cf00ffd8ca71cb72927b0981
Author: sirbayer <sirbayer@gmail.com>
Date:   Sat Nov 2 01:01:50 2013 -0700

    Bringing .gitignore and other things back into line with new policy of keeping this data ONLY in this tree.

commit d223c866daa588389561301077bc999496af1a5d
Author: sirbayer <sirbayer@gmail.com>
Date:   Sat Nov 2 00:57:41 2013 -0700

    Conflicts:
    	config/admins.txt
    	tgstation.dme

commit ac942d344fc21beec715a38ac1c0059fd9dbd79f
Merge: d2da16f c6c1dbd
Author: Cheridan <d_h2005@yahoo.com>
Date:   Fri Nov 1 21:02:27 2013 -0700

    Merge pull request #1684 from sirbayer/srsbsns-improvedprojectiles

    Projectile gun feeding rework

commit c6c1dbd363b55e537ac07da755e40d96e93d70fd
Merge: 6cb1003 d2da16f
Author: sirbayer <sirbayer@gmail.com>
Date:   Fri Nov 1 20:32:04 2013 -0700

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

commit 6cb100382c456fff379c1e5ca381b87140bfa328
Author: sirbayer <sirbayer@gmail.com>
Date:   Thu Oct 31 17:58:03 2013 -0700

    Removed potential runtime from spawning projectile/shotgun. Also made it so shotguns actually load shotgun shells.

commit d2da16feb8df6ebf7af74bc397ed91a648ddd070
Merge: d77963b b38dfd4
Author: MrPerson <spamtaffic@gmail.com>
Date:   Fri Nov 1 14:40:36 2013 -0700

    Merge pull request #1690 from Metacide/master

    Updated MetaStation.v37G.II.dmm to MetaStation.v37H.dmm

commit b38dfd4879fc3f4d3c3bfb45b9893785b255ad60
Author: Metacide <archaeosis@gmail.com>
Date:   Fri Nov 1 21:36:20 2013 +0000

    Updated MetaStation.v37G.II.dmm to MetaStation.v37H.dmm
    -Added virology smartfridge.
    -Added chemistry smartfridge.
    -Added more fire extinguishers to security.
    -Added cable coils to chemistry.
    -Added more briefcases to the map.
    -Added secure briefcases for each head and the detective.
    -Added bookbinder and photocopier to library.
    -Removed anomalous rwall by janitor's closet.
    -Updated maint. doors so they should all unlock correctly when heads use the emergency maint. all-access protocol.
    -Updated bomb test site camera so it should no longer runtime.
    -Updated the commemorative plaque near arrivals, which now displays the normal message and the map version number.
    -Fixed prison monitors just ouside the prison and in the lawyer's office.
    -Fixed genetics lab being visible to the public hallway, causing Beepsky to try and attack the monkeys within.
    -Turned pumps (but not taps) on by default for O2/N2 to airmix in atmos.

commit d77963bc43f1b23c487935ca62c2b0b071dc86f9
Merge: 9f55810 e543604
Author: Giacom <giacomand@gmail.com>
Date:   Thu Oct 31 05:56:05 2013 -0700

    Merge pull request #1683 from Miauw62/borgshaker

    Improved cyborg shakers.

commit 19e51caef09e78ca1122d26455b539ff5968d334
Author: sirbayer <sirbayer@gmail.com>
Date:   Wed Oct 30 03:00:03 2013 -0700

    Modification of .gitignore to include admins.txt. Hopefully.`

    Added myself to admins.txt for testing.

    Merge branch 'srsbsns'

    Fucking finally figuring out how to make admins.txt be ignored.

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

    Conflicts:
    	config/admins.txt

    stuff

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

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

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

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

    latest setting for tgstation.dme

    deeply do I loathe these files

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

    Conflicts:
    	config/admins.txt

    God I hate gitignore

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

    Modification of .gitignore to include admins.txt. Hopefully.`

    Added myself to admins.txt for testing.

    Merge branch 'srsbsns'

    Fucking finally figuring out how to make admins.txt be ignored.

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

    Conflicts:
    	config/admins.txt

    stuff

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

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

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

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

    latest setting for tgstation.dme

    deeply do I loathe these files

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

    Conflicts:
    	config/admins.txt

    God I hate gitignore

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

    Modification of .gitignore to include admins.txt. Hopefully.`

    Added myself to admins.txt for testing.

    Merge branch 'srsbsns'

    Fucking finally figuring out how to make admins.txt be ignored.

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

    Conflicts:
    	config/admins.txt

    stuff

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

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

    Conflicts:
    	config/admins.txt

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

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

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

    latest setting for tgstation.dme

    deeply do I loathe these files

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

    Conflicts:
    	config/admins.txt

    God I hate gitignore

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

    Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

    Conflicts:
    	config/admins.txt
    	data/investigate/singulo.html

    I don't what I'm doing

    Massive overhaul to automatic gun functionality, intended primarily to
    allow partially-filled magazines to be released.

    Now it compiles and doesn't throw runtimes! Also chambering rounds works
    right! Unfortunately the contents still need to be looked at, the Russian
    Revolver isn't working, and the Bartender's shotgun is just a nightmare.
    Also you still can't eject mags.

    Mags eject, most gun work. Shotguns still have a problem with reloading
    and chambering. Russian Revolver is a bitch.

    Heavy finalizing touches. Fixed references to changed trees. Added
    icon_states for some magazines. Fixed revolver glitches and subtyped
    double-barreled shotguns to revolvers to fix its glitches. Made bullets
    and spent shells more obvious via graphical changes. Probably did some
    other things but I can't think of what they'd be.

    Sprite tweaks for final preparations for pull request.

    final FINAL finalizations.

    Adding full paths to overwritten procs for simplicity's sake.

    Fixing damaged .gitignore and config/admins.txt.

    Finalization for pull preparation. Clean up some descs, eliminate data folder.

commit e543604d2bd4dae4649009efde880d9c62c56b39
Author: Miauw <gilles.coremans@gmail.com>
Date:   Wed Oct 30 21:55:05 2013 +0100

    Improved the new cyborg shaker.

commit 9f558101cb5dee1425b450eb4bbaeb340a266658
Merge: 0b5e2d3 dc8f30b
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 13:34:49 2013 -0700

    Merge pull request #1658 from Giacom/ai_vox_boogaloo

    Added a voice announcement system for the AI. [CHANGELOG]

commit dc8f30b1ec606ec9c2a33f65be18effabc27bda4
Author: Giacomand <giacomand@gmail.com>
Date:   Wed Oct 30 19:44:17 2013 +0000

     * Removed the deleted files from vox_sounds.dm

commit 0eb73fedab4c9887c80e2f5454d063d3e69095df
Merge: add3a98 402733f
Author: Giacom <giacomand@gmail.com>
Date:   Wed Oct 30 12:05:03 2013 -0700

    Merge pull request #3 from JJRcop/comma-period-silence

    Background sound removed from period and comma sounds, also they are now Vorbis

commit 402733f3b80a0f6824a446a6f1148abf40aef87d
Author: JJRcop <jjrcop@hidden.address>
Date:   Wed Oct 30 14:50:28 2013 -0400

    Made period and comma sounds completely silent, and turned them Vorbis

commit add3a989b0a82c5a76b286dc1be6c3018ec5b45d
Author: Giacomand <giacomand@gmail.com>
Date:   Wed Oct 30 17:41:23 2013 +0000

    Removed the HL sound effects.

commit 0b5e2d3c1754c2638cdf5da8d8f9fbb0a233addc
Merge: 2888ade 9ad2d5b
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 09:08:52 2013 -0700

    Merge pull request #1662 from Giacom/doppler_array_tweak

    The doppler array will now state the theoretical size of the explosion if it was uncapped.

commit 58678a7f3b28c765cefe6b5391ba314820edcda3
Merge: b1cd04d 2888ade
Author: Giacomand <giacomand@gmail.com>
Date:   Wed Oct 30 15:22:14 2013 +0000

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

commit 2888ade8976d8619dc3009706e3d42e02c7b4ab3
Merge: 8c6a39d 83b882e
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 08:19:22 2013 -0700

    Merge pull request #1655 from Giacom/robot_violin

    Added the space violin to the service cyborg modules + MORE [CHANGELOG]

commit 8c6a39da826927da885363fd04ba10a2515ca809
Merge: d46ba38 9a63474
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 06:48:43 2013 -0700

    Merge pull request #1672 from Miauw62/MULEfix

    MULEs deliver properly again.

commit d46ba3879f816d90d0508762e31721c767ffa6df
Merge: 033248d 3bf7f78
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 05:46:31 2013 -0700

    Merge pull request #1676 from JJRcop/fix-mech-hulk/tk

    Overwrote mech attack_tk proc to return immediately

commit 033248d216204b001574dd07bb2bfe11e76bab12
Merge: f9907e5 84248eb
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Oct 30 04:29:19 2013 -0700

    Merge pull request #1648 from Giacom/field_gens

    Field Generator/Containment Field Changes [MAP] (Fixes #205)

commit f9907e5fce0932a4eb280156ae4cc7e1266dd7b2
Merge: 3efaff6 9b2437a
Author: Cheridan <d_h2005@yahoo.com>
Date:   Tue Oct 29 23:14:05 2013 -0700

    Merge pull request #1674 from Giacom/dis_tiny_fix

    Validates the spray bottle is still on the user when emptying.

commit 3bf7f78b296b2530e57f82f68252d2ae461f0d5a
Author: JJRcop <jjrcop@hidden.address>
Date:   Tue Oct 29 19:36:25 2013 -0400

    Made mech attack_tk return

commit 3efaff62ba679acbf299c9af77494b4958e8768c
Merge: 1f27f5f 3144b54
Author: Giacom <giacomand@gmail.com>
Date:   Tue Oct 29 14:42:56 2013 -0700

    Merge pull request #1668 from AndroidSFV/Fix633

    Resolves #633

commit 04faefd5d91afe8b5dfd1df12c603ed582b5685b
Author: Miauw <gilles.coremans@gmail.com>
Date:   Tue Oct 29 22:02:00 2013 +0100

    Improved cyborg shakers. They now synthesize all base drink ingredients.

commit 1f27f5f670b93d11c384eccc1affe6849fc6bf6a
Merge: a501cef 2fe27c0
Author: Cheridan <d_h2005@yahoo.com>
Date:   Tue Oct 29 08:11:09 2013 -0700

    Merge pull request #1667 from AndroidSFV/fix636

    Resolves #636

commit 9b2437aa710c9313121602eabfa61c14d8b29cb8
Author: Giacomand <giacomand@gmail.com>
Date:   Mon Oct 28 17:29:09 2013 +0000

     * Validates the spray bottle is still on the user.

commit 9a63474eccef95860a3d0e46992403e291b58490
Author: Miauw <gilles.coremans@gmail.com>
Date:   Mon Oct 28 12:27:45 2013 +0100

    MULEs will now deliver crates to the dir of the target beacon. Fixes #295

commit 3144b54e922ef772c7279b26d17bc69b4d5212c0
Author: AndroidSFV <androidandro@hotmail.com>
Date:   Sun Oct 27 19:37:34 2013 -0500

    Fixes #633. Problem was a null.loc runtime from the chair being disassembled.

commit 2fe27c016780f13649acaa69ad488952673d2852
Author: AndroidSFV <androidandro@hotmail.com>
Date:   Sun Oct 27 19:03:49 2013 -0500

    Fixes #636. A wrapped package never ever had a w_class other than 3.

commit 9ad2d5b5c2a98ae1ef6ccba9a0fe73b9832098ad
Author: Giacomand <giacomand@gmail.com>
Date:   Sun Oct 27 12:45:02 2013 +0000

    The doppler array will now state the theoretical size of the explosion, which is the size of the explosion if there were no bomb cap.

commit b1cd04d23be0c63f028506043bc217b1308f0d72
Author: Giacomand <giacomand@gmail.com>
Date:   Sun Oct 27 10:07:35 2013 +0000

    * Added a changelog entry for it.

commit d848f5d65b5fc25086cda2bf2463a1f2829eeaeb
Merge: ff9c48a 48fcf10
Author: Giacom <giacomand@gmail.com>
Date:   Sun Oct 27 02:20:30 2013 -0700

    Merge pull request #2 from JJRcop/silence-i-kill-you

    THIS IS THE DAY SILENCE DIES

commit 48fcf107a903d040396bbc1c427fa6253adcab13
Author: JJRcop <jjrcop@hidden.address>
Date:   Sat Oct 26 23:15:52 2013 -0400

    Removed follwing silence from sound samples

    I KILL YOU, SILENCE

commit ff9c48a4aeb235519148ccf1e1db87fcd7a37146
Merge: d8507ac d866a36
Author: Giacom <giacomand@gmail.com>
Date:   Sat Oct 26 16:04:40 2013 -0700

    Merge pull request #1 from JJRcop/wood-ogg

    Adds missing "wood.ogg"

commit d866a3611b20eddb0b652f98ca79f5952e376a0b
Author: JJRcop <jjrcop@hidden.address>
Date:   Sat Oct 26 17:53:56 2013 -0400

    Adds missing "wood.ogg"

commit d8507acaa7de125c6c7e80cb5aa00dbb55588938
Author: Giacomand <giacomand@gmail.com>
Date:   Sat Oct 26 22:19:13 2013 +0100

     * Removed the text announcement. It wouldn't work if the AI used the sound effects.

commit 48d00948ca8d7b83edf078f2b8af9ddf795c79df
Author: Giacomand <giacomand@gmail.com>
Date:   Sat Oct 26 20:18:42 2013 +0100

    The AI's vocal announcement will also make a Request Console style announcement with the text of the message.

commit f44faba532bbe472cd98159a996750d5116ae2fb
Author: Giacomand <giacomand@gmail.com>
Date:   Sat Oct 26 17:56:39 2013 +0100

    Added a voice announcement system for the AI.
    Voices are based on /vg/'s female voice and are copyright free.
    There is a 60 second cooldown for each announcement.
    Added a compile option for AI voices. Undefining AI_VOX will not compile the resources, meaning players won't have to download them.

commit 83b882ed3f43bd24e7f678a090b53f44935feb35
Author: Giacomand <giacomand@gmail.com>
Date:   Sat Oct 26 13:49:41 2013 +0100

    * Added the space violin to the service cyborg modules.
    * Made the space violin usable by service cyborgs.
    * You can now examine Cyborgs to see their active module.
    * Made the choose module window look nicer.

commit 84248eb6ab59c4973a2cfff4d4e82217e50713ab
Author: Giacomand <giacomand@gmail.com>
Date:   Fri Oct 25 15:01:04 2013 +0100

    Made containment fields shock you when you walk into them, not when you walk near them.
    Field generators, that are active, will now shock you; they did before but it was because of the containment field near it.
    Changed the type path of the field generator and containment field:

    /obj/machinery/field_generator -> /obj/machinery/field/generator
    /obj/machinery/containment_field -> /obj/machinery/field/containment

    Changed the map to have the new type paths.
    The containment field will now shock you when it is created.
    The containment field layer is a little above objects, so objects going through are under the field icon.
    Cleaned up a bit of the code.
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'bayercustoms' into bayercustoms-housingstation
Merge branch 'bayercustoms' into bayercustoms-winterwonderland
Merge branch 'master' into bayercustoms-housingstation